- Add "arm" architectures.

diff --git a/VERSION.cmake b/VERSION.cmake
index bfdc536..6aa8b60 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,8 +60,8 @@
 #
 SET(LIBZYPP_MAJOR "5")
 SET(LIBZYPP_COMPATMINOR "19")
-SET(LIBZYPP_MINOR "19")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_MINOR "20")
+SET(LIBZYPP_PATCH "0")
 #
 # LAST RELEASED: 5.19.0 (19)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)

diff --git a/package/libzypp.changes b/package/libzypp.changes
index b087a56..7dd93b5 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Oct 28 16:47:36 CET 2008 - ma@suse.de
+
+- Add 'arm' architectures.
+- revision 11525
+
+-------------------------------------------------------------------
 Tue Oct 28 10:07:13 CET 2008 - schubi@suse.de
 
 - regarding "keep obsolete" in the solutions (bnc #439134)

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index c4850b4..1ff17f9 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -168,6 +168,14 @@ namespace zypp
     DEF_BUILTIN( sparcv9 );
     DEF_BUILTIN( sparcv8 );
     DEF_BUILTIN( sparc );
+
+    DEF_BUILTIN( armv6l );
+    DEF_BUILTIN( armv5tejl );
+    DEF_BUILTIN( armv5tel );
+    DEF_BUILTIN( armv5l );
+    DEF_BUILTIN( armv4tl );
+    DEF_BUILTIN( armv4l );
+    DEF_BUILTIN( armv3l );
 #undef DEF_BUILTIN
 
     ///////////////////////////////////////////////////////////////////
@@ -263,6 +271,14 @@ namespace zypp
         //
         defCompatibleWith( _sparcv9,   _noarch,_sparc );
         defCompatibleWith( _sparc64,   _noarch,_sparc,_sparcv9 );
+
+        defCompatibleWith( _armv3l,    _noarch );
+        defCompatibleWith( _armv4l,    _noarch,_armv3l );
+        defCompatibleWith( _armv4tl,   _noarch,_armv3l,_armv4l );
+        defCompatibleWith( _armv5l,    _noarch,_armv3l,_armv4l,_armv4tl );
+        defCompatibleWith( _armv5tel,  _noarch,_armv3l,_armv4l,_armv4tl,_armv5l );
+        defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel );
+        defCompatibleWith( _armv6l,    _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl );
         //
         ///////////////////////////////////////////////////////////////////
         //dumpOn( USR ) << endl;
@@ -357,6 +373,14 @@ namespace zypp
   const Arch Arch_sparcv8( _sparcv8 );
   const Arch Arch_sparc  ( _sparc );
 
+  const Arch Arch_armv6l   ( _armv6l );
+  const Arch Arch_armv5tejl( _armv5tejl );
+  const Arch Arch_armv5tel ( _armv5tel );
+  const Arch Arch_armv5l   ( _armv5l );
+  const Arch Arch_armv4tl  ( _armv4tl );
+  const Arch Arch_armv4l   ( _armv4l );
+  const Arch Arch_armv3l   ( _armv3l );
+
   ///////////////////////////////////////////////////////////////////
   //
   //   METHOD NAME : Arch::Arch

diff --git a/zypp/Arch.h b/zypp/Arch.h
index 607f1ed..23cecb2 100644 (file)
--- a/zypp/Arch.h
+++ b/zypp/Arch.h
@@ -206,6 +206,22 @@ namespace zypp
   extern const Arch Arch_sparcv8;
   /** \relates Arch */
   extern const Arch Arch_sparc;
+
+  /** \relates Arch */
+  extern const Arch Arch_armv6l;
+  /** \relates Arch */
+  extern const Arch Arch_armv5tejl;
+  /** \relates Arch */
+  extern const Arch Arch_armv5tel;
+  /** \relates Arch */
+  extern const Arch Arch_armv5l;
+  /** \relates Arch */
+  extern const Arch Arch_armv4tl;
+  /** \relates Arch */
+  extern const Arch Arch_armv4l;
+  /** \relates Arch */
+  extern const Arch Arch_armv3l;
+
   //@}
 
   ///////////////////////////////////////////////////////////////////