From 4189919c6ace59baaa3badb3194c617d24bedd16 Mon Sep 17 00:00:00 2001 From: Ondrej Kubik Date: Wed, 31 May 2023 16:32:38 +0100 Subject: [PATCH] kernel plugin: add debhelper build dependency required by "debian/rules clean" call Signed-off-by: Ondrej Kubik --- snapcraft/parts/plugins/kernel.py | 1 + snapcraft_legacy/plugins/v2/kernel.py | 1 + tests/legacy/unit/plugins/v2/test_kernel.py | 7 +++++++ tests/unit/parts/plugins/test_kernel.py | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/snapcraft/parts/plugins/kernel.py b/snapcraft/parts/plugins/kernel.py index 514657ec52..188450994b 100644 --- a/snapcraft/parts/plugins/kernel.py +++ b/snapcraft/parts/plugins/kernel.py @@ -385,6 +385,7 @@ def get_build_packages(self) -> Set[str]: build_packages = { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", diff --git a/snapcraft_legacy/plugins/v2/kernel.py b/snapcraft_legacy/plugins/v2/kernel.py index 1ece2957d1..cbe5c39449 100644 --- a/snapcraft_legacy/plugins/v2/kernel.py +++ b/snapcraft_legacy/plugins/v2/kernel.py @@ -430,6 +430,7 @@ def get_build_packages(self) -> Set[str]: build_packages = { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", diff --git a/tests/legacy/unit/plugins/v2/test_kernel.py b/tests/legacy/unit/plugins/v2/test_kernel.py index 1bc95d9eeb..0d6380f4d6 100644 --- a/tests/legacy/unit/plugins/v2/test_kernel.py +++ b/tests/legacy/unit/plugins/v2/test_kernel.py @@ -266,6 +266,7 @@ def test_get_base_build_packages(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -285,6 +286,7 @@ def test_get_base_build_packages_lz4(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -304,6 +306,7 @@ def test_get_base_build_packages_xz(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -323,6 +326,7 @@ def test_get_base_build_packages_zfs(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -347,6 +351,7 @@ def test_get_base_build_packages_zfs_cross(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -1005,6 +1010,7 @@ def test_use_llvm(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -1037,6 +1043,7 @@ def test_use_llvm_specific_version(self): { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", diff --git a/tests/unit/parts/plugins/test_kernel.py b/tests/unit/parts/plugins/test_kernel.py index c49b01fc8f..27f81c2856 100644 --- a/tests/unit/parts/plugins/test_kernel.py +++ b/tests/unit/parts/plugins/test_kernel.py @@ -71,6 +71,7 @@ def test_get_base_build_packages(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -92,6 +93,7 @@ def test_get_base_build_packages_lz4(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -113,6 +115,7 @@ def test_get_base_build_packages_xz(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -134,6 +137,7 @@ def test_get_base_build_packages_zfs(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -161,6 +165,7 @@ def test_get_base_build_packages_zfs_cross(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -188,6 +193,7 @@ def test_get_base_build_packages_efi(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -1097,6 +1103,7 @@ def test_use_llvm(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake", @@ -1131,6 +1138,7 @@ def test_use_llvm_specific_version(self, setup_method_fixture, new_dir): assert plugin.get_build_packages() == { "bc", "binutils", + "debhelper", "fakeroot", "gcc", "cmake",