diff --git a/debian/rules b/debian/rules index 88f7b988bca1..44d25babd521 100755 --- a/debian/rules +++ b/debian/rules @@ -173,10 +173,8 @@ include $(DROOT)/rules.d/4-checks.mk control_files := $(DEBIAN)/control.stub.in ifeq ($(do_libc_dev_package),true) -ifneq (,$(wildcard $(DEBIAN)/control.d/linux-libc-dev.stub)) control_files += $(DEBIAN)/control.d/linux-libc-dev.stub endif -endif # Calculate Ubuntu Compatible Signing levels UBUNTU_COMPATIBLE_SIGNING=$(shell grep -qx ' *Subject: C = GB, ST = Isle of Man, O = Canonical Ltd., OU = Secure Boot, CN = Canonical Ltd. Secure Boot Signing (2021 v3)' debian/canonical-revoked-certs.pem && echo ubuntu/4 pro/3) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index ade7674b1111..c38945163ae6 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -121,9 +121,7 @@ ifeq ($(do_full_build),false) do_source_package_content=false endif -# linux-libc-dev may not be needed, default to building it only for the -# primary variant -ifneq ($(filter --,$(variants)),) +ifeq ($(DEBIAN),debian.master) do_libc_dev_package=true else do_libc_dev_package=false diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index f2c3ce046767..8d7fd7b45b6e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -557,10 +557,6 @@ binary-arch-headers: install-arch-headers dh_testdir dh_testroot ifeq ($(do_libc_dev_package),true) -ifeq ($(filter debian.master%,$(DEBIAN)),) - echo "non-master branch building linux-libc-dev, aborting" - exit 1 -endif $(call dh_all,linux-libc-dev) endif