From 9bd640e3f01b79fb9154a137dca58a6d35376676 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Mon, 22 Dec 2014 01:07:49 +0100 Subject: [PATCH 1/2] Adapted to new building system - Avoid installing packages and using system files --- helpers/make-debian-installer | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index e28a3c1..aa82382 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -21,21 +21,6 @@ VERSION=3 NETINST=true . ./config -cat << EOF > /etc/apt/sources.list -deb $DEVELMIRROR $CODENAME main -deb-src $DEVELMIRROR $CODENAME main -deb $LOCALMIRROR $CODENAME main -deb $LOCALMIRROR $CODENAME-updates main -deb-src $LOCALMIRROR $CODENAME main -deb-src $LOCALMIRROR $CODENAME-updates main -deb-src $MIRROR $UPSTREAM main -deb-src $MIRROR $UPSTREAM-updates main -deb-src $MIRROR $UPSTREAM-security main -EOF - -apt-get update - -apt-get install trisquel-keyring find build/pkg-lists -type f | xargs sed -i /media-retriever/d @@ -78,5 +63,3 @@ rpl ubuntu-archive-keyring trisquel-archive-keyring . -R changelog "Rebranded and adapted for Trisquel" compile -cp build/tmp/netboot/mini.iso build/tmp/netboot/initrd.gz /root/ -cp build/dest/cdrom/vmlinuz /root/ From 3468ba93acc1e0781a482d512c16758d20b0cbe0 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Mon, 22 Dec 2014 01:24:57 +0100 Subject: [PATCH 2/2] Replaced build-dependency shim-signed with shim shim-signed is not avaliable in Trisquel --- helpers/make-debian-installer | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index aa82382..ec0b500 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -30,6 +30,8 @@ sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common +sed -i 's/shim-signed/shim/g' debian/control + cp $DATA/splash.png build/boot/x86/pics/trisquel.png sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg