From 2f4b3e03e358c20df0e2dbd9f0f5b129b0853c77bdc84c343d79fdd288488b93 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 10 Oct 2012 13:16:36 +0000 Subject: [PATCH] Accepting request 137709 from openSUSE:Factory:ARM switch to armv5tel architecture OBS-URL: https://build.opensuse.org/request/show/137709 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=228 --- rpm.changes | 5 +++++ rpm.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rpm.changes b/rpm.changes index 94bd766..48a4937 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 10 07:03:41 UTC 2012 - adrian@suse.de + +- follow armv5tel architecture switch from armv5el + ------------------------------------------------------------------- Wed Sep 26 14:13:48 UTC 2012 - coolo@suse.com diff --git a/rpm.spec b/rpm.spec index 02d972c..70ad4d3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -228,7 +228,7 @@ rm -f m4/lt*.m4 %build export CFLAGS="%{optflags} -ffunction-sections" export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections" -%ifarch alpha armv5tel +%ifarch alpha export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" %endif @@ -329,14 +329,14 @@ rm -f %{buildroot}%{_libdir}/*.la 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 armv7l +%ifarch armv7hl # rpm is using the host_cpu as default for the platform, but armv7hl 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 armv5el -# switch to armv5tel on armv5el +%ifarch armv5tel +# switch to armv5tel even when system cpu is armv7 echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform %endif