From 4eac9b497159c9e2954bfc91f376e01b1ec610a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Wed, 30 Nov 2022 16:32:17 +0000 Subject: [PATCH] debian-installer: initial build for aramo release. --- .../remove-proposed-updates.patch | 62 ++ helpers/DATA/debian-installer/splash.png | Bin 8776 -> 0 bytes helpers/DATA/debian-installer/splash.rle | Bin 9748 -> 0 bytes helpers/DATA/debian-installer/splash.svg | 557 ++++++++++++++++++ helpers/config | 2 +- helpers/make-debian-installer | 85 ++- 6 files changed, 694 insertions(+), 12 deletions(-) create mode 100644 helpers/DATA/debian-installer/remove-proposed-updates.patch delete mode 100644 helpers/DATA/debian-installer/splash.png delete mode 100644 helpers/DATA/debian-installer/splash.rle create mode 100644 helpers/DATA/debian-installer/splash.svg diff --git a/helpers/DATA/debian-installer/remove-proposed-updates.patch b/helpers/DATA/debian-installer/remove-proposed-updates.patch new file mode 100644 index 0000000..b6a8b96 --- /dev/null +++ b/helpers/DATA/debian-installer/remove-proposed-updates.patch @@ -0,0 +1,62 @@ +diff -Nru source/build/Makefile source_no_proposed/build/Makefile +--- source/build/Makefile 2022-10-20 08:22:18.334230755 -0500 ++++ source_no_proposed/build/Makefile 2022-10-20 08:25:19.346634640 -0500 +@@ -636,7 +636,7 @@ + echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \ + fi \ + else \ +- gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES); \ ++ gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS); \ + if [ "$(USE_UNRELEASED)" = 1 ]; then \ + gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased $(UDEB_COMPONENTS); \ + fi \ +@@ -648,10 +648,6 @@ + echo "Using generated $@:"; \ + sed -n "/^[^#]/ s/^/ /p" $@; \ + fi +- @if [ "$(USE_PROPOSED_UPDATES)" = 1 ] && ! grep -q proposed-updates $@; then \ +- echo "ERROR: no valid source for $(USE_UDEBS_FROM)-proposed-updates"; \ +- exit 1; \ +- fi + + # Font generation. + # +diff -Nru source/build/util/gen-sources.list.udeb source_no_proposed/build/util/gen-sources.list.udeb +--- source/build/util/gen-sources.list.udeb 2022-09-06 15:55:12.000000000 -0500 ++++ source_no_proposed/build/util/gen-sources.list.udeb 2022-10-20 08:26:32.538801725 -0500 +@@ -8,7 +8,6 @@ + SOURCES_LIST=$1 + SUITE=$2 + UDEB_COMPONENTS=$3 +-USE_PROPOSED_UPDATES=$4 # optional + + # Set to 1 or 2 to see increasing debug info about mirror tests + # Use 0 for quiet (normal) operation +@@ -84,16 +83,8 @@ + else + echo "WARNING: mirror '$tmirror' appears to be invalid; skipping" >&2 + fi +- if [ "$USE_PROPOSED_UPDATES" = 1 ] && +- test_url $tmirror/dists/$SUITE-proposed-updates/Release; then +- echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS" +- echo "INFO: using '$tmirror' for $SUITE-proposed-updates" >&2 +- fi + else + echo "$mirror $SUITE $UDEB_COMPONENTS" +- if [ "$USE_PROPOSED_UPDATES" = 1 ]; then +- echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS" +- fi + fi + + done | perl -ne 'print unless $seen{$_}; $seen{$_}=1' +diff -Nru source/debian/rules source_no_proposed/debian/rules +--- source/debian/rules 2022-10-20 08:22:18.318230720 -0500 ++++ source_no_proposed/debian/rules 2022-10-20 08:26:53.702850378 -0500 +@@ -13,7 +13,6 @@ + BOOTMENU_BEEP=n + else + USE_UDEBS_FROM=aramo +-USE_PROPOSED_UPDATES=1 + TRANSSTATUS=translation-status + BOOTMENU_BEEP=y + endif diff --git a/helpers/DATA/debian-installer/splash.png b/helpers/DATA/debian-installer/splash.png deleted file mode 100644 index 5e16aa3d9f961110a88c14a0fefb921f9f178c29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8776 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 diff --git a/helpers/DATA/debian-installer/splash.rle b/helpers/DATA/debian-installer/splash.rle deleted file mode 100644 index 2c06d3bf8380dd9e32d598f10cff2d223cf46cf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9748 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 Bzj^=w diff --git a/helpers/DATA/debian-installer/splash.svg b/helpers/DATA/debian-installer/splash.svg new file mode 100644 index 0000000..58f49c3 --- /dev/null +++ b/helpers/DATA/debian-installer/splash.svg @@ -0,0 +1,557 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/helpers/config b/helpers/config index 5e30da6..a0c6525 100755 --- a/helpers/config +++ b/helpers/config @@ -46,7 +46,7 @@ export DOMAIN=trisquel.info export UPSTREAM=jammy export UPSTREAMRELEASE=22.04 MIRROR=http://archive.ubuntu.com/ubuntu -LOCALMIRROR=https://archive.trisquel.org/trisquel +LOCALMIRROR=http://archive.trisquel.org/trisquel LOCAL_APT=`mktemp -d` if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index 05d1f30..6a78f64 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -1,7 +1,7 @@ #!/bin/sh # # Copyright (C) 2009-2020 Ruben Rodriguez -# Copyright (C) 2021 Luis Guzman +# Copyright (C) 2022 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,15 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=9 +VERSION=10 +EXTERNAL='deb-src http://ftp.debian.org/debian stable main' +REPOKEY=648ACFD622F3D138 NETINST=true - . ./config +# Set complete name as BUILD_DATE +sed -i "/DATE=/s/ | cut -d '.' -f 1//" debian/rules + cat << EOF > ${LOCAL_APT}/etc/apt_${CODENAME}.conf Dir::State "${LOCAL_APT}/var/lib/apt"; Dir::State::status "${LOCAL_APT}/var/lib/dpkg/status"; @@ -43,13 +47,38 @@ EOF find build/pkg-lists -type f | xargs sed -i /media-retriever/d apt-get update -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf LASTKERNEL=$(apt-cache show -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3) -sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/amd64.cfg -sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/amd64.cfg +#sed -i "/# The version of the kernel to use./a BASEVERSION = $LASTKERNEL" ./build/config/amd64.cfg +#sed -i "s/^KERNELVERSION = .*/KERNELVERSION = \$(BASEVERSION)-generic/g" ./build/config/amd64.cfg +#sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/amd64.cfg +##Optional +#sed -i '/KERNELNAME = vmlinuz/a #KERNELIMAGEVERSION = $(KERNELVERSION)' ./build/config/amd64.cfg +for i in amd64 arm64 ppc64el +do +find build/config/ -name $i.cfg | xargs sed -i "/# The version of the kernel to use./a BASEVERSION = $LASTKERNEL" +find build/config/ -name $i.cfg | xargs sed -i "s/^KERNELVERSION = .*/KERNELVERSION = \$(BASEVERSION)-generic/g" +find build/config/ -name $i.cfg | xargs sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" +find build/config/ -name $i.cfg | xargs sed -i '/KERNELNAME = vmlinuz/a #KERNELIMAGEVERSION = $(KERNELVERSION)' +done -sed -i 's/shim-signed/shim/g' debian/control +##TODO: fix the EFI bootloader image +sed -i '/shim/s|signed|unsigned|g' debian/control +sed -i 's|grub-efi-amd64-signed|grub-efi-amd64-bin|' debian/control +sed -i 's|-signed||' debian/control +sed -i '/win32-loader/d' debian/control -cp $DATA/splash.png build/boot/x86/pics/trisquel.png -sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg +#use unsigned shim +grep -rl "efi\.signed" | xargs sed -i 's|efi\.signed|efi|g' +#adjust path and name files from debian to trisquel | $arch-bin efi file (/usr/lib/grub/x86_64-efi/monolithic/grubx64.efi) +sed -i 's|\$platform-signed/grub|\$platform/monolithic/grub|' build/util/efi-image +sed -i 's|\$efi_name-installer.efi|\$efi_name.efi|' build/util/efi-image +##EO-TODO + +rm -r build/boot/artwork/11-homeworld +mkdir build/boot/artwork/trisquel/ +cp $DATA/splash.svg build/boot/artwork/trisquel/trisquel.svg +sed -i 's|SPLASH_PNG=.*|SPLASH_PNG=boot/artwork/trisquel/trisquel.png|' build/config/x86.cfg +grep -rl 'vshift 8' build/boot | xargs sed -i '/vshift/s|8|12|g' +grep -rl 'rows 12' build/boot | xargs sed -i '/rows/s|12|10|g' cat << EOF > build/sources.list.udeb.local deb $LOCALMIRROR $CODENAME main/debian-installer @@ -59,11 +88,11 @@ EOF #firmware-linux-free-udeb is missing cat << EOF >> build/pkg-lists/netboot/common -open-ath9k-htc-firmware-udeb +#open-ath9k-htc-firmware-udeb openfwwf-udeb EOF -replace "2004-20.." "2004-20$(date +'%y')" . -R +rpl "2004-20.." "2004-20$(date +'%y')" . -R rpl www.ubuntu.com trisquel.info . -R rpl ubuntu.com trisquel.info build/boot/ -R rpl www.ubuntu trisquel build/boot/ -R @@ -78,9 +107,43 @@ rpl "Trisquel Ltd, and Rosetta" "Canonical Ltd, and Rosetta" . -R rpl ubuntu-keyring trisquel-keyring . -R rpl ubuntu-archive-keyring trisquel-archive-keyring . -R -sed -i 's/.*SIGNED_IMAGE="$(KERNELNAME_ALT_SUFFIX)".*/'$'\t''efi-image $(TEMP_GRUB_EFI) x86_64-efi x64/' build/config/x86.cfg build/config/arm64.cfg +rpl Debian Trisquel . -R +rpl DEBIAN TRISQUEL . -R +rpl http://ftp.debian.org/debian http://archive.trisquel.org/trisquel . -R +rpl http://www.debian.org/ https://trisquel.info build/boot/ -R +# Replace the debian release for the trisquel one. +rpl bullseye $CODENAME . -R +rpl debian-archive-keyring trisquel-keyring debian/control +rpl debian-ports-archive-keyring trisquel-keyring debian/control +rpl debian-archive-keyring.gpg trisquel-archive-keyring.gpg . -R +rpl debian-ports-archive-keyring.gpg trisquel-archive-keyring.gpg . -R +rpl debian-archive-keyring-udeb trisquel-keyring-udeb . -R +rpl debian-ports-archive-keyring-udeb trisquel-keyring-udeb . -R + +# build/config/common +grep -rl TRISQUEL_VERSION |xargs sed -i "s|TRISQUEL_VERSION =.*|TRISQUEL_VERSION = $REVISION ($CODENAME)|" + +# Disable proposed-updates patch +patch -p1 < $DATA/remove-proposed-updates.patch + +echo "# (Test) Remove gtk related packages, not looking for graphical installer" +rm $(find build/pkg-lists -type f -path "*/gtk/*") +echo "Remove unused modules from d-i pkg-list" +grep -rl acpi-modules- build/pkg-lists/ |xargs sed -i '/acpi-modules-/d' +grep -rl cdrom-core-modules- build/pkg-lists/ |xargs sed -i '/cdrom-core-modules-/d' +grep -rl cdebconf-gtk-entropy build/config/ | xargs sed -i 's/cdebconf-gtk-entropy//' + +#sed -i 's/.*SIGNED_IMAGE="$(KERNELNAME_ALT_SUFFIX)".*/'$'\t''efi-image $(TEMP_GRUB_EFI) x86_64-efi x64/' build/config/x86.cfg build/config/arm64.cfg /bin/sed -i '/KERNELNAME_ALT_SUFFIX = -$(KERNELVERSION)/d' build/config/*.cfg build/config/*/*.cfg +# Ensure that ld-linux is executable +sed '/ifdef KERNELVERSION/a\\tchmod 755 $(TREE)\/lib\/$(DEB_HOST_MULTIARCH)\/ld-linux*' -i build/Makefile + +# HACK: include liblzma.so and liblz4.so from host into iso image, as runtime dependencies of zstd +sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile +sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblz4.so* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile +sed -i '/Build-Depends:/a\\tliblzma5, liblz4-1,' debian/control + # Fix mini.iso boot on EFI systems sed 's|/debian|/trisquel|' -i ./build/util/efi-image sed 's|EFI/debian|EFI/trisquel|' -i ./build/config/arm.cfg ./build/config/x86.cfg