diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-31 15:50:03 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-31 15:50:03 +0000 |
| commit | 7f7a2b99a0c2391926fe527a92ce439c8a147fcd (patch) | |
| tree | 3104522f3fe0c30eb568884f9e91e3ab47731683 /sub/kernel/Makefile | |
| parent | 3971b792e9e109e6fde2126ddb8c68c749827edb (diff) | |
| download | lh-bootstrap-7f7a2b99a0c2391926fe527a92ce439c8a147fcd.tar.gz lh-bootstrap-7f7a2b99a0c2391926fe527a92ce439c8a147fcd.tar.xz lh-bootstrap-7f7a2b99a0c2391926fe527a92ce439c8a147fcd.zip | |
Small incremental build fixes (47)
Diffstat (limited to 'sub/kernel/Makefile')
| -rw-r--r-- | sub/kernel/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile index 769f824..2e2dcda 100644 --- a/sub/kernel/Makefile +++ b/sub/kernel/Makefile @@ -2,6 +2,8 @@ include sub/kernel/Makefile.ncurses KERNEL_VERSION ?= 5.5 KERNEL_MAJOR := $(firstword $(subst ., ,$(KERNEL_VERSION))) +KERNEL_FULLVERSION := $(if $(word 2,$(subst ., ,$(KERNEL_VERSION))),$(KERNEL_VERSION),$(KERNEL_VERSION).0) + 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" $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared @@ -62,5 +64,5 @@ endif $(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 s6-rmrf $(OUTPUT)/rootfs/lib/modules/$(KERNEL_FULLVERSION)/build $(OUTPUT)/rootfs/lib/modules/$(KERNEL_FULLVERSION)/source exec setuidgid $(NORMALUSER) s6-touch $@ |