diff options
| author |   David Nyström <david.c.nystrom@gmail.com> | 2013-10-18 12:27:26 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 15:53:25 +0100 |
| commit | 39383e9bf1aa5e29d33d8af7f8e690d2238fd14f (patch) | |
| tree | b5373dd9241f8740cef3352086e0388a1b8c6824 /meta/recipes-devtools/rpm | |
| parent | acce6ff1a77cfd29e3868faa89b120becb58bbbf (diff) | |
| download | openembedded-core-contrib-39383e9bf1aa5e29d33d8af7f8e690d2238fd14f.tar.gz | |
rpm: Add nativesdk to BBCLASSEXTEND
Modified FILES-paths since nativesdk can't handle hardcoded paths,
Also added *.real binaries to packaging since this is not done when built
as native.
As far as /var having to be hardcoded, I have a hard time seeing someone
modifying bitbake.conf to place localstatedir somewhere else than /var.
If there exists a target/nativesdk portable way of hardcoding FILES,
please let me know, and we'll do it that way.
Cleanup of FEATURES, since it was the same for native & target.
Signed-off-by: David Nyström <david.nystrom@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 3c7e03b48a6..96996392210 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -105,12 +105,12 @@ acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" # Specify the default rpm macros in terms of adjustable variables rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" +rpm_macros_class-nativesdk = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" # sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux # Note: perl and sqlite w/o db specified does not currently work. # tcl, augeas, nss, gcrypt, xar and keyutils support is untested. -PACKAGECONFIG_class-native ??= "db bzip2 zlib beecrypt openssl libelf python" PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2," @@ -224,8 +224,16 @@ FILES_${PN} = "${bindir}/rpm \ ${libdir}/rpm/bin/rpmrepo \ ${libdir}/rpm/bin/rpmspecdump \ ${libdir}/rpm/bin/wget \ - /var/lib/rpm \ - /var/cache/rpm \ + ${libdir}/rpm \ + ${localstatedir}/cache \ + ${localstatedir}/cache/rpm \ + ${localstatedir}/cache/wdj \ + ${localstatedir}/lib \ + ${localstatedir}/lib/rpm \ + ${localstatedir}/lib/wdj \ + ${bindir}/rpm.real \ + ${bindir}/rpmconstant.real \ + ${bindir}/rpm2cpio.real \ " FILES_${PN}-dbg += "${libdir}/rpm/.debug \ @@ -235,7 +243,7 @@ FILES_${PN}-dbg += "${libdir}/rpm/.debug \ FILES_${PN}-common = "${bindir}/rpm2cpio \ ${bindir}/gendiff \ ${sysconfdir}/rpm \ - /var/spool/repackage \ + ${localstatedir}/spool/repackage \ " FILES_${PN}-libs = "${libdir}/librpm-*.so \ @@ -250,6 +258,7 @@ RDEPENDS_${PN}-build += "bash" FILES_${PN}-build = "${prefix}/src/rpm \ ${bindir}/rpmbuild \ + ${bindir}/rpmbuild.real \ ${libdir}/rpm/brp-* \ ${libdir}/rpm/check-files \ ${libdir}/rpm/cross-build \ @@ -313,6 +322,7 @@ FILES_${PN}-build = "${prefix}/src/rpm \ " RDEPENDS_${PN} = "base-files run-postinsts" RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}-build = "file" RDEPENDS_python-rpm = "${PN}" @@ -452,7 +462,7 @@ do_install_append() { } -do_install_append_class-native() { +add_native_wrapper() { create_wrapper ${D}/${bindir}/rpm \ RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \ @@ -481,4 +491,12 @@ do_install_append_class-native() { done } -BBCLASSEXTEND = "native" +do_install_append_class-native() { + add_native_wrapper +} + +do_install_append_class-nativesdk() { + add_native_wrapper +} + +BBCLASSEXTEND = "native nativesdk" |