On 04/27/2011 09:49 AM, Paul Eggleton wrote: > From: Paul Eggleton <[email protected]> > > Introduces a variable HALTARGS which specifies the arguments sent to > halt and reboot, and sets the default value to "-d -f", dropping the > previous -i (shut down all network interfaces before halt/reboot, which > causes a freeze with NFS root.) > > Fixes [YOCTO #997].
Is the SED_* tag a common search/replace mechanism in OE recipes? It's fine, I'm just wondering if there is an accepted best practice for this sort of thing. I know we do some sed replacements of /usr/bin and /etc. > > Signed-off-by: Paul Eggleton <[email protected]> Acked-by: Darren Hart <[email protected]> > --- > meta/recipes-core/initscripts/initscripts-1.0/halt | 2 +- > .../initscripts/initscripts-1.0/reboot | 2 +- > meta/recipes-core/initscripts/initscripts_1.0.bb | 9 ++++++++- > 3 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/halt > b/meta/recipes-core/initscripts/initscripts-1.0/halt > index 609b793..021d9be 100755 > --- a/meta/recipes-core/initscripts/initscripts-1.0/halt > +++ b/meta/recipes-core/initscripts/initscripts-1.0/halt > @@ -24,6 +24,6 @@ then > hddown="" > fi > > -halt -d -f -i -p $hddown > +halt SED_HALTARGS -p $hddown > > : exit 0 > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/reboot > b/meta/recipes-core/initscripts/initscripts-1.0/reboot > index 4c55885..cf32e95 100755 > --- a/meta/recipes-core/initscripts/initscripts-1.0/reboot > +++ b/meta/recipes-core/initscripts/initscripts-1.0/reboot > @@ -12,4 +12,4 @@ > PATH=/sbin:/bin:/usr/sbin:/usr/bin > > echo -n "Rebooting... " > -reboot -d -f -i > +reboot SED_HALTARGS > diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb > b/meta/recipes-core/initscripts/initscripts_1.0.bb > index d990925..720c252 100644 > --- a/meta/recipes-core/initscripts/initscripts_1.0.bb > +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb > @@ -6,7 +6,7 @@ DEPENDS = "makedevs" > RDEPENDS_${PN} = "makedevs" > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > -PR = "r124" > +PR = "r125" > > SRC_URI = "file://functions \ > file://halt \ > @@ -38,6 +38,13 @@ SRC_URI_append_arm = " file://alignment.sh" > > KERNEL_VERSION = "" > > +HALTARGS ?= "-d -f" > + > +do_configure() { > + sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/halt > + sed -i -e "s:SED_HALTARGS:${HALTARGS}:g" ${WORKDIR}/reboot > +} > + > do_install () { > # > # Create directories and install device independent scripts -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
