diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/prelink/prelink_git.bb | 8 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 |
2 files changed, 7 insertions, 4 deletions
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." | |||
8 | LICENSE = "GPLv2" | 8 | LICENSE = "GPLv2" |
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" |
10 | PV = "1.0+git${SRCPV}" | 10 | PV = "1.0+git${SRCPV}" |
11 | PR = "r1" | 11 | PR = "r2" |
12 | 12 | ||
13 | SRC_URI = "git://git.pokylinux.org/prelink-cross.git;protocol=git \ | 13 | SRC_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 | ||
18 | TARGET_OS_ORIG := "${TARGET_OS}" | 19 | TARGET_OS_ORIG := "${TARGET_OS}" |
19 | OVERRIDES_append = ":${TARGET_OS_ORIG}" | 20 | OVERRIDES_append = ":${TARGET_OS_ORIG}" |
@@ -33,10 +34,11 @@ do_configure_prepend () { | |||
33 | } | 34 | } |
34 | 35 | ||
35 | do_install_append () { | 36 | do_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 | ||
42 | pkg_postinst_prelink() { | 44 | pkg_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 | |||
74 | acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" | 74 | acpaths = "-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 |
77 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" | 77 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" |
78 | rpm_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 |
80 | WITH_BZIP2 = "--with-bzip2" | 81 | WITH_BZIP2 = "--with-bzip2" |