From ec9b17a75734e96d202d11386c82db396d8b2553bed0e01a6e7752174e191e0b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 10 Jun 2012 12:06:11 +0000 Subject: [PATCH] Accepting request 122218 from openSUSE:Factory:ARM use same mechanism to switch to armv7hl and armv5tel on native arm architectures OBS-URL: https://build.opensuse.org/request/show/122218 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=203 --- rpm.changes | 5 +++++ rpm.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rpm.changes b/rpm.changes index be4dc39..a978cbb 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 24 20:42:30 UTC 2012 - adrian@suse.de + +- set armv5tel architecture (similar to armv7hl approach) + ------------------------------------------------------------------- Thu May 10 10:51:41 UTC 2012 - coolo@suse.com diff --git a/rpm.spec b/rpm.spec index 8e08ae5..db321d8 100644 --- a/rpm.spec +++ b/rpm.spec @@ -334,12 +334,17 @@ rm -rf %{buildroot}/%{_libdir}/python%{py_ver} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm -%ifarch armv7hl +# On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros +%ifarch armv7hl armv7l # 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 +echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform +%endif %post %{fillup_only -an services}