summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-prelink.bbclass2
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb8
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.0.bb3
3 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index faf18142e6..ee0951c106 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -24,7 +24,7 @@ prelink_image () {
24 ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR 24 ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR
25 25
26 # Remove the prelink.conf if we had to add it. 26 # Remove the prelink.conf if we had to add it.
27 if [ $dummy_prelink_conf ]; then 27 if [ "$dummy_prelink_conf" == "true" ]; then
28 rm -f ${IMAGE_ROOTFS}/etc/prelink.conf 28 rm -f ${IMAGE_ROOTFS}/etc/prelink.conf
29 fi 29 fi
30 30
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."
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" 9LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
10PV = "1.0+git${SRCPV}" 10PV = "1.0+git${SRCPV}"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "git://git.pokylinux.org/prelink-cross.git;protocol=git \ 13SRC_URI = "git://git.pokylinux.org/prelink-cross.git;protocol=git \
14 file://prelink.conf \ 14 file://prelink.conf \
15 file://prelink.cron.daily \ 15 file://prelink.cron.daily \
16 file://prelink.default" 16 file://prelink.default \
17 file://macros.prelink"
17 18
18TARGET_OS_ORIG := "${TARGET_OS}" 19TARGET_OS_ORIG := "${TARGET_OS}"
19OVERRIDES_append = ":${TARGET_OS_ORIG}" 20OVERRIDES_append = ":${TARGET_OS_ORIG}"
@@ -33,10 +34,11 @@ do_configure_prepend () {
33} 34}
34 35
35do_install_append () { 36do_install_append () {
36 install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default 37 install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm
37 install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf 38 install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
38 install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink 39 install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
39 install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink 40 install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
41 install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink
40} 42}
41 43
42pkg_postinst_prelink() { 44pkg_postinst_prelink() {
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 8bce395483..e350150cf6 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -74,7 +74,8 @@ inherit autotools gettext
74acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" 74acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
75 75
76# Specify the default rpm macros in terms of adjustable variables 76# Specify the default rpm macros in terms of adjustable variables
77rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" 77rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros"
78rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros"
78 79
79# Configure values taken from rpm.spec 80# Configure values taken from rpm.spec
80WITH_BZIP2 = "--with-bzip2" 81WITH_BZIP2 = "--with-bzip2"