summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-02-13 02:13:37 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-02-13 02:13:37 +0000
commita904c72e7595c4981317b1df34250325f268783a (patch)
treeadfbe6fbb6f3236f9149b1985f7132d09231638f
parent97eb55a5db82725d922ed6c14fccd31c78b7384d (diff)
downloadlh-bootstrap-a904c72e7595c4981317b1df34250325f268783a.tar.xz
dropbear worked, but not busybox, trying another approach
-rw-r--r--sub/busybox/Makefile2
-rw-r--r--sub/busybox/host-full-config8
2 files changed, 5 insertions, 5 deletions
diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile
index e79850f..dbc2cd9 100644
--- a/sub/busybox/Makefile
+++ b/sub/busybox/Makefile
@@ -32,7 +32,7 @@ else
endif
$(OUTPUT)/build-host/.lh_bb_built: $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config $(OUTPUT)/build-host/.lh_utmps_installed $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC="$(BUILD_HOST_CC)" HOSTCC="$(BUILD_BUILD_CC)" CFLAGS="-O2 -I$(OUTPUT)/rootfs/package/admin/utmps/include" LDFLAGS="-L$(OUTPUT)/rootfs/package/admin/utmps/library -L$(OUTPUT)/rootfs/package/prog/skalibs/library" LDLIBS="-lutmps -lskarnet"
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC="$(BUILD_HOST_CC)" HOSTCC="$(BUILD_BUILD_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-host/.lh_bb_installed: $(OUTPUT)/build-host/.lh_bb_built $(OUTPUT)/tmp/.lh_layout_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/busybox/host-full-config b/sub/busybox/host-full-config
index 660bf41..8b5545b 100644
--- a/sub/busybox/host-full-config
+++ b/sub/busybox/host-full-config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.34.0.git
-# Sat Feb 13 02:03:30 2021
+# Sat Feb 13 03:10:43 2021
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -49,9 +49,9 @@ CONFIG_FEATURE_SYSLOG=y
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS="pthread"
+CONFIG_EXTRA_CFLAGS="-I$(OUTPUT)/rootfs/package/admin/utmps/include"
+CONFIG_EXTRA_LDFLAGS="-L$(OUTPUT)/rootfs/package/admin/utmps/library -L$(OUTPUT)/rootfs/package/prog/skalibs/library"
+CONFIG_EXTRA_LDLIBS="-lutmps -lskarnet"
# CONFIG_USE_PORTABLE_CODE is not set
CONFIG_STACK_OPTIMIZATION_386=y
CONFIG_STATIC_LIBGCC=y