Author: mlandres Date: Tue Oct 28 16:49:07 2008 New Revision: 11525 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11525&view=rev Log: - Add "arm" architectures. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Arch.cc trunk/libzypp/zypp/Arch.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11525&r1=11524&r2=11525&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Oct 28 16:49:07 2008 @@ -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) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11525&r1=11524&r2=11525&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Oct 28 16:49:07 2008 @@ -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) Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11525&r1=11524&r2=11525&view=diff ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Tue Oct 28 16:49:07 2008 @@ -168,6 +168,14 @@ 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 @@ // 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 @@ 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 Modified: trunk/libzypp/zypp/Arch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.h?rev=11525&r1=11524&r2=11525&view=diff ============================================================================== --- trunk/libzypp/zypp/Arch.h (original) +++ trunk/libzypp/zypp/Arch.h Tue Oct 28 16:49:07 2008 @@ -206,6 +206,22 @@ 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; + //@} /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org