Initial updates in preparation for CRUX 3.2 release

  - removed old syslinux from the Makefile, use the host system's
    syslinux instead
  - updated memtest86+ to version 5.01
  - added dash and dosfstools to the ISO environment
  - added HDT (hardware detection tool) to the boot options
  - updated various version strings for 3.2 (Makefile/setup/init/boot.msg)
  - updated setup-helper for 3.2
  - updated packages.opt:
    - removed gperf (moved to core)
    - added dosfstools, efivar, elilo, popt (for UEFI support)
    - added gstreamer, gst-plugins-base (new deps for firefox)

1 files changed, 25 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index 776327a..a249305 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,14 @@
 # Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se>
 #
 
-CRUXVERSION       = 3.1
+CRUXVERSION       = 3.2
 CUSTOMVERSION     =
 COLLECTIONS       = core opt xorg
 KERNEL_MIRROR     = http://www.kernel.org
 KERNEL_VERSION    = 4.0.6
 KERNEL_PATCHES    =
 BB_VERSION        = 1.22.1
-SYSLINUX_VERSION  = 4.04
-MEMTEST_VERSION   = 4.20
+MEMTEST_VERSION   = 5.01
 PKG_EXT           = pkg.tar.xz
 PKGMK_CONF        = $(PWD)/pkgmk.conf
 PORTS_DIR         = $(PWD)/ports
@@ -22,7 +21,7 @@ IMG_ROOT_DIR      = $(PWD)/tmp/img_root
 SRCISO_ROOT_DIR   = $(PWD)/tmp/srciso_root
 ISO_FILENAME      = $(PWD)/crux-$(CRUXVERSION)$(CUSTOMVERSION).iso
 SRCISO_FILENAME   = $(PWD)/crux-$(CRUXVERSION)$(CUSTOMVERSION)-source.iso
-ISO_PACKAGES      = filesystem bash coreutils bzip2 e2fsprogs jfsutils \
+ISO_PACKAGES      = filesystem bash dash coreutils bzip2 e2fsprogs jfsutils \
                     xfsprogs reiserfsprogs patch findutils glibc grep gzip kbd \
                     kmod less gawk ncurses inetutils pkgutils \
                     procps readline sed shadow sysklogd sysvinit tar \
@@ -30,7 +29,7 @@ ISO_PACKAGES      = filesystem bash coreutils bzip2 e2fsprogs jfsutils \
                     sysfsutils usbutils eudev zlib openssl openssh \
                     dhcpcd wget iproute2 libpcre iputils libgmp libdevmapper lvm2 \
                     attr acl libcap tcp_wrappers btrfs-progs lzo parted xz \
-                    efibootmgr gnu-efi libmpfr
+                    efibootmgr gnu-efi libmpfr dosfstools
 
 PORTS_core        = $(shell /bin/ls -I README $(PORTS_DIR)/core)
 PORTS_opt         = $(shell /bin/cat packages.opt)
@@ -49,7 +48,7 @@ PKGMK_DOWNLOAD=-d
 endif
 
 .PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap \
-	initramfs kernel-clean syslinux-clean clean iso \
+	initramfs kernel-clean clean iso \
 	busybox-clean initramfs-clean memtest-clean \
 	grub2-efi grub2-efi-clean grub2-efi-distclean
 
@@ -132,25 +131,6 @@ busybox-distclean: busybox-clean
 
 
 
-# isolinux
-iso/syslinux-$(SYSLINUX_VERSION).tar.gz:
-	cd iso && wget $(KERNEL_MIRROR)/pub/linux/utils/boot/syslinux/syslinux-$(SYSLINUX_VERSION).tar.gz
-
-iso/syslinux-$(SYSLINUX_VERSION): iso/syslinux-$(SYSLINUX_VERSION).tar.gz
-	tar -C iso -xzmf iso/syslinux-$(SYSLINUX_VERSION).tar.gz
-
-iso/syslinux-$(SYSLINUX_VERSION)/isolinux.bin: iso/syslinux-$(SYSLINUX_VERSION)
-
-syslinux: iso/syslinux-$(SYSLINUX_VERSION)/isolinux.bin
-
-syslinux-clean:
-	rm -rf iso/syslinux-$(SYSLINUX_VERSION)
-
-syslinux-distclean: syslinux-clean
-	rm -f iso/syslinux-$(SYSLINUX_VERSION).tar.gz
-
-
-
 # grub2-efi
 grub2-efi: /usr/bin/grub-mkimage
 	mkdir -p iso/EFI
@@ -190,11 +170,11 @@ memtest-distclean: memtest-clean
 
 
 
-clean: kernel-clean busybox-clean syslinux-clean initramfs-clean grub2-efi-clean
+clean: kernel-clean busybox-clean initramfs-clean grub2-efi-clean
 	@rm -rf tmp modules_install.log $(ISO_FILENAME) \
 		`basename $(ISO_FILENAME) .iso`.md5
 
-distclean: clean kernel-distclean syslinux-distclean setup.dependencies-clean
+distclean: clean kernel-distclean setup.dependencies-clean
 
 $(COLLECTIONS): check-root
 	@for p in $(PORTS_$(@)); do \
@@ -332,11 +312,13 @@ rootfs-clean:
 iso/setup.dependencies: packages.opt packages.xorg
 	@echo "Creating iso/setup.dependencies ..."
 	@for PORT in $(foreach c,$(COLLECTIONS),$(PORTS_$(c))); do \
-		echo -n $$PORT": "; \
-		prt-get \
-			--no-std-config \
-			$(foreach c,$(COLLECTIONS),--config-append="prtdir $(PORTS_DIR)/$(c)") \
-			quickdep $$PORT; \
+		if [ "$$PORT" != "COPYING" -a "$$PORT" != "COPYRIGHT" ]; then \
+			echo -n $$PORT": "; \
+			prt-get \
+				--no-std-config \
+				$(foreach c,$(COLLECTIONS),--config-append="prtdir $(PORTS_DIR)/$(c)") \
+				quickdep $$PORT; \
+		fi; \
 	done > $@
 	
 setup.dependencies: iso/setup.dependencies packages.all check-deps
@@ -349,7 +331,9 @@ setup.dependencies-clean:
 packages.all: packages.opt packages.xorg
 	@echo "Writing file packages.all ..."
 	@for PORT in $(foreach c,$(COLLECTIONS),$(PORTS_$(c))); do \
-		echo $$PORT; \
+		if [ "$$PORT" != "COPYING" -a "$$PORT" != "COPYRIGHT" ]; then \
+			echo $$PORT; \
+		fi; \
 	done | sort > $@
 
 # here we check if we have a dep, listed in a Pkgfile, which we do not provide on the iso
@@ -366,7 +350,7 @@ check-portstree: packages.all
 
 
 ##### image building #####
-image-base: check-root kernel syslinux initramfs rootfs setup.dependencies iso/efiboot.img
+image-base: check-root kernel initramfs rootfs setup.dependencies iso/efiboot.img
 	@echo "Creating installation image base"
 	@if [ -e $(IMG_ROOT_DIR) ]; then rm -rf $(IMG_ROOT_DIR); fi
 	@mkdir -p $(IMG_ROOT_DIR)/boot
@@ -404,7 +388,12 @@ image-base: check-root kernel syslinux initramfs rootfs setup.dependencies iso/e
 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 /usr/share/syslinux/isolinux.bin $(IMG_ROOT_DIR)/boot/isolinux/
+	@cp /usr/share/syslinux/ldlinux.c32 $(IMG_ROOT_DIR)/boot/isolinux/
+	@for F in hdt.c32 libutil.c32 libgpl.c32 libcom32.c32 libmenu.c32; do \
+		cp /usr/share/syslinux/$$F $(IMG_ROOT_DIR)/boot/isolinux/; \
+	 done
+	@cp /usr/share/pci.ids $(IMG_ROOT_DIR)/boot/isolinux/
 	@cp iso/isolinux/isolinux.cfg iso/isolinux/*.msg \
 		$(IMG_ROOT_DIR)/boot/isolinux
 	@cp iso/isolinux/memtest86+-$(MEMTEST_VERSION).bin $(IMG_ROOT_DIR)/boot/isolinux/memtest86plus
@@ -430,7 +419,7 @@ iso: image-base memtest
 	@echo "Done: $(shell date)"
 
 
-source-iso: busybox-source packages.all iso/syslinux-$(SYSLINUX_VERSION).tar.gz kernel/linux-$(KERNEL_VERSION).tar.xz
+source-iso: busybox-source packages.all kernel/linux-$(KERNEL_VERSION).tar.xz
 	@echo "Creating ISO image with sources ($(SRCISO_FILENAME))"
 	@rm -rf $(SRCISO_ROOT_DIR)
 	@mkdir -p $(SRCISO_ROOT_DIR)/ports $(SRCISO_ROOT_DIR)/kernel $(SRCISO_ROOT_DIR)/misc
@@ -443,7 +432,6 @@ source-iso: busybox-source packages.all iso/syslinux-$(SYSLINUX_VERSION).tar.gz
 	done
 	@echo "- Copying misc sources"
 	@cp busybox/busybox-$(BB_VERSION).tar.bz2   $(SRCISO_ROOT_DIR)/misc
-	@cp iso/syslinux-$(SYSLINUX_VERSION).tar.gz $(SRCISO_ROOT_DIR)/misc
 	@echo "- Copying kernel and patches"
 	@cp kernel/linux-$(KERNEL_VERSION).tar.xz  $(SRCISO_ROOT_DIR)/kernel
 	@for PATCH in $(KERNEL_PATCHES); do cp kernel/$$PATCH $(SRCISO_ROOT_DIR)/kernel; done