* [Buildroot] [PATCH v2 02/13] package/skeleton-init-openrc: basic skeleton for openrc
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 20:57 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 03/13] system/Config.in: add new init - openrc Michał Łyszczek
` (11 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
This basic skeleton is similar to skeleton-init-sysv.
All links in /var are same as in skeleton-init-sysv to be compatible
with current default filesystem scheme.
Exceptions:
* /dev/shm and /dev/pts dirs were removed, since they are created by
openrc devfs service
* /etc/fstab does not need /dev/shm, /dev/pts and /sys entries
becuse they are mounted by devfs and sysfs services respectively
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/skeleton-init-openrc/Config.in | 7 ++++++
.../skeleton-init-sysv.mk | 22 +++++++++++++++++++
package/skeleton-init-openrc/skeleton/dev/log | 1 +
.../skeleton-init-openrc/skeleton/etc/fstab | 3 +++
.../skeleton-init-openrc/skeleton/var/cache | 1 +
.../skeleton/var/lib/misc | 1 +
.../skeleton-init-openrc/skeleton/var/lock | 1 +
package/skeleton-init-openrc/skeleton/var/log | 1 +
package/skeleton-init-openrc/skeleton/var/run | 1 +
.../skeleton-init-openrc/skeleton/var/spool | 1 +
package/skeleton-init-openrc/skeleton/var/tmp | 1 +
13 files changed, 42 insertions(+)
create mode 100644 package/skeleton-init-openrc/Config.in
create mode 100644 package/skeleton-init-openrc/skeleton-init-sysv.mk
create mode 120000 package/skeleton-init-openrc/skeleton/dev/log
create mode 100644 package/skeleton-init-openrc/skeleton/etc/fstab
create mode 120000 package/skeleton-init-openrc/skeleton/var/cache
create mode 120000 package/skeleton-init-openrc/skeleton/var/lib/misc
create mode 120000 package/skeleton-init-openrc/skeleton/var/lock
create mode 120000 package/skeleton-init-openrc/skeleton/var/log
create mode 120000 package/skeleton-init-openrc/skeleton/var/run
create mode 120000 package/skeleton-init-openrc/skeleton/var/spool
create mode 120000 package/skeleton-init-openrc/skeleton/var/tmp
diff --git a/DEVELOPERS b/DEVELOPERS
index 0f89e49b92..92aa5381f8 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1616,6 +1616,7 @@ F: board/pine64/rock64
F: configs/rock64_defconfig
F: configs/socrates_cyclone5_defconfig
F: package/openrc/
+F: package/skeleton-init-openrc/
N: Michel Stempin <michel.stempin@wanadoo.fr>
F: board/licheepi/
diff --git a/package/Config.in b/package/Config.in
index d9cb755d68..584c7e4e5a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -5,6 +5,7 @@ menu "Target packages"
source "package/skeleton-custom/Config.in"
source "package/skeleton-init-common/Config.in"
source "package/skeleton-init-none/Config.in"
+ source "package/skeleton-init-openrc/Config.in"
source "package/skeleton-init-systemd/Config.in"
source "package/skeleton-init-sysv/Config.in"
diff --git a/package/skeleton-init-openrc/Config.in b/package/skeleton-init-openrc/Config.in
new file mode 100644
index 0000000000..8f4dd17ebd
--- /dev/null
+++ b/package/skeleton-init-openrc/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_OPENRC
+ bool
+ select BR2_PACKAGE_HAS_SKELETON
+ select BR2_PACKAGE_SKELETON_INIT_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+ default "skeleton-init-openrc" if BR2_PACKAGE_SKELETON_INIT_OPENRC
diff --git a/package/skeleton-init-openrc/skeleton-init-sysv.mk b/package/skeleton-init-openrc/skeleton-init-sysv.mk
new file mode 100644
index 0000000000..5ee2192093
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# skeleton-init-openrc
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_OPENRC_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_OPENRC_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
+
+SKELETON_INIT_OPENRC_PROVIDES = skeleton
+
+define SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS
+ $(call SYSTEM_RSYNC,$(SKELETON_INIT_OPENRC_PKGDIR)/skeleton,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/package/skeleton-init-openrc/skeleton/dev/log b/package/skeleton-init-openrc/skeleton/dev/log
new file mode 120000
index 0000000000..d96b3b1cb8
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/dev/log
@@ -0,0 +1 @@
+../tmp/log
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/etc/fstab b/package/skeleton-init-openrc/skeleton/etc/fstab
new file mode 100644
index 0000000000..3ec96cf634
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/etc/fstab
@@ -0,0 +1,3 @@
+# <file system> <mount pt> <type> <options> <dump> <pass>
+tmpfs /tmp tmpfs mode=1777 0 0
+tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
diff --git a/package/skeleton-init-openrc/skeleton/var/cache b/package/skeleton-init-openrc/skeleton/var/cache
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/cache
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/lib/misc b/package/skeleton-init-openrc/skeleton/var/lib/misc
new file mode 120000
index 0000000000..f1fde8c107
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/lib/misc
@@ -0,0 +1 @@
+../../tmp
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/lock b/package/skeleton-init-openrc/skeleton/var/lock
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/lock
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/log b/package/skeleton-init-openrc/skeleton/var/log
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/log
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/run b/package/skeleton-init-openrc/skeleton/var/run
new file mode 120000
index 0000000000..84ba55b912
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/run
@@ -0,0 +1 @@
+../run
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/spool b/package/skeleton-init-openrc/skeleton/var/spool
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/spool
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file
diff --git a/package/skeleton-init-openrc/skeleton/var/tmp b/package/skeleton-init-openrc/skeleton/var/tmp
new file mode 120000
index 0000000000..1431b0e432
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/var/tmp
@@ -0,0 +1 @@
+../tmp
\ No newline at end of file
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 02/13] package/skeleton-init-openrc: basic skeleton for openrc
2019-05-12 19:55 ` [Buildroot] [PATCH v2 02/13] package/skeleton-init-openrc: basic skeleton for openrc Michał Łyszczek
@ 2019-05-18 20:57 ` Thomas Petazzoni
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 20:57 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 May 2019 21:55:39 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> This basic skeleton is similar to skeleton-init-sysv.
> All links in /var are same as in skeleton-init-sysv to be compatible
> with current default filesystem scheme.
>
> Exceptions:
>
> * /dev/shm and /dev/pts dirs were removed, since they are created by
> openrc devfs service
> * /etc/fstab does not need /dev/shm, /dev/pts and /sys entries
> becuse they are mounted by devfs and sysfs services respectively
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
Applied to next, after doing one change, see below.
> +++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
Too much copy paste here: this file should have been named
skeleton-init-openrc.mk. I fixed that when applying.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 03/13] system/Config.in: add new init - openrc
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 02/13] package/skeleton-init-openrc: basic skeleton for openrc Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:18 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty Michał Łyszczek
` (10 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
This is very basic settings for openrc init.
* system/Config.in
Allows to select openrc as init system (which auto selects
openrc-skeleton and openrc package).
* package/ifupdown-scripts/Config.in
openrc has its own service to bring up/down interfaces, so
ifupdown-scripts should not be enabled when openrc is enabled to
prevent service clash.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
package/ifupdown-scripts/Config.in | 2 +-
package/openrc/Config.in | 1 +
system/Config.in | 6 ++++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
index 2f4b0d5467..4b984bc30c 100644
--- a/package/ifupdown-scripts/Config.in
+++ b/package/ifupdown-scripts/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_IFUPDOWN_SCRIPTS
bool "ifupdown scripts"
default y if BR2_ROOTFS_SKELETON_DEFAULT
- depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
+ depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC
help
Set of scripts used by ifupdown (either the standalone one,
or the busybox one) to bring network up, or tear it down.
diff --git a/package/openrc/Config.in b/package/openrc/Config.in
index 4baeed60ae..f79279533f 100644
--- a/package/openrc/Config.in
+++ b/package/openrc/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_OPENRC
bool "OpenRC"
select BR2_PACKAGE_NCURSES
+ depends on BR2_INIT_OPENRC
help
Init that works on top of pid 1 (for example openrc-init). By default
it does quite a lot on startup (like setting hwclock, mounting
diff --git a/system/Config.in b/system/Config.in
index 498b56e222..808fc070f3 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -11,6 +11,7 @@ config BR2_ROOTFS_SKELETON_DEFAULT
bool "default target skeleton"
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV
select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX
+ select BR2_PACKAGE_SKELETON_INIT_OPENRC if BR2_INIT_OPENRC
select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD
select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE
help
@@ -98,6 +99,11 @@ config BR2_INIT_SYSV
select BR2_PACKAGE_INITSCRIPTS
select BR2_PACKAGE_SYSVINIT
+config BR2_INIT_OPENRC
+ bool "OpenRC"
+ depends on BR2_USE_MMU
+ select BR2_PACKAGE_OPENRC
+
# In Buildroot, we decided not to support a split-usr when systemd is
# used as an init system. This is a design decision, not a systemd
# issue. Thus the select is with BR2_INIT_SYSTEMD (below) rather than
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 03/13] system/Config.in: add new init - openrc
2019-05-12 19:55 ` [Buildroot] [PATCH v2 03/13] system/Config.in: add new init - openrc Michał Łyszczek
@ 2019-05-18 21:18 ` Thomas Petazzoni
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:18 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 May 2019 21:55:40 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> This is very basic settings for openrc init.
>
> * system/Config.in
> Allows to select openrc as init system (which auto selects
> openrc-skeleton and openrc package).
>
> * package/ifupdown-scripts/Config.in
> openrc has its own service to bring up/down interfaces, so
> ifupdown-scripts should not be enabled when openrc is enabled to
> prevent service clash.
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
I've applied, with some changes, see below.
> diff --git a/package/openrc/Config.in b/package/openrc/Config.in
> index 4baeed60ae..f79279533f 100644
> --- a/package/openrc/Config.in
> +++ b/package/openrc/Config.in
> @@ -1,6 +1,7 @@
> config BR2_PACKAGE_OPENRC
> bool "OpenRC"
> select BR2_PACKAGE_NCURSES
> + depends on BR2_INIT_OPENRC
"depends on" must be before selects, otherwise "make check-package"
complains.
> +config BR2_INIT_OPENRC
> + bool "OpenRC"
> + depends on BR2_USE_MMU
I have replicated this BR2_USE_MMU dependency on the openrc package.
Also, a !BR2_STATIC_LIBS dependency was missing, which I have added to
both BR2_PACKAGE_OPENRC and BR2_INIT_OPENRC.
And due to this !BR2_STATIC_LIBS dependency, I've added a Config.in
comment as well.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 02/13] package/skeleton-init-openrc: basic skeleton for openrc Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 03/13] system/Config.in: add new init - openrc Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:20 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 05/13] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC Michał Łyszczek
` (9 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
* package/openrc/openrc.mk
add code that monitors BR2_TARGET_GENERIC_GETTY and if set,
creates configuration file (with SYSTEM_GETTY_*) for port in
/etc/conf.d/getty.$(SYSTEM_GETTY_PORT) and links so openrc
starts service.
* package/skeleton-init-openrc/skeleton/etc/init.d/getty
openrc service that spawns getty on configured port.
* system/Config.in
change dependency of BR2_TARGET_GENERIC_GETTY_TERM and
BR2_TARGET_GENERIC_GETTY_OPTIONS so openrc can make use
of these fields too.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
package/openrc/openrc.mk | 13 ++++++++
.../skeleton/etc/conf.d/.empty | 0
.../skeleton/etc/init.d/getty | 31 +++++++++++++++++++
.../skeleton/etc/runlevels/default/.empty | 0
system/Config.in | 8 ++---
5 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
create mode 100755 package/skeleton-init-openrc/skeleton/etc/init.d/getty
create mode 100644 package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 53f2947dcc..0feea22818 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -42,4 +42,17 @@ define OPENRC_REMOVE_UNNEEDED
endef
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
+GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT)
+GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(GETTY_SVCNAME)
+define OPENRC_SET_GETTY
+ echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\"" > $(GETTY_CONF_D)
+ echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" >> $(GETTY_CONF_D)
+ echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\"" >> $(GETTY_CONF_D)
+ ln -sf getty $(TARGET_DIR)/etc/init.d/$(GETTY_SVCNAME)
+ ln -sf /etc/init.d/$(GETTY_SVCNAME) $(TARGET_DIR)/etc/runlevels/default/$(GETTY_SVCNAME)
+endef
+OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
+endif # BR2_TARGET_GENERIC_GETTY
+
$(eval $(generic-package))
diff --git a/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty b/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/package/skeleton-init-openrc/skeleton/etc/init.d/getty b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
new file mode 100755
index 0000000000..acae1b218b
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# based on agetty service from OpenRC package
+
+description="start getty on terminal"
+supervisor=supervise-daemon
+port="${RC_SVCNAME#*.}"
+term_type="${term_type:-linux}"
+command=/sbin/getty
+command_args_foreground="${getty_options} ${baud} ${port} ${term_type}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ # start getty at the very end of init
+ after *
+ keyword -prefix
+}
+
+start_pre() {
+ if [ -z "$port" ]; then
+ eerror "${RC_SVCNAME} cannot be started directly. You must create"
+ eerror "symbolic links to it for the ports you want to start"
+ eerror "agetty on and add those to the appropriate runlevels."
+ return 1
+ else
+ export EINFO_QUIET="${quiet:-yes}"
+ fi
+}
+
+stop_pre() {
+ export EINFO_QUIET="${quiet:-yes}"
+}
diff --git a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/system/Config.in b/system/Config.in
index 808fc070f3..90aa0e52b9 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -343,16 +343,16 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
config BR2_TARGET_GENERIC_GETTY_TERM
string "TERM environment variable"
default "vt100"
- # currently observed only by busybox and sysvinit
- depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV
+ # currently observed by all but systemd
+ depends on !BR2_INIT_SYSTEMD
help
Specify a TERM type.
config BR2_TARGET_GENERIC_GETTY_OPTIONS
string "other options to pass to getty"
default ""
- # currently observed only by busybox and sysvinit
- depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV
+ # currently observed by all but systemd
+ depends on !BR2_INIT_SYSTEMD
help
Any other flags you want to pass to getty,
Refer to getty --help for details.
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty
2019-05-12 19:55 ` [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty Michał Łyszczek
@ 2019-05-18 21:20 ` Thomas Petazzoni
2019-05-19 8:32 ` michal.lyszczek at bofc.pl
0 siblings, 1 reply; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:20 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 May 2019 21:55:41 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
> index 53f2947dcc..0feea22818 100644
> --- a/package/openrc/openrc.mk
> +++ b/package/openrc/openrc.mk
> @@ -42,4 +42,17 @@ define OPENRC_REMOVE_UNNEEDED
> endef
> OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
>
> +ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
> +GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT)
> +GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(GETTY_SVCNAME)
The namespace of variables is global, so all variables defined by a
package must be prefixed by the package name, here OPENRC_.
> +define OPENRC_SET_GETTY
> + echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\"" > $(GETTY_CONF_D)
> + echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" >> $(GETTY_CONF_D)
> + echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\"" >> $(GETTY_CONF_D)
> + ln -sf getty $(TARGET_DIR)/etc/init.d/$(GETTY_SVCNAME)
> + ln -sf /etc/init.d/$(GETTY_SVCNAME) $(TARGET_DIR)/etc/runlevels/default/$(GETTY_SVCNAME)
> +endef
> +OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
> +endif # BR2_TARGET_GENERIC_GETTY
> +
> $(eval $(generic-package))
> diff --git a/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty b/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/package/skeleton-init-openrc/skeleton/etc/init.d/getty b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
> new file mode 100755
> index 0000000000..acae1b218b
> --- /dev/null
> +++ b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
I am not sure: should this be part of the OpenRC skeleton package ? Or
the OpenRC package itself ?
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty
2019-05-18 21:20 ` Thomas Petazzoni
@ 2019-05-19 8:32 ` michal.lyszczek at bofc.pl
0 siblings, 0 replies; 24+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-05-19 8:32 UTC (permalink / raw)
To: buildroot
Hello Thomas
On 2019-05-18 23:20:16, Thomas Petazzoni wrote:
> Hello,
>
> On Sun, 12 May 2019 21:55:41 +0200
> Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
>
> > diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
> > index 53f2947dcc..0feea22818 100644
> > --- a/package/openrc/openrc.mk
> > +++ b/package/openrc/openrc.mk
> > @@ -42,4 +42,17 @@ define OPENRC_REMOVE_UNNEEDED
> > endef
> > OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
> >
> > +ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
> > +GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT)
> > +GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(GETTY_SVCNAME)
>
> The namespace of variables is global, so all variables defined by a
> package must be prefixed by the package name, here OPENRC_.
Right, didn't know that, thanks. Will fix.
> > +define OPENRC_SET_GETTY
> > + echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\"" > $(GETTY_CONF_D)
> > + echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" >> $(GETTY_CONF_D)
> > + echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\"" >> $(GETTY_CONF_D)
> > + ln -sf getty $(TARGET_DIR)/etc/init.d/$(GETTY_SVCNAME)
> > + ln -sf /etc/init.d/$(GETTY_SVCNAME) $(TARGET_DIR)/etc/runlevels/default/$(GETTY_SVCNAME)
> > +endef
> > +OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
> > +endif # BR2_TARGET_GENERIC_GETTY
> > +
> > $(eval $(generic-package))
> > diff --git a/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty b/package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
> > new file mode 100644
> > index 0000000000..e69de29bb2
> > diff --git a/package/skeleton-init-openrc/skeleton/etc/init.d/getty b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
> > new file mode 100755
> > index 0000000000..acae1b218b
> > --- /dev/null
> > +++ b/package/skeleton-init-openrc/skeleton/etc/init.d/getty
>
> I am not sure: should this be part of the OpenRC skeleton package ? Or
> the OpenRC package itself ?
All init sysvinit/sysvinit.mk, busybox/busybox.mk systemd/systemd.mk has
BR2_TARGET_GENERIC_GETTY defined in their packages makefile and not
skeleton. It seemed consistent for me.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190519/c363eff9/attachment.asc>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 05/13] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (2 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 04/13] package/openrc: add support for spawning getty Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:21 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw Michał Łyszczek
` (8 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
* package/pkg-generic.mk
Add _INSTALL_INIT_OPENRC so packages can define own steps to perform
to install openrc service scripts.
* docs/manual/adding-packages-generic.txt
update documentation about new hook.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
Suggested by Thomas Petazzoni:
- update "adding-packages-generic.txt" about new hook
---
docs/manual/adding-packages-generic.txt | 13 +++++++------
package/pkg-generic.mk | 2 ++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 7be1754f54..5ac07a81b4 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -536,12 +536,13 @@ different steps of the build process.
should utilize this step if it has binaries which would be similar
to the kernel image, bootloader or root filesystem images.
-* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the
- actions to install init scripts either for the systemV-like init systems
- (busybox, sysvinit, etc.) or for the systemd units. These commands
- will be run only when the relevant init system is installed (i.e. if
- systemd is selected as the init system in the configuration, only
- +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
+* +LIBFOO_INSTALL_INIT_SYSV+, +LIBFOO_INSTALL_INIT_OPENRC+ and
+ +LIBFOO_INSTALL_INIT_SYSTEMD+ list the actions to install init
+ scripts either for the systemV-like init systems (busybox,
+ sysvinit, etc.), openrc or for the systemd units. These commands
+ will be run only when the relevant init system is installed (i.e.
+ if systemd is selected as the init system in the configuration,
+ only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
* +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which
is included to the main +make help+ output. These commands can print
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 67782138b4..6d63c46a5b 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -337,6 +337,8 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$($(PKG)_INSTALL_INIT_SYSTEMD))
$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
$($(PKG)_INSTALL_INIT_SYSV))
+ $(if $(BR2_INIT_OPENRC), \
+ $($(PKG)_INSTALL_INIT_OPENRC))
$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 05/13] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC
2019-05-12 19:55 ` [Buildroot] [PATCH v2 05/13] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC Michał Łyszczek
@ 2019-05-18 21:21 ` Thomas Petazzoni
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:21 UTC (permalink / raw)
To: buildroot
On Sun, 12 May 2019 21:55:42 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> * package/pkg-generic.mk
> Add _INSTALL_INIT_OPENRC so packages can define own steps to perform
> to install openrc service scripts.
>
> * docs/manual/adding-packages-generic.txt
> update documentation about new hook.
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
>
> ---
> Changes v1 -> v2
> Suggested by Thomas Petazzoni:
> - update "adding-packages-generic.txt" about new hook
> ---
> docs/manual/adding-packages-generic.txt | 13 +++++++------
> package/pkg-generic.mk | 2 ++
> 2 files changed, 9 insertions(+), 6 deletions(-)
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (3 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 05/13] package/pkg-generic.mk: add _INSTALL_INIT_OPENRC Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:22 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 07/13] package/openrc-netifrc: net package (v0.6.1) Michał Łyszczek
` (7 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
Adds support to openrc skeleton to monitor
BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW and remount rootfs as rw when
options is set.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
.../skeleton-init-openrc/skeleton-init-sysv.mk | 15 +++++++++++++++
package/skeleton-init-openrc/skeleton/etc/fstab | 1 +
2 files changed, 16 insertions(+)
diff --git a/package/skeleton-init-openrc/skeleton-init-sysv.mk b/package/skeleton-init-openrc/skeleton-init-sysv.mk
index 5ee2192093..bbe80071ae 100644
--- a/package/skeleton-init-openrc/skeleton-init-sysv.mk
+++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
@@ -15,8 +15,23 @@ SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
SKELETON_INIT_OPENRC_PROVIDES = skeleton
+ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
+# Comment /dev/root entry in fstab. When openrc does not find fstab entry for
+# "/", it will try to remount "/" as "rw".
+define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
+ $(SED) '/^ *\/dev\/root.*$$/s~^~#~' $(TARGET_DIR)/etc/fstab
+endef
+else
+# Uncomment /dev/root entry in fstab which has "ro" option so openrc notices
+# it and doesn't remount root to rw.
+define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
+ $(SED) '/^# *\/dev\/root.*$$/s~^#\+~~' $(TARGET_DIR)/etc/fstab
+endef
+endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
+
define SKELETON_INIT_OPENRC_INSTALL_TARGET_CMDS
$(call SYSTEM_RSYNC,$(SKELETON_INIT_OPENRC_PKGDIR)/skeleton,$(TARGET_DIR))
+ $(SKELETON_INIT_OPENRC_ROOT_RO_OR_RW)
endef
$(eval $(generic-package))
diff --git a/package/skeleton-init-openrc/skeleton/etc/fstab b/package/skeleton-init-openrc/skeleton/etc/fstab
index 3ec96cf634..21cf49ba5a 100644
--- a/package/skeleton-init-openrc/skeleton/etc/fstab
+++ b/package/skeleton-init-openrc/skeleton/etc/fstab
@@ -1,3 +1,4 @@
# <file system> <mount pt> <type> <options> <dump> <pass>
+/dev/root / ext2 ro,noauto 0 0
tmpfs /tmp tmpfs mode=1777 0 0
tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw
2019-05-12 19:55 ` [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw Michał Łyszczek
@ 2019-05-18 21:22 ` Thomas Petazzoni
2019-05-19 8:32 ` michal.lyszczek at bofc.pl
0 siblings, 1 reply; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:22 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 12 May 2019 21:55:43 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> diff --git a/package/skeleton-init-openrc/skeleton-init-sysv.mk b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> index 5ee2192093..bbe80071ae 100644
> --- a/package/skeleton-init-openrc/skeleton-init-sysv.mk
> +++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> @@ -15,8 +15,23 @@ SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
>
> SKELETON_INIT_OPENRC_PROVIDES = skeleton
>
> +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
> +# Comment /dev/root entry in fstab. When openrc does not find fstab entry for
> +# "/", it will try to remount "/" as "rw".
> +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> + $(SED) '/^ *\/dev\/root.*$$/s~^~#~' $(TARGET_DIR)/etc/fstab
> +endef
> +else
> +# Uncomment /dev/root entry in fstab which has "ro" option so openrc notices
> +# it and doesn't remount root to rw.
> +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> + $(SED) '/^# *\/dev\/root.*$$/s~^#\+~~' $(TARGET_DIR)/etc/fstab
> +endef
> +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
Why are you handling the ro/rw rootfs topic from skeleton-init-sysv.mk,
but the getty topic is handled from openrc.mk (in PATCH 04/13). It
doesn't seem very consistent.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw
2019-05-18 21:22 ` Thomas Petazzoni
@ 2019-05-19 8:32 ` michal.lyszczek at bofc.pl
2019-07-23 10:50 ` michal.lyszczek at bofc.pl
0 siblings, 1 reply; 24+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-05-19 8:32 UTC (permalink / raw)
To: buildroot
Hello Thomas
On 2019-05-18 23:22:40, Thomas Petazzoni wrote:
> Hello,
>
> On Sun, 12 May 2019 21:55:43 +0200
> Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
>
> > diff --git a/package/skeleton-init-openrc/skeleton-init-sysv.mk b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > index 5ee2192093..bbe80071ae 100644
> > --- a/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > +++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > @@ -15,8 +15,23 @@ SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
> >
> > SKELETON_INIT_OPENRC_PROVIDES = skeleton
> >
> > +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
> > +# Comment /dev/root entry in fstab. When openrc does not find fstab entry for
> > +# "/", it will try to remount "/" as "rw".
> > +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> > + $(SED) '/^ *\/dev\/root.*$$/s~^~#~' $(TARGET_DIR)/etc/fstab
> > +endef
> > +else
> > +# Uncomment /dev/root entry in fstab which has "ro" option so openrc notices
> > +# it and doesn't remount root to rw.
> > +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> > + $(SED) '/^# *\/dev\/root.*$$/s~^#\+~~' $(TARGET_DIR)/etc/fstab
> > +endef
> > +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
>
> Why are you handling the ro/rw rootfs topic from skeleton-init-sysv.mk,
> but the getty topic is handled from openrc.mk (in PATCH 04/13). It
> doesn't seem very consistent.
I just followed already established rules here (based on systemd package).
BR2_TARGET_GENERIC_GETTY is in systemd.mk, and
BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is in skeleton-init-systemd.mk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190519/c8b8a8b6/attachment.asc>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw
2019-05-19 8:32 ` michal.lyszczek at bofc.pl
@ 2019-07-23 10:50 ` michal.lyszczek at bofc.pl
0 siblings, 0 replies; 24+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-07-23 10:50 UTC (permalink / raw)
To: buildroot
Hello Thomas
On 2019-05-19 10:32:27, michal.lyszczek at bofc.pl wrote:
> Hello Thomas
> On 2019-05-18 23:22:40, Thomas Petazzoni wrote:
> > Hello,
> >
> > On Sun, 12 May 2019 21:55:43 +0200
> > Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> >
> > > diff --git a/package/skeleton-init-openrc/skeleton-init-sysv.mk b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > > index 5ee2192093..bbe80071ae 100644
> > > --- a/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > > +++ b/package/skeleton-init-openrc/skeleton-init-sysv.mk
> > > @@ -15,8 +15,23 @@ SKELETON_INIT_OPENRC_DEPENDENCIES = skeleton-init-common
> > >
> > > SKELETON_INIT_OPENRC_PROVIDES = skeleton
> > >
> > > +ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
> > > +# Comment /dev/root entry in fstab. When openrc does not find fstab entry for
> > > +# "/", it will try to remount "/" as "rw".
> > > +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> > > + $(SED) '/^ *\/dev\/root.*$$/s~^~#~' $(TARGET_DIR)/etc/fstab
> > > +endef
> > > +else
> > > +# Uncomment /dev/root entry in fstab which has "ro" option so openrc notices
> > > +# it and doesn't remount root to rw.
> > > +define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW
> > > + $(SED) '/^# *\/dev\/root.*$$/s~^#\+~~' $(TARGET_DIR)/etc/fstab
> > > +endef
> > > +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
> >
> > Why are you handling the ro/rw rootfs topic from skeleton-init-sysv.mk,
> > but the getty topic is handled from openrc.mk (in PATCH 04/13). It
> > doesn't seem very consistent.
>
> I just followed already established rules here (based on systemd package).
> BR2_TARGET_GENERIC_GETTY is in systemd.mk, and
> BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is in skeleton-init-systemd.mk
It's been some time and openrc has been only partialy merged. Any thoughts
about my last comment? Do you want me to move ro/rw handling to openrc.mk
or leave it as it is (to be consistent with systemd.mk)?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190723/cce7352c/attachment.asc>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 07/13] package/openrc-netifrc: net package (v0.6.1)
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (4 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 06/13] package/skeleton-init-openrc: add support to remount rootfs as rw Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 08/13] package/openrc-netifrc/openrc-netifrc.mk: add support for BR2_SYSTEM_DHCP Michał Łyszczek
` (6 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
netifrc package is a collection of scripts for openrc that
configure network interfaces. It can take advantage of many
external binaries like dhcp, wpa_supplicant or ifplugd.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
Suggested by Thomas Petazzoni:
- Add hash for LICENSE
- Merge OPENRC_NETIFRC_MAKE_OPTS into single assignment
- Move DESTDIR after OPENRC_NETIFRC_MAKE_OPTS in install target cmds
- Change short commit message
- Add project related links to Config.in
- Replace += with = in first assignments in makefile
Own initiative:
- Remove OPENRC_NETIFRC_REMOVE_UNNEEDED since it only removes
/usr/share/doc/netifrc and /usr/share/doc is removed anyway
in target-finalize target in package/Makefile
- Fix grammar in commit message.
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/openrc-netifrc/Config.in | 9 ++++
package/openrc-netifrc/openrc-netifrc.hash | 3 ++
package/openrc-netifrc/openrc-netifrc.mk | 53 ++++++++++++++++++++++
5 files changed, 67 insertions(+)
create mode 100644 package/openrc-netifrc/Config.in
create mode 100644 package/openrc-netifrc/openrc-netifrc.hash
create mode 100644 package/openrc-netifrc/openrc-netifrc.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 92aa5381f8..4cf9feff21 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1616,6 +1616,7 @@ F: board/pine64/rock64
F: configs/rock64_defconfig
F: configs/socrates_cyclone5_defconfig
F: package/openrc/
+F: package/openrc-netifrc/
F: package/skeleton-init-openrc/
N: Michel Stempin <michel.stempin@wanadoo.fr>
diff --git a/package/Config.in b/package/Config.in
index 584c7e4e5a..c724b33ce8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2196,6 +2196,7 @@ menu "System tools"
source "package/numactl/Config.in"
source "package/nut/Config.in"
source "package/openrc/Config.in"
+ source "package/openrc-netifrc/Config.in"
source "package/openvmtools/Config.in"
source "package/pamtester/Config.in"
source "package/polkit/Config.in"
diff --git a/package/openrc-netifrc/Config.in b/package/openrc-netifrc/Config.in
new file mode 100644
index 0000000000..3786ba8562
--- /dev/null
+++ b/package/openrc-netifrc/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_OPENRC_NETIFRC
+ bool "Install network interface startup scripts"
+ depends on BR2_PACKAGE_OPENRC
+ help
+ This package provides a system of modules to manage and configure network
+ interfaces via individual per-interface scripts in /etc/init.d.
+
+ wiki: https://wiki.gentoo.org/wiki/Netifrc
+ source: https://gitweb.gentoo.org/proj/netifrc.git
diff --git a/package/openrc-netifrc/openrc-netifrc.hash b/package/openrc-netifrc/openrc-netifrc.hash
new file mode 100644
index 0000000000..d811acc4a2
--- /dev/null
+++ b/package/openrc-netifrc/openrc-netifrc.hash
@@ -0,0 +1,3 @@
+# Calculated manually
+sha256 004907e0c3db2d106d6a51d604d79f971f1013fa7642054ad7efe5076e52f7b3 netifrc-0.6.1.tar.gz
+sha256 da376c9e2244f2a7220767ea4dd88cf423ff5b548e7c2f96b0f3b9dac727748a LICENSE
diff --git a/package/openrc-netifrc/openrc-netifrc.mk b/package/openrc-netifrc/openrc-netifrc.mk
new file mode 100644
index 0000000000..55421af72f
--- /dev/null
+++ b/package/openrc-netifrc/openrc-netifrc.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# openrc-netifrc
+#
+################################################################################
+
+OPENRC_NETIFRC_VERSION = 0.6.1
+OPENRC_NETIFRC_SOURCE = netifrc-$(OPENRC_NETIFRC_VERSION).tar.gz
+OPENRC_NETIFRC_SITE = $(call github,gentoo,netifrc,$(OPENRC_NETIFRC_VERSION))
+OPENRC_NETIFRC_LICENSE = BSD-2-Clause
+OPENRC_NETIFRC_LICENSE_FILES = LICENSE
+
+OPENRC_NETIFRC_DEPENDENCIES = openrc
+
+# set LIBNAME so netifrc puts files in proper directories and sets proper
+# paths in installed files. Since in buildroot /lib64 and /lib32 always
+# points to /lib, it's safe to hardcode it to "lib"
+OPENRC_NETIFRC_MAKE_OPTS = \
+ LIBNAME=lib \
+ LIBEXECDIR=/usr/libexec/netifrc
+
+define OPENRC_NETIFRC_BUILD_CMDS
+ $(MAKE) $(OPENRC_NETIFRC_MAKE_OPTS) -C $(@D)
+endef
+
+define OPENRC_NETIFRC_INSTALL_TARGET_CMDS
+ $(MAKE) $(OPENRC_NETIFRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),)
+define OPENRC_NETIFRC_REMOVE_UDEV
+ $(RM) $(TARGET_DIR)/lib/udev/net.sh
+ $(RM) $(TARGET_DIR)/lib/udev/rules.d/90-network.rules
+ rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev/rules.d
+ rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/lib/udev
+endef
+OPENRC_NETIFRC_TARGET_FINALIZE_HOOKS += OPENRC_NETIFRC_REMOVE_UDEV
+endif # BR2_PACKAGE_HAS_UDEV
+
+ifeq ($(BR2_PACKAGE_OPENRC_NETIFRC),y)
+# netifrc replaces network, staticroute and loopback services which are
+# installed by openrc
+define OPENRC_NETIFRC_INSTALL
+ $(RM) $(TARGET_DIR)/etc/runlevels/boot/{network,staticroute,loopback}
+ $(RM) $(TARGET_DIR)/etc/init.d/{network,staticroute,loopback}
+ $(RM) $(TARGET_DIR)/etc/conf.d/{network,staticroute,loopback}
+ ln -sf /etc/init.d/net.lo $(TARGET_DIR)/etc/runlevels/default/net.lo
+ echo "config_lo=\"127.0.0.1/8\"" > $(TARGET_DIR)/etc/conf.d/net
+endef
+OPENRC_NETIFRC_TARGET_FINALIZE_HOOKS += OPENRC_NETIFRC_INSTALL
+endif # BR2_PACKAGE_OPENRC_NETIFRC
+
+$(eval $(generic-package))
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 08/13] package/openrc-netifrc/openrc-netifrc.mk: add support for BR2_SYSTEM_DHCP
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (5 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 07/13] package/openrc-netifrc: net package (v0.6.1) Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 09/13] package/openrc: add patch to support busybox version of sysctl Michał Łyszczek
` (5 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
This patch makes openrc-netifrc package aware of BR2_SYSTEM_DHCP
config, and if set, will start dhcp daemon on configured interface.
* system/Config.in
Changes dependency of BR2_SYSTEM_DHCP config.
When INIT_OPENRC is not set, DHCP is available to set if any of
BUSYBOX, IFUPDOWN or NETWORKD is enabled, OPENRC_NETIFRC is
ignored and will always be disabled since it depends on OPENRC.
When INIT_OPENRC is set, DHCP is available to set only when
OPENRC_NETIFRC is enabled. Rest of the options are ignored and
asserted to disable with "&& !BR2_PACKAGE_OPENRC"
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
Own initiative:
- add short description about changes in system/Config.in
---
package/openrc-netifrc/openrc-netifrc.mk | 10 ++++++++++
system/Config.in | 10 +++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/package/openrc-netifrc/openrc-netifrc.mk b/package/openrc-netifrc/openrc-netifrc.mk
index 55421af72f..d9cf03eeb9 100644
--- a/package/openrc-netifrc/openrc-netifrc.mk
+++ b/package/openrc-netifrc/openrc-netifrc.mk
@@ -50,4 +50,14 @@ endef
OPENRC_NETIFRC_TARGET_FINALIZE_HOOKS += OPENRC_NETIFRC_INSTALL
endif # BR2_PACKAGE_OPENRC_NETIFRC
+OPENRC_NETIFRC_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
+ifneq ($(OPENRC_NETIFRC_DHCP_IFACE),)
+define OPENRC_NETIFRC_SYSTEM_DHCP
+ echo "config_$(OPENRC_NETIFRC_DHCP_IFACE)=\"dhcp\"" >> $(TARGET_DIR)/etc/conf.d/net
+ ln -sf net.lo $(TARGET_DIR)/etc/init.d/net.$(OPENRC_NETIFRC_DHCP_IFACE)
+ ln -sf /etc/init.d/net.$(OPENRC_NETIFRC_DHCP_IFACE) $(TARGET_DIR)/etc/runlevels/default/net.$(OPENRC_NETIFRC_DHCP_IFACE)
+endef
+OPENRC_NETIFRC_TARGET_FINALIZE_HOOKS += OPENRC_NETIFRC_SYSTEM_DHCP
+endif # BR2_SYSTEM_DHCP
+
$(eval $(generic-package))
diff --git a/system/Config.in b/system/Config.in
index 90aa0e52b9..32c502e310 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -372,7 +372,9 @@ config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW
config BR2_SYSTEM_DHCP
string "Network interface to configure through DHCP"
default ""
- depends on BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD
+ depends on ((BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || \
+ BR2_PACKAGE_SYSTEMD_NETWORKD) && !BR2_PACKAGE_OPENRC) || \
+ BR2_PACKAGE_OPENRC_NETIFRC
help
Enter here the name of the network interface (E.G. eth0) to
automatically configure through DHCP at bootup.
@@ -383,8 +385,10 @@ config BR2_SYSTEM_DHCP
overwrite /etc/network/interfaces or add a networkd
configuration file.
-comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd"
- depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || BR2_PACKAGE_SYSTEMD_NETWORKD)
+comment "automatic network configuration via DHCP needs ifupdown or busybox or networkd or openrc-netifrc"
+ depends on !(((BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || \
+ BR2_PACKAGE_SYSTEMD_NETWORKD) && !BR2_PACKAGE_OPENRC) || \
+ BR2_PACKAGE_OPENRC_NETIFRC)
endif # BR2_ROOTFS_SKELETON_DEFAULT
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 09/13] package/openrc: add patch to support busybox version of sysctl
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (6 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 08/13] package/openrc-netifrc/openrc-netifrc.mk: add support for BR2_SYSTEM_DHCP Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:25 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 10/13] package/openrc: change /run/lock from root:uucp to root:daemon Michał Łyszczek
` (4 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
Busybox version of sysctl does not support --system argument, and
files need to be loaded one by one. This patch adds code to sysctl
service in openrc to recognize busybox sysctl and execute proper
function based on that.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
...tl.in-add-support-for-busybox-sysctl.patch | 66 +++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
diff --git a/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch b/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
new file mode 100644
index 0000000000..da8cf042c6
--- /dev/null
+++ b/package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
@@ -0,0 +1,66 @@
+From ec1a0c8fa2e7a7c6cf70f68bdabc07cbb1a567cf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
+Date: Sun, 5 May 2019 23:43:40 +0200
+Subject: [PATCH] init.d/sysctl.in: add support for busybox sysctl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Busybox version of sysctl does not support --system argument,
+and files need to be loaded one by one. This patch adds code
+to recognize busybox sysctl and execute proper function based
+on that.
+
+Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
+---
+ init.d/sysctl.in | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/init.d/sysctl.in b/init.d/sysctl.in
+index e49f4db2..a705b3d4 100644
+--- a/init.d/sysctl.in
++++ b/init.d/sysctl.in
+@@ -37,6 +37,23 @@ BSD_sysctl()
+ return $retval
+ }
+
++Busybox_sysctl()
++{
++ local quiet
++ yesno $rc_verbose || quiet=-q
++
++ eindent
++ for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
++ if [ -r "$conf" ]; then
++ vebegin "applying $conf"
++ sysctl $quiet -p "$conf" || retval=1
++ veend $retval
++ fi
++ done
++ eoutdent
++ return $retval
++}
++
+ Linux_sysctl()
+ {
+ local quiet
+@@ -52,7 +69,15 @@ start()
+ ebegin "Configuring kernel parameters"
+ case "$RC_UNAME" in
+ *BSD|GNU) BSD_sysctl; rc=$? ;;
+- Linux) Linux_sysctl; rc=$? ;;
++ Linux)
++ sysctl -h > /dev/null 2>&1
++ if [ $? -ne 0 ]; then
++ # busybox version of sysctl does not recognize -h option
++ Busybox_sysctl
++ else
++ Linux_sysctl
++ fi
++ rc=$? ;;
+ esac
+ eend $rc "Unable to configure some kernel parameters"
+ }
+--
+2.18.1
+
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 09/13] package/openrc: add patch to support busybox version of sysctl
2019-05-12 19:55 ` [Buildroot] [PATCH v2 09/13] package/openrc: add patch to support busybox version of sysctl Michał Łyszczek
@ 2019-05-18 21:25 ` Thomas Petazzoni
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:25 UTC (permalink / raw)
To: buildroot
On Sun, 12 May 2019 21:55:46 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> Busybox version of sysctl does not support --system argument, and
> files need to be loaded one by one. This patch adds code to sysctl
> service in openrc to recognize busybox sysctl and execute proper
> function based on that.
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
>
> ---
> Changes v1 -> v2
> None
> ---
> ...tl.in-add-support-for-busybox-sysctl.patch | 66 +++++++++++++++++++
> 1 file changed, 66 insertions(+)
> create mode 100644 package/openrc/0001-init.d-sysctl.in-add-support-for-busybox-sysctl.patch
Applied to next, thanks. Please submit this patch to upstream OpenRC if
not already done. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 10/13] package/openrc: change /run/lock from root:uucp to root:daemon
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (7 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 09/13] package/openrc: add patch to support busybox version of sysctl Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 21:26 ` Thomas Petazzoni
2019-05-12 19:55 ` [Buildroot] [PATCH v2 11/13] package/openrc: add support to set terminal encoding Michał Łyszczek
` (3 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
On gentoo /run/lock is owned by uucp group because of historical
reasons. However uucp does not exist on buildroot by default, and
it makes more sense that 'daemon' group should own this directory.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
....in-change-run-lock-from-root-uucp-t.patch | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
diff --git a/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
new file mode 100644
index 0000000000..66bbba42ba
--- /dev/null
+++ b/package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
@@ -0,0 +1,34 @@
+From 5ae8209afad9a4284723712b46d8685e7f7fd72c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= <michal.lyszczek@bofc.pl>
+Date: Mon, 6 May 2019 00:06:39 +0200
+Subject: [PATCH] sh/init.sh.Linux.in: change /run/lock from root:uucp to
+ root:daemon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On gentoo /run/lock is owned by uucp group because of historical
+reasons. However uucp does not exist on buildroot by default, and
+it makes more sense that 'daemon' group should own this directory.
+
+Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
+---
+ sh/init.sh.Linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
+index 222bbd3b..7f1a88db 100644
+--- a/sh/init.sh.Linux.in
++++ b/sh/init.sh.Linux.in
+@@ -85,7 +85,7 @@ fi
+
+ [ -x /sbin/restorecon ] && /sbin/restorecon -rF /run
+ checkpath -d $RC_SVCDIR
+-checkpath -d -m 0775 -o root:uucp /run/lock
++checkpath -d -m 0775 -o root:daemon /run/lock
+
+ # Try to mount xenfs as early as possible, otherwise rc_sys() will always
+ # return RC_SYS_XENU and will think that we are in a domU while it's not.
+--
+2.18.1
+
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 10/13] package/openrc: change /run/lock from root:uucp to root:daemon
2019-05-12 19:55 ` [Buildroot] [PATCH v2 10/13] package/openrc: change /run/lock from root:uucp to root:daemon Michał Łyszczek
@ 2019-05-18 21:26 ` Thomas Petazzoni
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 21:26 UTC (permalink / raw)
To: buildroot
On Sun, 12 May 2019 21:55:47 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> On gentoo /run/lock is owned by uucp group because of historical
> reasons. However uucp does not exist on buildroot by default, and
> it makes more sense that 'daemon' group should own this directory.
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
>
> ---
> Changes v1 -> v2
> None
> ---
> ....in-change-run-lock-from-root-uucp-t.patch | 34 +++++++++++++++++++
> 1 file changed, 34 insertions(+)
> create mode 100644 package/openrc/0002-sh-init.sh.Linux.in-change-run-lock-from-root-uucp-t.patch
Applied to next, thanks. Could you please raise this issue with the
upstream OpenRC developers ? Perhaps they could add a build-time
variable to set the owner/group of /run/lock ? This way we could at
some point drop this patch from the openrc package in Buildroot.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH v2 11/13] package/openrc: add support to set terminal encoding
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (8 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 10/13] package/openrc: change /run/lock from root:uucp to root:daemon Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 12/13] package/openrc: add support for setting terminal keymap Michał Łyszczek
` (2 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
When openrc init is enabled, user can chose to set terminal
encoding to ascii, utf-8 or to keep default settings.
* system/Config.in
New kconfig choice BR2_TARGET_GENERIC_TERMENCODING_* to
choose terminal encoding. Depends on openrc init.
* package/openrc/openrc.mk
monitors BR2_TARGET_GENERIC_TERMENCODING_* choice and
make proper changes on TARGET_DIR to enable/disable
terminal encoding set.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
None
---
package/openrc/openrc.mk | 19 +++++++++++++++++++
system/Config.in | 17 +++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 0feea22818..8d5e6ec381 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -55,4 +55,23 @@ endef
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
endif # BR2_TARGET_GENERIC_GETTY
+ifeq ($(BR2_TARGET_GENERIC_TERMENCODING_KEEP),y)
+# openrc by default installs service to set terminal encoding, if we want to
+# keep default encoding we need to remove service from boot.
+define OPENRC_TERMENCODING
+ $(RM) $(TARGET_DIR)/etc/runlevels/boot/{termencoding,save-termencoding}
+ $(RM) $(TARGET_DIR)/etc/conf.d/termencoding
+endef
+OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_TERMENCODING
+else
+ifeq ($(BR2_TARGET_GENERIC_TERMENCODING_UTF8),y)
+# By default openrc will set terminal encoding to ASCII, if we want encoding
+# to be utf8, we need to set it.
+define OPENRC_TERMENCODING
+ echo "unicode=\"yes\"" > $(TARGET_DIR)/etc/conf.d/termencoding
+endef
+OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_TERMENCODING
+endif # BR2_TARGET_GENERIC_TERMENCODING_UTF8
+endif # BR2_TARGET_GENERIC_TERMENCODING_KEEP
+
$(eval $(generic-package))
diff --git a/system/Config.in b/system/Config.in
index 32c502e310..08bcb517e4 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -390,6 +390,23 @@ comment "automatic network configuration via DHCP needs ifupdown or busybox or n
BR2_PACKAGE_SYSTEMD_NETWORKD) && !BR2_PACKAGE_OPENRC) || \
BR2_PACKAGE_OPENRC_NETIFRC)
+choice
+ prompt "Terminal encoding"
+ default BR2_TARGET_GENERIC_TERMENCODING_KEEP
+ depends on BR2_INIT_OPENRC
+ help
+ Set terminal encoding. This makes sense only when you are going to
+ use virtual terminals with external monitor (or qemu) that uses
+ /dev/tty[1-12].
+
+config BR2_TARGET_GENERIC_TERMENCODING_KEEP
+ bool "keep default"
+config BR2_TARGET_GENERIC_TERMENCODING_ASCII
+ bool "ascii"
+config BR2_TARGET_GENERIC_TERMENCODING_UTF8
+ bool "utf-8"
+endchoice
+
endif # BR2_ROOTFS_SKELETON_DEFAULT
config BR2_SYSTEM_DEFAULT_PATH
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 12/13] package/openrc: add support for setting terminal keymap
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (9 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 11/13] package/openrc: add support to set terminal encoding Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-12 19:55 ` [Buildroot] [PATCH v2 13/13] package/skeleton-init-openrc: add support for starting sysv scripts Michał Łyszczek
2019-05-18 20:54 ` [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Thomas Petazzoni
12 siblings, 0 replies; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
When openrc init is enabled, user can chose to set terminal
keymap or keep default settings.
* system/Config.in
New config BR2_TARGET_GENERIC_TERM_KEYMAP which is available
only when openrc is selected and kbd package is installed.
Used to set keymap from /usr/share/keymaps
* package/openrc/openrc.mk
monitors BR2_TARGET_GENERIC_TERM_KEYMAP and configures init
to use specified keymap. It will also check if keymap exists
in the system
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
Own initiative:
- fix "kdb" typo in system/Config.in (should be kbd)
---
package/openrc/openrc.mk | 28 ++++++++++++++++++++++++++++
system/Config.in | 12 ++++++++++++
2 files changed, 40 insertions(+)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 8d5e6ec381..0498c9c95f 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -74,4 +74,32 @@ OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_TERMENCODING
endif # BR2_TARGET_GENERIC_TERMENCODING_UTF8
endif # BR2_TARGET_GENERIC_TERMENCODING_KEEP
+OPENRC_TERM_KEYMAP = $(call qstrip,$(BR2_TARGET_GENERIC_TERM_KEYMAP))
+ifneq ($(OPENRC_TERM_KEYMAP),)
+OPENRC_DEPENDENCIES += kbd
+# 1) check if passed kaymap exists in the installed system
+# 2) set keymap value in /etc/conf.d/keymaps
+# 3) set keyboard mode to same encoding as terminal encoding
+define OPENRC_SET_TERM_KEYMAP
+ if ! find $(TARGET_DIR)/usr/share/keymaps -name "*$(OPENRC_TERM_KEYMAP).map*" | grep -q ".*"; then \
+ echo "keymap $(OPENRC_TERM_KEYMAP) not found in $(TARGET_DIR)/usr/share/keymaps"; \
+ exit 1; \
+ fi
+ echo "keymap=\"$(OPENRC_TERM_KEYMAP)\"" > $(TARGET_DIR)/etc/conf.d/keymaps
+ if test -f $(TARGET_DIR)/etc/conf.d/termencoding; then \
+ grep "unicode=" $(TARGET_DIR)/etc/conf.d/termencoding >> $(TARGET_DIR)/etc/conf.d/keymaps; \
+ fi
+endef
+else
+# openrc installs keymaps service by default, so if keymap is not set (like
+# because kbd is not installed) we need to remove keymaps service from boot
+# so there are no errors about missing programs. If kbd is installed, but
+# keymap config is empty value, we also remove service to keep default values.
+define OPENRC_SET_TERM_KEYMAP
+ $(RM) $(TARGET_DIR)/etc/runlevels/boot/{keymaps,save-keymaps}
+ $(RM) $(TARGET_DIR)/etc/conf.d/keymaps
+endef
+endif # OPENRC_TERM_KEYMAP
+OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_TERM_KEYMAP
+
$(eval $(generic-package))
diff --git a/system/Config.in b/system/Config.in
index 08bcb517e4..e0421d8dff 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -407,6 +407,18 @@ config BR2_TARGET_GENERIC_TERMENCODING_UTF8
bool "utf-8"
endchoice
+config BR2_TARGET_GENERIC_TERM_KEYMAP
+ string "Set terminal keymap"
+ default "us"
+ depends on BR2_INIT_OPENRC && BR2_PACKAGE_KBD
+ help
+ Configures all virtual terminals (on /dev/tty[1-12]) to use
+ specified keymap. List of keymaps are installed in /usr/share/keymaps.
+ Set to empty, to keep default keymap.
+
+comment "Setting terminal keymap requires OpenRC and kbd package"
+ depends on !(BR2_INIT_OPENRC && BR2_PACKAGE_KBD)
+
endif # BR2_ROOTFS_SKELETON_DEFAULT
config BR2_SYSTEM_DEFAULT_PATH
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 13/13] package/skeleton-init-openrc: add support for starting sysv scripts
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (10 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 12/13] package/openrc: add support for setting terminal keymap Michał Łyszczek
@ 2019-05-12 19:55 ` Michał Łyszczek
2019-05-18 20:54 ` [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Thomas Petazzoni
12 siblings, 0 replies; 24+ messages in thread
From: Michał Łyszczek @ 2019-05-12 19:55 UTC (permalink / raw)
To: buildroot
* package/skeleton-init-openrc/skeleton/etc/init.d/sysv-rcs
This openrc script implements rcS and rcK equivalent which will
start or stop any script from /etc/init.d/S??*
* package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
symlink to /etc/init.d/sysv-rcs to start service at startup
* package/pkg-generic.mk
When openrc is enabled, evaluate $(PKG)_INSTALL_INIT_OPENRC, but
if install steps for openrc are not avilable, then evaluate
$(PKG)_INSTALL_INIT_SYSV))
* docs/manual/adding-packages-generic.txt
Add information about openrc exception to docs.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
---
Changes v1 -> v2
Suggested by Thomas Petazzoni
- update docs/manual/adding-packages-generic.txt about exception
---
docs/manual/adding-packages-generic.txt | 5 +-
package/pkg-generic.mk | 4 +-
.../skeleton/etc/init.d/sysv-rcs | 53 +++++++++++++++++++
.../skeleton/etc/runlevels/default/sysv-rcs | 1 +
4 files changed, 61 insertions(+), 2 deletions(-)
create mode 100755 package/skeleton-init-openrc/skeleton/etc/init.d/sysv-rcs
create mode 120000 package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index 5ac07a81b4..b402767b05 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -542,7 +542,10 @@ different steps of the build process.
sysvinit, etc.), openrc or for the systemd units. These commands
will be run only when the relevant init system is installed (i.e.
if systemd is selected as the init system in the configuration,
- only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
+ only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run). The only exception
+ is when openrc is chosen as init system and +LIBFOO_INSTALL_INIT_OPENRC+
+ has not been set, in such situation +LIBFOO_INSTALL_INIT_SYSV+ will
+ be called, since openrc supports sysv init scripts.
* +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which
is included to the main +make help+ output. These commands can print
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 6d63c46a5b..dc335973c7 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -338,7 +338,9 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
$($(PKG)_INSTALL_INIT_SYSV))
$(if $(BR2_INIT_OPENRC), \
- $($(PKG)_INSTALL_INIT_OPENRC))
+ $(if $($(PKG)_INSTALL_INIT_OPENRC), \
+ $($(PKG)_INSTALL_INIT_OPENRC), \
+ $($(PKG)_INSTALL_INIT_SYSV)))
$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
$(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \
$(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \
diff --git a/package/skeleton-init-openrc/skeleton/etc/init.d/sysv-rcs b/package/skeleton-init-openrc/skeleton/etc/init.d/sysv-rcs
new file mode 100755
index 0000000000..9cbfe354d1
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/etc/init.d/sysv-rcs
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+
+description="start or stop sysv rc[S,K] scripts"
+
+depend() {
+ after local
+}
+
+start() {
+ einfo "Starting sysv rc scripts"
+ for i in /etc/init.d/S??* ; do
+ # Ignore dangling symlinks (if any).
+ [ ! -f "$i" ] && continue
+
+ case "$i" in
+ *.sh)
+ # Source shell script for speed.
+ (
+ trap - INT QUIT TSTP
+ set start
+ . $i
+ )
+ ;;
+ *)
+ # No sh extension, so fork subprocess.
+ $i start
+ ;;
+ esac
+ done
+}
+
+stop() {
+ einfo "Stopping sysv rc scripts"
+ for i in /etc/init.d/S??* ; do
+ # Ignore dangling symlinks (if any).
+ [ ! -f "$i" ] && continue
+
+ case "$i" in
+ *.sh)
+ # Source shell script for speed.
+ (
+ trap - INT QUIT TSTP
+ set stop
+ . $i
+ )
+ ;;
+ *)
+ # No sh extension, so fork subprocess.
+ $i stop
+ ;;
+ esac
+ done
+}
diff --git a/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
new file mode 120000
index 0000000000..ef5e00823c
--- /dev/null
+++ b/package/skeleton-init-openrc/skeleton/etc/runlevels/default/sysv-rcs
@@ -0,0 +1 @@
+/etc/init.d/sysv-rcs
\ No newline at end of file
--
2.18.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2)
2019-05-12 19:55 [Buildroot] [PATCH v2 01/13] package/openrc: new package (v0.41.2) Michał Łyszczek
` (11 preceding siblings ...)
2019-05-12 19:55 ` [Buildroot] [PATCH v2 13/13] package/skeleton-init-openrc: add support for starting sysv scripts Michał Łyszczek
@ 2019-05-18 20:54 ` Thomas Petazzoni
12 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2019-05-18 20:54 UTC (permalink / raw)
To: buildroot
On Sun, 12 May 2019 21:55:38 +0200
Micha? ?yszczek <michal.lyszczek@bofc.pl> wrote:
> This adds openrc init system package. This performs default openrc
> installation with openrc-init that acts as pid1.
>
> MKPKGCONFIG=no:
> openrc does not use pkg-config per se, if MKPKGCONFIG is enabled,
> it will just install *.pc files on rootfs for other programs to
> find librc and libeinfo. These libs expose C api to control openrc
> (al rc-* functions use it). From the looks of it, these libs would
> be usefull if user wanted to write his own programs to manage
> services, and vast majority of people using openrc won't need it.
> Also, that's the reason why there is not INSTALL_STAGING=yes.
>
> Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
>
> ---
> Changes v1 -> v2
> Suggested by Thomas Petazzoni:
> - new commit short message
> - remove OPENRC_SOURCE (default is enough)
> - remove += from first OPENRC_DEPENDENCIES
> - use single OPENRC_MAKE_OPTS = (with line breaks)
> - Remove TARGETDIR from make opts (leftover from different solution)
> - Move conditional make opts below first OPENRC_MAKE_OPTS =
> - move DESTDIR after OPENRC_MAKE_OPTS in OPENRC_INSTALL_TARGET_CMDS
> - add links to sources and wiki in Config.in
> - add hash for LICENSE file
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 24+ messages in thread