diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2011-02-01 12:26:31 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 23:59:42 +0000 |
| commit | d71f6fff17e7a2bd5acd4339b26a2d3b28c76814 (patch) | |
| tree | 4fa3760641ca897cce16f42c7604fd1a263b8bb4 /meta | |
| parent | c22484279df745f37b3e80b125059d4167b01b7b (diff) | |
| download | openembedded-core-contrib-d71f6fff17e7a2bd5acd4339b26a2d3b28c76814.tar.gz | |
rpm: Add relocation to rpm-native
[BUGID #668]
Use the create_wrapper to setup automatic run-time relocation of
rpm-native.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 0f3425f794..09d1fc0a62 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb @@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt" -PR = "r9" +PR = "r10" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... @@ -430,4 +430,30 @@ do_install_append() { rm -f ${D}/${libdir}/rpm/libsqldb.* } +do_install_append_virtclass-native() { + create_wrapper ${D}/${bindir}/rpm \ + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + + create_wrapper ${D}/${bindir}/rpm2cpio \ + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + + create_wrapper ${D}/${bindir}/rpmbuild \ + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + + create_wrapper ${D}/${bindir}/rpmconstant \ + RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ + RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ + RPM_LOCALEDIRRPM=${STAGING_DATADIR_NATIVE}/locale + + # Adjust popt macros to match... + cat ${D}/${libdir}/rpm/rpmpopt | sed -e "s,^\(rpm[^ ]*\)\([ ]\),\1.real\2," > ${D}/${libdir}/rpm/rpmpopt.new + mv ${D}/${libdir}/rpm/rpmpopt.new ${D}/${libdir}/rpm/rpmpopt +} + BBCLASSEXTEND = "native" |