[UNSTABLE] UBUNTU: [Packaging] remove remaining references to ports

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@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

Nice. Some comments below.


> 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@canonical.com>


Acked-by: Juerg Haefliger <juergh@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'

'family' could be dropped as well since the only consumer seems to be
debian/scripts/misc/kernelconfig where it could be hard-coded. Maybe in a follow-on patch?

And can't we gather the list of arches on the fly somehow so that we can drop
kernelconfig altogether?

And while cleaning up, can we remove the d-i cruft going forward since it is
no longer needed?


> 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)"

On Tue, Aug 31, 2021 at 03:59:09PM +0100, Dimitri John Ledkov wrote:
> 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@canonical.com>

Looks like a good cleanup to me.

Acked-by: Andrea Righi <andrea.righi@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
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

On Tue, Aug 31, 2021 at 03:59:09PM +0100, Dimitri John Ledkov wrote:
> 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@canonical.com>

Applied to impish/linux (5.13).

Thanks,
-Andrea

On Tue, Aug 31, 2021 at 03:59:09PM +0100, Dimitri John Ledkov wrote:
> 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@canonical.com>