[OE-core] [oe-commits] Andrei Gherzan : busybox: Package hwclock.sh initscript separately

[Martin Jansa]

On Thu, Sep 27, 2012 at 10:52:31PM +0200, Martin Jansa wrote:
> On Fri, Aug 17, 2012 at 05:09:34PM +0000, git at git.openembedded.org 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 <andrei at gherzan.ro>
> > 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 <andrei at gherzan.ro>
> > Signed-off-by: Saul Wold <sgw at linux.intel.com>
> > 
> > ---
> > 
> >  meta/recipes-core/busybox/busybox.inc |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> > index 78239a2..5a5b383 100644
> > --- a/meta/recipes-core/busybox/busybox.inc
> > +++ b/meta/recipes-core/busybox/busybox.inc
> > @@ -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*"
> >  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 at 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,

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 <richard.purdie at linuxfoundation.org>                                                   
Date:   Tue Oct  2 17:24:08 2012 +0100                                                                        


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20121002/02a4ae85/attachment-0002.sig>