Add m68k architecture

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index 7ee92fd..37aea0e 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -209,6 +209,8 @@ namespace zypp
 
   DEF_BUILTIN( sh4 );
   DEF_BUILTIN( sh4a );
+
+  DEF_BUILTIN(m68k);
 #undef DEF_BUILTIN
 
   ///////////////////////////////////////////////////////////////////
@@ -344,6 +346,8 @@ namespace zypp
         //
         defCompatibleWith( _sh4(),             _noarch() );
         defCompatibleWith( _sh4a(),            _noarch(),_sh4() );
+
+        defCompatibleWith(_m68k(),             _noarch());
         //
         ///////////////////////////////////////////////////////////////////
         // dumpOn( USR ) << endl;

diff --git a/zypp/Arch.h b/zypp/Arch.h
index 66a4d77..37e2222 100644 (file)
--- a/zypp/Arch.h
+++ b/zypp/Arch.h
@@ -262,6 +262,9 @@ namespace zypp
   extern const Arch Arch_sh4;
   /** \relates Arch */
   extern const Arch Arch_sh4a;
+
+  /** \relates Arch */
+  extern const Arch Arch_m68k;
   //@}
 
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/parser/yum/schema/common-inc.rnc b/zypp/parser/yum/schema/common-inc.rnc
index 6cc6052..fc529b4 100644 (file)
--- a/zypp/parser/yum/schema/common-inc.rnc
+++ b/zypp/parser/yum/schema/common-inc.rnc
@@ -67,5 +67,6 @@ private.archenum = "noarch"
             | "sh3"
             | "sh4"
             | "sh4a"
+            | "m68k"
             | "src"
 

diff --git a/zypp/parser/yum/schema/common-inc.rng b/zypp/parser/yum/schema/common-inc.rng
index c83579f..6a2caef 100644 (file)
--- a/zypp/parser/yum/schema/common-inc.rng
+++ b/zypp/parser/yum/schema/common-inc.rng
@@ -130,6 +130,7 @@
       <value>sh3</value>
       <value>sh4</value>
       <value>sh4a</value>
+      <value>m68k</value>
       <value>src</value>
     </choice>
   </define>