CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfix-debian-installer' into 'belenos'

Browse source 
Bugfix debian installer

  Avoid using system files in helper and replaced shim-signed with shim

See merge request !13
This commit is contained in:
ruben 2014-12-22 21:48:23 +00:00
commit 8ca9495b06
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
helpers/make-debian-installer
View file

@ -21,21 +21,6 @@ VERSION=3
NETINST=true NETINST=true
. ./config . ./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 find build/pkg-lists -type f | xargs sed -i /media-retriever/d
@ -45,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 '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 cp $DATA/splash.png build/boot/x86/pics/trisquel.png
sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg
@ -78,5 +65,3 @@ rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
changelog "Rebranded and adapted for Trisquel" changelog "Rebranded and adapted for Trisquel"
compile compile
cp build/tmp/netboot/mini.iso build/tmp/netboot/initrd.gz /root/
cp build/dest/cdrom/vmlinuz /root/