| Message ID | 20230704081914.14618-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Unstable/Mantic] UBUNTU: [Packaging] snap: Remove old configs handling | expand |
On 23/07/04 10:19AM, Juerg Haefliger wrote: > Signed-off-by: Juerg Haefliger <juerg.haefliger@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 > -- > 2.39.2 Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
On 7/4/23 2:19 AM, Juerg Haefliger wrote: > Signed-off-by: Juerg Haefliger <juerg.haefliger@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 Acked-by: Tim Gardner <tim.gardner@canonical.com>
On Tue, Jul 04, 2023 at 10:19:14AM +0200, Juerg Haefliger wrote: > Signed-off-by: Juerg Haefliger <juerg.haefliger@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
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
Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/snapcraft.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)