| @@ -1,7 +1,7 @@
-Index: zypp/Arch.cc
+Index: libzypp/upstream/zypp/Arch.cc
===================================================================
---- zypp.orig/Arch.cc
-+++ 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 );
@@ -11,16 +11,15 @@
DEF_BUILTIN( armv7tnhl );
DEF_BUILTIN( armv7thl );
DEF_BUILTIN( armv7nhl );
-@@ -325,6 +327,8 @@ namespace zypp
- defCompatibleWith( _armv7nhl(), _noarch(),_armv7hl() );
- defCompatibleWith( _armv7thl(), _noarch(),_armv7hl() );
- defCompatibleWith( _armv7tnhl(), _noarch(),_armv7hl(),_armv7nhl(),_armv7thl() );
-+
-+ defCompatibleWith( _aarch64(), _noarch() );
+@@ -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() );
+ defCompatibleWith( _sh3(), _noarch() );
//
-@@ -430,6 +434,8 @@ namespace zypp
+@@ -430,6 +433,8 @@ namespace zypp
const Arch Arch_sparcv8( _sparcv8() );
const Arch Arch_sparc( _sparc() );
@@ -29,24 +28,36 @@
const Arch Arch_armv7tnhl( _armv7tnhl() );
const Arch Arch_armv7thl( _armv7thl() );
const Arch Arch_armv7nhl ( _armv7nhl() );
-Index: zypp/Arch.h
+Index: libzypp/upstream/zypp/Arch.h
===================================================================
---- zypp.orig/Arch.h
-+++ zypp/Arch.h
-@@ -222,6 +222,9 @@ namespace zypp
+--- 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: zypp/parser/yum/schema/common-inc.rnc
+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
===================================================================
---- zypp.orig/parser/yum/schema/common-inc.rnc
-+++ 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"
@@ -55,10 +66,10 @@
| "armv7tnhl"
| "armv7thl"
| "armv7nhl"
-Index: zypp/parser/yum/schema/common-inc.rng
+Index: libzypp/upstream/zypp/parser/yum/schema/common-inc.rng
===================================================================
---- zypp.orig/parser/yum/schema/common-inc.rng
-+++ 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>
@@ -67,4 +78,3 @@
<value>armv7tnhl</value>
<value>armv7thl</value>
<value>armv7nhl</value>
-
|
