[PATCH 1/2] logrotate: obey our flags

[PATCH 1/2] logrotate: obey our flags

[Fahad Usman]

Needed to quiet GNU_HASH warnings, amd some minor fixes.

Signed-off-by: Fahad Usman <fahad.usman@gmail.com>
Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-extended/logrotate/logrotate_3.8.7.bb |   18 ++++++++++++++++--
 1 file 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 3a6a228..42cd764 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
 SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
 SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
 
-EXTRA_OEMAKE = ""
+# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
+# optimization variables, so use it rather than EXTRA_CFLAGS.
+EXTRA_OEMAKE = "\
+    LFS= \
+    OS_NAME='${OS_NAME}' \
+    \
+    'CC=${CC}' \
+    'RPM_OPT_FLAGS=${CFLAGS}' \
+    'EXTRA_LDFLAGS=${LDFLAGS}' \
+"
+
+# OS_NAME in the makefile defaults to `uname -s`. The behavior for
+# freebsd/netbsd is questionable, so leave it as Linux, which only sets
+# INSTALL=install and BASEDIR=/usr.
+OS_NAME = "Linux"
 
 do_compile_prepend() {
     # Make sure the recompile is OK
@@ -24,7 +38,7 @@ do_compile_prepend() {
 }
 
 do_install(){
-    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
+    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} BINDIR=${bindir}
     mkdir -p ${D}${sysconfdir}/logrotate.d
     mkdir -p ${D}${sysconfdir}/cron.daily
     mkdir -p ${D}${localstatedir}/lib
-- 
1.7.9.5

[PATCH 2/2] logrotate: add packageconfigs

[Fahad Usman]

add packageconfigs for acl and selinux.

Signed-off-by: Fahad Usman <fahad.usman@gmail.com>
Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-extended/logrotate/logrotate_3.8.7.bb |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
index 42cd764..faa8e02 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
@@ -16,6 +16,11 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
 SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
 SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
 
+PACKAGECONFIG ?= "\
+    ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+"
+
 # If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
 # optimization variables, so use it rather than EXTRA_CFLAGS.
 EXTRA_OEMAKE = "\
@@ -25,6 +30,9 @@ EXTRA_OEMAKE = "\
     'CC=${CC}' \
     'RPM_OPT_FLAGS=${CFLAGS}' \
     'EXTRA_LDFLAGS=${LDFLAGS}' \
+    \
+    ${@base_contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
+    ${@base_contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \
 "
 
 # OS_NAME in the makefile defaults to `uname -s`. The behavior for
-- 
1.7.9.5

Re: [PATCH 2/2] logrotate: add packageconfigs

[Burton, Ross]

On 25 August 2014 17:22, Fahad Usman <fahad_usman@mentor.com> wrote:
> +    ${@base_contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
> +    ${@base_contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \

Should this have WITH_XXX=no for clarity and safety?

Ross

Re: [PATCH 2/2] logrotate: add packageconfigs

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

On Wed, Aug 27, 2014 at 8:52 AM, Burton, Ross <ross.burton@intel.com> wrote:

> On 25 August 2014 17:22, Fahad Usman <fahad_usman@mentor.com> wrote:
> > +    ${@base_contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
> > +    ${@base_contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes',
> '', d)} \
>
> Should this have WITH_XXX=no for clarity and safety?


Yeah, that'd be a good idea, so we don't rely on the default behavior of
the underlying buildsystem, which could change in future releases. We can
submit an additional patch to improve that.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1245 bytes --]

Re: [PATCH 1/2] logrotate: obey our flags

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

On Mon, Aug 25, 2014 at 9:22 AM, Fahad Usman <fahad_usman@mentor.com> wrote:

> Needed to quiet GNU_HASH warnings, amd some minor fixes.


Typo, not amd :)
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 663 bytes --]

Re: [PATCH 1/2] logrotate: obey our flags

[Khem Raj]

On 14-08-25 21:22:04, Fahad Usman wrote:
> Needed to quiet GNU_HASH warnings, amd some minor fixes.
> 
> Signed-off-by: Fahad Usman <fahad.usman@gmail.com>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> ---
>  meta/recipes-extended/logrotate/logrotate_3.8.7.bb |   18 ++++++++++++++++--
>  1 file 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 3a6a228..42cd764 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
>  SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
>  SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
>  
> -EXTRA_OEMAKE = ""
> +# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
> +# optimization variables, so use it rather than EXTRA_CFLAGS.
> +EXTRA_OEMAKE = "\
> +    LFS= \
> +    OS_NAME='${OS_NAME}' \
> +    \
> +    'CC=${CC}' \

hmmm CC may have spaces in it so you might need 'CC="${CC}"' or somesuch

Re: [PATCH 1/2] logrotate: obey our flags

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]

On Mon, Aug 25, 2014 at 10:19 AM, Khem Raj <raj.khem@gmail.com> wrote:

> On 14-08-25 21:22:04, Fahad Usman wrote:
> > Needed to quiet GNU_HASH warnings, amd some minor fixes.
> >
> > Signed-off-by: Fahad Usman <fahad.usman@gmail.com>
> > Signed-off-by: Christopher Larson <kergoth@gmail.com>
> > ---
> >  meta/recipes-extended/logrotate/logrotate_3.8.7.bb |   18
> ++++++++++++++++--
> >  1 file 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 3a6a228..42cd764 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
> >  SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
> >  SRC_URI[sha256sum] =
> "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
> >
> > -EXTRA_OEMAKE = ""
> > +# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
> > +# optimization variables, so use it rather than EXTRA_CFLAGS.
> > +EXTRA_OEMAKE = "\
> > +    LFS= \
> > +    OS_NAME='${OS_NAME}' \
> > +    \
> > +    'CC=${CC}' \
>
> hmmm CC may have spaces in it so you might need 'CC="${CC}"' or somesuch


Nope, the whole CC=${CC} argument is already quoted, note the single quotes
around it. Those quotes mean the entire CC=${CC} bit ends up in the
appropriate argument for make, so there's no need to quote the value alone.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 2790 bytes --]

Re: [PATCH 1/2] logrotate: obey our flags

[Khem Raj]

On 14-08-25 10:21:31, Christopher Larson wrote:
> On Mon, Aug 25, 2014 at 10:19 AM, Khem Raj <raj.khem@gmail.com> wrote:
> 
> > On 14-08-25 21:22:04, Fahad Usman wrote:
> > > Needed to quiet GNU_HASH warnings, amd some minor fixes.
> > >
> > > Signed-off-by: Fahad Usman <fahad.usman@gmail.com>
> > > Signed-off-by: Christopher Larson <kergoth@gmail.com>
> > > ---
> > >  meta/recipes-extended/logrotate/logrotate_3.8.7.bb |   18
> > ++++++++++++++++--
> > >  1 file 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 3a6a228..42cd764 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
> > >  SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
> > >  SRC_URI[sha256sum] =
> > "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
> > >
> > > -EXTRA_OEMAKE = ""
> > > +# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
> > > +# optimization variables, so use it rather than EXTRA_CFLAGS.
> > > +EXTRA_OEMAKE = "\
> > > +    LFS= \
> > > +    OS_NAME='${OS_NAME}' \
> > > +    \
> > > +    'CC=${CC}' \
> >
> > hmmm CC may have spaces in it so you might need 'CC="${CC}"' or somesuch
> 
> 
> Nope, the whole CC=${CC} argument is already quoted, note the single quotes
> around it. Those quotes mean the entire CC=${CC} bit ends up in the
> appropriate argument for make, so there's no need to quote the value alone.

What happens inside makefile is what I am concerned
in case of python, IIRC it passed it but when CC was used it would
freak out since CC now was a multiword str but then those were not inside makefiles
if you have verified thats fine here then I am OK.

Re: [PATCH 1/2] logrotate: obey our flags

[Usman, Fahad]

On 08/25/2014 10:51 PM, Khem Raj wrote:
>>>> +    LFS= \
>>>> > > >+    OS_NAME='${OS_NAME}' \
>>>> > > >+    \
>>>> > > >+    'CC=${CC}' \
>>> > >
>>> > >hmmm CC may have spaces in it so you might need 'CC="${CC}"' or somesuch
>> >
>> >
>> >Nope, the whole CC=${CC} argument is already quoted, note the single quotes
>> >around it. Those quotes mean the entire CC=${CC} bit ends up in the
>> >appropriate argument for make, so there's no need to quote the value alone.
> What happens inside makefile is what I am concerned
> in case of python, IIRC it passed it but when CC was used it would
> freak out since CC now was a multiword str but then those were not inside makefiles
> if you have verified thats fine here then I am OK.
Just checked the CC do have spaces, and it works fine. I am re-sending 
the patch with the fixed typo.