* [PATCH 0/1] Fix the way busybox splits
@ 2011-02-11 20:26 Mark Hatle
2011-02-11 20:26 ` [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts Mark Hatle
2011-02-12 0:35 ` [PATCH 0/1] Fix the way busybox splits Richard Purdie
0 siblings, 2 replies; 6+ messages in thread
From: Mark Hatle @ 2011-02-11 20:26 UTC (permalink / raw)
To: poky
In order to resolve the issue of more then one initscript per split package,
change the way busybox splits. We have added two additional packages
busybox-udhcpc and busybox-syslog.. Both of which are now "recommended"
to ensure that if available, they are installed.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/busybox
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/busybox
Thanks,
Mark Hatle <mark.hatle@windriver.com>
---
Mark Hatle (1):
busybox: Rework busybox to fix limitations in initscripts
meta/recipes-core/busybox/busybox.inc | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts
2011-02-11 20:26 [PATCH 0/1] Fix the way busybox splits Mark Hatle
@ 2011-02-11 20:26 ` Mark Hatle
2011-02-11 22:58 ` Darren Hart
2011-02-12 0:35 ` [PATCH 0/1] Fix the way busybox splits Richard Purdie
1 sibling, 1 reply; 6+ messages in thread
From: Mark Hatle @ 2011-02-11 20:26 UTC (permalink / raw)
To: poky
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.
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
--
1.7.3.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts
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
2011-02-11 23:12 ` Mark Hatle
2011-02-12 3:07 ` Gary Thomas
0 siblings, 2 replies; 6+ messages in thread
From: Darren Hart @ 2011-02-11 22:58 UTC (permalink / raw)
To: Mark Hatle; +Cc: poky
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts
2011-02-11 22:58 ` Darren Hart
@ 2011-02-11 23:12 ` Mark Hatle
2011-02-12 3:07 ` Gary Thomas
1 sibling, 0 replies; 6+ messages in thread
From: Mark Hatle @ 2011-02-11 23:12 UTC (permalink / raw)
To: Darren Hart; +Cc: poky
On 2/11/11 4:58 PM, Darren Hart wrote:
> 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
Yes this fixes that issue.
--Mark
> --
> 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
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] busybox: Rework busybox to fix limitations in initscripts
2011-02-11 22:58 ` Darren Hart
2011-02-11 23:12 ` Mark Hatle
@ 2011-02-12 3:07 ` Gary Thomas
1 sibling, 0 replies; 6+ messages in thread
From: Gary Thomas @ 2011-02-12 3:07 UTC (permalink / raw)
To: Darren Hart; +Cc: poky
On 02/11/2011 03:58 PM, Darren Hart wrote:
> 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
Should do - it's exactly the problem I was working with Mark about.
>
> --
> 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
>
>
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/1] Fix the way busybox splits
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-12 0:35 ` Richard Purdie
1 sibling, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2011-02-12 0:35 UTC (permalink / raw)
To: Mark Hatle; +Cc: poky
On Fri, 2011-02-11 at 14:26 -0600, Mark Hatle wrote:
> In order to resolve the issue of more then one initscript per split package,
> change the way busybox splits. We have added two additional packages
> busybox-udhcpc and busybox-syslog.. Both of which are now "recommended"
> to ensure that if available, they are installed.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: mhatle/busybox
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/busybox
>
> Thanks,
> Mark Hatle <mark.hatle@windriver.com>
Merged into master, thanks.
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-02-12 3:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.