--- zypp/Arch.cc | 6 ++++++ zypp/Arch.h | 4 ++++ zypp/parser/yum/schema/common-inc.rnc | 2 ++ zypp/parser/yum/schema/common-inc.rng | 2 ++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/zypp/Arch.cc b/zypp/Arch.cc index 262b9e3..c2d237c 100644 --- a/zypp/Arch.cc +++ b/zypp/Arch.cc @@ -187,6 +187,8 @@ namespace zypp DEF_BUILTIN( sparcv8 ); DEF_BUILTIN( sparc ); + DEF_BUILTIN( armv7nhl ); + DEF_BUILTIN( armv7hl ); DEF_BUILTIN( armv7l ); DEF_BUILTIN( armv6l ); DEF_BUILTIN( armv5tejl ); @@ -317,6 +319,8 @@ namespace zypp defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel ); 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( _sh3, _noarch ); // @@ -422,6 +426,8 @@ 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_armv7l( _armv7l ); const Arch Arch_armv6l( _armv6l ); const Arch Arch_armv5tejl( _armv5tejl ); diff --git a/zypp/Arch.h b/zypp/Arch.h index 39ff6ed..6b18a6e 100644 --- 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_armv7nhl; + /** \relates Arch */ + extern const Arch Arch_armv7hl; + /** \relates Arch */ extern const Arch Arch_armv7l; /** \relates Arch */ extern const Arch Arch_armv6l; diff --git a/zypp/parser/yum/schema/common-inc.rnc b/zypp/parser/yum/schema/common-inc.rnc index 7e60a2a..4d27fcc 100644 --- a/zypp/parser/yum/schema/common-inc.rnc +++ b/zypp/parser/yum/schema/common-inc.rnc @@ -31,6 +31,8 @@ private.archenum = "noarch" | "armv5tel" | "armv7el" | "armv7l" + | "armv7hl" + | "armv7nhl" | "athlon" | "i386" | "i486" diff --git a/zypp/parser/yum/schema/common-inc.rng b/zypp/parser/yum/schema/common-inc.rng index 6baea52..c58ce88 100644 --- a/zypp/parser/yum/schema/common-inc.rng +++ b/zypp/parser/yum/schema/common-inc.rng @@ -94,6 +94,8 @@ <value>armv5tel</value> <value>armv7el</value> <value>armv7l</value> + <value>armv7hl</value> + <value>armv7nhl</value> <value>athlon</value> <value>i386</value> <value>i486</value> -- 1.7.2.2 -- To unsubscribe, e-mail: zypp-devel+unsubscribe@opensuse.org For additional commands, e-mail: zypp-devel+help@opensuse.org