From 38eaebdd5747de1cf765bb2e602aa918b3b2b3b0 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 4 Oct 2019 14:20:23 -0700 Subject: [PATCH 1/2] begin to update for etiona --- helpers/make-debian-installer | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index da6a956..219b5e9 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -26,9 +26,6 @@ find build/pkg-lists -type f | xargs sed -i /media-retriever/d LASTKERNEL=$(apt-cache show linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3) /bin/sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/i386.cfg ./build/config/amd64.cfg sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/i386.cfg ./build/config/amd64.cfg -sed -i "/signed/d" ./build/config/amd64.cfg - -sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common sed -i 's/shim-signed/shim/g' debian/control @@ -62,6 +59,10 @@ rpl "Trisquel Ltd, and Rosetta" "Canonical Ltd, and Rosetta" . -R rpl ubuntu-keyring trisquel-keyring . -R rpl ubuntu-archive-keyring trisquel-archive-keyring . -R +/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*.cfg +/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*/*.cfg +/bin/sed -i '/efi.img/d' build/config/*.cfg + changelog "Rebranded and adapted for Trisquel" compile From 8cb7709c3435f9c379215fef7ed91982a1a56f56 Mon Sep 17 00:00:00 2001 From: Mason Hock Date: Fri, 4 Oct 2019 16:42:56 -0700 Subject: [PATCH 2/2] remove need for signed grub and kernel --- helpers/make-debian-installer | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index 219b5e9..b7d3019 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 NETINST=true . ./config @@ -59,9 +59,8 @@ rpl "Trisquel Ltd, and Rosetta" "Canonical Ltd, and Rosetta" . -R rpl ubuntu-keyring trisquel-keyring . -R rpl ubuntu-archive-keyring trisquel-archive-keyring . -R -/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*.cfg -/bin/sed -i '/KERNELNAME_ALT_SUFFIX/d' build/config/*/*.cfg -/bin/sed -i '/efi.img/d' build/config/*.cfg +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 changelog "Rebranded and adapted for Trisquel" compile