Re: [PATCH] linux-custom: repack linux-libc-dev

[Henning Schild <henning.schild@siemens.com>]

Am Wed, 12 Jun 2019 22:10:02 +0200
schrieb Cedric Hombourger <Cedric_Hombourger@mentor.com>:

> Debian's linux-libc-dev package has "asm" headers in the following
> directory: /usr/include/<libc-arch>/asm while the builddeb script
> from the Linux kernel places them in: /usr/include/asm. Repack the
> linux-libc-dev package (fixing a build error for packages built
> against Isar-created distributions shipping a custom kernel in
> lieu of Debian's).

To me that sounds like an upstream bug that should not just get covered
up by repacking. I would propose looking into a kernel patch for the
"debpkg" step. That patch could be carried in your layer(s) and Isar
while it is pending upstream.

Looking at both ubuntu and debian, old and new .. it should never
be /usr/include/asm/.

> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>  meta/recipes-kernel/linux/files/build-kernel.sh | 38
> +++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3
> deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh
> b/meta/recipes-kernel/linux/files/build-kernel.sh index
> 8b7b23b..2c97932 100644 ---
> a/meta/recipes-kernel/linux/files/build-kernel.sh +++
> b/meta/recipes-kernel/linux/files/build-kernel.sh @@ -9,8 +9,20 @@
>  
>  source /isar/common.sh
>  
> -host_arch=$(dpkg --print-architecture)
> +unsupported_arch() {
> +    echo "error: unsupported architecture ($1)" >&2
> +    exit 1
> +}
> +
> +case $target_arch in
> +     amd64) LIBC_HEADERS_DIR="x86_64-linux-gnu"    ;;
> +     armhf) LIBC_HEADERS_DIR="arm-linux-gnueabihf" ;;
> +     arm64) LIBC_HEADERS_DIR="aarch64-linux-gnu"   ;;
> +    mipsel) LIBC_HEADERS_DIR="mipsel-linux-gnu"    ;;
> +         *) unsupported_arch "$target_arch"        ;;
> +esac

Looks suspiciously like "${CROSS-COMPILE}gcc -dumpmachine". Using that
would relieve us from carrying those magic strings around.


> +host_arch=$(dpkg --print-architecture)
>  if [ "$host_arch" != "$target_arch" ]; then
>      case $target_arch in
>      armhf)
> @@ -26,8 +38,7 @@ if [ "$host_arch" != "$target_arch" ]; then
>          export CROSS_COMPILE="mipsel-linux-gnu-"
>          ;;
>      *)
> -        echo "error: unsupported architecture ($target_arch)"
> -        exit 1
> +        unsupported_arch "$target_arch"
>          ;;
>      esac
>  fi
> @@ -35,6 +46,7 @@ fi
>  REPACK_DIR="$1/../repack"
>  REPACK_LINUX_IMAGE_DIR="${REPACK_DIR}/linux-image"
>  REPACK_LINUX_HEADERS_DIR="${REPACK_DIR}/linux-headers"
> +REPACK_LIBC_HEADERS_DIR="${REPACK_DIR}/libc-headers"
>  
>  if [ -e .config ]; then
>  	make olddefconfig
> @@ -56,6 +68,7 @@ rm -rf "${REPACK_DIR}"
>  mkdir -p "${REPACK_DIR}"
>  mkdir -p "${REPACK_LINUX_IMAGE_DIR}"
>  mkdir -p "${REPACK_LINUX_HEADERS_DIR}"
> +mkdir -p "${REPACK_LIBC_HEADERS_DIR}"
>  
>  cp -a debian "${REPACK_DIR}"
>  
> @@ -67,6 +80,7 @@ cd ..
>  
>  dpkg-deb -R linux-image-${PV}_${PV}-1_*.deb
> "${REPACK_LINUX_IMAGE_DIR}" dpkg-deb -R
> linux-headers-${PV}_${PV}-1_*.deb "${REPACK_LINUX_HEADERS_DIR}"
> +dpkg-deb -R linux-libc-dev_${PV}-1_*.deb
> "${REPACK_LIBC_HEADERS_DIR}" dpkg-gencontrol -crepack/debian/control \
>  	-lrepack/debian/changelog \
> @@ -110,6 +124,10 @@ if [ "$target_arch" = "arm64" ]; then
>  	gunzip "$vmlinuz.gz"
>  fi
>  
> +# Move libc's asm headers where they are expected
> +mkdir ${REPACK_LIBC_HEADERS_DIR}/usr/include/${LIBC_HEADERS_DIR}
> +mv ${REPACK_LIBC_HEADERS_DIR}/usr/include/asm
> ${REPACK_LIBC_HEADERS_DIR}/usr/include/${LIBC_HEADERS_DIR} +
>  dpkg-gencontrol -crepack/debian/control \
>  	-lrepack/debian/changelog \
>  	-frepack/debian/files \
> @@ -121,12 +139,26 @@ dpkg-gencontrol -crepack/debian/control \
>  	-DDepends="${KERNEL_HEADERS_DEBIAN_DEPENDS}" \
>  	-DArchitecture=$target_arch
>  
> +dpkg-gencontrol -crepack/debian/control \
> +	-lrepack/debian/changelog \
> +	-frepack/debian/files \
> +	-plinux-libc-dev \
> +	-P"${REPACK_LIBC_HEADERS_DIR}" \
> +	-Vkernel:debarch="${KERNEL_NAME}" \
> +	-DPackage="linux-libc-dev" \
> +	-DSection=kernel \
> +	-DDepends="${LIBC_HEADERS_DEBIAN_DEPENDS}" \
> +	-DArchitecture=$target_arch
> +
>  fakeroot dpkg-deb -b "${REPACK_LINUX_IMAGE_DIR}" \
>  	linux-image-${KERNEL_NAME}_${PV}-1_${KERNEL_NAME}.deb
>  rm -f linux-image-${PV}_${PV}-1_*.deb
>  fakeroot dpkg-deb -b "${REPACK_LINUX_HEADERS_DIR}" \
>  	linux-headers-${KERNEL_NAME}_${PV}-1_${KERNEL_NAME}.deb
>  rm -f linux-headers-${PV}_${PV}-1_*.deb
> +rm -f linux-libc-dev_${PV}-1_*.deb
> +fakeroot dpkg-deb -b "${REPACK_LIBC_HEADERS_DIR}" \
> +	linux-libc-dev_${PV}-1_${KERNEL_NAME}.deb
>  
>  # linux-libc-dev causes dependency problems if we downgrade
>  # remove it after the build so the downgraded version does not get
> deployed

Ahh this guy is still somehow in the patch. You might want to have a
look at 7a1f14ca. My guess is that skipping the downgrade is still OK
because the problem just shows once you install the libc-dev package.