Re: [PATCH 2/2] build-kernel: fix the cross compile arch naming

[Jan Kiszka <jan.kiszka@siemens.com>]

On 11.09.18 12:16, [ext] Henning Schild wrote:
> In debian cross building scenarios we have three machines.
> "build" is where we work on, "host" is what we produce binaries for, and
> "target" would be a third arch if we build a cross compiler to run on
> "host". ("target" is not yet relevant on Isar)
> 
> We used to call "build" "host" and "host" "target", this patch changes
> the kernel building to the debian/GNU naming.

Does this have any impact on generated packages, their content or file names? 
I'm assuming "no", but it would be good to clarify this, and also state that it 
does not change the interface towards recipes using this include.

Thanks,
Jan

> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   meta/recipes-kernel/linux/files/build-kernel.sh | 18 +++++++++---------
>   meta/recipes-kernel/linux/linux-custom.inc      |  4 ++--
>   2 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux/files/build-kernel.sh b/meta/recipes-kernel/linux/files/build-kernel.sh
> index 2cee28f..d1824db 100644
> --- a/meta/recipes-kernel/linux/files/build-kernel.sh
> +++ b/meta/recipes-kernel/linux/files/build-kernel.sh
> @@ -9,11 +9,11 @@
>   
>   set -e
>   
> -host_arch=$(dpkg --print-architecture)
> -target_arch=$2
> +build_arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
> +host_arch=$(dpkg-architecture -qDEB_HOST_ARCH)
>   
> -if [ "$host_arch" != "$target_arch" ]; then
> -    case $target_arch in
> +if [ "$build_arch" != "$host_arch" ]; then
> +    case $host_arch in
>       armhf)
>           export ARCH=arm
>           export CROSS_COMPILE="arm-linux-gnueabihf-"
> @@ -23,7 +23,7 @@ if [ "$host_arch" != "$target_arch" ]; then
>           export CROSS_COMPILE="aarch64-linux-gnu-"
>           ;;
>       *)
> -        echo "error: unsupported architecture ($target_arch)"
> +        echo "error: unsupported architecture ($host_arch)"
>           exit 1
>           ;;
>       esac
> @@ -44,7 +44,7 @@ if [ "${KV}" != "${PV}" ]; then
>   fi
>   
>   rm -f .version
> -KBUILD_DEBARCH=$target_arch make -j $(($(nproc) * 2)) deb-pkg
> +KBUILD_DEBARCH=$host_arch make -j $(($(nproc) * 2)) deb-pkg
>   
>   rm -rf ${REPACK_DIR}
>   mkdir -p ${REPACK_DIR}
> @@ -65,7 +65,7 @@ dpkg-gencontrol -crepack/debian/control \
>   	-DSection=kernel \
>   	-DPriority=required \
>   	-DDepends="${KERNEL_DEBIAN_DEPENDS}" \
> -	-DArchitecture=$target_arch
> +	-DArchitecture=$host_arch
>   
>   # Add Debian-like link installation to postinst
>   touch ${REPACK_LINUX_IMAGE_DIR}/lib/modules/${PV}/.fresh-install
> @@ -91,7 +91,7 @@ if [ \"\$1\" != upgrade ] && command -v linux-update-symlinks >/dev/null; then\\
>   fi"
>   
>   # Make sure arm64 kernels are decompressed
> -if [ "$target_arch" = "arm64" ]; then
> +if [ "$host_arch" = "arm64" ]; then
>   	vmlinuz=${REPACK_LINUX_IMAGE_DIR}/boot/vmlinuz-${PV}
>   	mv $vmlinuz $vmlinuz.gz
>   	gunzip $vmlinuz.gz
> @@ -106,7 +106,7 @@ dpkg-gencontrol -crepack/debian/control \
>   	-DPackage="linux-headers-${KERNEL_NAME}" \
>   	-DSection=kernel \
>   	-DDepends="${KERNEL_HEADERS_DEBIAN_DEPENDS}" \
> -	-DArchitecture=$target_arch
> +	-DArchitecture=$host_arch
>   
>   dpkg-deb -b ${REPACK_LINUX_IMAGE_DIR} \
>   	linux-image-${KERNEL_NAME}_${PV}-1_${KERNEL_NAME}.deb
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
> index d75346e..7ee2a86 100644
> --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -52,6 +52,6 @@ dpkg_runbuild() {
>   	export KBUILD_DEPENDS="${KBUILD_DEPENDS}"
>   	export KERNEL_DEBIAN_DEPENDS="${KERNEL_DEBIAN_DEPENDS}"
>   	export KERNEL_HEADERS_DEBIAN_DEPENDS="${KERNEL_HEADERS_DEBIAN_DEPENDS}"
> -
> -	sudo -E chroot ${BUILDCHROOT_DIR} /build-kernel.sh ${PP}/${PPS} ${DISTRO_ARCH}
> +	export DEB_HOST_ARCH="${DISTRO_ARCH}"
> +	sudo -E chroot ${BUILDCHROOT_DIR} /build-kernel.sh ${PP}/${PPS}
>   }
> 


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux