Add arch armv7tnhl and armv7thl

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index 6b5eeb0..84253d1 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -187,6 +187,8 @@ namespace zypp
     DEF_BUILTIN( sparcv8 );
     DEF_BUILTIN( sparc );
 
+    DEF_BUILTIN( armv7tnhl );
+    DEF_BUILTIN( armv7thl );
     DEF_BUILTIN( armv7nhl );
     DEF_BUILTIN( armv7hl );
     DEF_BUILTIN( armv7l );
@@ -320,7 +322,9 @@ namespace zypp
         defCompatibleWith( _armv6l,    _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl );
         defCompatibleWith( _armv7l,    _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl,_armv6l );
         defCompatibleWith( _armv7hl,    _noarch );
-        defCompatibleWith( _armv7nhl,   _noarch, _armv7hl );
+        defCompatibleWith( _armv7nhl,   _noarch,_armv7hl );
+        defCompatibleWith( _armv7thl,   _noarch,_armv7hl );
+        defCompatibleWith( _armv7tnhl,  _noarch,_armv7hl,_armv7nhl,_armv7thl);
         //
         defCompatibleWith( _sh3,       _noarch );
         //
@@ -426,8 +430,10 @@ namespace zypp
   const Arch Arch_sparcv8( _sparcv8 );
   const Arch Arch_sparc( _sparc );
 
-  const Arch Arch_armv7nhl ( _armv7nhl );
-  const Arch Arch_armv7hl ( _armv7hl );
+  const Arch Arch_armv7tnhl( _armv7tnhl );
+  const Arch Arch_armv7thl( _armv7thl );
+  const Arch Arch_armv7nhl( _armv7nhl );
+  const Arch Arch_armv7hl( _armv7hl );
   const Arch Arch_armv7l( _armv7l );
   const Arch Arch_armv6l( _armv6l );
   const Arch Arch_armv5tejl( _armv5tejl );

diff --git a/zypp/Arch.h b/zypp/Arch.h
index 6b18a6e..c55aca0 100644 (file)
--- a/zypp/Arch.h
+++ b/zypp/Arch.h
@@ -222,6 +222,10 @@ namespace zypp
   extern const Arch Arch_sparc;
 
   /** \relates Arch */
+  extern const Arch Arch_armv7tnhl;
+  /** \relates Arch */
+  extern const Arch Arch_armv7thl;
+  /** \relates Arch */
   extern const Arch Arch_armv7nhl;
   /** \relates Arch */
   extern const Arch Arch_armv7hl;

diff --git a/zypp/parser/yum/schema/common-inc.rnc b/zypp/parser/yum/schema/common-inc.rnc
index f12ac3b..f785b9c 100644 (file)
--- a/zypp/parser/yum/schema/common-inc.rnc
+++ b/zypp/parser/yum/schema/common-inc.rnc
@@ -43,6 +43,8 @@ private.archenum = "noarch"
             | "ppc64"
             | "s390"
             | "s390x"
+            | "armv7tnhl"
+            | "armv7thl"
             | "sh4"
             | "x86_64"
             | "src"

diff --git a/zypp/parser/yum/schema/common-inc.rng b/zypp/parser/yum/schema/common-inc.rng
index 60e5742..7ccef6f 100644 (file)
--- a/zypp/parser/yum/schema/common-inc.rng
+++ b/zypp/parser/yum/schema/common-inc.rng
@@ -106,6 +106,8 @@
       <value>ppc64</value>
       <value>s390</value>
       <value>s390x</value>
+      <value>armv7tnhl</value>
+      <value>armv7thl</value>
       <value>sh4</value>
       <value>x86_64</value>
       <value>src</value>