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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@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/
  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?





[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux