APPLIED/Cmnt: [Unstable][PATCH] UBUNTU: [Packaging] Remove obsolete etc/kernelconfig

[Andrea Righi]

On Wed, Dec 07, 2022 at 07:08:08AM +0100, Juerg Haefliger wrote:
> etc/kernelconfig is no longer needed with the new annotation scheme so
> drop it. Check for its existence in the kernelconfig script until all
> derivatives have migrated to the new scheme at which point this can be
> dropped as well.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>

Applied to lunar:linux-unstable.

BTW, as you may have noticed already, there are other files that can be
dropped once everything is migrated to the new schema, like
splitconfigs.pl, old-kernelconfig, config-check, but these need to be
removed only when everything (all derivatives and backports) will use
the new schema.

Thanks,
-Andrea

> ---
>  debian.master/etc/kernelconfig   | 1 -
>  debian/scripts/misc/kernelconfig | 6 +++++-
>  2 files changed, 5 insertions(+), 2 deletions(-)
>  delete mode 100644 debian.master/etc/kernelconfig
> 
> diff --git a/debian.master/etc/kernelconfig b/debian.master/etc/kernelconfig
> deleted file mode 100644
> index 2ecc9e822d51..000000000000
> --- a/debian.master/etc/kernelconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -archs="amd64 armhf arm64 ppc64el riscv64 s390x"
> diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
> index 7a556474b54f..e9c6fe3b6de3 100755
> --- a/debian/scripts/misc/kernelconfig
> +++ b/debian/scripts/misc/kernelconfig
> @@ -30,7 +30,11 @@ kerneldir="`pwd`"
>  confdir="$kerneldir/${DEBIAN}/config"
>  variant="$2"
>  
> -. $DEBIAN/etc/kernelconfig
> +# TODO: Drop this once all derivatives have migrated to the new annotations
> +# scheme
> +if [ -e $DEBIAN/etc/kernelconfig ] ; then
> +	. $DEBIAN/etc/kernelconfig
> +fi
>  
>  bindir="`pwd`/${DROOT}/scripts/misc"
>  test -d CONFIGS || mkdir CONFIGS
> -- 
> 2.34.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team