From 3340b5a93638ac45a63dc8454d3eb29e254794f9 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 29 Jan 2020 17:21:33 +0000 Subject: Small incremental build fixes (40) --- layout/rootfs/etc/group | 1 + layout/rootfs/etc/passwd | 1 + layout/rootfs/etc/s6-rc/source-base/00/up | 4 ++-- .../etc/s6-rc/source-base/fifodir-cleanup/run | 4 ++-- layout/rootfs/etc/s6-rc/source-base/init-dev/up | 14 +++++------ layout/rootfs/etc/s6-rc/source-base/init-sysctl/up | 2 +- .../rootfs/etc/s6-rc/source-base/mount-devpts/up | 6 ++--- layout/rootfs/etc/s6-rc/source-base/mount-proc/up | 4 +--- .../rootfs/etc/s6-rc/source-base/mount-rwfs/down | 2 +- layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up | 2 +- layout/rootfs/etc/s6-rc/source-base/mount-sys/up | 4 +--- layout/rootfs/etc/s6-rc/source-base/mount-tmp/up | 4 +--- .../rootfs/etc/s6-rc/source-base/mount-userfs/down | 2 +- .../rootfs/etc/s6-rc/source-base/mount-userfs/up | 2 +- sub/busybox/host-full-config | 4 ++-- sub/skarnet.org/Makefile | 27 +++++++--------------- 16 files changed, 33 insertions(+), 50 deletions(-) diff --git a/layout/rootfs/etc/group b/layout/rootfs/etc/group index 278f0cc..fe84981 100644 --- a/layout/rootfs/etc/group +++ b/layout/rootfs/etc/group @@ -3,3 +3,4 @@ catchlog:x:98: nogroup:x:65534: log:x:61: ntp:x:62: +fdh:x:76: diff --git a/layout/rootfs/etc/passwd b/layout/rootfs/etc/passwd index 1e7464f..0e6110c 100644 --- a/layout/rootfs/etc/passwd +++ b/layout/rootfs/etc/passwd @@ -7,3 +7,4 @@ kllog:x:102:61:kllog:/:/nonexistent ntp:x:105:62:ntp:/:/nonexistent ntplog:x:106:62:ntplog:/:/nonexistent sshlog:x:138:61:sshlog:/var/log/sshd-4:/nonexistent +sysfdh:x:137:76:sysfdh:/:/nonexistent diff --git a/layout/rootfs/etc/s6-rc/source-base/00/up b/layout/rootfs/etc/s6-rc/source-base/00/up index 5ca67e1..5ffa243 100644 --- a/layout/rootfs/etc/s6-rc/source-base/00/up +++ b/layout/rootfs/etc/s6-rc/source-base/00/up @@ -1,2 +1,2 @@ -if { s6-echo "init stage2 starting" } -s6-hostname %%HOSTNAME%% +if { echo "init stage2 starting" } +hostname %%HOSTNAME%% diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run index a2c371b..edd2c67 100755 --- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run +++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run @@ -2,9 +2,9 @@ fdmove -c 2 1 if { - forbacktickx -p -0 i { s6-ls -0 /run/service } + forbacktickx -p -d"\n" i { ls -1 /run/service } importas -u i s6-cleanfifodir /run/service/${i}/event } s6-setuidgid nobody -s6-sleep 86400 +sleep 86400 diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/up b/layout/rootfs/etc/s6-rc/source-base/init-dev/up index 75c622a..9f9edb5 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-dev/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/up @@ -1,8 +1,8 @@ -foreground { s6-ln -sf /proc/self/fd /dev } -foreground { s6-ln -sf /proc/kcore /dev/core } -foreground { s6-ln -sf loop0 /dev/loop } -foreground { s6-ln -sf /run/shm /dev } -foreground { s6-ln -sf fd/0 /dev/stdin } -foreground { s6-ln -sf fd/1 /dev/stdout } -foreground { s6-ln -sf fd/2 /dev/stderr } +foreground { ln -sf /proc/self/fd /dev } +foreground { ln -sf /proc/kcore /dev/core } +foreground { ln -sf loop0 /dev/loop } +foreground { ln -sf /run/shm /dev } +foreground { ln -sf fd/0 /dev/stdin } +foreground { ln -sf fd/1 /dev/stdout } +foreground { ln -sf fd/2 /dev/stderr } exit 0 diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up index 9e846f8..3f3330c 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up @@ -3,4 +3,4 @@ forstdin -nCd"\n" -- LINE importas -u LINE LINE multidefine -C $LINE { CTL VALUE } redirfd -w 1 /proc/sys/$CTL -s6-echo -- $VALUE +echo -- $VALUE diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up index 8c5da6d..f352659 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up @@ -1,4 +1,2 @@ -if { s6-mkdir -p -m 0755 -- /dev/pts } -foreground { s6-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts } -importas ? ? -s6-test $? -le 1 +if { mkdir -p -m 0755 -- /dev/pts } +mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up index 1eeaa8a..249f8e9 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up @@ -1,3 +1 @@ -foreground { s6-mount -wt proc proc /proc } -importas ? ? -s6-test $? -le 1 +mount -wt proc proc /proc diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down index 00b6eb1..2205619 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down +++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down @@ -1 +1 @@ -s6-umount /mnt/rwfs +umount /mnt/rwfs diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up index f5bee4c..f7984e2 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up @@ -1 +1 @@ -s6-mount -wt ext4 /dev/vdb /mnt/rwfs +mount -wt ext4 /dev/vdb /mnt/rwfs diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up index 9573fe4..bd46374 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up @@ -1,3 +1 @@ -foreground { s6-mount -wt sysfs sys /sys } -importas ? ? -s6-test $? -le 1 +mount -wt sysfs sys /sys diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up index 2f0e1e1..a321930 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up @@ -1,3 +1 @@ -foreground { s6-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp } -importas ? ? -s6-test $? -le 1 +mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down index 2583c7d..8eaa02c 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down +++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down @@ -1 +1 @@ -s6-umount /mnt/userfs +umount /mnt/userfs diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up index 5ccc55e..b702681 100644 --- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up +++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up @@ -1 +1 @@ -s6-mount -wt ext4 /dev/vdc /mnt/userfs +mount -wt ext4 /dev/vdc /mnt/userfs diff --git a/sub/busybox/host-full-config b/sub/busybox/host-full-config index 6c921c6..b818810 100644 --- a/sub/busybox/host-full-config +++ b/sub/busybox/host-full-config @@ -692,7 +692,7 @@ CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_FEATURE_TASKSET_CPULIST is not set # CONFIG_UEVENT is not set -# CONFIG_UMOUNT is not set +CONFIG_UMOUNT=y # CONFIG_FEATURE_UMOUNT_ALL is not set # CONFIG_UNSHARE is not set # CONFIG_WALL is not set @@ -855,7 +855,7 @@ CONFIG_FEATURE_LESS_ENV=y # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set +CONFIG_HOSTNAME=y # CONFIG_DNSDOMAINNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index 521f401..1e44fe0 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -7,6 +7,7 @@ suffix := SKALIBS_VERSION := d200635a4c624c687b3387f937425d12239eb5c3 EXECLINE_VERSION := 1c14235c4055f9e9ae5664c81909d6f1b2e4ba1e S6_PORTABLE_UTILS_VERSION := c7bd01088dc5a15500fb91d58f4fff5bbe4d3438 +S6_LINUX_UTILS_VERSION := 47473861bd8c5629ad51fbe5a8aa7ff243f3348a S6_DNS_VERSION := 4a27fef217491f03aab8497d899ecb58289897d2 S6_NETWORKING_VERSION := cfc739a5ec6e408faadef3b17250c50bca0f0b38 S6_VERSION := 4ad28c83818e3b7b351ac328e3753d8dab8b2804 @@ -25,7 +26,7 @@ S6_DNS_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/web/s6-dns/includ ifeq ($(CONSOLE),) EARLY_GETTY := else -EARLY_GETTY := -G "getty -H lh-$(word 1,$(subst -, ,$(TRIPLE))) $(CONSOLE)" +EARLY_GETTY := -G "getty -H lh-$(word 1,$(subst -, ,$(TRIPLE))) 115200 $(CONSOLE)" endif $(OUTPUT)/sources/.lh_skalibs_cloned: | $(OUTPUT)/tmp/.lh_prepared @@ -43,6 +44,11 @@ $(OUTPUT)/sources/.lh_s6pu_cloned: | $(OUTPUT)/tmp/.lh_prepared exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-portable-utils && git checkout $(S6_PORTABLE_UTILS_VERSION) && :> package/deps-build" exec setuidgid $(NORMALUSER) touch $@ +$(OUTPUT)/sources/.lh_s6lu_cloned: | $(OUTPUT)/tmp/.lh_prepared + if test -d $(OUTPUT)/sources/s6-linux-utils ; then cd $(OUTPUT)/sources/s6-linux-utils && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-linux-utils$(suffix) s6-linux-utils ; fi + exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-linux-utils && git checkout $(S6_LINUX_UTILS_VERSION) && :> package/deps-build" + exec setuidgid $(NORMALUSER) touch $@ + $(OUTPUT)/sources/.lh_s6dns_cloned: | $(OUTPUT)/tmp/.lh_prepared if test -d $(OUTPUT)/sources/s6-dns ; then cd $(OUTPUT)/sources/s6-dns && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-dns$(suffix) s6-dns ; fi exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-dns && git checkout $(S6_DNS_VERSION) && :> package/deps-build" @@ -358,6 +364,7 @@ $(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed | for i in `ls -1 $(OUTPUT)/rootfs/etc/s6-linux-init/current/bin` ; do ln -sf ../etc/s6-linux-init/current/bin/$$i $(OUTPUT)/rootfs/bin/$$i ; done exec setuidgid $(NORMALUSER) s6-touch $@ + $(OUTPUT)/build-host/.lh_mdevd_copied: $(OUTPUT)/sources/.lh_mdevd_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/mdevd exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/mdevd $(OUTPUT)/build-host/mdevd @@ -376,23 +383,5 @@ $(OUTPUT)/build-host/.lh_mdevd_installed: $(OUTPUT)/build-host/.lh_mdevd_built | exec setuidgid $(NORMALUSER) s6-touch $@ -$(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 ./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_mdevd_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-touch $@ -- cgit v1.2.3