diff options
| author | Matt Housh <jaeger@crux.ninja> | 2015-09-29 13:26:25 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.ninja> | 2015-09-29 13:26:25 -0500 |
| commit | c19189fc2f826a69c7c053946899b3f5c155232c (patch) | |
| tree | 2a72e9ea0986a7974f78cbbcd8e2cb0b76d28a85 | |
| parent | d6b758ee9d10cb4fc82c045c117b87c0bfb6b9e6 (diff) | |
| download | iso-c19189fc2f826a69c7c053946899b3f5c155232c.tar.gz iso-c19189fc2f826a69c7c053946899b3f5c155232c.tar.xz | |
Switched back to prebuilt syslinux, removed tcp_wrappers from ISO package list3.2-rc1
| -rw-r--r-- | Makefile | 34 |
1 files changed, 27 insertions, 7 deletions
@@ -11,6 +11,7 @@ KERNEL_VERSION = 4.1.8 KERNEL_PATCHES = BB_VERSION = 1.22.1 MEMTEST_VERSION = 5.01 +SYSLINUX_VERSION = 6.03 PKG_EXT = pkg.tar.xz PKGMK_CONF = $(PWD)/pkgmk.conf PORTS_DIR = $(PWD)/ports @@ -28,7 +29,7 @@ ISO_PACKAGES = filesystem bash dash coreutils bzip2 e2fsprogs jfsutils \ util-linux vim which dialog nano mdadm pciutils libusb libusb-compat \ sysfsutils usbutils eudev zlib openssl openssh \ dhcpcd wget iproute2 libpcre iputils libgmp libdevmapper lvm2 \ - attr acl libcap tcp_wrappers btrfs-progs lzo parted xz \ + attr acl libcap btrfs-progs lzo parted xz \ efibootmgr gnu-efi libmpfr dosfstools PORTS_core = $(shell /bin/ls -I README $(PORTS_DIR)/core) @@ -49,7 +50,7 @@ endif .PHONY: help check-root check-log $(COLLECTIONS) all all-chroot bootstrap \ initramfs kernel-clean clean iso \ - busybox-clean initramfs-clean memtest-clean \ + busybox-clean initramfs-clean memtest-clean syslinux-clean \ grub2-efi grub2-efi-clean grub2-efi-distclean help: @@ -170,6 +171,25 @@ memtest-distclean: memtest-clean +# syslinux +iso/syslinux-$(SYSLINUX_VERSION).tar.xz: + cd iso && wget https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-$(SYSLINUX_VERSION).tar.xz + +iso/syslinux-$(SYSLINUX_VERSION): iso/syslinux-$(SYSLINUX_VERSION).tar.xz + tar -C iso -Jxf iso/syslinux-$(SYSLINUX_VERSION).tar.xz + +iso/syslinux-$(SYSLINUX_VERSION)/bios/core/isolinux.bin: iso/syslinux-$(SYSLINUX_VERSION) + +syslinux: iso/syslinux-$(SYSLINUX_VERSION)/bios/core/isolinux.bin + +syslinux-clean: + rm -rf iso/syslinux-$(SYSLINUX_VERSION) + +syslinux-distclean: syslinux-clean + rm -f iso/syslinux-$(SYSLINUX_VERSION).tar.xz + + + clean: kernel-clean busybox-clean initramfs-clean grub2-efi-clean @rm -rf tmp modules_install.log $(ISO_FILENAME) \ `basename $(ISO_FILENAME) .iso`.md5 @@ -387,13 +407,13 @@ image-base: check-root kernel initramfs rootfs setup.dependencies iso/efiboot.im ##### iso image building ##### -iso: image-base memtest +iso: image-base memtest syslinux @echo "Copying ISO specific files" @mkdir -p $(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/; \ + @cp iso/syslinux-$(SYSLINUX_VERSION)/bios/core/isolinux.bin $(IMG_ROOT_DIR)/boot/isolinux/ + @cp iso/syslinux-$(SYSLINUX_VERSION)/bios/com32/elflink/ldlinux/ldlinux.c32 $(IMG_ROOT_DIR)/boot/isolinux/ + @for F in hdt/hdt.c32 libutil/libutil.c32 gpllib/libgpl.c32 lib/libcom32.c32 cmenu/libmenu/libmenu.c32; do \ + cp iso/syslinux-$(SYSLINUX_VERSION)/bios/com32/$$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 \ |