[Buildroot] [PATCH/next 1/3] package/openrc: bump to version 0.42.1

[Buildroot] [PATCH/next 1/3] package/openrc: bump to version 0.42.1

[aduskett at gmail.com]

From: Adam Duskett <Aduskett@gmail.com>

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 package/openrc/openrc.hash | 2 +-
 package/openrc/openrc.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash
index 7d58e254c4..bb5880806d 100644
--- a/package/openrc/openrc.hash
+++ b/package/openrc/openrc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	c99488ca54f2b795328d07bbd456ade49b571136bba7501f7eaaeb1ca9f9ecc4	openrc-0.41.2.tar.gz
+sha256	91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2	openrc-0.42.1.tar.gz
 sha256	96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624	LICENSE
diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index 3f6453cef5..b1b3ed2c56 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENRC_VERSION = 0.41.2
+OPENRC_VERSION = 0.42.1
 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
 OPENRC_LICENSE = BSD-2-Clause
 OPENRC_LICENSE_FILES = LICENSE
-- 
2.24.1

[Buildroot] [PATCH/next 2/3] package/openrc: add libselinux support

[aduskett at gmail.com]

From: Adam Duskett <Aduskett@gmail.com>

If the libselinux package is selected, add the package to the dependency list
and explicitly set OPENRC_MAKE_OPTS += MKSELINUX=yes

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 package/openrc/openrc.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
index b1b3ed2c56..57d156807c 100644
--- a/package/openrc/openrc.mk
+++ b/package/openrc/openrc.mk
@@ -18,7 +18,6 @@ OPENRC_MAKE_OPTS = \
 	LIBNAME=lib \
 	LIBEXECDIR=/usr/libexec/rc \
 	MKPKGCONFIG=no \
-	MKSELINUX=no \
 	MKSYSVINIT=yes \
 	BRANDING="Buildroot $(BR2_VERSION_FULL)" \
 	CC=$(TARGET_CC)
@@ -29,6 +28,13 @@ else
 OPENRC_MAKE_OPTS += MKSTATICLIBS=yes
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+OPENRC_MAKE_OPTS += MKSELINUX=yes
+OPENRC_DEPENDENCIES += libselinux
+else
+OPENRC_MAKE_OPTS += MKSELINUX=no
+endif
+
 define OPENRC_BUILD_CMDS
 	$(MAKE) $(OPENRC_MAKE_OPTS) -C $(@D)
 endef
-- 
2.24.1

[Buildroot] [PATCH/next 3/3] support/testing: add openrc tests

[aduskett at gmail.com]

From: Adam Duskett <Aduskett@gmail.com>

Two simple tests to ensure that openrc boots without any services crashing
with a read only and a read write filing system.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 .gitlab-ci.yml                            |  2 +
 support/testing/tests/init/test_openrc.py | 51 +++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 support/testing/tests/init/test_openrc.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6436a8417..6717d78367 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -368,6 +368,8 @@ tests.init.test_busybox.TestInitSystemBusyboxRoNet: { extends: .runtime_test }
 tests.init.test_busybox.TestInitSystemBusyboxRw: { extends: .runtime_test }
 tests.init.test_busybox.TestInitSystemBusyboxRwNet: { extends: .runtime_test }
 tests.init.test_none.TestInitSystemNone: { extends: .runtime_test }
+tests.init.test_openrc.TestInitSystemOpenrcRoFull: { extends: .runtime_test }
+tests.init.test_openrc.TestInitSystemOpenrcRwFull: { extends: .runtime_test }
 tests.init.test_systemd.TestInitSystemSystemdRoFull: { extends: .runtime_test }
 tests.init.test_systemd.TestInitSystemSystemdRoIfupdown: { extends: .runtime_test }
 tests.init.test_systemd.TestInitSystemSystemdRoNetworkd: { extends: .runtime_test }
diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py
new file mode 100644
index 0000000000..23669a9572
--- /dev/null
+++ b/support/testing/tests/init/test_openrc.py
@@ -0,0 +1,51 @@
+import infra.basetest
+from tests.init.base import InitSystemBase as InitSystemBase
+
+
+class InitSystemOpenrcBase(InitSystemBase):
+    config = \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_INIT_OPENRC=y
+        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7"
+        BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+        BR2_LINUX_KERNEL_DTS_SUPPORT=y
+        BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def check_init(self):
+        super(InitSystemOpenrcBase, self)
+
+        # Test all services are OK
+        output, _ = self.emulator.run("rc-status -c")
+        self.assertEqual(len(output), 0)
+
+
+class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase):
+    config = InitSystemOpenrcBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+
+
+class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase):
+    config = InitSystemOpenrcBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
-- 
2.24.1

[Buildroot] [PATCH/next 1/3] package/openrc: bump to version 0.42.1

[Carlos Santos]

On Sat, Feb 29, 2020 at 8:28 PM <aduskett@gmail.com> wrote:
>
> From: Adam Duskett <Aduskett@gmail.com>
>
> Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> ---
>  package/openrc/openrc.hash | 2 +-
>  package/openrc/openrc.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/openrc/openrc.hash b/package/openrc/openrc.hash
> index 7d58e254c4..bb5880806d 100644
> --- a/package/openrc/openrc.hash
> +++ b/package/openrc/openrc.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256 c99488ca54f2b795328d07bbd456ade49b571136bba7501f7eaaeb1ca9f9ecc4        openrc-0.41.2.tar.gz
> +sha256 91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2        openrc-0.42.1.tar.gz
>  sha256 96862463f4e77e2508e4fc2c83773fd24807cb699368b63fd93a5e2b466dd624        LICENSE
> diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk
> index 3f6453cef5..b1b3ed2c56 100644
> --- a/package/openrc/openrc.mk
> +++ b/package/openrc/openrc.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>
> -OPENRC_VERSION = 0.41.2
> +OPENRC_VERSION = 0.42.1
>  OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION))
>  OPENRC_LICENSE = BSD-2-Clause
>  OPENRC_LICENSE_FILES = LICENSE
> --
> 2.24.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

I'm working on this upgrade too and found that It's necessary to patch
 runlevels/Makefile to avoid creating agetty.tty[1-6] if
MKSYSVINIT=yes.

-- 
Carlos Santos <unixmania@gmail.com>

[Buildroot] [PATCH/next 1/3] package/openrc: bump to version 0.42.1

[Yann E. MORIN]

Carlos, Adam, All,

On 2020-03-01 09:18 -0300, Carlos Santos spake thusly:
> On Sat, Feb 29, 2020 at 8:28 PM <aduskett@gmail.com> wrote:
> > From: Adam Duskett <Aduskett@gmail.com>
> > Signed-off-by: Adam Duskett <Aduskett@gmail.com>
[--SNIP--]
> > -OPENRC_VERSION = 0.41.2
> > +OPENRC_VERSION = 0.42.1
[--SNIP--]
> I'm working on this upgrade too and found that It's necessary to patch
>  runlevels/Makefile to avoid creating agetty.tty[1-6] if
> MKSYSVINIT=yes.

Thanks for the feedback. I've marked that series as changes-requested in
patchwork. Thanks!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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] [PATCH/next 1/3] package/openrc: bump to version 0.42.1

[Carlos Santos]

On Sun, Mar 1, 2020 at 10:18 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Carlos, Adam, All,
>
> On 2020-03-01 09:18 -0300, Carlos Santos spake thusly:
> > On Sat, Feb 29, 2020 at 8:28 PM <aduskett@gmail.com> wrote:
> > > From: Adam Duskett <Aduskett@gmail.com>
> > > Signed-off-by: Adam Duskett <Aduskett@gmail.com>
> [--SNIP--]
> > > -OPENRC_VERSION = 0.41.2
> > > +OPENRC_VERSION = 0.42.1
> [--SNIP--]
> > I'm working on this upgrade too and found that It's necessary to patch
> >  runlevels/Makefile to avoid creating agetty.tty[1-6] if
> > MKSYSVINIT=yes.
>
> Thanks for the feedback. I've marked that series as changes-requested in
> patchwork. Thanks!
>
> Regards,
> Yann E. MORIN.

I sent an updated series.

-- 
Carlos Santos <unixmania@gmail.com>