[Unstable][PATCH 09/10] UBUNTU: [Packaging] rules: Remove ship_extras_package feature
Juerg Haefliger
juerg.haefliger at canonical.com
Tue Dec 17 09:25:26 UTC 2024
Flagged by --warn-undefined-variables:
debian/rules.d/2-binary-arch.mk:574: warning: undefined variable 'ship_extras_package'
This is a concept introduced in 2017:
> This feature may be useful for config debugging and for custom kernel
> development.
This is a Kamal AWS thing and was only used in trusty/linux-aws. I don't
see it being useful (anymore), remove it.
Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
debian/rules.d/2-binary-arch.mk | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 6ee1494c2cc9..190ca186b9ec 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -536,7 +536,6 @@ binary-arch-headers: $(stampdir)/stamp-install-arch-headers
binary-%: pkgimg = $(bin_pkg_name)-$*
binary-%: pkgimg_mods = $(mods_pkg_name)-$*
binary-%: pkgimg_ex = $(mods_extra_pkg_name)-$*
-binary-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
binary-%: pkgbldinfo = $(bldinfo_pkg_name)-$*
binary-%: pkghdr = $(hdrs_pkg_name)-$*
binary-%: pkgrust = $(rust_pkg_name)-$*
@@ -557,18 +556,9 @@ binary-%: $(stampdir)/stamp-install-%
$(call dh_all,$(pkgimg_mods))$(if $(do_zstd_ko), -- -Znone)
ifeq ($(do_extras_package),true)
- ifeq ($(ship_extras_package),false)
- # If $(ship_extras_package) is explicitly set to false, then do not
- # construct the linux-image-extra package; instead just log all of the
- # "extra" modules which were pointlessly built yet won't be shipped.
- find $(pkgdir_ex) -name '*.ko' | sort \
- | sed 's|^$(pkgdir_ex)/|NOT-SHIPPED |' \
- | tee -a $*.not-shipped.log;
- else
if [ -f $(DEBIAN)/control.d/$*.inclusion-list ] ; then \
$(call dh_all_inline,$(pkgimg_ex))$(if $(do_zstd_ko), -- -Znone); \
fi
- endif
endif
$(foreach _m,$(all_standalone_dkms_modules), \
--
2.43.0
More information about the kernel-team
mailing list