APPLIED[U]: [Unstable/Mantic][PATCH] UBUNTU: [Packaging] snap: Remove old configs handling

Andrea Righi andrea.righi at canonical.com
Wed Jul 19 05:36:13 UTC 2023


On Tue, Jul 04, 2023 at 10:19:14AM +0200, Juerg Haefliger wrote:
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
> ---
>  debian/snapcraft.mk | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/debian/snapcraft.mk b/debian/snapcraft.mk
> index 00efb13c213b..bbccdcc2feca 100644
> --- a/debian/snapcraft.mk
> +++ b/debian/snapcraft.mk
> @@ -8,8 +8,4 @@ else
>    arch := $(ARCH)
>  endif
>  config:
> -	if [ -e debian/config/config.common.ubuntu ]; then \
> -	    cat debian.$(branch)/config/config.common.ubuntu debian.$(branch)/config/$(arch)/config.common.$(arch) debian.$(branch)/config/$(arch)/config.flavour.$(flavour) >.config; \
> -	else \
> -	    python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(flavour) >.config; \
> -	fi
> +	python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(flavour) >.config

Applied to mantic/linux-unstable.

Thanks,
-Andrea



More information about the kernel-team mailing list