logrotate: do not move binary logrotate to /usr/bin

PATCH In review Hongxu Jia 2 participants 4 messages Nov 2, 2015 – Nov 17, 2015

lore

Share & tools

lore

Hongxu Jia

author

2015-11-02 08:33 UTC #0 lore raw

cover logrotate: do not move binary logrotate to /usr/bin

The following changes since commit 370a2916c4559c17952392b872322e8e490b124c:

build-appliance-image: Update to jethro head revision (2015-10-29 22:20:40 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/logrotate
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/logrotate

Hongxu Jia (1):
logrotate: do not move binary logrotate to /usr/bin

 meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Signature · 1 line

1.9.1

Hongxu Jia

author

2015-11-02 08:33 UTC #1 lore raw

PATCH 1/1 logrotate: do not move binary logrotate to /usr/bin

In oe-core commit a46d3646a3e1781be4423b508ea63996b3cfca8a
...

Author: Fahad Usman <[email protected]>
Date:   Tue Aug 26 13:16:48 2014 +0500

logrotate: obey our flags

Needed to quiet GNU_HASH warnings, and some minor fixes.
...
it explicitly move logrotate to /usr/bin without any reason, which is against the original Linux location /usr/sbin.

So partly revert the above commit which let logrotate be kept in the original place /usr/sbin.

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-extended/logrotate/logrotate_3.9.1.bb +1 -1

index 7d0a159..5f1a601 100644
@@ -53,7 +53,7 @@ do_compile_prepend() {
 }
 
 do_install(){
-    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} BINDIR=${bindir}
+    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
     mkdir -p ${D}${sysconfdir}/logrotate.d
     mkdir -p ${D}${sysconfdir}/cron.daily
     mkdir -p ${D}${localstatedir}/lib

Signature · 1 line

1.9.1

Christopher Larson

2015-11-16 16:32 UTC #2 lore raw

Quoted 34 lines · Hongxu Jia

In oe-core commit a46d3646a3e1781be4423b508ea63996b3cfca8a
...
Author: Fahad Usman <[email protected]>
Date:   Tue Aug 26 13:16:48 2014 +0500
logrotate: obey our flags
Needed to quiet GNU_HASH warnings, and some minor fixes.
...
it explicitly move logrotate to /usr/bin without any reason, which is against the original Linux location /usr/sbin.
So partly revert the above commit which let logrotate be kept in the original place /usr/sbin.
Signed-off-by Hongxu Jia <[email protected]>
---
 meta/recipes-extended/logrotate/logrotate_3.9.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/logrotate/logrotate_3.9.1.bb +1 -1
index 7d0a159..5f1a601 100644
@@ -53,7 +53,7 @@ do_compile_prepend() {
 }
 
 do_install(){
-    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
 BINDIR=${bindir}
+    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
     mkdir -p ${D}${sysconfdir}/logrotate.d
     mkdir -p ${D}${sysconfdir}/cron.daily

Quoted 2 lines

     mkdir -p ${D}${localstatedir}/lib

This just makes it not obey our target paths again, using its hardcoded destination. Why not pass BINDIR=${sbindir} instead?

Signature · 5 lines

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

Hongxu Jia

author

2015-11-17 01:36 UTC #3 lore raw

Quoted 47 lines · Christopher Larson

On Mon, Nov 2, 2015 at 1:33 AM, Hongxu Jia <[email protected] <mailto:[email protected]>> wrote:

    In oe-core commit a46d3646a3e1781be4423b508ea63996b3cfca8a
    ...
    Author: Fahad Usman <[email protected]
    <mailto:[email protected]>>
    Date:   Tue Aug 26 13:16:48 2014 +0500

    logrotate: obey our flags

        Needed to quiet GNU_HASH warnings, and some minor fixes.
    ...
    it explicitly move logrotate to /usr/bin without any reason,
    which is against the original Linux location /usr/sbin.

    So partly revert the above commit which let logrotate be
    kept in the original place /usr/sbin.

    Signed-off-by: Hongxu Jia <[email protected]
    <mailto:[email protected]>>
    ---
     meta/recipes-extended/logrotate/logrotate_3.9.1.bb
    <http://logrotate_3.9.1.bb> | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
    <http://logrotate_3.9.1.bb>
    b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
    <http://logrotate_3.9.1.bb>
    index 7d0a159..5f1a601 100644
    --- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
    <http://logrotate_3.9.1.bb>
    +++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
    <http://logrotate_3.9.1.bb>
    @@ -53,7 +53,7 @@ do_compile_prepend() {
     }

     do_install(){
    -    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
    BINDIR=${bindir}
    +    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
         mkdir -p ${D}${sysconfdir}/logrotate.d
         mkdir -p ${D}${sysconfdir}/cron.daily
         mkdir -p ${D}${localstatedir}/lib

Quoted 1 line

This just makes it not obey our target paths again, using its hardcoded destination. Why not pass BINDIR=${sbindir} instead?

It is fine to me

//Hongxu

Quoted 6 lines

Signature · 5 lines

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