Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-07-03 10:26:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Changes:
--------
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-06-25 14:45:49.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-07-03
10:26:49.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Jul 2 09:53:02 UTC 2013 - dmuel...@suse.com
+
+- extend the armv7hl hack also to armv6hl
+
+-------------------------------------------------------------------
+Thu Jun 27 22:03:51 UTC 2013 - dmuel...@suse.com
+
+- add support for armv6hl target
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
rpm-python.spec: same change
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:50.000000000 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:50.000000000 +0200
@@ -251,13 +251,11 @@
export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
%endif
-%if %{_target_cpu}
%ifarch %arm
BUILDTARGET="--build=%{_target_cpu}-suse-linux-gnueabi"
%else
BUILDTARGET="--build=%{_target_cpu}-suse-linux"
%endif
-%endif
#cp -p /usr/share/gettext/config.rpath .
cp autogen.sh beecrypt
@@ -355,15 +353,10 @@
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
# On arm the kernel architecture is ignored. Not the best idea, but lets stay
compatible with other distros
-%ifarch armv7hl
-# rpm is using the host_cpu as default for the platform, but armv7hl is not
known by the kernel.
+%ifarch armv7hl armv6hl
+# rpm is using the host_cpu as default for the platform, but armv6/7hl is not
known by the kernel.
# so we need to enforce the platform here.
-# We don't want to use armv7l because it would make us incompatible to Fedora
and MeeGo plattforms.
-echo -n armv7hl-suse-linux> %{buildroot}/etc/rpm/platform
-%endif
-%ifarch armv5tel
-# switch to armv5tel even when system cpu is armv7
-echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform
+echo -n "%{_target_cpu}-suse-linux-gnueabi" > %{buildroot}/etc/rpm/platform
%endif
%post
++++++ macrosin.diff ++++++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:51.000000000 +0200
@@ -284,7 +284,7 @@
#------------------------------------------------------------------------------
# arch macro for all supported ARM processors
-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
-+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl
armv6l armv7l armv7hl
++%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl
armv6l armv6hl armv7l armv7hl
+%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl
+%armb armv4b armv5b armv5teb
++++++ rpmrc.diff ++++++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:51.000000000 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:51.000000000 +0200
@@ -52,15 +52,17 @@
optflags: hppa1.0 -O2 -g -mpa-risc-1-0
optflags: hppa1.1 -O2 -g -mpa-risc-1-0
optflags: hppa1.2 -O2 -g -mpa-risc-1-0
-@@ -67,6 +68,7 @@
+@@ -66,7 +67,9 @@
+ optflags: armv5tel -O2 -g -march=armv5te
optflags: armv5tejl -O2 -g -march=armv5te
optflags: armv6l -O2 -g -march=armv6
++optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mabi=aapcs-linux
optflags: armv7l -O2 -g -march=armv7
+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb
-mabi=aapcs-linux
optflags: atarist -O2 -g -fomit-frame-pointer
optflags: atariste -O2 -g -fomit-frame-pointer
-@@ -76,12 +78,13 @@
+@@ -76,12 +79,13 @@
optflags: milan -O2 -g -fomit-frame-pointer
optflags: hades -O2 -g -fomit-frame-pointer
@@ -76,15 +78,17 @@
#############################################################
# Canonical arch names and numbers
-@@ -142,6 +145,7 @@
+@@ -141,7 +145,9 @@
+ arch_canon: armv5tel: armv5tel 12
arch_canon: armv5tejl: armv5tejl 12
arch_canon: armv6l: armv6l 12
++arch_canon: armv6hl: armv6hl 12
arch_canon: armv7l: armv7l 12
+arch_canon: armv7hl: armv7hl 12
arch_canon: m68kmint: m68kmint 13
arch_canon: atarist: m68kmint 13
-@@ -166,6 +170,7 @@
+@@ -166,6 +172,7 @@
arch_canon: sh4: sh4 17
arch_canon: sh4a: sh4a 17
arch_canon: xtensa: xtensa 18
@@ -92,7 +96,7 @@
#############################################################
# Canonical OS names and numbers
-@@ -203,17 +208,17 @@
+@@ -203,17 +210,17 @@
#############################################################
# For a given uname().machine, the default build arch
@@ -118,7 +122,7 @@
buildarchtranslate: i486: i386
buildarchtranslate: i386: i386
-@@ -243,6 +248,7 @@
+@@ -243,6 +250,7 @@
buildarchtranslate: ppc64iseries: ppc64
buildarchtranslate: ppc64pseries: ppc64
buildarchtranslate: ppc64p7: ppc64
@@ -126,16 +130,18 @@
buildarchtranslate: armv3l: armv3l
buildarchtranslate: armv4b: armv4b
-@@ -252,6 +258,8 @@
+@@ -251,7 +259,10 @@
+ buildarchtranslate: armv5tel: armv5tel
buildarchtranslate: armv5tejl: armv5tejl
buildarchtranslate: armv6l: armv6l
++buildarchtranslate: armv6hl: armv6hl
buildarchtranslate: armv7l: armv7l
+buildarchtranslate: armv7hl: armv7hl
+buildarchtranslate: aarch64: aarch64
buildarchtranslate: atarist: m68kmint
buildarchtranslate: atariste: m68kmint
-@@ -274,6 +282,15 @@
+@@ -274,6 +285,15 @@
buildarchtranslate: sh4: sh4
buildarchtranslate: sh4a: sh4
@@ -151,7 +157,7 @@
#############################################################
# Architecture compatibility
-@@ -330,14 +347,19 @@
+@@ -330,14 +350,20 @@
arch_compat: hppa2.0: hppa1.2
arch_compat: hppa1.2: hppa1.1
arch_compat: hppa1.1: hppa1.0
@@ -166,6 +172,7 @@
+arch_compat: armv7hl: armv7l
arch_compat: armv7l: armv6l
arch_compat: armv6l: armv5tejl
++arch_compat: armv6hl: armv6l
arch_compat: armv5tejl: armv5tel
-arch_compat: armv5tel: armv4tl
+arch_compat: armv5tel: armv5l
@@ -173,7 +180,7 @@
arch_compat: armv4tl: armv4l
arch_compat: armv4l: armv3l
arch_compat: armv3l: noarch
-@@ -354,7 +376,7 @@
+@@ -354,7 +380,7 @@
arch_compat: s390: noarch
arch_compat: s390x: s390 noarch
@@ -182,7 +189,7 @@
arch_compat: x86_64: amd64 em64t athlon noarch
arch_compat: amd64: x86_64 em64t athlon noarch
-@@ -364,6 +386,8 @@
+@@ -364,6 +390,8 @@
arch_compat: sh4: noarch
arch_compat: sh4a: sh4
@@ -191,15 +198,17 @@
os_compat: IRIX64: IRIX
os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
-@@ -439,6 +463,7 @@
+@@ -439,7 +467,9 @@
buildarch_compat: mipsel: noarch
buildarch_compat: armv4b: noarch
+buildarch_compat: armv7hl: armv7l
buildarch_compat: armv7l: armv6l
++buildarch_compat: armv6hl: armv6l
buildarch_compat: armv6l: armv5tejl
buildarch_compat: armv5tejl: armv5tel
-@@ -450,7 +475,8 @@
+ buildarch_compat: armv5tel: armv4tl
+@@ -450,7 +480,8 @@
buildarch_compat: hppa2.0: hppa1.2
buildarch_compat: hppa1.2: hppa1.1
buildarch_compat: hppa1.1: hppa1.0
@@ -209,7 +218,7 @@
buildarch_compat: parisc: noarch
buildarch_compat: atarist: m68kmint noarch
-@@ -473,6 +499,7 @@
+@@ -473,6 +504,7 @@
buildarch_compat: sh3: noarch
buildarch_compat: sh4: noarch
buildarch_compat: sh4a: sh4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
