Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More fixups for arm64 CD builds 

* Actually put the kernel and initramfs on the CD (doh!)
 * Replace the %install% variables with real paths
This commit is contained in:
Steve McIntyre 2014-11-05 13:58:04 +00:00
parent 7c0db7034b
commit f256a86827
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
uncompressed versions from the output disc. Closes: #767253. Initial uncompressed versions from the output disc. Closes: #767253. Initial
patch from Michael Vogt - thanks! patch from Michael Vogt - thanks!
* Add 586 kernels to replace 486 for i386 CDs * Add 586 kernels to replace 486 for i386 CDs
* More tweaks for arm64 CD building
-- Steve McIntyre <93sam@debian.org> Wed, 29 Oct 2014 17:33:10 +0000 -- Steve McIntyre <93sam@debian.org> Wed, 29 Oct 2014 17:33:10 +0000

9
tools/boot/jessie/boot-arm64
View File

@ -65,6 +65,10 @@ for image in $BOOT_IMAGES; do
fi fi
done done
mkdir -p $CDDIR/$INSTALLDIR
cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
# Boot setup including config and help files comes from d-i. # Boot setup including config and help files comes from d-i.
mkdir -pv $PWD/boot$N mkdir -pv $PWD/boot$N
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx) cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx)
@ -127,6 +131,11 @@ if [ -d boot$N/grub ] ; then
fi fi
else else
echo " No EFI boot code for $ARCH on CD$N" echo " No EFI boot code for $ARCH on CD$N"
# Finally, belt and braces - fix up the %install% entries in grub
# in case they're still there
sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg
fi fi
# th,th, thats all # th,th, thats all