diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-30 15:16:54 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-30 15:16:54 +0000 |
| commit | 62896c28e9889803fbe479fe94b0cae2ee9681bb (patch) | |
| tree | 3954fff07654aa528110b15cd3a451ecafae6e20 /sub/kernel/Makefile | |
| parent | 61c8a693f00ce1c5141ec5f8339298f796f29707 (diff) | |
| download | lh-bootstrap-62896c28e9889803fbe479fe94b0cae2ee9681bb.tar.xz | |
Update kernel to 5.5, fix disk-image modules dep
Diffstat (limited to 'sub/kernel/Makefile')
| -rw-r--r-- | sub/kernel/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile index 260f13e..769f824 100644 --- a/sub/kernel/Makefile +++ b/sub/kernel/Makefile @@ -1,6 +1,6 @@ include sub/kernel/Makefile.ncurses -KERNEL_VERSION ?= 5.4.13 +KERNEL_VERSION ?= 5.5 KERNEL_MAJOR := $(firstword $(subst ., ,$(KERNEL_VERSION))) KERNEL_ENV := HOSTCC=$(BUILD_BUILD_CC) DEPMOD=$(OUTPUT)/build-build/opt/kmod/bin/depmod INSTALL_MOD_PATH=$(OUTPUT)/rootfs CROSS_COMPILE=$(BUILD_HOST_PREFIX)- ARCH=$(KERNEL_GENERIC_ARCH) INSTALL_MOD_STRIP="-R .note -R .comment -R .note.GNU-stack --strip-debug" @@ -50,9 +50,7 @@ $(OUTPUT)/build-host/kernel/.lh_built: $(OUTPUT)/build-host/kernel/.lh_configure exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) all $(KERNEL_ENV) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/kernel/.lh_installed: $(OUTPUT)/build-host/kernel/.lh_built | $(OUTPUT)/build-build/.lh_kmod_installed $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) modules_install $(KERNEL_ENV) - exec s6-rmrf $(OUTPUT)/rootfs/lib/modules/$(KERNEL_VERSION)/build $(OUTPUT)/rootfs/lib/modules/$(KERNEL_VERSION)/source +$(OUTPUT)/build-host/kernel/.lh_installed: $(OUTPUT)/build-host/kernel/.lh_built | $(OUTPUT)/build-build/.lh_skarnet_installed exec cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/System.map $(OUTPUT)/rootfs/boot/System.map-$(KERNEL_VERSION) exec s6-ln -sf System.map-$(KERNEL_VERSION) $(OUTPUT)/rootfs/boot/System.map cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/bzImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/zImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/Image $(OUTPUT)/kernel @@ -61,3 +59,8 @@ ifeq ($(KERNEL_GENERIC_ARCH),x86) exec s6-ln -sf vmlinuz-$(KERNEL_VERSION) $(OUTPUT)/rootfs/boot/vmlinuz endif exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/kernel/.lh_modules_installed: $(OUTPUT)/build-host/kernel/.lh_built | $(OUTPUT)/build-build/.lh_kmod_installed $(OUTPUT)/build-build/.lh_skarnet_installed + exec cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) modules_install $(KERNEL_ENV) + exec s6-rmrf $(OUTPUT)/rootfs/lib/modules/$(KERNEL_VERSION)/build $(OUTPUT)/rootfs/lib/modules/$(KERNEL_VERSION)/source + exec setuidgid $(NORMALUSER) s6-touch $@ |