diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 16:07:45 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-01-21 16:07:45 +0000 |
| commit | bed3b0836b8e0feadbdd0f37d645099855346f8e (patch) | |
| tree | 7118e3c777d2d6ae493497bc28bce88afe21c378 | |
| parent | 0cefa319ad039f970ab10080aa9b1871fe190a3e (diff) | |
| download | lh-bootstrap-bed3b0836b8e0feadbdd0f37d645099855346f8e.tar.xz | |
Small incremental build fixes (20)
| -rw-r--r-- | sub/kernel/Makefile | 2 | ||||
| -rwxr-xr-x | sub/layout/copylayout | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile index c8bf11d..260f13e 100644 --- a/sub/kernel/Makefile +++ b/sub/kernel/Makefile @@ -2,7 +2,7 @@ include sub/kernel/Makefile.ncurses KERNEL_VERSION ?= 5.4.13 KERNEL_MAJOR := $(firstword $(subst ., ,$(KERNEL_VERSION))) -KERNEL_ENV := 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" +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 cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) wget https://cdn.kernel.org/pub/linux/kernel/v$(KERNEL_MAJOR).x/linux-$(KERNEL_VERSION).tar.xz diff --git a/sub/layout/copylayout b/sub/layout/copylayout index e0ea0a2..a45f296 100755 --- a/sub/layout/copylayout +++ b/sub/layout/copylayout @@ -3,6 +3,7 @@ output="$1" s6-hiercopy layout/rootfs $output/rootfs +chown -R 0:0 $output/rootfs find "$output/rootfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; buildtime=$(s6-clock) |