diff options
| author | Matt Housh <jaeger@crux.nu> | 2010-09-17 15:04:55 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2010-09-17 15:04:55 -0500 |
| commit | 65d94396868668d057e352e8159069182b895d5c (patch) | |
| tree | 6258e55b66ff0b89d21f1dd3c7b58e1e3fdfef03 /Makefile | |
| parent | 960dfb2d314cd0101351fb21578c182578444930 (diff) | |
| download | iso-65d94396868668d057e352e8159069182b895d5c.tar.gz iso-65d94396868668d057e352e8159069182b895d5c.tar.xz | |
Updated busybox, removed deprecated IDE drivers, added MemTest86+ target, tweaks/fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 33 |
1 files changed, 27 insertions, 6 deletions
@@ -9,8 +9,9 @@ COLLECTIONS = core opt xorg KERNEL_MIRROR = ftp://ftp.kernel.org KERNEL_VERSION = 2.6.35.4 KERNEL_PATCHES = -BB_VERSION = 1.16.2 +BB_VERSION = 1.17.2 SYSLINUX_VERSION = 3.86 +MEMTEST_VERSION = 4.10 SQUASHFS_VERSION = 4.0 PKG_EXT = pkg.tar.xz PKGMK_CONF = $(PWD)/pkgmk.conf @@ -48,7 +49,9 @@ else PKGMK_DOWNLOAD=-d endif -.PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap kernel kernel-clean syslinux syslinux-clean clean iso +.PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap \ + kernel kernel-clean syslinux syslinux-clean clean iso busybox-clean \ + unsquashfs-clean initramfs-clean memtest-clean help: @echo "CRUX Makefile" @@ -148,9 +151,26 @@ syslinux-distclean: +# memtest86+ +iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz: + cd iso/isolinux && wget http://www.memtest.org/download/$(MEMTEST_VERSION)/memtest86+-$(MEMTEST_VERSION).bin.gz + +iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin: iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz + zcat iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz > iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest: iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest-clean: + rm -f iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin + +memtest-distclean: memtest-clean + rm -f iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin.gz + + + # unsquashfs iso/squashfs$(SQUASHFS_VERSION).tar.gz: - cd iso && wget http://dl.sourceforge.net/sourceforge/squashfs/squashfs$(SQUASHFS_VERSION).tar.gz + cd iso && wget http://download.sourceforge.net/squashfs/squashfs$(SQUASHFS_VERSION).tar.gz iso/squashfs$(SQUASHFS_VERSION): iso/squashfs$(SQUASHFS_VERSION).tar.gz tar -C iso -xzmf iso/squashfs$(SQUASHFS_VERSION).tar.gz @@ -165,7 +185,7 @@ unsquashfs: iso/squashfs$(SQUASHFS_VERSION)/squashfs-tools/unsquashfs unsquashfs-clean: rm -rf iso/squashfs$(SQUASHFS_VERSION) -unsquashfs-distclean: +unsquashfs-distclean: unsquashfs-clean rm -f iso/squashfs$(SQUASHFS_VERSION).tar.gz @@ -380,12 +400,13 @@ image-base: check-root kernel syslinux initramfs squashfs setup.dependencies uns ##### iso image building ##### -iso: image-base +iso: image-base memtest @echo "Copying ISO specific files" @mkdir -p $(IMG_ROOT_DIR)/boot/isolinux @cp iso/syslinux-$(SYSLINUX_VERSION)/core/isolinux.bin $(IMG_ROOT_DIR)/boot/isolinux - @cp iso/isolinux/{isolinux.cfg,*.msg,memtest86plus} \ + @cp iso/isolinux/{isolinux.cfg,*.msg} \ $(IMG_ROOT_DIR)/boot/isolinux + @cp iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin $(IMG_ROOT_DIR)/boot/isolinux/memtest86plus @echo "- Creating ISO sort table" @echo "$(IMG_ROOT_DIR)/boot 100" > /tmp/iso.sort @echo "$(IMG_ROOT_DIR)/boot/isolinux 200" >> /tmp/iso.sort |