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

[Masahiro Yamada]

On Tue, Dec 5, 2023 at 8:35 AM Dimitri John Ledkov
<dimitri.ledkov at canonical.com> wrote:
>
> On Mon, 4 Dec 2023 at 15:36, Masahiro Yamada
> <masahiro.yamada at canonical.com> wrote:
> >
> > 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?
> >
> >
> >
> > I think so.
> >
> > See a comment in debian/scripts/misc/annotations.
> >
> >
> > CONFIG_VERSION_SIGNATURE is a Ubuntu-local feature.
> >
> > You can see it in /proc/version_signature
> > and the banner in dmesg if you use Ubuntu.
> >
> >
> > If you delete this sed code, presumably you will get
> > an empty string for it because the value is empty in
> > debian.master/config/annotations
> >
> >
> > I recommend keeping the sed code.
> >
>
> Doesn't the next line do the same thing?
>
> sed -i 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu
> $(release)-$(revision)-$* $(raw_kernelversion)"/'
> $(builddir)/build-$*/.config



Sorry, I missed the next line.


How embarrassing.


Then, this clean-up should be safe.


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










> I'll test build unstable as applied, and will check buildinfo package
> to ensure the end config (as used to compile the kernel) has
> VERSION_SIGNATURE correctly set.
>
> >
> >
> >
> >
> >
> > config VERSION_SIGNATURE
> >         string "Arbitrary version signature"
> >         help
> >           This string will be created in a file, /proc/version_signature. It
> >           is useful in determining arbitrary data about your kernel.
> > For instance,
> >           if you have several kernels of the same version, but need to
> > keep track
> >           of a revision of the same kernel, but not affect it's ability to load
> >           compatible modules, this is the easiest way to do that.
> >
> >
> >
> > It says that it is "Arbitrary" data, so the kernel will work fine
> > even if CONFIG_VERSION_SIGNATURE is empty.
> >
> > But, in that case, we can propose removing this entirely.
> >
> >
> >
> >
> >
> >
> >
> >
> > >
> > > Signed-off-by: Juerg Haefliger <juerg.haefliger 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
> >
> > --
> > kernel-team mailing list
> > kernel-team at lists.ubuntu.com
> > https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
>
>
> --
> Dimitri
>
> Sent from Ubuntu Pro
> https://ubuntu.com/pro