summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFahad Usman <fahad_usman@mentor.com>2014-08-26 13:16:48 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-27 12:12:31 +0100
commit682933a531b1efaab1b7948540f6efd9523deab7 (patch)
treeae42081c1699238b62cb51e2a2a2788ece90542c
parent61e3e41ad2e50668931783a02c4bec8522744e76 (diff)
downloadpoky-682933a531b1efaab1b7948540f6efd9523deab7.tar.gz
logrotate: obey our flags
Needed to quiet GNU_HASH warnings, and some minor fixes. (From OE-Core rev: a46d3646a3e1781be4423b508ea63996b3cfca8a) Signed-off-by: Fahad Usman <fahad.usman@gmail.com> Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.8.7.bb18
1 files changed, 16 insertions, 2 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
index 3a6a2287db..42cd764da0 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
@@ -16,7 +16,21 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
16SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213" 16SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
17SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64" 17SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
18 18
19EXTRA_OEMAKE = "" 19# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
20# optimization variables, so use it rather than EXTRA_CFLAGS.
21EXTRA_OEMAKE = "\
22 LFS= \
23 OS_NAME='${OS_NAME}' \
24 \
25 'CC=${CC}' \
26 'RPM_OPT_FLAGS=${CFLAGS}' \
27 'EXTRA_LDFLAGS=${LDFLAGS}' \
28"
29
30# OS_NAME in the makefile defaults to `uname -s`. The behavior for
31# freebsd/netbsd is questionable, so leave it as Linux, which only sets
32# INSTALL=install and BASEDIR=/usr.
33OS_NAME = "Linux"
20 34
21do_compile_prepend() { 35do_compile_prepend() {
22 # Make sure the recompile is OK 36 # Make sure the recompile is OK
@@ -24,7 +38,7 @@ do_compile_prepend() {
24} 38}
25 39
26do_install(){ 40do_install(){
27 oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} 41 oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} BINDIR=${bindir}
28 mkdir -p ${D}${sysconfdir}/logrotate.d 42 mkdir -p ${D}${sysconfdir}/logrotate.d
29 mkdir -p ${D}${sysconfdir}/cron.daily 43 mkdir -p ${D}${sysconfdir}/cron.daily
30 mkdir -p ${D}${localstatedir}/lib 44 mkdir -p ${D}${localstatedir}/lib