manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix git installer build for arm64

This commit is contained in:
Roland Clobus 2024-08-01 20:05:21 +02:00
parent 22c48e92be
commit a05946d32c
No known key found for this signature in database
GPG Key ID: 62C57C6AA61495BD
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build/installer_debian-installer
View File

@ -265,8 +265,20 @@ case "${LB_DERIVATIVE}" in
Check_package chroot /usr/bin/gcc gcc Check_package chroot /usr/bin/gcc gcc
Install_packages Install_packages
# Set architecture-specific variables
case "${LB_ARCHITECTURE}" in
arm64)
TARGETS="build_cdrom_gtk build_cdrom_grub"
;;
*)
TARGETS="build_cdrom_gtk build_cdrom_isolinux"
;;
esac
# These variables do not need to be passed inside the chroot, they can be resolved earlier: # These variables do not need to be passed inside the chroot, they can be resolved earlier:
# SOURCE_DATE_EPOCH, _QUIET, LB_PARENT_MIRROR_CHROOT, LB_PARENT_DISTRIBUTION_CHROOT # SOURCE_DATE_EPOCH, _QUIET, LB_PARENT_MIRROR_CHROOT, LB_PARENT_DISTRIBUTION_CHROOT
# TARGETS
cat << EOF > chroot/buildit.sh cat << EOF > chroot/buildit.sh
#!/bin/sh #!/bin/sh
# Get the version of the git repo that matches SOURCE_DATE_EPOCH # Get the version of the git repo that matches SOURCE_DATE_EPOCH
@ -319,7 +331,7 @@ fi
# USE_UDEBS_FROM -> use the same distribution as the chroot # USE_UDEBS_FROM -> use the same distribution as the chroot
# ROOTCMD -> Workaround for #1058994. Fakeroot is not present in the chroot (and not required) # ROOTCMD -> Workaround for #1058994. Fakeroot is not present in the chroot (and not required)
export LINUX_KERNEL_ABI=\$(dpkg-query --showformat "\\\${db:Status-Abbrev} \\\${Package}\n" --show linux-image-* | awk '\$1=="ii" { c = split(\$2, a, "-"); if (c>3) { if (a[4] ~ /^[0-9]+/) { print a[3] "-" a[4] } else { print a[3] } } }' | sort | tail -1) export LINUX_KERNEL_ABI=\$(dpkg-query --showformat "\\\${db:Status-Abbrev} \\\${Package}\n" --show linux-image-* | awk '\$1=="ii" { c = split(\$2, a, "-"); if (c>3) { if (a[4] ~ /^[0-9]+/) { print a[3] "-" a[4] } else { print a[3] } } }' | sort | tail -1)
MIRROR="[check-valid-until=no] ${LB_PARENT_MIRROR_CHROOT}" TARGETS="build_cdrom_gtk build_cdrom_isolinux" USE_UDEBS_FROM=${LB_PARENT_DISTRIBUTION_CHROOT} ROOTCMD=" " bash ./daily-build build-only MIRROR="[check-valid-until=no] ${LB_PARENT_MIRROR_CHROOT}" TARGETS="${TARGETS}" USE_UDEBS_FROM=${LB_PARENT_DISTRIBUTION_CHROOT} ROOTCMD=" " bash ./daily-build build-only
EOF EOF
Chroot chroot "sh buildit.sh" Chroot chroot "sh buildit.sh"
# Place the files in the cache. Download_file will use the cache instead of downloading # Place the files in the cache. Download_file will use the cache instead of downloading