* [PATCH 1/2] busybox: add group to -passwd package
@ 2011-01-26 18:21 Bernhard Reutner-Fischer
2011-01-26 18:21 ` [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES Bernhard Reutner-Fischer
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Bernhard Reutner-Fischer @ 2011-01-26 18:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/busybox/busybox.inc | 6 +++++-
recipes/busybox/busybox_1.1x.inc | 1 +
recipes/busybox/files/group | 12 ++++++++++++
recipes/busybox/files/passwd | 3 ---
recipes/busybox/files/shadow | 3 ---
5 files changed, 18 insertions(+), 7 deletions(-)
create mode 100644 recipes/busybox/files/group
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 03efc99..9d87d9f 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -19,6 +19,7 @@ SRC_URI = "\
file://busybox-udhcpd \
file://default.script file://simple.script \
file://dhcp-hostname.patch \
+ file://group \
file://hwclock.sh \
file://hwclock-default \
file://ifupdown-spurious-environ.patch \
@@ -50,7 +51,7 @@ RDEPENDS_${PN} += "${PN}-mountall"
RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES_${PN}-passwd = "${sysconfdir}/passwd.${PN}"
+FILES_${PN}-passwd = "${sysconfdir}/passwd.${PN} ${sysconfdir}/group.${PN}"
FILES_${PN}-shadow = "${sysconfdir}/shadow.${PN}"
FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
${sysconfdir}/default/busybox-syslog"
@@ -187,6 +188,7 @@ do_install () {
if grep -q "CONFIG_PASSWD=y" ${WORKDIR}/defconfig; then
install -m 0644 ${WORKDIR}/passwd ${D}${sysconfdir}/passwd.${PN}
+ install -m 0644 ${WORKDIR}/group ${D}${sysconfdir}/group.${PN}
if grep -q "CONFIG_FEATURE_SHADOWPASSWDS=y" ${WORKDIR}/defconfig; then
install -m 0640 ${WORKDIR}/shadow ${D}${sysconfdir}/shadow.${PN}
fi
@@ -280,9 +282,11 @@ pkg_prerm_${PN}-mountall () {
pkg_postinst_${PN}-passwd () {
update-alternatives --install ${sysconfdir}/passwd default_passwd passwd.${PN} 50
+ update-alternatives --install ${sysconfdir}/group default_group group.${PN} 50
}
pkg_prerm_${PN}-passwd () {
update-alternatives --remove default_passwd passwd.${PN}
+ update-alternatives --remove default_group group.${PN}
}
pkg_postinst_${PN}-shadow () {
diff --git a/recipes/busybox/busybox_1.1x.inc b/recipes/busybox/busybox_1.1x.inc
index 1078aac..9552d4d 100644
--- a/recipes/busybox/busybox_1.1x.inc
+++ b/recipes/busybox/busybox_1.1x.inc
@@ -13,6 +13,7 @@ SRC_URI = "\
file://busybox-httpd \
file://busybox-udhcpd \
file://default.script file://simple.script \
+ file://group \
file://hwclock.sh \
file://hwclock-default \
file://mount.busybox \
diff --git a/recipes/busybox/files/group b/recipes/busybox/files/group
new file mode 100644
index 0000000..3dd8cdd
--- /dev/null
+++ b/recipes/busybox/files/group
@@ -0,0 +1,12 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+tty:x:5:
+disk:x:6:
+mail:x:8:
+man:x:12:
+www-data:x:33:
+utmp:x:43:
+nogroup:x:65534:
+users:x:100:
diff --git a/recipes/busybox/files/passwd b/recipes/busybox/files/passwd
index 64c9ab6..34921c3 100644
--- a/recipes/busybox/files/passwd
+++ b/recipes/busybox/files/passwd
@@ -2,10 +2,7 @@ root:x:0:0:root:/root:/bin/sh
daemon:x:1:1:daemon:/usr/sbin:/bin/sh
bin:x:2:2:bin:/bin:/bin/sh
sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
man:x:6:12:man:/var/cache/man:/bin/sh
mail:x:8:8:mail:/var/mail:/bin/sh
www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
diff --git a/recipes/busybox/files/shadow b/recipes/busybox/files/shadow
index 25df693..e64a964 100644
--- a/recipes/busybox/files/shadow
+++ b/recipes/busybox/files/shadow
@@ -2,10 +2,7 @@ root::14741:0:99999:7:::
daemon:*:14741:0:99999:7:::
bin:*:14741:0:99999:7:::
sys:*:14741:0:99999:7:::
-sync:*:14741:0:99999:7:::
man:*:14741:0:99999:7:::
mail:*:14741:0:99999:7:::
www-data:*:14741:0:99999:7:::
-backup:*:14741:0:99999:7:::
-irc:*:14741:0:99999:7:::
nobody:*:14741:0:99999:7:::
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES
2011-01-26 18:21 [PATCH 1/2] busybox: add group to -passwd package Bernhard Reutner-Fischer
@ 2011-01-26 18:21 ` Bernhard Reutner-Fischer
2011-01-26 19:29 ` Tom Rini
2011-01-26 18:54 ` [PATCH 1/2] busybox: add group to -passwd package Andreas Oberritter
2011-01-26 19:28 ` Tom Rini
2 siblings, 1 reply; 5+ messages in thread
From: Bernhard Reutner-Fischer @ 2011-01-26 18:21 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/busybox/busybox-config.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/recipes/busybox/busybox-config.inc b/recipes/busybox/busybox-config.inc
index 723ec0e..d4454b1 100644
--- a/recipes/busybox/busybox-config.inc
+++ b/recipes/busybox/busybox-config.inc
@@ -18,6 +18,7 @@ def features_to_busybox_settings(d):
busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
+ busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
# X, Y = ${@features_to_uclibc_settings(d)}
# unfortunately doesn't seem to work with bitbake, workaround:
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] busybox: add group to -passwd package
2011-01-26 18:21 [PATCH 1/2] busybox: add group to -passwd package Bernhard Reutner-Fischer
2011-01-26 18:21 ` [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES Bernhard Reutner-Fischer
@ 2011-01-26 18:54 ` Andreas Oberritter
2011-01-26 19:28 ` Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Andreas Oberritter @ 2011-01-26 18:54 UTC (permalink / raw)
To: openembedded-devel
Hi Bernhard,
On 01/26/2011 07:21 PM, Bernhard Reutner-Fischer wrote:
> recipes/busybox/files/passwd | 3 ---
> recipes/busybox/files/shadow | 3 ---
these two changes seem to have been included by mistake.
> diff --git a/recipes/busybox/files/passwd b/recipes/busybox/files/passwd
> index 64c9ab6..34921c3 100644
> --- a/recipes/busybox/files/passwd
> +++ b/recipes/busybox/files/passwd
> @@ -2,10 +2,7 @@ root:x:0:0:root:/root:/bin/sh
> daemon:x:1:1:daemon:/usr/sbin:/bin/sh
> bin:x:2:2:bin:/bin:/bin/sh
> sys:x:3:3:sys:/dev:/bin/sh
> -sync:x:4:65534:sync:/bin:/bin/sync
> man:x:6:12:man:/var/cache/man:/bin/sh
> mail:x:8:8:mail:/var/mail:/bin/sh
> www-data:x:33:33:www-data:/var/www:/bin/sh
> -backup:x:34:34:backup:/var/backups:/bin/sh
> -irc:x:39:39:ircd:/var/run/ircd:/bin/sh
> nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
> diff --git a/recipes/busybox/files/shadow b/recipes/busybox/files/shadow
> index 25df693..e64a964 100644
> --- a/recipes/busybox/files/shadow
> +++ b/recipes/busybox/files/shadow
> @@ -2,10 +2,7 @@ root::14741:0:99999:7:::
> daemon:*:14741:0:99999:7:::
> bin:*:14741:0:99999:7:::
> sys:*:14741:0:99999:7:::
> -sync:*:14741:0:99999:7:::
> man:*:14741:0:99999:7:::
> mail:*:14741:0:99999:7:::
> www-data:*:14741:0:99999:7:::
> -backup:*:14741:0:99999:7:::
> -irc:*:14741:0:99999:7:::
> nobody:*:14741:0:99999:7:::
Apart from that, the patch looks sane.
Regards,
Andreas
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] busybox: add group to -passwd package
2011-01-26 18:21 [PATCH 1/2] busybox: add group to -passwd package Bernhard Reutner-Fischer
2011-01-26 18:21 ` [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES Bernhard Reutner-Fischer
2011-01-26 18:54 ` [PATCH 1/2] busybox: add group to -passwd package Andreas Oberritter
@ 2011-01-26 19:28 ` Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2011-01-26 19:28 UTC (permalink / raw)
To: openembedded-devel
On 01/26/2011 11:21 AM, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer<rep.dot.nop@gmail.com>
> ---
> recipes/busybox/busybox.inc | 6 +++++-
> recipes/busybox/busybox_1.1x.inc | 1 +
> recipes/busybox/files/group | 12 ++++++++++++
> recipes/busybox/files/passwd | 3 ---
> recipes/busybox/files/shadow | 3 ---
> 5 files changed, 18 insertions(+), 7 deletions(-)
> create mode 100644 recipes/busybox/files/group
I assume the passwd/shadow changes are to keep them in sync with the
group file so:
Acked-by: Tom Rini <tom_rini@mentor.com>
>
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index 03efc99..9d87d9f 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -19,6 +19,7 @@ SRC_URI = "\
> file://busybox-udhcpd \
> file://default.script file://simple.script \
> file://dhcp-hostname.patch \
> + file://group \
> file://hwclock.sh \
> file://hwclock-default \
> file://ifupdown-spurious-environ.patch \
> @@ -50,7 +51,7 @@ RDEPENDS_${PN} += "${PN}-mountall"
> RRECOMMENDS_${PN} += "libgcc ${PN}-syslog"
>
> FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
> -FILES_${PN}-passwd = "${sysconfdir}/passwd.${PN}"
> +FILES_${PN}-passwd = "${sysconfdir}/passwd.${PN} ${sysconfdir}/group.${PN}"
> FILES_${PN}-shadow = "${sysconfdir}/shadow.${PN}"
> FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog.${PN} \
> ${sysconfdir}/default/busybox-syslog"
> @@ -187,6 +188,7 @@ do_install () {
>
> if grep -q "CONFIG_PASSWD=y" ${WORKDIR}/defconfig; then
> install -m 0644 ${WORKDIR}/passwd ${D}${sysconfdir}/passwd.${PN}
> + install -m 0644 ${WORKDIR}/group ${D}${sysconfdir}/group.${PN}
> if grep -q "CONFIG_FEATURE_SHADOWPASSWDS=y" ${WORKDIR}/defconfig; then
> install -m 0640 ${WORKDIR}/shadow ${D}${sysconfdir}/shadow.${PN}
> fi
> @@ -280,9 +282,11 @@ pkg_prerm_${PN}-mountall () {
>
> pkg_postinst_${PN}-passwd () {
> update-alternatives --install ${sysconfdir}/passwd default_passwd passwd.${PN} 50
> + update-alternatives --install ${sysconfdir}/group default_group group.${PN} 50
> }
> pkg_prerm_${PN}-passwd () {
> update-alternatives --remove default_passwd passwd.${PN}
> + update-alternatives --remove default_group group.${PN}
> }
>
> pkg_postinst_${PN}-shadow () {
> diff --git a/recipes/busybox/busybox_1.1x.inc b/recipes/busybox/busybox_1.1x.inc
> index 1078aac..9552d4d 100644
> --- a/recipes/busybox/busybox_1.1x.inc
> +++ b/recipes/busybox/busybox_1.1x.inc
> @@ -13,6 +13,7 @@ SRC_URI = "\
> file://busybox-httpd \
> file://busybox-udhcpd \
> file://default.script file://simple.script \
> + file://group \
> file://hwclock.sh \
> file://hwclock-default \
> file://mount.busybox \
> diff --git a/recipes/busybox/files/group b/recipes/busybox/files/group
> new file mode 100644
> index 0000000..3dd8cdd
> --- /dev/null
> +++ b/recipes/busybox/files/group
> @@ -0,0 +1,12 @@
> +root:x:0:
> +daemon:x:1:
> +bin:x:2:
> +sys:x:3:
> +tty:x:5:
> +disk:x:6:
> +mail:x:8:
> +man:x:12:
> +www-data:x:33:
> +utmp:x:43:
> +nogroup:x:65534:
> +users:x:100:
> diff --git a/recipes/busybox/files/passwd b/recipes/busybox/files/passwd
> index 64c9ab6..34921c3 100644
> --- a/recipes/busybox/files/passwd
> +++ b/recipes/busybox/files/passwd
> @@ -2,10 +2,7 @@ root:x:0:0:root:/root:/bin/sh
> daemon:x:1:1:daemon:/usr/sbin:/bin/sh
> bin:x:2:2:bin:/bin:/bin/sh
> sys:x:3:3:sys:/dev:/bin/sh
> -sync:x:4:65534:sync:/bin:/bin/sync
> man:x:6:12:man:/var/cache/man:/bin/sh
> mail:x:8:8:mail:/var/mail:/bin/sh
> www-data:x:33:33:www-data:/var/www:/bin/sh
> -backup:x:34:34:backup:/var/backups:/bin/sh
> -irc:x:39:39:ircd:/var/run/ircd:/bin/sh
> nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
> diff --git a/recipes/busybox/files/shadow b/recipes/busybox/files/shadow
> index 25df693..e64a964 100644
> --- a/recipes/busybox/files/shadow
> +++ b/recipes/busybox/files/shadow
> @@ -2,10 +2,7 @@ root::14741:0:99999:7:::
> daemon:*:14741:0:99999:7:::
> bin:*:14741:0:99999:7:::
> sys:*:14741:0:99999:7:::
> -sync:*:14741:0:99999:7:::
> man:*:14741:0:99999:7:::
> mail:*:14741:0:99999:7:::
> www-data:*:14741:0:99999:7:::
> -backup:*:14741:0:99999:7:::
> -irc:*:14741:0:99999:7:::
> nobody:*:14741:0:99999:7:::
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES
2011-01-26 18:21 ` [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES Bernhard Reutner-Fischer
@ 2011-01-26 19:29 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2011-01-26 19:29 UTC (permalink / raw)
To: openembedded-devel
On 01/26/2011 11:21 AM, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer<rep.dot.nop@gmail.com>
Acked-by: Tom Rini <tom_rini@mentor.com>
> ---
> recipes/busybox/busybox-config.inc | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/recipes/busybox/busybox-config.inc b/recipes/busybox/busybox-config.inc
> index 723ec0e..d4454b1 100644
> --- a/recipes/busybox/busybox-config.inc
> +++ b/recipes/busybox/busybox-config.inc
> @@ -18,6 +18,7 @@ def features_to_busybox_settings(d):
> busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
> busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
> busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
> + busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem)
> return "\n".join(cnf), "\n".join(rem)
> # X, Y = ${@features_to_uclibc_settings(d)}
> # unfortunately doesn't seem to work with bitbake, workaround:
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-26 19:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-26 18:21 [PATCH 1/2] busybox: add group to -passwd package Bernhard Reutner-Fischer
2011-01-26 18:21 ` [PATCH 2/2] busybox: 2.4 module support for kernel24 MACHINE_FEATURES Bernhard Reutner-Fischer
2011-01-26 19:29 ` Tom Rini
2011-01-26 18:54 ` [PATCH 1/2] busybox: add group to -passwd package Andreas Oberritter
2011-01-26 19:28 ` Tom Rini
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.