Re: Source for data/*/isolinux.bin?
On Tue, Nov 15, 2005 at 12:19:53PM +0000, Colin Watson wrote:
> Since I don't have CDs 2-5 for Ubuntu and since I wanted to use a newer
> version of isolinux, I made the attached change to the version of
> debian-cd we're using to make it just pull isolinux.bin out of
> syslinux.deb in the mirror, the same way we handle yaboot on powerpc.
Martin Michlmayr kindly pointed out that I forgot the attachment.
--
Colin Watson [cjwatson@debian.org]
* finding or making colin.watson@canonical.com--2005/debian-cd--ubuntu--0--patch-220
* finding or making colin.watson@canonical.com--2005/debian-cd--ubuntu--0--patch-221
* computing changeset
D data/dapper/.arch-ids/isolinux.bin.id
D data/dapper/isolinux.bin
A {arch}/debian-cd/debian-cd--ubuntu/debian-cd--ubuntu--0/colin.watson@canonical.com--2005/patch-log/patch-221
M tools/boot/dapper/boot-amd64
M tools/boot/dapper/boot-i386
* changeset report
* modified files
--- orig/tools/boot/dapper/boot-amd64
+++ mod/tools/boot/dapper/boot-amd64
@@ -85,7 +85,12 @@
if [ "$NN" = "1" ]; then
echo "Using ISOLINUX boot-disks image on CD$N"
mkdir -p boot$N/isolinux
- cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
+ SYSLINUXDEB="$($BASEDIR/tools/apt-selection cache show syslinux | \
+ grep ^Filename | awk '{print $2}')"
+ (ar p "$MIRROR/$SYSLINUXDEB" data.tar.gz | \
+ tar zxf - -C . ./usr/lib/syslinux/isolinux.bin)
+ mv usr/lib/syslinux/isolinux.bin boot$N/isolinux/
+ rm -rf usr
cp -lf cdrom/vmlinuz $CDDIR/install/
cp -lf cdrom/initrd.gz $CDDIR/install/
echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
--- orig/tools/boot/dapper/boot-i386
+++ mod/tools/boot/dapper/boot-i386
@@ -86,7 +86,12 @@
if [ "$NN" = "1" ]; then
echo "Using ISOLINUX boot-disks image on CD$N"
mkdir -p boot$N/isolinux
- cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
+ SYSLINUXDEB="$($BASEDIR/tools/apt-selection cache show syslinux | \
+ grep ^Filename | awk '{print $2}')"
+ (ar p "$MIRROR/$SYSLINUXDEB" data.tar.gz | \
+ tar zxf - -C . ./usr/lib/syslinux/isolinux.bin)
+ mv usr/lib/syslinux/isolinux.bin boot$N/isolinux/
+ rm -rf usr
cp -lf cdrom/vmlinuz $CDDIR/install/
cp -lf cdrom/initrd.gz $CDDIR/install/
echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
* added files
--- /dev/null
+++ mod/{arch}/debian-cd/debian-cd--ubuntu/debian-cd--ubuntu--0/colin.watson@canonical.com--2005/patch-log/patch-221
@@ -0,0 +1,13 @@
+Revision: debian-cd--ubuntu--0--patch-221
+Archive: colin.watson@canonical.com--2005
+Creator: Colin Watson <colin.watson@canonical.com>
+Date: Mon Nov 14 17:21:48 GMT 2005
+Standard-date: 2005-11-14 17:21:48 GMT
+Removed-files: data/dapper/.arch-ids/isolinux.bin.id
+ data/dapper/isolinux.bin
+Modified-files: tools/boot/dapper/boot-amd64
+ tools/boot/dapper/boot-i386
+New-patches: colin.watson@canonical.com--2005/debian-cd--ubuntu--0--patch-221
+Summary: extract isolinux.bin from syslinux.deb on the mirror rather than providing a version in our source tree
+Keywords:
+
* removed files
--- orig/data/dapper/.arch-ids/isolinux.bin.id
+++ /dev/null
@@ -1 +0,0 @@
-Colin Watson <colin.watson@canonical.com> Fri Oct 14 11:35:10 2005 5840.12
Binary files orig/data/dapper/isolinux.bin and /dev/null differ
Reply to: