Andrei Gherzan : busybox: Package hwclock.sh initscript separately

oe-commits Martin Jansa 2 participants 3 messages Sep 27, 2012 – Oct 5, 2012 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20120817170934.A810F1032B@opal

Martin Jansa

author

2012-09-27 21:05 UTC #1 lore raw

Quoted 34 lines · On Fri, Aug 17, 2012 at 05:09:34PM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: b97e37e1444ef32e7837dcc79e3fad36c4284b65
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b97e37e1444ef32e7837dcc79e3fad36c4284b65

Author: Andrei Gherzan <[email protected]>
Date:   Fri Aug 17 00:15:15 2012 +0300

busybox: Package hwclock.sh initscript separately

We package this separately to be able to pull this in only if this makes sense for the MACHINE.

Signed-off-by Andrei Gherzan <[email protected]>

Signed-off-by Saul Wold <[email protected]>

---

 meta/recipes-core/busybox/busybox.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

meta/recipes-core/busybox/busybox.inc +1 -1

index 78239a2..5a5b383 100644
@@ -14,15 +14,16 @@ SECTION = "base"
 export EXTRA_CFLAGS = "${CFLAGS}"
 export EXTRA_LDFLAGS = "${LDFLAGS}"
 
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev"
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
 
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*"

meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 29

Quoted 10 lines

meta/recipes-core/busybox/busybox.inc +2 -1

 FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
+FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh"
 
-INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev"
+INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock""
 
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-syslog = "syslog"

Missing
INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh"
?

Did you test it?

Here it fails like this:
Configuring busybox-hwclock.
usage: update-rc.d [-n] [-f] [-r <root>] <basename> remove
update-rc.d [-n] [-r <root>] [-s] <basename> defaults [NN | sNN kNN] update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
-n: not really
-f: force
-v: verbose
-r: alternate root path (default is /)
-s: invoke start methods if appropriate to current runlevel
Collected errors:
* pkg_run_script: package "busybox-hwclock" postinst script returned status 1.
* opkg_configure: busybox-hwclock.postinst returned 1.

And indeed it's broken:
SHR root@qemux86-64 ~ $ cat /var/lib/opkg/info/busybox-hwclock.postinst #!/bin/sh
if test "x$D" != "x"; then

        OPT="-r $D"
else
        OPT="-s"

fi
update-rc.d $OPT ${INITSCRIPT_NAME} defaults

Cheers,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-10-02 16:52 UTC #2 lore raw

Quoted 70 lines · Martin Jansa

Quoted 34 lines · On Fri, Aug 17, 2012 at 05:09:34PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: b97e37e1444ef32e7837dcc79e3fad36c4284b65
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b97e37e1444ef32e7837dcc79e3fad36c4284b65
Author: Andrei Gherzan <[email protected]>
Date:   Fri Aug 17 00:15:15 2012 +0300
busybox: Package hwclock.sh initscript separately
We package this separately to be able to pull this in only if this makes sense for the MACHINE.
Signed-off-by Andrei Gherzan <[email protected]>
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-core/busybox/busybox.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/busybox/busybox.inc +1 -1
index 78239a2..5a5b383 100644
@@ -14,15 +14,16 @@ SECTION = "base"
 export EXTRA_CFLAGS = "${CFLAGS}"
 export EXTRA_LDFLAGS = "${LDFLAGS}"
 
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev"
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
 
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*"
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 29
Quoted 10 lines
meta/recipes-core/busybox/busybox.inc +2 -1
 FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
+FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh"
 
-INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev"
+INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock""
 
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-syslog = "syslog"
Missing
INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh"
?
Did you test it?
Here it fails like this:
Configuring busybox-hwclock.
usage: update-rc.d [-n] [-f] [-r <root>] <basename> remove
update-rc.d [-n] [-r <root>] [-s] <basename> defaults [NN | sNN kNN] update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
-n: not really
-f: force
-v: verbose
-r: alternate root path (default is /)
-s: invoke start methods if appropriate to current runlevel
Collected errors:
* pkg_run_script: package "busybox-hwclock" postinst script returned status 1.
* opkg_configure: busybox-hwclock.postinst returned 1.
And indeed it's broken:
SHR root@qemux86-64 ~ $ cat /var/lib/opkg/info/busybox-hwclock.postinst #!/bin/sh
if test "x$D" != "x"; then

Quoted 7 lines

        OPT="-r $D"
else
        OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} defaults
Cheers,

Fixed now in master
Module: openembedded-core.git
Branch: master
Commit: 43b4ffc11874803db37c43b521ce27c51c677c8b
URL:
http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=43b4ffc11874803db37c43b521ce27c51c677c8b

Author: Richard Purdie <[email protected]>                                                   
Date:   Tue Oct  2 17:24:08 2012 +0100

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Andrei Gherzan

2012-10-05 10:51 UTC #3 lore raw

Strangely this worked for me... but indeed that was something i missed by mistake. Thanks.

*ag*

Quoted 106 lines · Martin Jansa

Quoted 5 lines · Martin Jansa
Quoted 4 lines · On Fri, Aug 17, 2012 at 05:09:34PM +0000, [email protected]:
Module: openembedded-core.git
Branch: master
Commit: b97e37e1444ef32e7837dcc79e3fad36c4284b65
URL:
http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b97e37e1444ef32e7837dcc79e3fad36c4284b65
Quoted 7 lines
Quoted 7 lines
Author: Andrei Gherzan <[email protected]>
Date:   Fri Aug 17 00:15:15 2012 +0300
busybox: Package hwclock.sh initscript separately
We package this separately to be able to pull this in only if this
makes
Quoted 11 lines
Review
Quoted 11 lines
sense for the MACHINE.
Signed-off-by Andrei Gherzan <[email protected]>
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-core/busybox/busybox.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0
b/meta/recipes-core/busybox/busybox.inc
Quoted 8 lines
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 17
Quoted 8 lines
index 78239a2..5a5b383 100644
meta/recipes-core/busybox/busybox.inc +0 -1
@@ -14,15 +14,16 @@ SECTION = "base"
 export EXTRA_CFLAGS = "${CFLAGS}"
 export EXTRA_LDFLAGS = "${LDFLAGS}"
 
-PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog
${PN}-mdev"
Quoted 1 line
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 17
Quoted 1 line
meta/recipes-core/busybox/busybox.inc +1 -0
+PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog
${PN}-mdev ${PN}-hwclock"
Quoted 3 lines
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 19
Quoted 3 lines
meta/recipes-core/busybox/busybox.inc +0 -0
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog*
${sysconfdir}/syslog-startup.conf*"
Quoted 6 lines
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 24
Quoted 6 lines
meta/recipes-core/busybox/busybox.inc +1 -1
 FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
 FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
+FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh"
 
-INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd
${PN}-mdev"
Quoted 1 line
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 25
Quoted 1 line
meta/recipes-core/busybox/busybox.inc +1 -0
+INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd
${PN}-mdev ${PN}-hwclock""
Quoted 8 lines
meta/recipes-core/busybox/busybox.inc SECTION = "base" · line 27
Quoted 3 lines
meta/recipes-core/busybox/busybox.inc +0 -0
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-syslog = "syslog"
Missing
INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh"
?
Quoted 6 lines
Did you test it?
Here it fails like this:
Configuring busybox-hwclock.
usage: update-rc.d [-n] [-f] [-r <root>] <basename> remove
       update-rc.d [-n] [-r <root>] [-s] <basename> defaults [NN | sNN
kNN]
Quoted 1 line
update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl
[runlvl] [...] .
Quoted 5 lines
-n: not really
-f: force
-v: verbose
-r: alternate root path (default is /) -s: invoke start methods if appropriate to current
runlevel
Quoted 2 lines
Collected errors:
* pkg_run_script: package "busybox-hwclock" postinst script returned
status 1.
Quoted 6 lines
* opkg_configure: busybox-hwclock.postinst returned 1.
And indeed it's broken:
SHR root@qemux86-64 ~ $ cat /var/lib/opkg/info/busybox-hwclock.postinst #!/bin/sh
if test "x$D" != "x"; then
Quoted 7 lines
        OPT="-r $D"
else
        OPT="-s"
fi
update-rc.d $OPT ${INITSCRIPT_NAME} defaults
Cheers,
Fixed now in master
Module: openembedded-core.git
Branch: master
Commit: 43b4ffc11874803db37c43b521ce27c51c677c8b
URL:
http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=43b4ffc11874803db37c43b521ce27c51c677c8b
Author: Richard Purdie <[email protected]>
Date:   Tue Oct  2 17:24:08 2012 +0100
--
Martin 'JaMa' Jansa jabber: [email protected]