diff options
| author | Matt Housh <jaeger@crux.ninja> | 2017-02-11 12:13:46 -0600 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.ninja> | 2017-02-11 12:13:46 -0600 |
| commit | ee0cc3096f1ba5c1ce9c3071f1a4720b7fba8861 (patch) | |
| tree | dd148a53d38264605ae63428bbb84ff1385fc54c /Makefile | |
| parent | e166850be2fa5ece1ee4c230ccc24622b601ff21 (diff) | |
| download | iso-ee0cc3096f1ba5c1ce9c3071f1a4720b7fba8861.tar.gz iso-ee0cc3096f1ba5c1ce9c3071f1a4720b7fba8861.tar.xz | |
Updated kernel to 4.9.6, added libinput and xorg-xf86-input-libinput, updated packages.{opt,xorg} and iso/setup.dependencies
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -6,10 +6,10 @@ CRUXVERSION = 3.3 CUSTOMVERSION = COLLECTIONS = core opt xorg -KERNEL_MIRROR = http://www.kernel.org -KERNEL_VERSION = 4.4.30 +KERNEL_MIRROR = https://cdn.kernel.org +KERNEL_VERSION = 4.9.6 KERNEL_PATCHES = -BB_VERSION = 1.22.1 +BB_VERSION = 1.25.1 MEMTEST_VERSION = 5.01 SYSLINUX_VERSION = 6.03 PKG_EXT = pkg.tar.xz @@ -31,7 +31,8 @@ ISO_PACKAGES = filesystem bash dash coreutils bzip2 e2fsprogs jfsutils \ dhcpcd wget iproute2 libpcre iputils libgmp libdevmapper lvm2 \ attr acl libcap btrfs-progs lzo parted xz \ efibootmgr efivar gnu-efi libmpfr dosfstools \ - libgcrypt libgpg-error popt cryptsetup start-stop-daemon + libgcrypt libgpg-error popt cryptsetup start-stop-daemon \ + linux-firmware wpa_supplicant dbus libnl wireless-tools PORTS_core = $(shell /bin/ls -I README $(PORTS_DIR)/core) PORTS_opt = $(shell /bin/cat packages.opt) @@ -294,7 +295,7 @@ rootfs: kernel busybox @for PACKAGE in $(ISO_PACKAGES); do \ bsdtar -C $(ROOTFS_DIR) -xpf $(PORTS_DIR)/*/$$PACKAGE/$$PACKAGE\#*.$(PKG_EXT); \ done - @sed -i -e 's/^#PermitRootLogin yes/PermitRootLogin yes/' \ + @sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' \ $(ROOTFS_DIR)/etc/ssh/sshd_config @echo "- Installing kernel and modules..." @cp kernel/linux-$(KERNEL_VERSION)/System.map $(ROOTFS_DIR)/boot/System.map @@ -436,7 +437,7 @@ iso: image-base memtest syslinux -c boot/isolinux/isolinux.boot -no-emul-boot -boot-load-size 4 \ -boot-info-table \ -eltorito-alt-boot -e boot/efiboot.img -no-emul-boot \ - -sort /tmp/iso.sort -o "$(ISO_FILENAME)" $(IMG_ROOT_DIR) + -sort /tmp/iso.sort -input-charset utf-8 -o "$(ISO_FILENAME)" $(IMG_ROOT_DIR) @isohybrid -u $(ISO_FILENAME) @md5sum `basename $(ISO_FILENAME)` > `basename $(ISO_FILENAME) .iso`.md5 @rm /tmp/iso.sort |