Bump buildroot to 2020.11-rc1 (#985)

* Update buildroot-patches for 2020.11-rc1 buildroot

* Update buildroot to 2020.11-rc1

Signed-off-by: Stefan Agner <stefan@agner.ch>

* Don't rely on sfdisk --list-free output

The --list-free (-F) argument does not allow machine readable mode. And
it seems that the output format changes over time (different spacing,
using size postfixes instead of raw blocks).

Use sfdisk json output and calculate free partition space ourselfs. This
works for 2.35 and 2.36 and is more robust since we rely on output which
is meant for scripts to parse.

* Migrate defconfigs for Buildroot 2020.11-rc1

In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE).

* Rebase/remove systemd patches for systemd 246

* Drop apparmor/libapparmor from buildroot-external

* hassos-persists: use /run as directory for lockfiles

The U-Boot tools use /var/lock by default which is not created any more
by systemd by default (it is under tmpfiles legacy.conf, which we no
longer install).

* Disable systemd-update-done.service

The service is not suited for pure read-only systems. In particular the
service needs to be able to write a file in /etc and /var. Remove the
service. Note: This is a static service and cannot be removed using
systemd-preset.

* Disable apparmor.service for now

The service loads all default profiles. Some might actually cause
problems. E.g. the profile for ping seems not to match our setup for
/etc/resolv.conf:
[85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
Stefan Agner
2020-11-13 18:25:44 +01:00
committed by GitHub
parent 25a0dd3082
commit a0871be6c0
4024 changed files with 68095 additions and 47900 deletions

View File

@@ -0,0 +1,82 @@
import os
import infra.basetest
class TestSELinuxInfra(infra.basetest.BRTest):
config = infra.basetest.BASIC_TOOLCHAIN_CONFIG +\
"""
BR2_PACKAGE_REFPOLICY=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_SETOOLS=y
BR2_TARGET_ROOTFS_CPIO=y
"""
def base_test_run(self):
cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
self.emulator.boot(arch="armv5", kernel="builtin",
options=["-initrd", cpio_file])
self.emulator.login()
class TestSELinuxExtraModules(TestSELinuxInfra):
config = TestSELinuxInfra.config + \
"""
BR2_REFPOLICY_EXTRA_MODULES="ntp tor"
"""
def test_run(self):
TestSELinuxInfra.base_test_run(self)
out, ret = self.emulator.run("seinfo -t ntpd_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "ntpd_t")
out, ret = self.emulator.run("seinfo -t tor_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "tor_t")
class TestSELinuxExtraModulesDirs(TestSELinuxInfra):
config = TestSELinuxInfra.config + \
"""
BR2_REFPOLICY_EXTRA_MODULES_DIRS="{}"
""".format(infra.filepath("tests/core/test_selinux/extra_modules"))
def test_run(self):
TestSELinuxInfra.base_test_run(self)
out, ret = self.emulator.run("seinfo -t buildroot_test_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "buildroot_test_t")
class TestSELinuxCustomGit(TestSELinuxInfra):
config = TestSELinuxInfra.config + \
"""
BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y
BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL="https://github.com/SELinuxProject/refpolicy.git"
BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION="RELEASE_2_20200818"
"""
def test_run(self):
pass
class TestSELinuxPackage(TestSELinuxInfra):
br2_external = [infra.filepath("tests/core/test_selinux/br2_external")]
config = TestSELinuxInfra.config + \
"""
BR2_PACKAGE_SELINUX_TEST=y
"""
def test_run(self):
TestSELinuxInfra.base_test_run(self)
out, ret = self.emulator.run("seinfo -t ntpd_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "ntpd_t")
out, ret = self.emulator.run("seinfo -t tor_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "tor_t")
out, ret = self.emulator.run("seinfo -t buildroot_test_t", 15)
self.assertEqual(ret, 0)
self.assertEqual(out[2].strip(), "buildroot_test_t")

View File

@@ -0,0 +1 @@
source "$BR2_EXTERNAL_SELINUX_PATH/package/selinux-test/Config.in"

View File

@@ -0,0 +1 @@
name: SELINUX

View File

@@ -0,0 +1 @@
include $(sort $(wildcard $(BR2_EXTERNAL_SELINUX_PATH)/package/*/*.mk))

View File

@@ -0,0 +1,4 @@
config BR2_PACKAGE_SELINUX_TEST
bool "SELinux test package"
help
Test package for SELinux Buildroot helpers.

View File

@@ -0,0 +1,9 @@
################################################################################
#
# SELinux test package
#
################################################################################
SELINUX_TEST_SELINUX_MODULES = ntp tor
$(eval $(generic-package))

View File

@@ -0,0 +1 @@
## <summary>Buildroot rules</summary>

View File

@@ -0,0 +1,3 @@
policy_module(buildroot, 1.0.0)
type buildroot_test_t;

View File

@@ -0,0 +1 @@
## <summary>Buildroot rules</summary>

View File

@@ -0,0 +1,3 @@
policy_module(buildroot, 1.0.0)
type buildroot_test_t;