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 | |
| parent | 3971b792e9e109e6fde2126ddb8c68c749827edb (diff) | |
| download | lh-bootstrap-7f7a2b99a0c2391926fe527a92ce439c8a147fcd.tar.xz | |
Small incremental build fixes (47)
| -rw-r--r-- | layout/rootfs/etc/resolv.conf | 2 | ||||
| -rw-r--r-- | layout/rootfs/etc/s6-rc/source-base/init-eth0/up | 2 | ||||
| -rw-r--r-- | layout/rootfs/etc/s6-rc/source-base/init-route/up | 2 | ||||
| -rwxr-xr-x | layout/rootfs/etc/s6-rc/source-base/sshd-4/run | 2 | ||||
| -rwxr-xr-x | run-qemu | 2 | ||||
| -rw-r--r-- | sub/kernel/Makefile | 4 |
6 files changed, 8 insertions, 6 deletions
diff --git a/layout/rootfs/etc/resolv.conf b/layout/rootfs/etc/resolv.conf index a30c407..27a94c0 100644 --- a/layout/rootfs/etc/resolv.conf +++ b/layout/rootfs/etc/resolv.conf @@ -1 +1 @@ -nameserver 10.0.0.3 +nameserver 10.0.2.3 diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/up b/layout/rootfs/etc/s6-rc/source-base/init-eth0/up index b41c637..b3dd787 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/up @@ -1,3 +1,3 @@ if { sleep 2 } # delay to load virtio-net -if { ip addr add 10.0.0.1/24 dev eth0 } +if { ip addr add 10.0.2.1/24 dev eth0 } ip link set dev eth0 up diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/up b/layout/rootfs/etc/s6-rc/source-base/init-route/up index 6a6b62c..4333289 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-route/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-route/up @@ -1 +1 @@ -ip route add default via 10.0.0.2 +ip route add default via 10.0.2.2 diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run index 7d8da1b..9af7f3d 100755 --- a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run +++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run @@ -1,6 +1,6 @@ #!/command/execlineb -P fdmove -c 2 1 fdmove 1 3 -s6-tcpserver4 -v 2 -1 -- 10.0.0.1 22 +s6-tcpserver4 -v 2 -1 -- 10.0.2.1 22 s6-tcpserver-access -v 2 -DRHl0 -t 5000 -i data/rules -- dropbear -i -K 60 @@ -14,5 +14,5 @@ exec qemu-system-${QEMU_ARCH} -nographic -M virt $cpuoption -smp 4 -m 2G -nodefa -drive if=virtio,file=$OUTPUT/rootfs.qcow2,format=qcow2,media=disk,index=1 \ -drive if=virtio,file=$OUTPUT/rwfs.qcow2,format=qcow2,media=disk,index=2 \ -drive if=virtio,file=$OUTPUT/userfs.qcow2,format=qcow2,media=disk,index=3 \ - -netdev user,id=eth0,hostfwd=tcp:127.0.0.1:2222-10.0.0.1:22 \ + -netdev user,id=eth0,hostfwd=::2222-10.0.2.1:22 \ -device virtio-net-device,netdev=eth0 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 $@ |