Re: [PATCH] builddeb: generate multi-arch friendly linux-libc-dev package

[Ben Hutchings]

On Thu, 2019-07-04 at 09:43 +0900, Masahiro Yamada wrote:
> CCed a couple of people.
> 
> On Mon, Jun 17, 2019 at 3:15 PM Cedric Hombourger
> <Cedric_Hombourger@xxxxxxxxxx> wrote:
> > Debian-based distributions place libc header files in a machine
> > specific directory (/usr/include/<libc-machine>) instead of
> > /usr/include/asm to support installation of the linux-libc-dev
> > package from multiple architectures. Move headers installed by
> > "make headers_install" accordingly.
> > 
> > Signed-off-by: Cedric Hombourger <Cedric_Hombourger@xxxxxxxxxx>
> > Reviewed-by: Henning Schild <henning.schild@xxxxxxxxxxx>
> > ---
> >  scripts/package/builddeb | 5 +++++
> >  1 file changed, 5 insertions(+)
> > 
> > diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> > index b03dd56a4782..8f7afb3a84e9 100755
> > --- a/scripts/package/builddeb
> > +++ b/scripts/package/builddeb
> > @@ -132,6 +132,11 @@ fi
> >  if [ "$ARCH" != "um" ]; then
> >         $MAKE -f $srctree/Makefile headers_check
> >         $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
> > +       # move asm headers to /usr/include/<libc-machine>/asm to match the structure
> > +       # used by Debian-based distros (to support multi-arch)
> > +       libc_mach=$($CC -dumpmachine)
> > +       mkdir $libc_headers_dir/usr/include/$libc_mach
> > +       mv $libc_headers_dir/usr/include/asm $libc_headers_dir/usr/include/$libc_mach/

This is wrong; the multiarch architecture tuple used in directory names
does not necessarily match the compiler's architecture tuple.  Firstly,
if you use a biarch compiler the compiler is only going to tell you the
default architecture.  Secondly, on i386 the minimum processor is i586
or i686 but the multiarch architecture tuple is still "i386-linux-gnu"
(and there might be other cases like this).

So, the correct command is:

    dpkg-architecture -a$debarch -qDEB_HOST_MULTIARCH

> >  fi
> > 
> >  # Install the maintainer scripts
> 
> I am not sure but,
> I just worried about the backward compatibility...
> Was this previously broken?

Debian has had multiarch support since Debian 7 "wheezy", and older
versions are no longer supported.  So I think this change is fine to
make unconditionally.

The current linux-libc-dev packages build by "make deb-pkg" are
"broken" in that multiple architectures can't be co-installed with each
other, whereas this genrally can be done with the linux-libc-dev
packages provided by Debian-based distributions.  However, co-
installation is only allowed if the version strings and contents of
common files in the packages are identical, and I don't know whether
that's going to be true for those generated by "make deb-pkg".

> I guess debian is using own control file
> instead of the one in upstream kernel.

We maintain multiple configurations, a meaningful changelog, tools
packages, etc.  So "make deb-pkg" is not used for official kernel
packages but we recommend it for custom kernels.

> So, this is almost a matter for developers, I think.
> 
> How did debian-base distros managed this before,
> and will this introduce no breakage?

On the Debian side a similar change was made in Debian 7 "wheezy".  In
Ubuntu I believe it was done earlier as they modified dpkg to support
multiarch before us.

> Ben,
> Could you comment on this?

Ben.

-- 
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.

Attachment: signature.asc
Description: This is a digitally signed message part