[UNSTABLE][PATCH] UBUNTU: [Packaging] remove remaining references to ports
Dimitri John Ledkov
dimitri.ledkov at canonical.com
Tue Aug 31 14:59:09 UTC 2021
Remove remaining few, unused, references to family=ports builds. Also
remove the maintainer targets to operate on ports.
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
---
debian.master/config/config.common.ports | 3 ---
debian.master/etc/kernelconfig | 9 ++-------
debian/rules.d/1-maintainer.mk | 12 +-----------
3 files changed, 3 insertions(+), 21 deletions(-)
delete mode 100644 debian.master/config/config.common.ports
diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
deleted file mode 100644
index 45749474d3..0000000000
--- a/debian.master/config/config.common.ports
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Common config options automatically generated by splitconfig.pl
-#
diff --git a/debian.master/etc/kernelconfig b/debian.master/etc/kernelconfig
index 95a0f78274..653d2c2173 100644
--- a/debian.master/etc/kernelconfig
+++ b/debian.master/etc/kernelconfig
@@ -1,7 +1,2 @@
-if [ "$variant" = "ports" ]; then
- archs=""
- family='ports'
-else
- archs="amd64 armhf arm64 ppc64el s390x"
- family='ubuntu'
-fi
+archs="amd64 armhf arm64 ppc64el s390x"
+family='ubuntu'
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 48eb1441db..1b5800a031 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -1,7 +1,7 @@
# The following targets are for the maintainer only! do not run if you don't
# know what they do.
-.PHONY: printenv updateconfigs printchanges insertchanges startnewrelease diffupstream help updateportsconfigs editportsconfigs autoreconstruct finalchecks
+.PHONY: printenv updateconfigs printchanges insertchanges startnewrelease diffupstream help autoreconstruct finalchecks
help:
@echo "These are the targets in addition to the normal $(DEBIAN) ones:"
@@ -13,11 +13,6 @@ help:
@echo " editconfigs : Update core arch configs interractively"
@echo " genconfigs : Generate core arch configs in CONFIGS/*"
@echo
- @echo " updateportsconfigs : Update ports arch configs"
- @echo
- @echo " editportsconfigs : Update ports arch configs interactivly"
- @echo " genportconfigs : Generate ports arch configs in CONFIGS/*"
- @echo
@echo " printchanges : Print the current changelog entries (from git)"
@echo
@echo " insertchanges : Insert current changelog entries (from git)"
@@ -48,11 +43,6 @@ updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs:
$(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ "$(do_enforce_all)"
rm -rf build
-updateportsconfigs defaultportsconfigs editportsconfigs genportsconfigs askconfigs:
- dh_testdir;
- $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ ports
- rm -rf build
-
printenv:
dh_testdir
@echo "src package name = $(src_pkg_name)"
--
2.30.2
More information about the kernel-team
mailing list