* [Buildroot] [PATCH 1/5 v3] package/skeleton-init-openrc: add support for starting sysv scripts
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
@ 2019-08-04 12:14 ` Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 2/5 v3] package/skeleton-init-openrc: add support to remount rootfs as rw Yann E. MORIN
` (4 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2019-08-04 12:14 UTC (permalink / raw)
To: buildroot
From: Micha? ?yszczek <michal.lyszczek@bofc.pl>
Add an OpenRC service that starts and stops sysv-init scripts. We order
that scrpt 'after local' so that it is started after all other native
openrc services.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
[yann.morin.1998 at free.fr:
- don't propagate the micro optimisation for running .sh scripts
- use spaces, not TABs
- stop services in reverse order
- reword commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
docs/manual/adding-packages-generic.txt | 5 +++-
package/openrc/sysv-rcs | 25 +++++++++++++++++++
package/pkg-generic.mk | 3 ++-
.../skeleton/etc/runlevels/default/sysv-rcs | 1 +
4 files changed, 32 insertions(+), 2 deletions(-)
create mode 100755 package/openrc/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/openrc/sysv-rcs b/package/openrc/sysv-rcs
new file mode 100755
index 0000000000..606a73d2b4
--- /dev/null
+++ b/package/openrc/sysv-rcs
@@ -0,0 +1,25 @@
+#!/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).
+ [ -e "$i" ] || continue
+ $i start
+ done
+}
+
+stop() {
+ einfo "Stopping sysv rc scripts"
+ for i in $(ls -r /etc/init.d/S??*); do
+ # Ignore dangling symlinks (if any).
+ [ -e "$i" ] || continue
+ $i stop
+ done
+}
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 9620dec524..1f24b52a69 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -338,7 +338,8 @@ $(BUILD_DIR)/%/.stamp_target_installed:
$(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\
$($(PKG)_INSTALL_INIT_SYSV))
$(if $(BR2_INIT_OPENRC), \
- $($(PKG)_INSTALL_INIT_OPENRC))
+ $(or $($(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/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.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 2/5 v3] package/skeleton-init-openrc: add support to remount rootfs as rw
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 1/5 v3] package/skeleton-init-openrc: add support for starting sysv scripts Yann E. MORIN
@ 2019-08-04 12:14 ` Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 3/5 v3] package/openrc: add support for spawning getty Yann E. MORIN
` (3 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2019-08-04 12:14 UTC (permalink / raw)
To: buildroot
From: Micha? ?yszczek <michal.lyszczek@bofc.pl>
Add a pseudo entry for /dev/root in fstab, to tell openrc to prperly
remount or not remount / read-write.
For consistency with systemd (which is the only other init system to
tweak an fstab basd on / being rw or not), we do this change in the
openrc skeleton rahter than in the openrc package.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
[yann.morin.1998 at free.fr:
- tweak the sed expressions
- reword commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
.../skeleton-init-openrc/skeleton-init-openrc.mk | 15 +++++++++++++++
package/skeleton-init-openrc/skeleton/etc/fstab | 1 +
2 files changed, 16 insertions(+)
diff --git a/package/skeleton-init-openrc/skeleton-init-openrc.mk b/package/skeleton-init-openrc/skeleton-init-openrc.mk
index 5ee2192093..656fc531d7 100644
--- a/package/skeleton-init-openrc/skeleton-init-openrc.mk
+++ b/package/skeleton-init-openrc/skeleton-init-openrc.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.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 3/5 v3] package/openrc: add support for spawning getty
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 1/5 v3] package/skeleton-init-openrc: add support for starting sysv scripts Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 2/5 v3] package/skeleton-init-openrc: add support to remount rootfs as rw Yann E. MORIN
@ 2019-08-04 12:14 ` Yann E. MORIN
2019-08-04 12:14 ` [Buildroot] [PATCH 4/5 v3] package/netifrc: new package Yann E. MORIN
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2019-08-04 12:14 UTC (permalink / raw)
To: buildroot
From: Micha? ?yszczek <michal.lyszczek@bofc.pl>
We install a template getty service, and we 'instanciate' it in the
default runlevel, using the configured tty.
Ideally, packages that provide a getty program would be responsible for
installing the corresponding service file. However, to keep consistency
with the existing init systems (busybox, systemd, and sysv), we do do
provide it from the openrc package itself.
OpenrRC only acts on the files in a runlevel sub-directory, but the
documentation [0] actually suggests that the instance symlink be done
in init.d, and then again symlinked into the actual runlevel
sub-directory. So, we abide by the rules.
Also, to be noted, the getty service file is installed without ensuring
that a getty command is available. This again is not unlike other init
systems, sysvinit and busybox, which behave the same.
[0] https://wiki.gentoo.org/wiki/OpenRC
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
[yann.morin.1998 at free.fr:
- move getty template to openrc package (Thomas)
- fix namespace of the vaiables (Thomas)
- simplify creation of the defaults file
- rewrite commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/openrc/getty | 24 +++++++++++++++++++
package/openrc/openrc.mk | 18 ++++++++++++++
.../skeleton/etc/conf.d/.empty | 0
.../skeleton/etc/runlevels/default/.empty | 0
system/Config.in | 8 +++----
5 files changed, 46 insertions(+), 4 deletions(-)
create mode 100755 package/openrc/getty
create mode 100644 package/skeleton-init-openrc/skeleton/etc/conf.d/.empty
create mode 100644 package/skeleton-init-openrc/skeleton/etc/runlevels/default/.empty
diff --git a/package/openrc/getty b/package/openrc/getty
new file mode 100755
index 0000000000..8fcb071f8a
--- /dev/null
+++ b/package/openrc/getty
@@ -0,0 +1,24 @@
+#!/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() {
+ export EINFO_QUIET="${quiet:-yes}"
+}
+
+stop_pre() {
+ export EINFO_QUIET="${quiet:-yes}"
+}
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 53f2947dcc..5978b6de5d 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -42,4 +42,22 @@ define OPENRC_REMOVE_UNNEEDED
endef
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_REMOVE_UNNEEDED
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
+OPENRC_GETTY_SVCNAME = getty.$(SYSTEM_GETTY_PORT)
+OPENRC_GETTY_CONF_D = $(TARGET_DIR)/etc/conf.d/$(OPENRC_GETTY_SVCNAME)
+define OPENRC_SET_GETTY
+ { \
+ echo "baud=\"$(SYSTEM_GETTY_BAUDRATE)\""; \
+ echo "term_type=\"$(SYSTEM_GETTY_TERM)\"" ; \
+ echo "getty_options=\"-L $(SYSTEM_GETTY_OPTIONS)\""; \
+ } > $(OPENRC_GETTY_CONF_D)
+ $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/getty \
+ $(TARGET_DIR)/etc/init.d/getty
+ ln -sf getty $(TARGET_DIR)/etc/init.d/$(OPENRC_GETTY_SVCNAME)
+ ln -sf /etc/init.d/$(OPENRC_GETTY_SVCNAME) \
+ $(TARGET_DIR)/etc/runlevels/default/$(OPENRC_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/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 af7d8566d3..1bfe069b2e 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -348,16 +348,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.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 4/5 v3] package/netifrc: new package
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
` (2 preceding siblings ...)
2019-08-04 12:14 ` [Buildroot] [PATCH 3/5 v3] package/openrc: add support for spawning getty Yann E. MORIN
@ 2019-08-04 12:14 ` Yann E. MORIN
2019-09-23 21:13 ` Thomas Petazzoni
2019-08-04 12:14 ` [Buildroot] [PATCH 5/5 v3] package/netifrc: add support for BR2_SYSTEM_DHCP Yann E. MORIN
2019-09-23 21:12 ` [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Thomas Petazzoni
5 siblings, 1 reply; 12+ messages in thread
From: Yann E. MORIN @ 2019-08-04 12:14 UTC (permalink / raw)
To: buildroot
From: Micha? ?yszczek <michal.lyszczek@bofc.pl>
netifrc entirely replaces openrc's basic network management. As such, it
conflicts with the network services installed by openrc, so we remove
them from openrc when netifrc is enabled.
Currently, we only catter tfor the loopback interface, but we prepare
for also handling the DHCP interface, to come in a latter patch.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
[yann.morin.1998 at free.fr:
- remove openrc files within the openrc package itself
- as it's a generic-package, no need to use post-install hooks
- use description from the homepage in the help text
- check-package fixes
- rename package
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/netifrc/Config.in | 12 ++++++++++
package/netifrc/netifrc.hash | 3 +++
package/netifrc/netifrc.mk | 45 ++++++++++++++++++++++++++++++++++++
package/openrc/openrc.mk | 11 +++++++++
6 files changed, 73 insertions(+)
create mode 100644 package/netifrc/Config.in
create mode 100644 package/netifrc/netifrc.hash
create mode 100644 package/netifrc/netifrc.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index d43a9f2c74..9483a5056a 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1646,6 +1646,7 @@ F: board/altera/socrates_cyclone5/
F: board/pine64/rock64
F: configs/rock64_defconfig
F: configs/socrates_cyclone5_defconfig
+F: package/netifrc/
F: package/openrc/
F: package/skeleton-init-openrc/
diff --git a/package/Config.in b/package/Config.in
index cb0f89ad99..7d271117e3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2220,6 +2220,7 @@ menu "System tools"
source "package/mender-grubenv/Config.in"
source "package/monit/Config.in"
source "package/ncdu/Config.in"
+ source "package/netifrc/Config.in"
source "package/numactl/Config.in"
source "package/nut/Config.in"
source "package/openrc/Config.in"
diff --git a/package/netifrc/Config.in b/package/netifrc/Config.in
new file mode 100644
index 0000000000..9347033d67
--- /dev/null
+++ b/package/netifrc/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_NETIFRC
+ bool "netifrc"
+ depends on BR2_PACKAGE_OPENRC
+ help
+ netifrc is a collection of modules created to configure and
+ manage network interfaces via individual, per-interface
+ scripts.
+
+ https://wiki.gentoo.org/wiki/Netifrc
+
+comment "netifrc needs openrc as init system"
+ depends on !BR2_PACKAGE_OPENRC
diff --git a/package/netifrc/netifrc.hash b/package/netifrc/netifrc.hash
new file mode 100644
index 0000000000..d811acc4a2
--- /dev/null
+++ b/package/netifrc/netifrc.hash
@@ -0,0 +1,3 @@
+# Calculated manually
+sha256 004907e0c3db2d106d6a51d604d79f971f1013fa7642054ad7efe5076e52f7b3 netifrc-0.6.1.tar.gz
+sha256 da376c9e2244f2a7220767ea4dd88cf423ff5b548e7c2f96b0f3b9dac727748a LICENSE
diff --git a/package/netifrc/netifrc.mk b/package/netifrc/netifrc.mk
new file mode 100644
index 0000000000..4b9a0a8d39
--- /dev/null
+++ b/package/netifrc/netifrc.mk
@@ -0,0 +1,45 @@
+################################################################################
+#
+# netifrc
+#
+################################################################################
+
+NETIFRC_VERSION = 0.6.1
+NETIFRC_SITE = $(call github,gentoo,netifrc,$(NETIFRC_VERSION))
+NETIFRC_LICENSE = BSD-2-Clause
+NETIFRC_LICENSE_FILES = LICENSE
+
+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"
+NETIFRC_MAKE_OPTS = \
+ LIBNAME=lib \
+ LIBEXECDIR=/usr/libexec/netifrc
+
+define NETIFRC_BUILD_CMDS
+ $(MAKE) $(NETIFRC_MAKE_OPTS) -C $(@D)
+endef
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),)
+define 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
+endif # BR2_PACKAGE_HAS_UDEV
+
+define NETIFRC_NET_CFG
+ config_lo="127.0.0.1/8"
+endef
+
+define NETIFRC_INSTALL_TARGET_CMDS
+ $(MAKE) $(NETIFRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
+ $(NETIFRC_REMOVE_UDEV)
+ $(call PRINTF,$(NETIFRC_NET_CFG)) > $(TARGET_DIR)/etc/conf.d/net
+ ln -sf /etc/init.d/net.lo $(TARGET_DIR)/etc/runlevels/default/net.lo
+endef
+
+$(eval $(generic-package))
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 5978b6de5d..387962d4d5 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -37,6 +37,17 @@ define OPENRC_INSTALL_TARGET_CMDS
$(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install
endef
+ifeq ($(BR2_PACKAGE_NETIFRC),y)
+# netifrc replaces network, staticroute and loopback services which are
+# installed by openrc
+define OPENRC_NO_NET
+ $(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}
+endef
+OPENRC_POST_TARGET_INSTALL_HOOKS += OPENRC_NO_NET
+endif
+
define OPENRC_REMOVE_UNNEEDED
$(RM) -r $(TARGET_DIR)/usr/share/openrc
endef
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 4/5 v3] package/netifrc: new package
2019-08-04 12:14 ` [Buildroot] [PATCH 4/5 v3] package/netifrc: new package Yann E. MORIN
@ 2019-09-23 21:13 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2019-09-23 21:13 UTC (permalink / raw)
To: buildroot
On Sun, 4 Aug 2019 14:14:18 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> +NETIFRC_VERSION = 0.6.1
> +NETIFRC_SITE = $(call github,gentoo,netifrc,$(NETIFRC_VERSION))
> +NETIFRC_LICENSE = BSD-2-Clause
> +NETIFRC_LICENSE_FILES = LICENSE
> +
> +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"
> +NETIFRC_MAKE_OPTS = \
> + LIBNAME=lib \
> + LIBEXECDIR=/usr/libexec/netifrc
> +
> +define NETIFRC_BUILD_CMDS
> + $(MAKE) $(NETIFRC_MAKE_OPTS) -C $(@D)
> +endef
> +
> +ifeq ($(BR2_PACKAGE_HAS_UDEV),)
> +define 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
This was failing, because netifrc installed its udev stuff
in /usr/lib/udev, because here it queried pkg-config (the host one) of
udevdir. So I've forced that to be /lib/udev by passing
UDEVDIR=/lib/udev in NETIFRC_MAKE_OPTS.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/5 v3] package/netifrc: add support for BR2_SYSTEM_DHCP
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
` (3 preceding siblings ...)
2019-08-04 12:14 ` [Buildroot] [PATCH 4/5 v3] package/netifrc: new package Yann E. MORIN
@ 2019-08-04 12:14 ` Yann E. MORIN
2019-09-23 21:12 ` [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Thomas Petazzoni
5 siblings, 0 replies; 12+ messages in thread
From: Yann E. MORIN @ 2019-08-04 12:14 UTC (permalink / raw)
To: buildroot
From: Micha? ?yszczek <michal.lyszczek@bofc.pl>
This patch makes openrc-netifrc package aware of BR2_SYSTEM_DHCP
config, and if set, will start dhcp daemon on configured interface.
Signed-off-by: Micha? ?yszczek <michal.lyszczek@bofc.pl>
[yann.morin.1998 at free.fr:
- simplify condition for BR2_SYSTEM_DHCP
- reword commit log
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/netifrc/netifrc.mk | 12 ++++++++++++
system/Config.in | 8 +++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/package/netifrc/netifrc.mk b/package/netifrc/netifrc.mk
index 4b9a0a8d39..15719ee8b4 100644
--- a/package/netifrc/netifrc.mk
+++ b/package/netifrc/netifrc.mk
@@ -31,8 +31,19 @@ define NETIFRC_REMOVE_UDEV
endef
endif # BR2_PACKAGE_HAS_UDEV
+NETIFRC_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
+ifneq ($(NETIFRC_DHCP_IFACE),)
+NETIFRC_DHCP_CFG = config_$(NETIFRC_DHCP_IFACE)="dhcp"
+define NETIFRC_DHCP_SERVICE
+ ln -sf net.lo $(TARGET_DIR)/etc/init.d/net.$(NETIFRC_DHCP_IFACE)
+ ln -sf /etc/init.d/net.$(NETIFRC_DHCP_IFACE) \
+ $(TARGET_DIR)/etc/runlevels/default/net.$(NETIFRC_DHCP_IFACE)
+endef
+endif # BR2_SYSTEM_DHCP != ""
+
define NETIFRC_NET_CFG
config_lo="127.0.0.1/8"
+ $(NETIFRC_DHCP_CFG)
endef
define NETIFRC_INSTALL_TARGET_CMDS
@@ -40,6 +51,7 @@ define NETIFRC_INSTALL_TARGET_CMDS
$(NETIFRC_REMOVE_UDEV)
$(call PRINTF,$(NETIFRC_NET_CFG)) > $(TARGET_DIR)/etc/conf.d/net
ln -sf /etc/init.d/net.lo $(TARGET_DIR)/etc/runlevels/default/net.lo
+ $(NETIFRC_DHCP_SERVICE)
endef
$(eval $(generic-package))
diff --git a/system/Config.in b/system/Config.in
index 1bfe069b2e..c87266f431 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -377,7 +377,8 @@ 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_NETIFRC
help
Enter here the name of the network interface (E.G. eth0) to
automatically configure through DHCP at bootup.
@@ -388,8 +389,9 @@ 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 netifrc"
+ depends on !(BR2_PACKAGE_BUSYBOX || BR2_PACKAGE_IFUPDOWN || \
+ BR2_PACKAGE_SYSTEMD_NETWORKD || BR2_PACKAGE_NETIFRC)
endif # BR2_ROOTFS_SKELETON_DEFAULT
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc)
2019-08-04 12:14 [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Yann E. MORIN
` (4 preceding siblings ...)
2019-08-04 12:14 ` [Buildroot] [PATCH 5/5 v3] package/netifrc: add support for BR2_SYSTEM_DHCP Yann E. MORIN
@ 2019-09-23 21:12 ` Thomas Petazzoni
2019-09-24 8:21 ` michal.lyszczek at bofc.pl
5 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2019-09-23 21:12 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 4 Aug 2019 14:14:15 +0200
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Micha? ?yszczek (5):
> package/skeleton-init-openrc: add support for starting sysv scripts
> package/skeleton-init-openrc: add support to remount rootfs as rw
> package/openrc: add support for spawning getty
> package/netifrc: new package
> package/netifrc: add support for BR2_SYSTEM_DHCP
Thanks a lot, I've applied the series. There was an issue on PATCH 4/5
though, so I'll reply to that.
When I test this series, with Busybox, there are a few errors at boot
time related to loadkeys, dumpkeys and kbd_mode being missing:
http://code.bulix.org/39k5v9-881711?raw. Can we do something about
this? This was on a machine with no screen/keyboard, i.e console over
serial port.
Also, would it be possible to add a test case for OpenRC in
support/testing/tests/init/ ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc)
2019-09-23 21:12 ` [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc) Thomas Petazzoni
@ 2019-09-24 8:21 ` michal.lyszczek at bofc.pl
2019-09-24 21:50 ` michal.lyszczek at bofc.pl
0 siblings, 1 reply; 12+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-09-24 8:21 UTC (permalink / raw)
To: buildroot
On 2019-09-23 23:12:40, Thomas Petazzoni wrote:
> Hello,
>
> On Sun, 4 Aug 2019 14:14:15 +0200
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
> > Micha? ?yszczek (5):
> > package/skeleton-init-openrc: add support for starting sysv scripts
> > package/skeleton-init-openrc: add support to remount rootfs as rw
> > package/openrc: add support for spawning getty
> > package/netifrc: new package
> > package/netifrc: add support for BR2_SYSTEM_DHCP
>
> Thanks a lot, I've applied the series. There was an issue on PATCH 4/5
> though, so I'll reply to that.
>
> When I test this series, with Busybox, there are a few errors at boot
> time related to loadkeys, dumpkeys and kbd_mode being missing:
> http://code.bulix.org/39k5v9-881711?raw. Can we do something about
> this? This was on a machine with no screen/keyboard, i.e console over
> serial port.
This looks like some keyboard related programs were not installed, and in
this case those keyboard scripts should not be installed I reckon, as it
seems pointless to set keyboard mapping if system does not have keyboard
installed.
I suspect bug in Kconfig, missing deps, I will look at it today.
> Also, would it be possible to add a test case for OpenRC in
> support/testing/tests/init/ ?
Sure, once openrc is fully merged (as in there is no more changes during
review) I will write those tests.
-------------- 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/20190924/5ac2093f/attachment.asc>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc)
2019-09-24 8:21 ` michal.lyszczek at bofc.pl
@ 2019-09-24 21:50 ` michal.lyszczek at bofc.pl
2019-09-25 7:18 ` Thomas Petazzoni
0 siblings, 1 reply; 12+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-09-24 21:50 UTC (permalink / raw)
To: buildroot
Hi Thomas
On 2019-09-24 10:21:58, michal.lyszczek at bofc.pl wrote:
> On 2019-09-23 23:12:40, Thomas Petazzoni wrote:
> > Hello,
> >
> > On Sun, 4 Aug 2019 14:14:15 +0200
> > "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> >
> > > Micha? ?yszczek (5):
> > > package/skeleton-init-openrc: add support for starting sysv scripts
> > > package/skeleton-init-openrc: add support to remount rootfs as rw
> > > package/openrc: add support for spawning getty
> > > package/netifrc: new package
> > > package/netifrc: add support for BR2_SYSTEM_DHCP
> >
> > Thanks a lot, I've applied the series. There was an issue on PATCH 4/5
> > though, so I'll reply to that.
> >
> > When I test this series, with Busybox, there are a few errors at boot
> > time related to loadkeys, dumpkeys and kbd_mode being missing:
> > http://code.bulix.org/39k5v9-881711?raw. Can we do something about
> > this? This was on a machine with no screen/keyboard, i.e console over
> > serial port.
>
> This looks like some keyboard related programs were not installed, and in
> this case those keyboard scripts should not be installed I reckon, as it
> seems pointless to set keyboard mapping if system does not have keyboard
> installed.
>
> I suspect bug in Kconfig, missing deps, I will look at it today.
>
> > Also, would it be possible to add a test case for OpenRC in
> > support/testing/tests/init/ ?
>
> Sure, once openrc is fully merged (as in there is no more changes during
> review) I will write those tests.
It looks like openrc is starting `keymaps' service, which means
BR2_TARGET_GENERIC_TERM_KEYMAP is enabled, but this config depends on
BR2_INIT_OPENRC && BR2_PACKAGE_KBD, (related snipet):
> config BR2_TARGET_GENERIC_TERM_KEYMAP
> ????string "Set terminal keymap"
> ????default "us"
> ????depends on BR2_INIT_OPENRC && BR2_PACKAGE_KBD
>
> comment "Setting terminal keymap requires OpenRC and kdb package"
> ????depends on !(BR2_INIT_OPENRC && BR2_PACKAGE_KBD)
keymaps service is disabled in package/openrc/openrc.mk
> OPENRC_TERM_KEYMAP = $(call qstrip,$(BR2_TARGET_GENERIC_TERM_KEYMAP))
> ifneq ($(OPENRC_TERM_KEYMAP),)
> (...)
> else
> 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
so it would seem that BR2_PACKAGE_KBD is set in the same time as
BR2_TARGET_GENERIC_TERM_KEYMAP, which is strange as `depends' looks
legit and this should not happen (and I am sure I've tested it and
it worked fine).
So, can you please share your .config or name of defconfig you used, as
I cannot seem to reproduce this.
-------------- 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/20190924/1bb309f6/attachment.asc>
^ permalink raw reply [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc)
2019-09-24 21:50 ` michal.lyszczek at bofc.pl
@ 2019-09-25 7:18 ` Thomas Petazzoni
2019-09-25 8:13 ` michal.lyszczek at bofc.pl
0 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2019-09-25 7:18 UTC (permalink / raw)
To: buildroot
Hello Michal,
On Tue, 24 Sep 2019 23:50:56 +0200
michal.lyszczek at bofc.pl wrote:
> It looks like openrc is starting `keymaps' service, which means
> BR2_TARGET_GENERIC_TERM_KEYMAP is enabled, but this config depends on
> BR2_INIT_OPENRC && BR2_PACKAGE_KBD, (related snipet):
I'm not sure which version of Buildroot you're looking at, but there is
no option named BR2_TARGET_GENERIC_TERM_KEYMAP in current Buildroot
master.
> keymaps service is disabled in package/openrc/openrc.mk
And there's no such code in openrc.mk in Buildroot master.
Perhaps you're looking at some local branch you have, with some patches
that are not in upstream Buildroot at this point ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/5 v3] openrc: further itegration (branch yem/openrc)
2019-09-25 7:18 ` Thomas Petazzoni
@ 2019-09-25 8:13 ` michal.lyszczek at bofc.pl
0 siblings, 0 replies; 12+ messages in thread
From: michal.lyszczek at bofc.pl @ 2019-09-25 8:13 UTC (permalink / raw)
To: buildroot
Hello Thomas,
On 2019-09-25 09:18:26, Thomas Petazzoni wrote:
> Hello Michal,
>
> On Tue, 24 Sep 2019 23:50:56 +0200
> michal.lyszczek at bofc.pl wrote:
>
> > It looks like openrc is starting `keymaps' service, which means
> > BR2_TARGET_GENERIC_TERM_KEYMAP is enabled, but this config depends on
> > BR2_INIT_OPENRC && BR2_PACKAGE_KBD, (related snipet):
>
> I'm not sure which version of Buildroot you're looking at, but there is
> no option named BR2_TARGET_GENERIC_TERM_KEYMAP in current Buildroot
> master.
>
> > keymaps service is disabled in package/openrc/openrc.mk
>
> And there's no such code in openrc.mk in Buildroot master.
>
> Perhaps you're looking at some local branch you have, with some patches
> that are not in upstream Buildroot at this point ?
Right, so it would seem you are missing these 2 patches
https://patchwork.ozlabs.org/patch/1098589/
https://patchwork.ozlabs.org/patch/1098588/
I remember Yann saying it would be nice to have this in every init system,
not only openrc. This is probably the reason why these 2 were not merged.
But honestly I don't really know what changes to make to make these patches
generic to all init systems. The only common parts are:
> 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.
and
> 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
Which for me look generic enough to be used in other init systems, we just
have to remove `depends on BR2_INIT_OPENRC' (or add deps on another init)
once it is implemented in others inits. Other changes regarding these
features are done in package/openrc/openrc.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/20190925/d99fe2c6/attachment.asc>
^ permalink raw reply [flat|nested] 12+ messages in thread