Commit e5ec0025 by Alexey Andreyev

12.2.0+git5 aarch64 patch

1 parent cdb7b772
Index: libzypp/upstream/zypp/Arch.cc
===================================================================
--- libzypp.orig/upstream/zypp/Arch.cc
+++ libzypp/upstream/zypp/Arch.cc
@@ -187,6 +187,8 @@ namespace zypp
DEF_BUILTIN( sparcv8 );
DEF_BUILTIN( sparc );
+ DEF_BUILTIN( aarch64 );
+
DEF_BUILTIN( armv7tnhl );
DEF_BUILTIN( armv7thl );
DEF_BUILTIN( armv7nhl );
@@ -325,6 +327,7 @@ namespace zypp
defCompatibleWith( _armv7nhl(), _noarch(),_armv7hl() );
defCompatibleWith( _armv7thl(), _noarch(),_armv7hl() );
defCompatibleWith( _armv7tnhl(), _noarch(),_armv7hl(),_armv7nhl(),_armv7thl() );
+ defCompatibleWith( _aarch64(), _noarch() );
//
defCompatibleWith( _sh3(), _noarch() );
//
@@ -430,6 +433,8 @@ namespace zypp
const Arch Arch_sparcv8( _sparcv8() );
const Arch Arch_sparc( _sparc() );
+ const Arch Arch_aarch64( _aarch64() );
+
const Arch Arch_armv7tnhl( _armv7tnhl() );
const Arch Arch_armv7thl( _armv7thl() );
const Arch Arch_armv7nhl ( _armv7nhl() );
Index: libzypp/upstream/zypp/Arch.h
===================================================================
--- libzypp.orig/upstream/zypp/Arch.h
+++ libzypp/upstream/zypp/Arch.h
@@ -222,6 +222,8 @@ namespace zypp
extern const Arch Arch_sparc;
/** \relates Arch */
+ extern const Arch Arch_aarch64;
+ /** \relates Arch */
extern const Arch Arch_armv7tnhl;
/** \relates Arch */
extern const Arch Arch_armv7thl;
Index: libzypp/upstream/zypp/ZConfig.cc
===================================================================
--- libzypp.orig/upstream/zypp/ZConfig.cc
+++ libzypp/upstream/zypp/ZConfig.cc
@@ -127,7 +127,7 @@ namespace zypp
ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
}
}
- else if ( architecture == Arch_armv7l)
+ else if ( architecture == Arch_armv7l || architecture == Arch_aarch64 )
{
std::ifstream platform( "/etc/rpm/platform" );
if (platform)
Index: libzypp/upstream/zypp/parser/yum/schema/common-inc.rnc
===================================================================
--- libzypp.orig/upstream/zypp/parser/yum/schema/common-inc.rnc
+++ libzypp/upstream/zypp/parser/yum/schema/common-inc.rnc
@@ -51,6 +51,7 @@ private.archenum = "noarch"
| "sparcv9"
| "sparcv8"
| "sparc"
+ | "aarch64"
| "armv7tnhl"
| "armv7thl"
| "armv7nhl"
Index: libzypp/upstream/zypp/parser/yum/schema/common-inc.rng
===================================================================
--- libzypp.orig/upstream/zypp/parser/yum/schema/common-inc.rng
+++ libzypp/upstream/zypp/parser/yum/schema/common-inc.rng
@@ -114,6 +114,7 @@
<value>sparcv9</value>
<value>sparcv8</value>
<value>sparc</value>
+ <value>aarch64</value>
<value>armv7tnhl</value>
<value>armv7thl</value>
<value>armv7nhl</value>
......@@ -6,6 +6,7 @@ Version: 12.2.0
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
Patch0: aarch64.patch
BuildRequires: cmake
BuildRequires: openssl-devel
BuildRequires: libudev-devel
......@@ -70,9 +71,11 @@ Authors:
Marius Tomaschewski <mt@suse.de>
Stanislav Visnovsky <visnov@suse.cz>
Ladislav Slezak <lslezak@suse.cz>
Alexey Andreyev <aa13q.ru>
%prep
%setup -q -n %{name}-%{version}/%{name}
%patch -p1
%build
mkdir -p build
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!