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 index 457fbacb5b..2f0a81bbd3 100644 --- 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 @@ -22,7 +22,7 @@ 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 +@@ -83,7 +83,7 @@ fi fi checkpath -d "$RC_SVCDIR" diff --git a/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch b/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch index 733506ada9..42f77ffdea 100644 --- a/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch +++ b/package/openrc/0005-runlevels-do-not-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch @@ -8,27 +8,28 @@ Also tty[1-6] may not exist (e.g. embedded devices with serial consoles only). Signed-off-by: Carlos Santos +[Adam: update for 0.50] +Signed-off-by: Adam Duskett --- - runlevels/Makefile | 6 ------ + tools/meson_runlevels.sh | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/runlevels/Makefile b/runlevels/Makefile -index 73843d8b..dbfb59ca 100644 ---- a/runlevels/Makefile -+++ b/runlevels/Makefile -@@ -90,12 +90,6 @@ install: - fi; \ - ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \ - fi -- if test "${MKSYSVINIT}" = yes && test "${OS}" = Linux; then \ -- for x in tty1 tty2 tty3 tty4 tty5 tty6; do \ -- ln -snf ${INITDIR}/agetty ${DESTDIR}/${INITDIR}/"agetty.$$x" || exit $$?; \ -- ln -snf ${INITDIR}/agetty.$$x ${DEFAULTDIR}/"agetty.$$x" || exit $$?; \ -- done; \ -- fi - - check test:: +diff --git a/tools/meson_runlevels.sh b/tools/meson_runlevels.sh +index 1473d4e..eee256b 100755 +--- a/tools/meson_runlevels.sh ++++ b/tools/meson_runlevels.sh +@@ -91,11 +91,5 @@ if ! test -d "${DESTDIR}${shutdowndir}"; then + ln -snf "${init_d_dir}/$x" "${DESTDIR}${shutdowndir}/$x" + done + fi +-if test "${sysvinit}" = yes && test "${os}" = Linux; then \ +- for x in tty1 tty2 tty3 tty4 tty5 tty6; do +- ln -snf "${init_d_dir}/agetty" "${DESTDIR}/${init_d_dir}/agetty.$x" +- ln -snf "${init_d_dir}/agetty.$x" "${DESTDIR}/${defaultdir}/agetty.$x" +- done; +-fi + ln -snf "${rc_libexecdir}"/sh/functions.sh "${DESTDIR}/${init_d_dir}" -- 2.18.2 diff --git a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch index cf592a88b0..ad78a4b8f7 100644 --- a/package/openrc/0006-Also-create-run-lock-subsys-directory.patch +++ b/package/openrc/0006-Also-create-run-lock-subsys-directory.patch @@ -15,7 +15,7 @@ diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in index e8afc1fb..662ab223 100644 --- a/sh/init.sh.Linux.in +++ b/sh/init.sh.Linux.in -@@ -82,7 +82,7 @@ elif ! mountinfo -q /run; then +@@ -83,7 +83,7 @@ elif ! mountinfo -q /run; then fi checkpath -d "$RC_SVCDIR" diff --git a/package/openrc/0007-allow-setting-rc_libexecdir-path.patch b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch new file mode 100644 index 0000000000..a11c789275 --- /dev/null +++ b/package/openrc/0007-allow-setting-rc_libexecdir-path.patch @@ -0,0 +1,44 @@ +From 89c42e7e0d8d5913789a76b007ed6a0c43078c63 Mon Sep 17 00:00:00 2001 +From: artoo +Date: Wed, 8 Sep 2021 22:41:58 +0200 +Subject: [PATCH] allow setting rc_libexecdir path + + - Allow to change the rc dir name of the rc_libexecdir path + - Introduce a librcdir option for override with value 'rc' + +Upstream: https://github.com/OpenRC/openrc/pull/443 + +Signed-off-by: artoo +[Adam: update for 0.50] +Signed-off-by: Adam Duskett +--- + meson.build | 2 +- + meson_options.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 5b3f8fa..40d4be1 100644 +--- a/meson.build ++++ b/meson.build +@@ -102,7 +102,7 @@ if os == 'Linux' and libexecdir == 'libexec' + libexecdir = 'lib' + endif + libexecdir = rootprefix / libexecdir +-rc_libexecdir = libexecdir / 'rc' ++rc_libexecdir = libexecdir / get_option('librcdir') + rc_bindir = rc_libexecdir / 'bin' + rc_sbindir = rc_libexecdir / 'sbin' + rc_shdir = rc_libexecdir / 'sh' +diff --git a/meson_options.txt b/meson_options.txt +index 2c74152..d2f67e4 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -37,3 +37,5 @@ option('termcap', type : 'combo', + description : 'the termcap library to use') + option('zsh-completions', type : 'boolean', + description : 'install zsh completions') ++option('librcdir', type : 'string', value : 'rc', ++ description : 'default location of rc libexec dir') +-- +2.41.0 + diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash index 4fcfa9132f..698acf4978 100644 --- a/package/openrc/openrc.hash +++ b/package/openrc/openrc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6 openrc-0.43.3.tar.gz -sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624 LICENSE +sha256 4ec46f2729c77c4387146b491c4d121f5cba48bff2f0aeaff99895dcda5cea85 openrc-0.51.tar.gz +sha256 6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70 LICENSE diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 1d4e70f712..8cc488a081 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENRC_VERSION = 0.43.3 +OPENRC_VERSION = 0.51 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE @@ -12,39 +12,27 @@ OPENRC_CPE_ID_VENDOR = openrc_project OPENRC_DEPENDENCIES = ncurses -# set LIBNAME so openrc 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_MAKE_OPTS = \ - LIBNAME=lib \ - LIBEXECDIR=/usr/libexec/rc \ - MKPKGCONFIG=no \ - MKSYSVINIT=yes \ - BRANDING="Buildroot $(BR2_VERSION_FULL)" \ - CC=$(TARGET_CC) - -ifeq ($(BR2_SHARED_LIBS),y) -OPENRC_MAKE_OPTS += MKSTATICLIBS=no -else -OPENRC_MAKE_OPTS += MKSTATICLIBS=yes -endif +OPENRC_CONF_OPTS = \ + -Dos=Linux \ + -Dpam=false \ + -Dlibrcdir=/usr/libexec/rc \ + -Dpkgconfig=false \ + -Dsysvinit=true \ + -Drootprefix=/ \ + -Dbranding="\"Buildroot $(BR2_VERSION_FULL)\"" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -OPENRC_MAKE_OPTS += MKSELINUX=yes +OPENRC_CONF_OPTS += -Dselinux=enabled OPENRC_DEPENDENCIES += libselinux else -OPENRC_MAKE_OPTS += MKSELINUX=no +OPENRC_CONF_OPTS += -Dselinux=disabled endif -define OPENRC_BUILD_CMDS - $(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D) -endef - -define OPENRC_INSTALL_TARGET_CMDS - $(MAKE) $(OPENRC_MAKE_OPTS) DESTDIR=$(TARGET_DIR) -C $(@D) install +define OPENRC_INSTALL_SYSV_RCS_SCRIPT $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \ $(TARGET_DIR)/etc/init.d/sysv-rcs endef +OPENRC_POST_INSTALL_TARGET_HOOKS += OPENRC_INSTALL_SYSV_RCS_SCRIPT ifeq ($(BR2_PACKAGE_KBD),) # keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so @@ -90,4 +78,4 @@ endef OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY endif # BR2_TARGET_GENERIC_GETTY -$(eval $(generic-package)) +$(eval $(meson-package))