diff options
| -rwxr-xr-x | debian/bin/gencontrol.py | 17 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/config/config | 2 | ||||
| -rw-r--r-- | debian/lib/python/debian_linux/debian.py | 1 | ||||
| -rw-r--r-- | debian/templates/tests-control.headers.in | 3 | ||||
| -rw-r--r-- | debian/tests/kbuild | 2 |
6 files changed, 23 insertions, 13 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 28df8a4c9..19d15117c 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -565,18 +565,15 @@ class Gencontrol(Base): self.tests_control_image = tests_control self.tests_control.append(tests_control) - if flavour == self.quick_flavour: - tests_control = self.process_package( - self.templates['tests-control.headers'][0], vars) - tests_control['Depends'].append( + if flavour == (self.quick_flavour or self.default_flavour): + if not self.tests_control_headers: + self.tests_control_headers = self.process_package( + self.templates['tests-control.headers'][0], vars) + self.tests_control.append(self.tests_control_headers) + self.tests_control_headers['Architecture'].add(arch) + self.tests_control_headers['Depends'].append( PackageRelationGroup(package_headers['Package'], override_arches=(arch,))) - if self.tests_control_headers: - self.tests_control_headers['Depends'].extend( - tests_control['Depends']) - else: - self.tests_control_headers = tests_control - self.tests_control.append(tests_control) def get_config(*entry_name): entry_real = ('image',) + entry_name diff --git a/debian/changelog b/debian/changelog index b78532a91..f75a9e2c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -132,6 +132,17 @@ linux (5.19~rc4-1~exp1) experimental; urgency=medium -- Ben Hutchings <benh@debian.org> Fri, 01 Jul 2022 18:01:46 +0200 +linux (5.18.14-2) UNRELEASED; urgency=medium + + * d/tests: kbuild test case depends on python3 + * d/tests: Run kbuild test with default flavour if quick flavour not defined + * d/lib/python/debian_linux/debian.py: Add Architecture field to TestsControl + * d/tests: Restrict kbuild tests to architectures with default or quick + flavour + * security: Add landlock and bpf to enabled LSM list (Closes: #999551) + + -- Ben Hutchings <benh@debian.org> Fri, 29 Jul 2022 00:43:54 +0200 + linux (5.18.14-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/config/config b/debian/config/config index 0ad95cbfd..d5e5a81d5 100644 --- a/debian/config/config +++ b/debian/config/config @@ -7715,7 +7715,7 @@ CONFIG_FORTIFY_SOURCE=y ## choice: First legacy 'major LSM' to be initialized CONFIG_DEFAULT_SECURITY_APPARMOR=y ## end choice -CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" +CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf" ## ## file: security/Kconfig.hardening diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index ffff1ed1c..763d08756 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -805,6 +805,7 @@ class TestsControl(_ControlFileDict): _fields = collections.OrderedDict(( ('Tests', str), ('Test-Command', str), + ('Architecture', PackageArchitecture), ('Restrictions', str), ('Features', str), ('Depends', PackageRelation), diff --git a/debian/templates/tests-control.headers.in b/debian/templates/tests-control.headers.in index 92a64f859..f56894d8d 100644 --- a/debian/templates/tests-control.headers.in +++ b/debian/templates/tests-control.headers.in @@ -1,3 +1,4 @@ Tests: kbuild -Depends: +Architecture: +Depends: python3 Restrictions: superficial diff --git a/debian/tests/kbuild b/debian/tests/kbuild index b6797e397..2634c17e4 100644 --- a/debian/tests/kbuild +++ b/debian/tests/kbuild @@ -24,7 +24,7 @@ obj-m += foo.o EOF arch="$(dpkg --print-architecture)" -release="$(debian/bin/getconfig.py version abiname)-$(debian/bin/getconfig.py base $arch none quick-flavour)" +release="$(debian/bin/getconfig.py version abiname)-$(debian/bin/getconfig.py base $arch none quick-flavour || debian/bin/getconfig.py base $arch none default-flavour)" echo "I: Build for $release" # There are some warnings sent to stderr that we need to suppress, |