Accepting request 124356 from Base:System
use same mechanism to switch to armv7hl and armv5tel on native arm architectures (forwarded request 122218 from adrianSuSE) OBS-URL: https://build.opensuse.org/request/show/124356 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=178
This commit is contained in:
commit
0a85f96e77
@ -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
|
Thu May 10 10:51:41 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
7
rpm.spec
7
rpm.spec
@ -334,12 +334,17 @@ rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
|
|||||||
rm -f %{buildroot}%{_libdir}/*.la
|
rm -f %{buildroot}%{_libdir}/*.la
|
||||||
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
|
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
|
||||||
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
|
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.
|
# 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.
|
# 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.
|
# 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
|
echo -n armv7hl-suse-linux> %{buildroot}/etc/rpm/platform
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch armv5el
|
||||||
|
# switch to armv5tel on armv5el
|
||||||
|
echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform
|
||||||
|
%endif
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{fillup_only -an services}
|
%{fillup_only -an services}
|
||||||
|
Loading…
Reference in New Issue
Block a user