Petter Reinholdtsen wrote: > Where is this patch? Is it commited? Sorry, I forgot to attach it. (Luckily only the diff was in /tmp, not the files...) Thus, I don't think it's commited. Cheers T.
--- build/Makefile~ Sat Jun 14 17:18:20 2003
+++ build/Makefile Sat Jun 14 17:20:46 2003
@@ -49,7 +49,7 @@
pkg-lists/base \
pkg-lists/$(TYPE)/common \
`if [ -f pkg-lists/$(TYPE)/$(DEB_HOST_ARCH) ]; then echo pkg-lists/$(TYPE)/$(DEB_HOST_ARCH); fi` \
- | sed -e 's/^\(.*\)$${kernel:Version}\(.*\)$$/$(foreach VERSION,$(KERNELIMAGEVERSION),\1$(VERSION)\2\n)/g' \
+ | sed -e 's/^\(.*\)$${kernel:Version}\(.*\)$$/$(foreach VERSION,$(KERNELIMAGEVERSION),\1$(VERSION)\2 )/g' \
) $(EXTRAS)
# Scratch directory.
BASE_TMP=./tmp/
--- build/make/arch/linux-i386.orig Sat Jun 14 11:13:58 2003
+++ build/make/arch/linux-i386 Sat Jun 14 17:34:51 2003
@@ -8,33 +8,13 @@
dd if=/dev/zero of=$@.new bs=1k count=$(FLOPPY_SIZE)
mkfs.msdos -i deb00001 -n 'Debian Installer' -C $@.new $(FLOPPY_SIZE)
-ifdef USER_MOUNT_HACK
- ln -sf `pwd`/$@.new $(USER_MOUNT_HACK)
- mount $(TMP_MNT)
-else
- mount -t vfat -o loop $@.new $(TMP_MNT)
-endif
-
- # syslinux is used to make the floppy bootable.
- if $(foreach NAME,$(KERNELNAME), \
- cp -f $(TEMP)/$(NAME) $(TMP_MNT)/linux) \
- && cp $(INITRD) $(TMP_MNT)/initrd.gz \
- && cp syslinux.cfg $(TMP_MNT)/ \
- && todos $(TMP_MNT)/syslinux.cfg ; \
- then \
- umount $(TMP_MNT) ; \
- true ; \
- else \
- umount $(TMP_MNT) ; \
- false ; \
- fi
-
-ifdef USER_MOUNT_HACK
- syslinux $(SYSLINUX_OPTS) $(USER_MOUNT_HACK)
- rm -f $(USER_MOUNT_HACK)
-else
+ # syslinux is used to make the floppy bootable
+ $(foreach NAME,$(KERNELNAME), \
+ mcopy -i$@.new $(TEMP)/$(NAME) ::\linux \
+ && mcopy -i$@.new $(INITRD) ::\initrd.gz \
+ && todos < syslinux.cfg | \
+ mcopy -i$@.new - ::\syslinux.cfg)
syslinux $(SYSLINUX_OPTS) $@.new
-endif
# Finalize the image.
mv $@.new $@
@@ -49,4 +29,3 @@
cd_image: cd_content
mkisofs -r -J -b `basename $(IMAGE)` -o $(TYPE).iso $(DEST)
mv $(TYPE).iso $(DEST)
-
Attachment:
pgp4RVGpQhyCn.pgp
Description: PGP signature