* [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50
@ 2023-10-09 14:29 Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 2/4] package/openrc: add linux-pam support Adam Duskett
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Adam Duskett @ 2023-10-09 14:29 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Michał Łyszczek
- Convert to a meson package.
- Remove uneeded make opts and installation commands.
- Change OPENRC_MAKE_OPTS to OPENRC_CONF_OPTS
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
....in-change-run-lock-from-root-uucp-t.patch | 2 +-
...-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch | 35 ++++++++---------
...lso-create-run-lock-subsys-directory.patch | 2 +-
package/openrc/openrc.hash | 4 +-
package/openrc/openrc.mk | 38 ++++---------------
5 files changed, 30 insertions(+), 51 deletions(-)
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..41c367d953 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 <unixmania@gmail.com>
+Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
+Refresh for 0.50
---
- 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/openrc.hash b/package/openrc/openrc.hash
index 4fcfa9132f..24a6878911 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 8d9bb3a68a491d5d4e0f0af1515e00f27e4463acc0c256930aded26c7c8a834b openrc-0.50.tar.gz
+sha256 6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70 LICENSE
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 1d4e70f712..01c23a2a79 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENRC_VERSION = 0.43.3
+OPENRC_VERSION = 0.50
OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
OPENRC_LICENSE = BSD-2-Clause
OPENRC_LICENSE_FILES = LICENSE
@@ -12,40 +12,18 @@ 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 \
+ -Dpkgconfig=false \
+ -Dsysvinit=true
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
- $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \
- $(TARGET_DIR)/etc/init.d/sysv-rcs
-endef
-
ifeq ($(BR2_PACKAGE_KBD),)
# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
# remove them if the kbd package is not selected (e.g. devices with serial
@@ -90,4 +68,4 @@ endef
OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
endif # BR2_TARGET_GENERIC_GETTY
-$(eval $(generic-package))
+$(eval $(meson-package))
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/4] package/openrc: add linux-pam support
2023-10-09 14:29 [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Adam Duskett
@ 2023-10-09 14:29 ` Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 3/4] package/openrc: add bash-completion support Adam Duskett
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Adam Duskett @ 2023-10-09 14:29 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Michał Łyszczek
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/openrc/openrc.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 01c23a2a79..5e667de7f8 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -24,6 +24,13 @@ else
OPENRC_CONF_OPTS += -Dselinux=disabled
endif
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+OPENRC_CONF_OPTS += -Dpam=true
+OPENRC_DEPENDENCIES += linux-pam
+else
+OPENRC_CONF_OPTS += -Dpam=false
+endif
+
ifeq ($(BR2_PACKAGE_KBD),)
# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
# remove them if the kbd package is not selected (e.g. devices with serial
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/4] package/openrc: add bash-completion support
2023-10-09 14:29 [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 2/4] package/openrc: add linux-pam support Adam Duskett
@ 2023-10-09 14:29 ` Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 4/4] package/openrc: add merged user support Adam Duskett
2023-10-09 14:58 ` [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Yann E. MORIN
3 siblings, 0 replies; 6+ messages in thread
From: Adam Duskett @ 2023-10-09 14:29 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Michał Łyszczek
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/openrc/openrc.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 5e667de7f8..80a9dec778 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -17,6 +17,12 @@ OPENRC_CONF_OPTS = \
-Dpkgconfig=false \
-Dsysvinit=true
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+OPENRC_CONF_OPTS += -Dbash-completions=true
+else
+OPENRC_CONF_OPTS += -Dbash-completions=false
+endif
+
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
OPENRC_CONF_OPTS += -Dselinux=enabled
OPENRC_DEPENDENCIES += libselinux
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 4/4] package/openrc: add merged user support
2023-10-09 14:29 [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 2/4] package/openrc: add linux-pam support Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 3/4] package/openrc: add bash-completion support Adam Duskett
@ 2023-10-09 14:29 ` Adam Duskett
2023-10-09 15:00 ` Yann E. MORIN
2023-10-09 14:58 ` [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Yann E. MORIN
3 siblings, 1 reply; 6+ messages in thread
From: Adam Duskett @ 2023-10-09 14:29 UTC (permalink / raw)
To: buildroot; +Cc: Eric Le Bihan, Adam Duskett, Michał Łyszczek
Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
---
package/openrc/openrc.mk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 80a9dec778..c80342a174 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -37,6 +37,12 @@ else
OPENRC_CONF_OPTS += -Dpam=false
endif
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
+OPENRC_CONF_OPTS += -Dsplit-usr=true
+else
+OPENRC_CONF_OPTS += -Dsplit-usr=false
+endif
+
ifeq ($(BR2_PACKAGE_KBD),)
# keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
# remove them if the kbd package is not selected (e.g. devices with serial
--
2.41.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50
2023-10-09 14:29 [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Adam Duskett
` (2 preceding siblings ...)
2023-10-09 14:29 ` [Buildroot] [PATCH 4/4] package/openrc: add merged user support Adam Duskett
@ 2023-10-09 14:58 ` Yann E. MORIN
3 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-10-09 14:58 UTC (permalink / raw)
To: Adam Duskett; +Cc: Eric Le Bihan, Michał Łyszczek, buildroot
Adam, All,
On 2023-10-09 16:29 +0200, Adam Duskett spake thusly:
> - Convert to a meson package.
> - Remove uneeded make opts and installation commands.
> - Change OPENRC_MAKE_OPTS to OPENRC_CONF_OPTS
Don't describe the patch; explain it.
For example:
- why is the license hash changed?
- why is the LIBNAME hack no longer needed (stating "Remove uneeded
foo" is not really enough, maybe it's just "foo is now handled
correctly by meson")
- why don't we no longer need to install our sysv-rcs? And thus, why
is it not removed from the tree?
- where is the BRANDING gone?
Regards,
Yann E. MORIN.
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
> ....in-change-run-lock-from-root-uucp-t.patch | 2 +-
> ...-add-agetty.tty-1-6-if-MKSYSVINIT-ye.patch | 35 ++++++++---------
> ...lso-create-run-lock-subsys-directory.patch | 2 +-
> package/openrc/openrc.hash | 4 +-
> package/openrc/openrc.mk | 38 ++++---------------
> 5 files changed, 30 insertions(+), 51 deletions(-)
>
> 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..41c367d953 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 <unixmania@gmail.com>
> +Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> +Refresh for 0.50
> ---
> - 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/openrc.hash b/package/openrc/openrc.hash
> index 4fcfa9132f..24a6878911 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 8d9bb3a68a491d5d4e0f0af1515e00f27e4463acc0c256930aded26c7c8a834b openrc-0.50.tar.gz
> +sha256 6ac2bf77510808fbec7dc86cbfbca98dfc4c6b47dc99e4ca77b5370e097d8e70 LICENSE
> diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
> index 1d4e70f712..01c23a2a79 100644
> --- a/package/openrc/openrc.mk
> +++ b/package/openrc/openrc.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -OPENRC_VERSION = 0.43.3
> +OPENRC_VERSION = 0.50
> OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
> OPENRC_LICENSE = BSD-2-Clause
> OPENRC_LICENSE_FILES = LICENSE
> @@ -12,40 +12,18 @@ 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 \
> + -Dpkgconfig=false \
> + -Dsysvinit=true
>
> 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
> - $(INSTALL) -D -m 0755 $(OPENRC_PKGDIR)/sysv-rcs \
> - $(TARGET_DIR)/etc/init.d/sysv-rcs
> -endef
> -
> ifeq ($(BR2_PACKAGE_KBD),)
> # keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
> # remove them if the kbd package is not selected (e.g. devices with serial
> @@ -90,4 +68,4 @@ endef
> OPENRC_TARGET_FINALIZE_HOOKS += OPENRC_SET_GETTY
> endif # BR2_TARGET_GENERIC_GETTY
>
> -$(eval $(generic-package))
> +$(eval $(meson-package))
> --
> 2.41.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 4/4] package/openrc: add merged user support
2023-10-09 14:29 ` [Buildroot] [PATCH 4/4] package/openrc: add merged user support Adam Duskett
@ 2023-10-09 15:00 ` Yann E. MORIN
0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-10-09 15:00 UTC (permalink / raw)
To: Adam Duskett; +Cc: Eric Le Bihan, Michał Łyszczek, buildroot
Adam, All,
On 2023-10-09 16:29 +0200, Adam Duskett spake thusly:
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
> package/openrc/openrc.mk | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
> index 80a9dec778..c80342a174 100644
> --- a/package/openrc/openrc.mk
> +++ b/package/openrc/openrc.mk
> @@ -37,6 +37,12 @@ else
> OPENRC_CONF_OPTS += -Dpam=false
> endif
>
> +ifeq ($(BR2_ROOTFS_MERGED_USR),y)
> +OPENRC_CONF_OPTS += -Dsplit-usr=true
So, if the user requested a merged usr, you instruct openrc to use a
split usr, ...
> +else
> +OPENRC_CONF_OPTS += -Dsplit-usr=false
... and conversely?
We need a runtime test to validate those two conditions.
Regards,
Yann E. MORIN.
> +endif
> +
> ifeq ($(BR2_PACKAGE_KBD),)
> # keymaps and save-keymaps require kbd_mode and dumpkeys, respectively, so
> # remove them if the kbd package is not selected (e.g. devices with serial
> --
> 2.41.0
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-09 15:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 14:29 [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 2/4] package/openrc: add linux-pam support Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 3/4] package/openrc: add bash-completion support Adam Duskett
2023-10-09 14:29 ` [Buildroot] [PATCH 4/4] package/openrc: add merged user support Adam Duskett
2023-10-09 15:00 ` Yann E. MORIN
2023-10-09 14:58 ` [Buildroot] [PATCH 1/4] package/openrc: bump version to 0.50 Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.