Think something's broken in devel:packagemanagement/rpm, seems to be a project.diff floating around there (didn't come from me)
/Carsten 2011/1/7 Anas Nashif <[email protected]>: > Hi, > I have made the following changes to rpm in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Anas Nashif > > [This message was auto-generated] > > --- > > Request #11581: > > submit: devel:packagemanagement/rpm(r6) -> Trunk:Testing/rpm > > > Message: > Fixes BMC#11428 (RPM does not currently support 'armv7hl' and 'armv7nhl' > architectures). Please accept if patch OK and pass on to Trunk:Testing as > soon as possible as it's the basic piece to enable ARM hard floating point > port. (forwarded request 11580 from cvm) > > State: new 2011-01-07T13:36:24 nashif > Comment: None > > > > changes files: > -------------- > --- rpm.changes > +++ rpm.changes > @@ -0,0 +1,3 @@ > +* Fri Dec 17 2010 Carsten Munk <[email protected]> - 4.8.1 > +- Added armv7hl and armv7nhl architectures, fixing BMC#11428 > + > > new: > ---- > project.diff > rpm-4.8.1-armv7hl-armv7nhl-support.patch > > spec files: > ----------- > --- rpm.spec > +++ rpm.spec > @@ -18,6 +18,7 @@ > Patch4: rpm-macros.patch > Patch5: arch.patch > Patch6: fix-perl-epoch.patch > +Patch7: rpm-4.8.1-armv7hl-armv7nhl-support.patch > > > # Partially GPL/LGPL dual-licensed and some bits with BSD > @@ -117,7 +118,7 @@ > %patch4 -p1 -b .vendor > %patch5 -p1 -b .arm > %patch6 -p1 -b .epoch > - > +%patch7 -p1 -b .armv7hl > > %build > CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`" > > other changes: > -------------- > > ++++++ project.diff (new) > --- project.diff > +++ project.diff > +--- rpm-python.spec.orig > ++++ rpm-python.spec > +@@ -6,16 +6,11 @@ > + %bcond_with sqlite > + # just for giggles, option to build with internal Berkeley DB > + %bcond_with int_bdb > +-# run internal testsuite? > +-%bcond_with check > +- > + > + %define rpmhome /usr/lib/rpm > + > + %define rpmver 4.8.1 > + > +-%define bdbver 4.8.24 > +-%define dbprefix db > + > + Summary: The RPM package management system > + Name: rpm-python > +@@ -30,13 +25,10 @@ Requires: curl > + Requires: rpm = %{version} > + BuildRequires: db4-devel > + > +-%if %{with check} > +-#BuildRequires: fakechroot > +-%endif > + > + # XXX generally assumed to be installed but make it explicit as rpm > + # is a bit special... > +-BuildRequires: moblin-rpm-config > ++BuildRequires: meego-rpm-config > + BuildRequires: gawk > + BuildRequires: elfutils-devel >= 0.112 > + BuildRequires: elfutils-libelf-devel > +@@ -50,7 +42,6 @@ BuildRequires: ncurses-devel > + BuildRequires: bzip2-devel >= 0.9.0c-2 > + BuildRequires: lua-devel >= 5.1 > + BuildRequires: libcap-devel > +-BuildRequires: libacl-devel > + BuildRequires: xz-devel >= 4.999.8 > + BuildRequires: cvs > + > +@@ -78,11 +69,6 @@ popd > + %clean > + rm -rf $RPM_BUILD_ROOT > + > +-%if %{with check} > +-%check > +-make check > +-%endif > +- > + %files > + %defattr(-,root,root) > + %{_libdir}/python* > +--- rpm.changes.orig > ++++ rpm.changes > +@@ -1,3 +1,7 @@ > ++* Fri Jul 02 2010 Anas Nashif <[email protected]> - 4.8.1 > ++- Removed unused BuildRequires and macros > ++- removed old requirement on moblin-rpm-config in python spec file > ++ > + * Sun Jun 20 2010 Anas Nashif <[email protected]> - 4.8.1 > + - Update to 4.8.1 > + Security: > +--- rpm.spec.orig > ++++ rpm.spec > +@@ -3,9 +3,6 @@ > + > + %define rpmhome /usr/lib/rpm > + > +-%define bdbver 4.8.24 > +-%define dbprefix db > +- > + Summary: The RPM package management system > + Name: rpm > + Version: 4.8.1 > +@@ -33,10 +30,6 @@ Requires: coreutils > + Requires: db4-utils > + BuildRequires: db4-devel > + > +-%if %{with check} > +-#BuildRequires: fakechroot > +-%endif > +- > + # XXX generally assumed to be installed but make it explicit as rpm > + # is a bit special... > + BuildRequires: meego-rpm-config > +@@ -54,7 +47,6 @@ BuildRequires: ncurses-devel > + BuildRequires: bzip2-devel >= 0.9.0c-2 > + BuildRequires: lua-devel >= 5.1 > + BuildRequires: libcap-devel > +-BuildRequires: libacl-devel > + BuildRequires: xz-devel >= 4.999.8 > + > + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root > +@@ -213,8 +205,8 @@ exit 0 > + %{_bindir}/rpmquery > + %{_bindir}/rpmverify > + > +-%{_mandir}/man8/rpm.8* > +-%{_mandir}/man8/rpm2cpio.8* > ++%doc %{_mandir}/man8/rpm.8* > ++%doc %{_mandir}/man8/rpm2cpio.8* > + > + # XXX this places translated manuals to wrong package wrt eg rpmbuild > + %lang(fr) %{_mandir}/fr/man[18]/*.[18]* > > ++++++ rpm-4.8.1-armv7hl-armv7nhl-support.patch (new) > --- rpm-4.8.1-armv7hl-armv7nhl-support.patch > +++ rpm-4.8.1-armv7hl-armv7nhl-support.patch > +diff -ru rpm-4.8.1-old/rpmrc.in rpm-4.8.1/rpmrc.in > +--- rpm-4.8.1-old/rpmrc.in 2009-12-07 09:36:49.000000000 -0500 > ++++ rpm-4.8.1/rpmrc.in 2010-12-17 15:13:55.000000000 -0500 > +@@ -66,6 +66,8 @@ > + optflags: armv5tejl -O2 -g -march=armv5te > + optflags: armv6l -O2 -g -march=armv6 > + optflags: armv7l -O2 -g -march=armv7 > ++optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 > -mno-thumb > ++optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon > -mno-thumb > + > + optflags: atarist -O2 -g -fomit-frame-pointer > + optflags: atariste -O2 -g -fomit-frame-pointer > +@@ -140,6 +142,8 @@ > + arch_canon: armv5tejl: armv5tejl 12 > + arch_canon: armv6l: armv6l 12 > + arch_canon: armv7l: armv7l 12 > ++arch_canon: armv7hl: armv7hl 12 > ++arch_canon: armv7nhl: armv7nhl 12 > + > + arch_canon: m68kmint: m68kmint 13 > + arch_canon: atarist: m68kmint 13 > +@@ -248,6 +252,8 @@ > + buildarchtranslate: armv5tejl: armv5tejl > + buildarchtranslate: armv6l: armv6l > + buildarchtranslate: armv7l: armv7l > ++buildarchtranslate: armv7hl: armv7hl > ++buildarchtranslate: armv7nhl: armv7nhl > + > + buildarchtranslate: atarist: m68kmint > + buildarchtranslate: atariste: m68kmint > +@@ -336,6 +342,8 @@ > + arch_compat: armv4tl: armv4l > + arch_compat: armv4l: armv3l > + arch_compat: armv3l: noarch > ++arch_compat: armv7nhl: armv7hl > ++arch_compat: armv7hl: noarch > + > + arch_compat: atarist: m68kmint noarch > + arch_compat: atariste: m68kmint noarch > +@@ -440,6 +448,8 @@ > + buildarch_compat: armv4tl: armv4l > + buildarch_compat: armv4l: armv3l > + buildarch_compat: armv3l: noarch > ++buildarch_compat: armv7nhl: armv7hl > ++buildarch_compat: armv7hl: noarch > + > + buildarch_compat: hppa2.0: hppa1.2 > + buildarch_compat: hppa1.2: hppa1.1 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits > _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
