diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-02-10 16:29:20 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-02-10 16:29:20 +0000 |
| commit | 0c40a1a2f42c86841800518e52c1794d4b19aa3a (patch) | |
| tree | 2b84d52c78eea744e5a015e472faec20c2f53af5 /sub | |
| parent | bb72a243221616c13d1ed3f4c6191041bf9949d5 (diff) | |
| download | lh-bootstrap-0c40a1a2f42c86841800518e52c1794d4b19aa3a.tar.xz | |
Add bcnm again, use bcnm-waitif
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/kernel/qemu-system-aarch64-config | 2 | ||||
| -rw-r--r-- | sub/kernel/qemu-system-arm-config | 2 | ||||
| -rw-r--r-- | sub/kernel/qemu-system-x86_64-config | 2 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 21 |
4 files changed, 23 insertions, 4 deletions
diff --git a/sub/kernel/qemu-system-aarch64-config b/sub/kernel/qemu-system-aarch64-config index f05d1fb..9cb137c 100644 --- a/sub/kernel/qemu-system-aarch64-config +++ b/sub/kernel/qemu-system-aarch64-config @@ -1243,7 +1243,7 @@ CONFIG_VIRTIO_NET=m # # CONFIG_WAN is not set # CONFIG_VMXNET3 is not set -CONFIG_NET_FAILOVER=y +CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set # CONFIG_NVM is not set diff --git a/sub/kernel/qemu-system-arm-config b/sub/kernel/qemu-system-arm-config index 9260a21..76af7fd 100644 --- a/sub/kernel/qemu-system-arm-config +++ b/sub/kernel/qemu-system-arm-config @@ -1200,7 +1200,7 @@ CONFIG_VIRTIO_NET=m # # CONFIG_WAN is not set # CONFIG_VMXNET3 is not set -CONFIG_NET_FAILOVER=y +CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set # CONFIG_NVM is not set diff --git a/sub/kernel/qemu-system-x86_64-config b/sub/kernel/qemu-system-x86_64-config index 19a9c45..aa504a4 100644 --- a/sub/kernel/qemu-system-x86_64-config +++ b/sub/kernel/qemu-system-x86_64-config @@ -1204,7 +1204,7 @@ CONFIG_VIRTIO_NET=m # # CONFIG_WAN is not set # CONFIG_VMXNET3 is not set -CONFIG_NET_FAILOVER=y +CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set # CONFIG_NVM is not set diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 4430514..843fee5 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -14,6 +14,7 @@ S6_VERSION := 4ad28c83818e3b7b351ac328e3753d8dab8b2804 S6_RC_VERSION := 40939adadfae8f06835f202aca7d243210c25226 S6_LINUX_INIT_VERSION := 4e6634208509f5c67b4d5ad449db696b8e4b6c3d MDEVD_VERSION := 7430c9be1d379ae1eb0626ec67968b6edcfbf7d6 +BCNM_VERSION := 55bc8fead207fcb2aafe414ce84073f147ebce39 SKARNET_CONF_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),--disable-shared --enable-static-libc,--enable-shared --disable-allstatic) SKARNET_ENV := $(if $(filter true,$(BUILD_HOST_STATIC)),,env LDFLAGS=-Wl,-rpath-link,$(OUTPUT)/rootfs/library.so) @@ -401,5 +402,23 @@ $(OUTPUT)/build-host/.lh_mdevd_installed: $(OUTPUT)/build-host/.lh_mdevd_built | exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_skarnet_installed: $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_s6net_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_s6rc_installed $(OUTPUT)/build-host/.lh_s6li_laidout $(OUTPUT)/build-host/.lh_s6lu_installed $(OUTPUT)/build-host/.lh_mdevd_installed | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_bcnm_copied: $(OUTPUT)/sources/.lh_bcnm_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/bcnm + exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/bcnm $(OUTPUT)/build-host/bcnm + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_bcnm_configured: $(OUTPUT)/build-host/.lh_bcnm_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/bcnm $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS) + exec setuidgid $(NORMALUSER) touch $@ + +$(OUTPUT)/build-host/.lh_bcnm_built: $(OUTPUT)/build-host/.lh_bcnm_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/bcnm $(MAKE) all strip + exec setuidgid $(NORMALUSER) s6-touch $@ + +$(OUTPUT)/build-host/.lh_bcnm_installed: $(OUTPUT)/build-host/.lh_bcnm_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec cd $(OUTPUT)/build-host/bcnm $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs + exec setuidgid $(NORMALUSER) s6-touch $@ + + +$(OUTPUT)/build-host/.lh_skarnet_installed: $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_s6net_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_s6rc_installed $(OUTPUT)/build-host/.lh_s6li_laidout $(OUTPUT)/build-host/.lh_s6lu_installed $(OUTPUT)/build-host/.lh_mdevd_installed $(OUTPUT)/build-host/.lh_bcnm_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-touch $@ |