diff options
| author | Matt Housh <jaeger@crux.nu> | 2011-11-14 13:10:30 -0600 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2011-11-14 13:10:30 -0600 |
| commit | 4cb19e2f21a91f72bc437380159bb249d58f5883 (patch) | |
| tree | 66d2444dce2d7a888e0cff10e21c75bbfea64cc8 /Makefile | |
| parent | f13143fb80b3ad87de33b24a59a501fb9a0a435e (diff) | |
| download | iso-4cb19e2f21a91f72bc437380159bb249d58f5883.tar.gz iso-4cb19e2f21a91f72bc437380159bb249d58f5883.tar.xz | |
Preliminary updates for possible 2.7.1 release
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -7,11 +7,11 @@ CRUXVERSION = 2.7 CUSTOMVERSION = COLLECTIONS = core opt xorg KERNEL_MIRROR = ftp://ftp.kernel.org -KERNEL_VERSION = 2.6.35.6 +KERNEL_VERSION = 2.6.39.4 KERNEL_PATCHES = BB_VERSION = 1.17.2 -SYSLINUX_VERSION = 3.86 -MEMTEST_VERSION = 4.10 +SYSLINUX_VERSION = 4.04 +MEMTEST_VERSION = 4.20 SQUASHFS_VERSION = 4.0 PKG_EXT = pkg.tar.xz PKGMK_CONF = $(PWD)/pkgmk.conf @@ -50,8 +50,8 @@ PKGMK_DOWNLOAD=-d endif .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 + kernel kernel-clean syslinux syslinux-clean clean iso busybox \ + busybox-clean unsquashfs-clean initramfs-clean memtest-clean help: @echo "CRUX Makefile" @@ -200,7 +200,7 @@ distclean: clean kernel-distclean syslinux-distclean setup.dependencies-clean $(COLLECTIONS): check-root @for p in $(PORTS_$(@)); do \ echo "port: $$p"; \ - (cd $(PORTS_DIR)/$@/$$p && pkgmk $(PKGMK_DOWNLOAD) $(PKGMK_FORCE)); \ + (cd $(PORTS_DIR)/$@/$$p && pkgmk -cf $(PKGMK_CONF) $(PKGMK_DOWNLOAD) $(PKGMK_FORCE)); \ done all: $(COLLECTIONS) @@ -319,7 +319,7 @@ squashfs: kernel busybox @ldconfig -r $(SQUASHFS_DIR) @cp iso/bin/{setup,setup-helper,setup-chroot,net-setup,net-setup-helper,serial_console} $(SQUASHFS_DIR)/usr/bin @mkdir -p squashfs - @mksquashfs $(SQUASHFS_DIR) squashfs/crux.squashfs -noappend -e usr/bin/net-setup -e usr/bin/net-setup-helper &> /dev/null + @mksquashfs $(SQUASHFS_DIR) squashfs/crux.squashfs -noappend &> /dev/null @mksquashfs $(SQUASHFS_DIR) squashfs/crux.squashfs-net -noappend -e usr/bin/setup -e usr/bin/setup-helper &> /dev/null squashfs-clean: @@ -358,7 +358,7 @@ check-deps: packages.all iso/setup.dependencies { for (p=2; p<=NF; p++) { if ( ! ($$p in pkgs)) { printf(" * %s %s\n", $$1, $$p) }}} \ ' iso/setup.dependencies -# check for duplicate, missing and orpahn packages in the ports tree +# check for duplicate, missing and orphan packages in the ports tree check-portstree: packages.all @cd $(PORTS_DIR) && ./checkportstree |