diff options
| author | Matt Housh <jaeger@morpheus.net> | 2017-11-24 14:45:24 -0600 |
|---|---|---|
| committer | Matt Housh <jaeger@morpheus.net> | 2017-11-24 14:45:24 -0600 |
| commit | a8ad911bfbc53d1f9b64bc3112f120a0c92a3b3b (patch) | |
| tree | b62b01c5d31e4a21074957026635eb62d2378704 | |
| parent | d8f081e6af31df3fd5507d209a61a18bc2112a4f (diff) | |
| download | iso-a8ad911bfbc53d1f9b64bc3112f120a0c92a3b3b.tar.gz iso-a8ad911bfbc53d1f9b64bc3112f120a0c92a3b3b.tar.xz | |
Updated kernel to 4.9.61, added parallel kernel build, added rootfs-clean to clean target, added hacks script for bootstrap
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | hacks.sh | 7 | ||||
| -rw-r--r-- | kernel/linux-4.9.61.config (renamed from kernel/linux-4.9.6.config) | 12 | ||||
| -rw-r--r-- | kernel/linux-4.9.61.defconfig (renamed from kernel/linux-4.9.6.defconfig) | 2 |
4 files changed, 21 insertions, 7 deletions
@@ -7,7 +7,7 @@ CRUXVERSION = 3.3 CUSTOMVERSION = COLLECTIONS = core opt xorg KERNEL_MIRROR = https://cdn.kernel.org -KERNEL_VERSION = 4.9.6 +KERNEL_VERSION = 4.9.61 KERNEL_PATCHES = BB_VERSION = 1.25.1 MEMTEST_VERSION = 5.01 @@ -97,7 +97,7 @@ kernel/linux-$(KERNEL_VERSION)/arch/x86/boot/bzImage: kernel/linux-$(KERNEL_VERS make -C kernel/linux-$(KERNEL_VERSION) mrproper cp -f kernel/linux-$(KERNEL_VERSION).config kernel/linux-$(KERNEL_VERSION)/.config make -C kernel/linux-$(KERNEL_VERSION) oldconfig - make -C kernel/linux-$(KERNEL_VERSION) all + make -j$(shell nproc) -C kernel/linux-$(KERNEL_VERSION) all kernel: kernel/linux-$(KERNEL_VERSION)/arch/x86/boot/bzImage @@ -192,7 +192,7 @@ syslinux-distclean: syslinux-clean -clean: kernel-clean busybox-clean initramfs-clean grub2-efi-clean +clean: kernel-clean busybox-clean initramfs-clean grub2-efi-clean rootfs-clean @rm -rf tmp modules_install.log $(ISO_FILENAME) \ `basename $(ISO_FILENAME) .iso`.md5 @@ -258,6 +258,7 @@ all-chroot: check-root @rm -rf $(FAKE_ROOT_DIR) bootstrap: check-root kernel + $(shell $(PWD)/hacks.sh) @echo "Bootstrap started (`date +'%F %T'`)" @echo "- Stage 0 (`date +'%F %T'`)" @$(MAKE) all > log.stage0 2>&1 diff --git a/hacks.sh b/hacks.sh new file mode 100755 index 0000000..0ea52fc --- /dev/null +++ b/hacks.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -ex + +# gnu-efi parallel build breakage +sed -i -e '15s/make/make -j1/' ports/opt/gnu-efi/Pkgfile +rm -f ports/opt/gnu-efi/.signature diff --git a/kernel/linux-4.9.6.config b/kernel/linux-4.9.61.config index 87ee0c9..0ae9e71 100644 --- a/kernel/linux-4.9.6.config +++ b/kernel/linux-4.9.61.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.6 Kernel Configuration +# Linux/x86 4.9.61 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -716,10 +716,16 @@ CONFIG_NET_PTP_CLASSIFY=y # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_BRIDGE_VLAN_FILTERING is not set CONFIG_HAVE_NET_DSA=y -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set +CONFIG_LLC=m # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set diff --git a/kernel/linux-4.9.6.defconfig b/kernel/linux-4.9.61.defconfig index d53b168..7e4c5f6 100644 --- a/kernel/linux-4.9.6.defconfig +++ b/kernel/linux-4.9.61.defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.6 Kernel Configuration +# Linux/x86 4.9.61 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y |