diff options
| author | Matt Housh <jaeger@morpheus.net> | 2014-02-13 09:09:58 -0600 |
|---|---|---|
| committer | Matt Housh <jaeger@morpheus.net> | 2014-02-13 09:09:58 -0600 |
| commit | 504807f712fecfb71a1e5c5076b804e184234f13 (patch) | |
| tree | 1c91c85ae1d5d88248bba242f85b94540f68b145 /Makefile | |
| parent | 22481f11da4f25cc5dc4f2679d250a563ebdde35 (diff) | |
| download | iso-504807f712fecfb71a1e5c5076b804e184234f13.tar.gz iso-504807f712fecfb71a1e5c5076b804e184234f13.tar.xz | |
More updates in preparation for 3.1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
@@ -3,13 +3,13 @@ # Copyright (c) 2003-2005 Per Liden <per@fukt.bth.se> # -CRUXVERSION = 3.0 -CUSTOMVERSION = +CRUXVERSION = 3.1 +CUSTOMVERSION = -$(shell date +%Y%m%d) COLLECTIONS = core opt xorg KERNEL_MIRROR = http://www.kernel.org -KERNEL_VERSION = 3.7.10 +KERNEL_VERSION = 3.10.28 KERNEL_PATCHES = -BB_VERSION = 1.20.2 +BB_VERSION = 1.22.1 SYSLINUX_VERSION = 4.04 GRUB2_VERSION = 2.00 MEMTEST_VERSION = 4.20 @@ -30,7 +30,8 @@ ISO_PACKAGES = filesystem bash coreutils bzip2 e2fsprogs jfsutils \ util-linux vim which dialog nano mdadm pciutils libusb libusb-compat \ sysfsutils usbutils udev zlib openssl openssh \ dhcpcd wget iproute2 libpcre iputils libgmp libdevmapper lvm2 \ - attr acl libcap tcp_wrappers btrfs-progs parted xz + attr acl libcap tcp_wrappers btrfs-progs parted xz \ + efibootmgr gnu-efi PORTS_core = $(shell /bin/ls -I README $(PORTS_DIR)/core) PORTS_opt = $(shell /bin/cat packages.opt) @@ -81,7 +82,7 @@ check-log: # kernel kernel/linux-$(KERNEL_VERSION).tar.xz: - cd kernel && wget $(KERNEL_MIRROR)/pub/linux/kernel/v3.0/linux-$(KERNEL_VERSION).tar.xz + cd kernel && wget $(KERNEL_MIRROR)/pub/linux/kernel/v3.x/linux-$(KERNEL_VERSION).tar.xz kernel/linux-$(KERNEL_VERSION): kernel/linux-$(KERNEL_VERSION).tar.xz tar -C kernel -xJmf kernel/linux-$(KERNEL_VERSION).tar.xz @@ -112,7 +113,6 @@ busybox/busybox-$(BB_VERSION).tar.bz2: busybox/busybox-$(BB_VERSION): busybox/busybox-$(BB_VERSION).tar.bz2 @tar -C busybox -xjmf busybox/busybox-$(BB_VERSION).tar.bz2 - @(cd busybox/busybox-$(BB_VERSION) && patch -p1 -i ../busybox-$(BB_VERSION)-glibc-2.16.patch) busybox/busybox: busybox/busybox-$(BB_VERSION) @cp -f busybox/busybox-$(BB_VERSION).config busybox/busybox-$(BB_VERSION)/.config @@ -166,9 +166,8 @@ iso/grub-$(GRUB2_VERSION)/x86_64/grub2-x86_64.efi: iso/grub-$(GRUB2_VERSION) CFLAGS="-Wno-error" ../configure --with-platform=efi --target=x86_64 && \ make && \ cd grub-core && \ - ../grub-mkimage -d . -p '(cd0)/boot/grub' -o ../grub2-x86_64.efi \ - -O x86_64-efi '--prefix=(cd0)/boot/grub' \ - $(shell find *.mod | xargs | sed 's/.mod//g')) + ../grub-mkimage -c ../../../grub-early.cfg -d . -o ../grub2-x86_64.efi \ + -O x86_64-efi search search_fs_file normal configfile iso9660) iso/grub-$(GRUB2_VERSION)/i386/grub2-i386.efi: iso/grub-$(GRUB2_VERSION) (cd iso/grub-$(GRUB2_VERSION) && \ @@ -177,14 +176,13 @@ iso/grub-$(GRUB2_VERSION)/i386/grub2-i386.efi: iso/grub-$(GRUB2_VERSION) CFLAGS="-Wno-error" ../configure --with-platform=efi --target=i386 && \ make && \ cd grub-core && \ - ../grub-mkimage -d . -p '(cd0)/boot/grub' -o ../grub2-i386.efi \ - -O i386-efi '--prefix=(cd0)/boot/grub' \ - $(shell find *.mod | xargs | sed 's/.mod//g')) + ../grub-mkimage -c ../../../grub-early.cfg -d . -o ../grub2-i386.efi \ + -O i386-efi search search_fs_file normal configfile iso9660) grub2-efi: iso/grub-$(GRUB2_VERSION)/x86_64/grub2-x86_64.efi iso/grub-$(GRUB2_VERSION)/i386/grub2-i386.efi iso/efiboot.img: grub2-efi - dd if=/dev/zero of=iso/efiboot.img bs=1M count=8 + dd if=/dev/zero of=iso/efiboot.img bs=1M count=2 mkdosfs -n CRUX-EFI iso/efiboot.img mkdir -p iso/efiboot mount -o loop iso/efiboot.img iso/efiboot @@ -223,7 +221,7 @@ memtest-distclean: memtest-clean -clean: kernel-clean busybox-clean syslinux-clean initramfs-clean +clean: kernel-clean busybox-clean syslinux-clean initramfs-clean grub2-efi-clean @rm -rf tmp modules_install.log $(ISO_FILENAME) \ `basename $(ISO_FILENAME) .iso`.md5 |