| Message ID | 20230531094032.323782-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,J] UBUNTU: [Packaging] rules: Use old-kernelconfig for old configs | expand |
On Wed, May 31, 2023 at 11:40:32AM +0200, Juerg Haefliger wrote: > Use the original old-kernelconfig script if the configs haven't been > migrated yet to the new annotations scheme. > > Ignore: yes > Fixes: 4010fc1ea927 ("UBUNTU: [Packaging] new annotations model infrastructure") > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> All good, thanks. Acked-by: Andrea Righi <andrea.righi@canonical.com> > --- > debian/rules.d/1-maintainer.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk > index 0380d83d9ef8..16eb8819c43c 100644 > --- a/debian/rules.d/1-maintainer.mk > +++ b/debian/rules.d/1-maintainer.mk > @@ -41,9 +41,13 @@ printdebian: > > updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: > dh_testdir; > +ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) > + $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@ "$(do_enforce_all)" > +else > kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \ > $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ > @rm -rf build > +endif > > migrateconfigs: > ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) > -- > 2.37.2 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 23/05/31 11:40AM, Juerg Haefliger wrote: > Use the original old-kernelconfig script if the configs haven't been > migrated yet to the new annotations scheme. > > Ignore: yes > Fixes: 4010fc1ea927 ("UBUNTU: [Packaging] new annotations model infrastructure") > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > debian/rules.d/1-maintainer.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk > index 0380d83d9ef8..16eb8819c43c 100644 > --- a/debian/rules.d/1-maintainer.mk > +++ b/debian/rules.d/1-maintainer.mk > @@ -41,9 +41,13 @@ printdebian: > > updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: > dh_testdir; > +ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) > + $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@ "$(do_enforce_all)" > +else > kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \ > $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ > @rm -rf build > +endif > > migrateconfigs: > ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) > -- > 2.37.2 Acked-by: Andrei Gherzan <andrei.gherzan@canonical.com>
On 5/31/23 3:40 AM, Juerg Haefliger wrote: > Use the original old-kernelconfig script if the configs haven't been > migrated yet to the new annotations scheme. > > Ignore: yes > Fixes: 4010fc1ea927 ("UBUNTU: [Packaging] new annotations model infrastructure") > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > debian/rules.d/1-maintainer.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk > index 0380d83d9ef8..16eb8819c43c 100644 > --- a/debian/rules.d/1-maintainer.mk > +++ b/debian/rules.d/1-maintainer.mk > @@ -41,9 +41,13 @@ printdebian: > > updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: > dh_testdir; > +ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) > + $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@ "$(do_enforce_all)" > +else > kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \ > $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ > @rm -rf build > +endif > > migrateconfigs: > ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) Applied to jammy/linux:master-next. Thanks. -rtg
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 0380d83d9ef8..16eb8819c43c 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -41,9 +41,13 @@ printdebian: updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: dh_testdir; +ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) + $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@ "$(do_enforce_all)" +else kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \ $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ @rm -rf build +endif migrateconfigs: ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),)
Use the original old-kernelconfig script if the configs haven't been migrated yet to the new annotations scheme. Ignore: yes Fixes: 4010fc1ea927 ("UBUNTU: [Packaging] new annotations model infrastructure") Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/1-maintainer.mk | 4 ++++ 1 file changed, 4 insertions(+)