| Message ID | 20230308082525.1326054-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Unstable/Lunar] UBUNTU: [Packaging] debian/rules: Honor 'do_skip_checks' for builds | expand |
On Wed, Mar 08, 2023 at 09:25:25AM +0100, Juerg Haefliger wrote: > One of the build steps is a config check to ensure that the generated > configs are as expected. For mainline builds, this sometimes isn't the > case but we don't care so skip that check if 'do_skip_checks' is true > (which is the case for mainline builds). > > Ignore: yes > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> Applied to lunar/linux. Thanks, -Andrea > --- > debian/rules.d/4-checks.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk > index dba124fbad8e..2f7853fd51e5 100644 > --- a/debian/rules.d/4-checks.mk > +++ b/debian/rules.d/4-checks.mk > @@ -30,6 +30,7 @@ checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% > # Check the config against the known options list. > config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > @echo Debug: $@ > +ifneq ($(do_skip_checks),true) > if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ > perl -f $(DROOT)/scripts/checks/config-check \ > $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ > @@ -38,3 +39,4 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% > python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ > --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ > fi > +endif > -- > 2.34.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index dba124fbad8e..2f7853fd51e5 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -30,6 +30,7 @@ checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% # Check the config against the known options list. config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% @echo Debug: $@ +ifneq ($(do_skip_checks),true) if [ -e $(commonconfdir)/config.common.ubuntu ]; then \ perl -f $(DROOT)/scripts/checks/config-check \ $(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \ @@ -38,3 +39,4 @@ config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \ --arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \ fi +endif
One of the build steps is a config check to ensure that the generated configs are as expected. For mainline builds, this sometimes isn't the case but we don't care so skip that check if 'do_skip_checks' is true (which is the case for mainline builds). Ignore: yes Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/4-checks.mk | 2 ++ 1 file changed, 2 insertions(+)