diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-02-13 01:54:06 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2021-02-13 01:54:06 +0000 |
| commit | 97eb55a5db82725d922ed6c14fccd31c78b7384d (patch) | |
| tree | 8400212617046e9f2a89590787651eeee16f5afa | |
| parent | 9ff737d57f8891baa48e1d8f56a7b76fd67f3554 (diff) | |
| download | lh-bootstrap-97eb55a5db82725d922ed6c14fccd31c78b7384d.tar.xz | |
utmpsify busybox and dropbear
| -rw-r--r-- | sub/busybox/Makefile | 4 | ||||
| -rw-r--r-- | sub/busybox/host-full-config | 2 | ||||
| -rw-r--r-- | sub/dropbear/Makefile | 4 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile index 4dad275..e79850f 100644 --- a/sub/busybox/Makefile +++ b/sub/busybox/Makefile @@ -31,8 +31,8 @@ else exec setuidgid $(NORMALUSER) cp -f $(WD)/sub/busybox/host-full-config $@ endif -$(OUTPUT)/build-host/.lh_bb_built: $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config | $(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)" +$(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) 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 a2ee2cc..660bf41 100644 --- a/sub/busybox/host-full-config +++ b/sub/busybox/host-full-config @@ -528,7 +528,7 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set CONFIG_GETTY=y CONFIG_LOGIN=y -# CONFIG_LOGIN_SESSION_AS_CHILD is not set +CONFIG_LOGIN_SESSION_AS_CHILD=y # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile index 9a36173..515ed51 100644 --- a/sub/dropbear/Makefile +++ b/sub/dropbear/Makefile @@ -22,8 +22,8 @@ $(OUTPUT)/build-host/.lh_dropbear_patched: $(OUTPUT)/build-host/.lh_dropbear_cop exec setuidgid $(NORMALUSER) cp -f sub/dropbear/localoptions.h $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)/localoptions.h exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_dropbear_configured: $(OUTPUT)/build-host/.lh_dropbear_patched | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC "$(BUILD_HOST_CC)" export LDFLAGS "-s $(DROPBEAR_MAKE_STATIC)" ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline --without-pam --enable-bundled-libtom --disable-zlib --disable-harden $(DROPBEAR_CONF_STATIC) +$(OUTPUT)/build-host/.lh_dropbear_configured: $(OUTPUT)/build-host/.lh_dropbear_patched $(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/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC "$(BUILD_HOST_CC)" export CFLAGS "-O2 -I$(OUTPUT)/rootfs/package/admin/utmps/include" export LDFLAGS "-s $(DROPBEAR_MAKE_STATIC) -L$(OUTPUT)/rootfs/package/admin/utmps/library -L$(OUTPUT)/rootfs/package/prog/skalibs/library" export LIBS "-lutmps -lskarnet" ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-utmp --disable-wtmp --disable-pututline --without-pam --enable-bundled-libtom --disable-zlib --disable-harden $(DROPBEAR_CONF_STATIC) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-host/.lh_dropbear_built: $(OUTPUT)/build-host/.lh_dropbear_configured | $(OUTPUT)/build-build/.lh_skarnet_installed diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 71ef567..6cb76cd 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -4,7 +4,7 @@ url := git://git.skarnet.org suffix := -SKALIBS_VERSION := c9cbf322db9b0617e38859b08e9ea90976bd6fcd +SKALIBS_VERSION := 025e5ed74528cc2e8676268ad07b169949d89ae3 UTMPS_VERSION := ae14b1b6d6a8e3efc5f6a04a0b23807f0afe47a5 EXECLINE_VERSION := 6ff749e62652103b3ab84ef145691602ed6e0fea S6_PORTABLE_UTILS_VERSION := 8a3b18c61d42d822cc25c74d5c04c53c7b053643 |