From 3920d3da400baef3fb080bfaced6db1428e4acde Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 25 Feb 2011 17:34:20 -0600 Subject: rpm: Fix rpm usage of prelink on the target RPM has the ability to validate files that have been prelinked, however the necessary configuration and staging was not done properly. Resolve this issue by fixing the macro paths, providing the missing RPM macro, and correcting a defect in the way the prelink image class was working with the necessary configuration file. Signed-off-by: Mark Hatle --- meta/recipes-devtools/prelink/prelink_git.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/prelink') diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb index 53ef04573c..e8abf59356 100644 --- a/meta/recipes-devtools/prelink/prelink_git.bb +++ b/meta/recipes-devtools/prelink/prelink_git.bb @@ -8,12 +8,13 @@ runtime and thus programs come up faster." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" PV = "1.0+git${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.pokylinux.org/prelink-cross.git;protocol=git \ file://prelink.conf \ file://prelink.cron.daily \ - file://prelink.default" + file://prelink.default \ + file://macros.prelink" TARGET_OS_ORIG := "${TARGET_OS}" OVERRIDES_append = ":${TARGET_OS_ORIG}" @@ -33,10 +34,11 @@ do_configure_prepend () { } do_install_append () { - install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink + install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink } pkg_postinst_prelink() { -- cgit 1.2.3-korg