ACK: [Noble/Unstable][PATCH 2/6] UBUNTU: [Packaging] Remove obsolete config handling

[Masahiro Yamada]

On Fri, Nov 24, 2023 at 10:30 PM Juerg Haefliger
<juerg.haefliger at canonical.com> wrote:
>
> Remove hopefully the last remaining leftovers from the old
> pre-annotations-only config scheme.
>
> While at it, drop the duplicate/redundant 'sed' call. Or am I missing
> something?
>
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>



Sorry for my previous silly comment.




Acked-by: Masahiro Yamada <masahiro.yamada at canonical.com>








> ---
>  debian/rules.d/2-binary-arch.mk | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 0750fd9e8fc3..1cf2b106bf25 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -15,11 +15,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames
>         @echo Debug: $@
>         install -d $(builddir)/build-$*
>         touch $(builddir)/build-$*/ubuntu-build
> -       if [ -e $(commonconfdir)/config.common.ubuntu ]; then \
> -               cat $(commonconfdir)/config.common.ubuntu $(archconfdir)/config.common.$(arch) $(archconfdir)/config.flavour.$(target_flavour) > $(builddir)/build-$*/.config; \
> -       else \
> -               python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config; \
> -       fi
> +       python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(target_flavour) > $(builddir)/build-$*/.config
>         sed -i 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' $(builddir)/build-$*/.config
>         [ "$(do_odm_drivers)" = 'true' ] && true || \
>                 sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \
> --
> 2.40.1
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team