| Message ID | 20230525153555.472130-1-andrei.gherzan@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,J,1/1] UBUNTU: [Packaging] fix typo in 4-checks.mk | expand |
On 5/25/23 9:35 AM, Andrei Gherzan wrote: > BugLink: https://bugs.launchpad.net/bugs/2020413 > > There is a syntax typo/error in 4-checks.mk where "else" misses a > semicolon. > > This bug can be hit only if we are still using the old > configs+annotations model and we opt to not migrate to the new model. > > Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> > --- > debian/rules.d/4-checks.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index 5606745afef7..1671dba31f6b 100644 > --- a/debian/rules.d/4-checks.mk > +++ b/debian/rules.d/4-checks.mk > @@ -32,7 +32,7 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ > perl -f $(DROOT)/scripts/config-check \ > $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ > - "$(skipconfig)" "$(do_enforce_all)" \ > + "$(skipconfig)" "$(do_enforce_all)"; \ > else \ > python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ > --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ Acked-by: Tim Gardner <tim.gardner@canonical.com>
On Thu, May 25, 2023 at 04:35:55PM +0100, Andrei Gherzan wrote: > BugLink: https://bugs.launchpad.net/bugs/2020413 > > There is a syntax typo/error in 4-checks.mk where "else" misses a > semicolon. > > This bug can be hit only if we are still using the old > configs+annotations model and we opt to not migrate to the new model. Thanks for fixing this and also thanks to Juergh for spotting the bug. Acked-by: Andrea Righi <andrea.righi@canonical.com> > > Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> > --- > debian/rules.d/4-checks.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index 5606745afef7..1671dba31f6b 100644 > --- a/debian/rules.d/4-checks.mk > +++ b/debian/rules.d/4-checks.mk > @@ -32,7 +32,7 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ > perl -f $(DROOT)/scripts/config-check \ > $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ > - "$(skipconfig)" "$(do_enforce_all)" \ > + "$(skipconfig)" "$(do_enforce_all)"; \ > else \ > python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ > --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 25/05/2023 17:35, Andrei Gherzan wrote: > BugLink: https://bugs.launchpad.net/bugs/2020413 > > There is a syntax typo/error in 4-checks.mk where "else" misses a > semicolon. > > This bug can be hit only if we are still using the old > configs+annotations model and we opt to not migrate to the new model. > > Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> > --- > debian/rules.d/4-checks.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index 5606745afef7..1671dba31f6b 100644 > --- a/debian/rules.d/4-checks.mk > +++ b/debian/rules.d/4-checks.mk > @@ -32,7 +32,7 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ > perl -f $(DROOT)/scripts/config-check \ > $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ > - "$(skipconfig)" "$(do_enforce_all)" \ > + "$(skipconfig)" "$(do_enforce_all)"; \ > else \ > python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ > --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ Acked-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
On 25/05/2023 17:35, Andrei Gherzan wrote: > BugLink: https://bugs.launchpad.net/bugs/2020413 > > There is a syntax typo/error in 4-checks.mk where "else" misses a > semicolon. > > This bug can be hit only if we are still using the old > configs+annotations model and we opt to not migrate to the new model. > > Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> > --- > debian/rules.d/4-checks.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index 5606745afef7..1671dba31f6b 100644 > --- a/debian/rules.d/4-checks.mk > +++ b/debian/rules.d/4-checks.mk > @@ -32,7 +32,7 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ > perl -f $(DROOT)/scripts/config-check \ > $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ > - "$(skipconfig)" "$(do_enforce_all)" \ > + "$(skipconfig)" "$(do_enforce_all)"; \ > else \ > python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ > --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ Applied to jammy:linux master-next. Thanks. Roxana
diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index 5606745afef7..1671dba31f6b 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -32,7 +32,7 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ perl -f $(DROOT)/scripts/config-check \ $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ - "$(skipconfig)" "$(do_enforce_all)" \ + "$(skipconfig)" "$(do_enforce_all)"; \ else \ python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \
BugLink: https://bugs.launchpad.net/bugs/2020413 There is a syntax typo/error in 4-checks.mk where "else" misses a semicolon. This bug can be hit only if we are still using the old configs+annotations model and we opt to not migrate to the new model. Signed-off-by: Andrei Gherzan <andrei.gherzan@canonical.com> --- debian/rules.d/4-checks.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)