On Wed, Apr 09, 2025 at 05:37:00PM +0100, Andrew Cooper wrote: > ... in preparation to use it for arm64 too. Rename the script. > > Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
Reviewed-by: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
> ---
> CC: Roger Pau Monné <roger....@citrix.com>
> CC: Stefano Stabellini <sstabell...@kernel.org>
> CC: Michal Orzel <michal.or...@amd.com>
> CC: Marek Marczykowski-Górecki <marma...@invisiblethingslab.com>
> CC: Anthony PERARD <anthony.per...@vates.tech>
> ---
> .gitlab-ci.yml | 3 +-
> ...{x86_64-kernel-linux.sh => build-linux.sh} | 34 +++++++++++++------
> 2 files changed, 24 insertions(+), 13 deletions(-)
> rename scripts/{x86_64-kernel-linux.sh => build-linux.sh} (55%)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 5a0a853e551d..ff8dce7be05d 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -31,8 +31,7 @@ stages:
> #
> x86_64-kernel-linux-6.6.56:
> extends: .x86_64-artifacts
> - script:
> - - . scripts/x86_64-kernel-linux.sh
> + script: ./scripts/build-linux.sh
> variables:
> LINUX_VERSION: 6.6.56
>
> diff --git a/scripts/x86_64-kernel-linux.sh b/scripts/build-linux.sh
> similarity index 55%
> rename from scripts/x86_64-kernel-linux.sh
> rename to scripts/build-linux.sh
> index 5a0160655bea..5e25e958c0f3 100755
> --- a/scripts/x86_64-kernel-linux.sh
> +++ b/scripts/build-linux.sh
> @@ -9,6 +9,7 @@ set -ex -o pipefail
>
> WORKDIR="${PWD}"
> COPYDIR="${WORKDIR}/binaries/"
> +UNAME=$(uname -m)
>
> # Build Linux
> MAJOR=${LINUX_VERSION%%.*}
> @@ -16,17 +17,28 @@ curl -fsSLO \
>
> https://cdn.kernel.org/pub/linux/kernel/v"${MAJOR}".x/linux-"${LINUX_VERSION}".tar.xz
> tar oxf linux-"${LINUX_VERSION}".tar.xz
> cd linux-"${LINUX_VERSION}"
> -make ARCH=x86 defconfig
> -make ARCH=x86 xen.config
> +
> +make defconfig
> ./scripts/config --enable BRIDGE
> ./scripts/config --enable IGC
> ./scripts/config --enable TUN
> -cp .config .config.orig
> -cat .config.orig \
> - | grep 'XEN' \
> - | grep '=m' \
> - | sed 's/=m/=y/g' \
> - >> .config
> -make ARCH=x86 olddefconfig
> -make -s -j "$(nproc)" ARCH=x86
> -cp arch/x86/boot/bzImage "${COPYDIR}"
> +
> +case $UNAME in
> + x86_64)
> + make xen.config
> + cp .config .config.orig
> + cat .config.orig \
> + | grep 'XEN' \
> + | grep '=m' \
> + | sed 's/=m/=y/g' >> .config
> + ;;
> +esac
> +
> +make olddefconfig
> +
> +case $UNAME in
> + x86_64)
> + make -j$(nproc) bzImage
> + cp arch/x86/boot/bzImage "${COPYDIR}"
> + ;;
> +esac
> --
> 2.39.5
>
--
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
signature.asc
Description: PGP signature
