builddeb: generate multi-arch friendly linux-libc-dev package
diff mbox series

Message ID 1560752096-1323-1-git-send-email-Cedric_Hombourger@mentor.com
State New
Headers show
Series
  • builddeb: generate multi-arch friendly linux-libc-dev package
Related show

Commit Message

Cedric Hombourger June 17, 2019, 6:14 a.m. UTC
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@mentor.com>
Reviewed-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/package/builddeb | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Masahiro Yamada July 4, 2019, 12:43 a.m. UTC | #1
CCed a couple of people.

On Mon, Jun 17, 2019 at 3:15 PM Cedric Hombourger
<Cedric_Hombourger@mentor.com> 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@mentor.com>
> Reviewed-by: Henning Schild <henning.schild@siemens.com>
> ---
>  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/
>  fi
>
>  # Install the maintainer scripts


I am not sure but,
I just worried about the backward compatibility...
Was this previously broken?

I guess debian is using own control file
instead of the one in upstream kernel.
So, this is almost a matter for developers, I think.

How did debian-base distros managed this before,
and will this introduce no breakage?

Ben,
Could you comment on this?
Cedric Hombourger July 4, 2019, 12:39 p.m. UTC | #2
Hello Yamada-san

Thanks for your review of this patch. Answers below

On 7/4/2019 2:43 AM, Masahiro Yamada wrote:
> CCed a couple of people.
>
> On Mon, Jun 17, 2019 at 3:15 PM Cedric Hombourger
> <Cedric_Hombourger@mentor.com> 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@mentor.com>
>> Reviewed-by: Henning Schild <henning.schild@siemens.com>
>> ---
>>   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/
>>   fi
>>
>>   # Install the maintainer scripts
>
> I am not sure but,
> I just worried about the backward compatibility...

this patch is actually addressing a compatibility problem with 
multi-arch capable distros (all the major Debian-based distros that I 
know of are) where the currently generated libc headers packages is 
placing arch specific headers where all arch compilers installed on the 
system would find them

> Was this previously broken?

yes (as noted above) but would only be seen on systems with multi-arch 
packages / development tools installed

> I guess debian is using own control file
> instead of the one in upstream kernel.
> So, this is almost a matter for developers, I think.

Correct. Debian and some others use their own.

We (Mentor and Siemens) as well as other folks from the embedded 
community build embedded platforms using Debian as a base and recent 
kernels (so we can run Debian on e.g. recent Arm64 hardware designs). 
This is achieved by using Isar (https://github.com/ilbers/isar). The 
custom kernel recipe it provides uses builddeb since that feature is 
mainline. It also allows us to use custom kernels regardless of the 
Debian-based distro we use (Raspbian, Ubuntu, Debian, etc.)

> How did debian-base distros managed this before,
> and will this introduce no breakage?

We would expect desktop distros to continue using their own 
debian/{control,rules} files but would recommend to have the .deb 
produce by the kernel be better aligned with Debian so we can swap their 
"old" kernels with recent LTS or recent HEAD kernels.

Hope I was able to shed some light on our use-case / motivation.

> Ben,
> Could you comment on this?
>
>
Ben Hutchings July 4, 2019, 1:10 p.m. UTC | #3
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@mentor.com> 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@mentor.com>
> > Reviewed-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  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.

Patch
diff mbox series

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/
 fi
 
 # Install the maintainer scripts