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

[Cedric Hombourger]

On 7/11/2019 4:46 PM, Masahiro Yamada wrote:
> On Tue, Jul 9, 2019 at 4:44 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 using Debian's tuple from
> > dpkg-architecture (stored in debian/arch).
> >
> > Signed-off-by: Cedric Hombourger <Cedric_Hombourger@xxxxxxxxxx>
> > ---
> >   scripts/package/builddeb | 5 +++++
> >   scripts/package/mkdebian | 1 +
> >   2 files changed, 6 insertions(+)
> >
> > diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> > index b03dd56a4782..d5d33bcba1fb 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)
> > +       host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH)
> > +       mkdir $libc_headers_dir/usr/include/$host_arch
> > +       mv $libc_headers_dir/usr/include/asm $libc_headers_dir/usr/include/$host_arch/
> >   fi
>
> I just wondered whether there is something better than $(cat debian/arch),
> but maybe not.
>
> OK, I am ready to pick it up for 5.3-rc1.
>
> With Ben's Ack, I would be able to proceed with more confident.

Great thank you. Let me know if I can help clear any remaining concerns 
you may have

> >   # Install the maintainer scripts
> > diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> > index 8351584cb24e..e0750b70453f 100755
> > --- a/scripts/package/mkdebian
> > +++ b/scripts/package/mkdebian
> > @@ -197,6 +197,7 @@ Architecture: $debarch
> >   Description: Linux support headers for userspace development
> >    This package provides userspaces headers from the Linux kernel.  These headers
> >    are used by the installed headers for GNU glibc and other system libraries.
> > +Multi-Arch: same
> >
> >   Package: $dbg_packagename
> >   Section: debug
> > --
> > 2.11.0