diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
| commit | f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch) | |
| tree | 2b1e7628b5bad58c4b4065b9de30321bd02ff502 /fs/iso9660/iso9660.mk | |
| parent | b10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff) | |
| parent | 7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff) | |
| download | buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.gz buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.zip | |
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts:
target/Makefile.in
Diffstat (limited to 'fs/iso9660/iso9660.mk')
| -rw-r--r-- | fs/iso9660/iso9660.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 66e2de20b..6f60893a4 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -15,14 +15,14 @@ ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y) ISO9660_OPTS+=-U endif -$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub +$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot linux26 ext2-root grub @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660") mkdir -p $(ISO9660_TARGET_DIR) mkdir -p $(ISO9660_TARGET_DIR)/boot/grub cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst - cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel - cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd + cp $(LINUX26_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel + cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd # Use fakeroot to pretend all target binaries are owned by root rm -f $(FAKEROOT_SCRIPT) touch $(BUILD_DIR)/.fakeroot.00000 |