From: Darren Hart <dvhart@linux.intel.com>
To: Mark Hatle <mark.hatle@windriver.com>
Cc: poky@yoctoproject.org
Subject: Re: [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts
Date: Fri, 11 Feb 2011 14:58:49 -0800 [thread overview]
Message-ID: <4D55BF29.90703@linux.intel.com> (raw)
In-Reply-To: <036ec84d411be6ee4d2bb2bf4c0fd2cb5c811cf7.1297455890.git.mark.hatle@windriver.com>
On 02/11/2011 12:26 PM, Mark Hatle wrote:
> A recent busybox change added a "second" initscript to the main busybox
> package. This however is not supported by the update-rc.d.bbclass.
> Instead we split the package so that each initscript gets it's own split.
Does this address:
http://bugzilla.pokylinux.org/show_bug.cgi?id=706
--
Darren
> Signed-off-by: Mark Hatle<mark.hatle@windriver.com>
> ---
> meta/recipes-core/busybox/busybox.inc | 21 ++++++++++++++-------
> 1 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> index 55f056c..9f2d64c 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -12,22 +12,25 @@ SECTION = "base"
> PRIORITY = "required"
>
> export EXTRA_CFLAGS = "${CFLAGS}"
> -PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"
> +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog"
>
> FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*"
> FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
> +FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc"
>
> -FILES_${PN} += "${datadir}/udhcpc"
> -FILES_${PN} += "${sysconfdir}/init.d/busybox-udhcpc"
> +INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc"
>
> -INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd"
> INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
> +INITSCRIPT_NAME_${PN}-syslog = "syslog"
> INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> -INITSCRIPT_NAME_${PN} = "syslog busybox-udhcpc"
> -CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${PN}"
> +INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
> +CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
> +
> +RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
>
> # This disables the syslog startup links in slugos (see slugos-init)
> -INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ."
> +INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
>
> inherit cml1 update-rc.d
>
> @@ -116,7 +119,9 @@ pkg_postinst_${PN} () {
>
> # This adds the links, remember that this has to work when building an image too, hence the $D
> while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done<$D/etc/busybox.links
> +}
>
> +pkg_postinst_${PN}-syslog () {
> update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50
> update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50
> }
> @@ -150,7 +155,9 @@ pkg_prerm_${PN} () {
> bn=`basename $link`
> sh /usr/bin/update-alternatives --remove $bn $to
> done</etc/busybox.links
> +}
>
> +pkg_prerm_${PN}-syslog () {
> # remove syslog
> if test "x$D" = "x"; then
> if test "$1" = "upgrade" -o "$1" = "remove"; then
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
next prev parent reply other threads:[~2011-02-11 22:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-11 20:26 [PATCH 0/1] Fix the way busybox splits Mark Hatle
2011-02-11 20:26 ` [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts Mark Hatle
2011-02-11 22:58 ` Darren Hart [this message]
2011-02-11 23:12 ` Mark Hatle
2011-02-12 3:07 ` Gary Thomas
2011-02-12 0:35 ` [PATCH 0/1] Fix the way busybox splits Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D55BF29.90703@linux.intel.com \
--to=dvhart@linux.intel.com \
--cc=mark.hatle@windriver.com \
--cc=poky@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox