summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-02-09 22:03:20 +0000
committerLaurent Bercot <ska@appnovation.com>2023-02-09 22:03:20 +0000
commitb796ef65d0e07ae86c34567d3913bfd81d506210 (patch)
tree95d254854b86166cd652140c275da084c06a8d0a
parent337f33185360c93e74eab974a3c8b8e31629231e (diff)
downloadlh-bootstrap-b796ef65d0e07ae86c34567d3913bfd81d506210.tar.xz
Update to latest versions (yet untested)
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--CONTRIBUTING5
-rw-r--r--DCO37
-rw-r--r--Makefile13
-rw-r--r--doc/index.html2
-rw-r--r--layout/rootfs/etc/mdev.conf9
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/00/up4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd1
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/btmpd/run8
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/btmpd/type1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/default/contents2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/000
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run6
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-dev/up15
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-eth0/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-lo/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-route/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth00
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-route/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-sysctl/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-utmp/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-utmp/type1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-utmp/up3
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/klogd-log/run2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/klogd/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/klogd/run3
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/mdevd/run5
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-devpts/up4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-disks/contents2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/000
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/000
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/000
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-tmp/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-userfs/down2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-userfs/up2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-lan/contents4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth00
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-40
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents6
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/sshd-4-log/run2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth00
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/sshd-4/run4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs0
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/syslogd-log/run2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd1
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/syslogd/run4
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd1
-rwxr-xr-xlayout/rootfs/etc/s6-rc/source-base/wtmpd/run7
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/wtmpd/type1
l---------layout/rwfs/var/log/btmp1
l---------layout/rwfs/var/log/wtmp1
-rw-r--r--lh-config.dist4
-rwxr-xr-xmake32
-rw-r--r--sub/bearssl/Makefile22
-rw-r--r--sub/busybox/Makefile26
-rw-r--r--sub/dev/Makefile.curl26
-rw-r--r--sub/dev/Makefile.git26
-rw-r--r--sub/dev/Makefile.libressl26
-rw-r--r--sub/dev/Makefile.make26
-rw-r--r--sub/dev/Makefile.strace26
-rw-r--r--sub/dev/Makefile.zlib24
-rw-r--r--sub/dropbear/Makefile34
-rw-r--r--sub/kernel/Makefile42
-rw-r--r--sub/kernel/Makefile.ncurses4
-rw-r--r--sub/kmod/Makefile6
-rw-r--r--sub/skarnet.org/Makefile558
-rw-r--r--sub/socklog/Makefile34
-rw-r--r--sub/socklog/patch.sed5
-rw-r--r--sub/xz/Makefile30
134 files changed, 425 insertions, 734 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..6279422
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,5 @@
+ Please add a Signed-Off-By: line at the end of your commit,
+which certifies that you have the right and authority to pass
+it on as an open-source patch, as explicited in the Developer's
+Certificate of Origin available in this project's DCO file,
+or at https://developercertificate.org/
diff --git a/DCO b/DCO
new file mode 100644
index 0000000..8201f99
--- /dev/null
+++ b/DCO
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
diff --git a/Makefile b/Makefile
index 8f1029c..2243070 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ it: all
all: kernel rootfs rwfs userfs images
-kernel: $(OUTPUT)/build-host/kernel/.lh_installed $(OUTPUT)/build-host/kernel/.lh_modules_installed
+kernel: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_installed $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_modules_installed
rootfs: $(OUTPUT)/tmp/.lh_rootfs_installed
rwfs: $(OUTPUT)/tmp/.lh_rwfs_installed
userfs: $(OUTPUT)/tmp/.lh_userfs_installed
@@ -37,7 +37,7 @@ include sub/dev/Makefile.zlib
include sub/dev/Makefile.libressl
include sub/dev/Makefile.curl
include sub/dev/Makefile.git
-LH_DEV_TARGETS := $(OUTPUT)/build-host/.lh_strace_installed $(OUTPUT)/build-host/.lh_make_installed $(OUTPUT)/build-host/.lh_zlib_installed $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_git_installed
+LH_DEV_TARGETS := $(OUTPUT)/build-$(TRIPLE)/.lh_strace_installed $(OUTPUT)/build-$(TRIPLE)/.lh_make_installed $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_git_installed
else
LH_DEV_TARGETS :=
endif
@@ -54,8 +54,8 @@ clean:
# Prepare the output directory. This is at the bottom of the dependency tree.
$(OUTPUT)/tmp/.lh_prepared: lh-config
- exec mkdir -p -m 0755 -- $(OUTPUT)/tmp $(OUTPUT)/rootfs $(OUTPUT)/rwfs $(OUTPUT)/userfs $(OUTPUT)/build-build/bin $(OUTPUT)/build-build/opt $(OUTPUT)/build-build/tmp $(OUTPUT)/build-host/bin $(OUTPUT)/build-host/opt $(OUTPUT)/build-host/tmp $(OUTPUT)/host-host $(OUTPUT)/sources
- exec chown -R -- $(NORMALUSER_UID):$(NORMALUSER_GID) $(OUTPUT)/tmp $(OUTPUT)/build-build $(OUTPUT)/build-host $(OUTPUT)/host-host
+ exec mkdir -p -m 0755 -- $(OUTPUT)/tmp $(OUTPUT)/rootfs $(OUTPUT)/rwfs $(OUTPUT)/userfs $(OUTPUT)/build-build/bin $(OUTPUT)/build-build/opt $(OUTPUT)/build-build/tmp $(OUTPUT)/build-$(TRIPLE)/bin $(OUTPUT)/build-$(TRIPLE)/opt $(OUTPUT)/build-$(TRIPLE)/tmp $(OUTPUT)/sources
+ exec chown -R -- $(NORMALUSER_UID):$(NORMALUSER_GID) $(OUTPUT)/tmp $(OUTPUT)/build-build $(OUTPUT)/build-$(TRIPLE)
exec chown -- $(NORMALUSER_UID):$(NORMALUSER_GID) $(OUTPUT)/sources $(OUTPUT)
exec setuidgid $(NORMALUSER) touch $@
@@ -68,7 +68,7 @@ $(OUTPUT)/build-build/.lh_done: $(OUTPUT)/build-build/.lh_skarnet_installed $(OU
# The filesystems
-$(OUTPUT)/tmp/.lh_rootfs_installed: $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-host/.lh_skarnet_installed $(OUTPUT)/build-host/.lh_socklog_installed $(OUTPUT)/build-host/.lh_bb_installed $(OUTPUT)/build-host/.lh_dropbear_installed $(LH_DEV_TARGETS)
+$(OUTPUT)/tmp/.lh_rootfs_installed: $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed $(OUTPUT)/build-$(TRIPLE)/.lh_bb_installed $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_installed $(LH_DEV_TARGETS)
exec setuidgid $(NORMALUSER) touch $@
@@ -81,7 +81,7 @@ $(OUTPUT)/tmp/.lh_userfs_installed: $(OUTPUT)/tmp/.lh_layout_installed
# The qemu disk images (requires qemu and libguestfs-tools)
-$(OUTPUT)/tmp/.lh_diskimages_done: $(OUTPUT)/build-host/kernel/.lh_modules_installed $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_rwfs_installed $(OUTPUT)/tmp/.lh_userfs_installed
+$(OUTPUT)/tmp/.lh_diskimages_done: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_modules_installed $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_rwfs_installed $(OUTPUT)/tmp/.lh_userfs_installed
virt-make-fs --format=qcow2 --type=ext4 --size=$(ROOTFS_SIZE) $(OUTPUT)/rootfs $(OUTPUT)/rootfs.qcow2 & \
virt-make-fs --format=qcow2 --type=ext4 --size=$(RWFS_SIZE) $(OUTPUT)/rwfs $(OUTPUT)/rwfs.qcow2 & \
virt-make-fs --format=qcow2 --type=ext4 --size=$(USERFS_SIZE) $(OUTPUT)/userfs $(OUTPUT)/userfs.qcow2 & wait
@@ -106,6 +106,5 @@ include sub/kmod/Makefile
include sub/layout/Makefile
include sub/bearssl/Makefile
include sub/skarnet.org/Makefile
-include sub/socklog/Makefile
include sub/busybox/Makefile
include sub/dropbear/Makefile
diff --git a/doc/index.html b/doc/index.html
index 15d4388..71205a8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,7 +84,7 @@ file carefully </li>
<ul>
<li> <tt>lh-bootstrap</tt> is discussed on the
-<a href="//skarnet.org/lists.html#skaware">skaware</a> mailing-list. </li>
+<a href="//skarnet.org/lists/#skaware">skaware</a> mailing-list. </li>
<li> It can also be discussed on the <tt>#s6</tt> IRC channel on OFTC. </li>
</ul>
diff --git a/layout/rootfs/etc/mdev.conf b/layout/rootfs/etc/mdev.conf
index ee9572f..a8ecd5c 100644
--- a/layout/rootfs/etc/mdev.conf
+++ b/layout/rootfs/etc/mdev.conf
@@ -26,12 +26,3 @@ watchdog 0:0 0600
watchdog0 0:0 0600
$MODALIAS=.* 0:0 0600 @modprobe -b "$MODALIAS"
-
-# alsa sound devices
-SUBSYSTEM=sound;.* 0:29 0660
-
-adsp 0:29 0660 >sound/
-audio 0:29 0660 >sound/
-dsp 0:29 0660 >sound/
-mixer 0:29 0660 >sound/
-sequencer.* 0:29 0660 >sound/
diff --git a/layout/rootfs/etc/s6-rc/source-base/00/up b/layout/rootfs/etc/s6-rc/source-base/00/up
index 5ffa243..5ca67e1 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 { echo "init stage2 starting" }
-hostname %%HOSTNAME%%
+if { s6-echo "init stage2 starting" }
+s6-hostname %%HOSTNAME%%
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/run b/layout/rootfs/etc/s6-rc/source-base/btmpd/run
new file mode 100755
index 0000000..4c7ffe6
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/run
@@ -0,0 +1,8 @@
+#!/package/admin/execline/command/execlineb -S1
+
+fdmove -c 2 1
+s6-setuidgid utmp
+cd /var/log/wtmpd
+fdmove 1 3
+s6-ipcserver -1 -c 1000 -- /run/utmps/.btmpd-socket
+utmps-wtmpd btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/type b/layout/rootfs/etc/s6-rc/source-base/btmpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/type
@@ -0,0 +1 @@
+longrun
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents b/layout/rootfs/etc/s6-rc/source-base/default/contents
deleted file mode 100644
index 359e9bc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/default/contents
+++ /dev/null
@@ -1,2 +0,0 @@
-ok-local
-ok-lan
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/00
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 71f2243..0d2b850 100755
--- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
@@ -1,10 +1,10 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
fdmove -c 2 1
if
{
- forbacktickx -p -d"\n" i { ls -1 /run/service }
+ forbacktickx -p -d"\n" i { s6-ls /run/service }
importas -u i i
s6-cleanfifodir /run/service/${i}/event
}
s6-setuidgid nobody
-sleep 86400
+s6-sleep 86400
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
deleted file mode 100644
index 18fefaa..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-dev
-mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
index edc5c1b..df8e960 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
@@ -1 +1 @@
-mdevd-coldplug
+mdevd-coldplug -O4
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc
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 9f9edb5..602cf0b 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,7 @@
-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
+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 }
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies
deleted file mode 100644
index 97749cc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/down b/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
index 6733be4..547ab86 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
@@ -1,3 +1,2 @@
foreground { ip link set dev eth0 down }
foreground { bcnm-waitif -d 2 eth0 }
-exit 0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies
deleted file mode 100644
index 97749cc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/down b/layout/rootfs/etc/s6-rc/source-base/init-lo/down
index 5a85d32..861cdd2 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-lo/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/down
@@ -1,3 +1,2 @@
foreground { ip link set dev lo down }
foreground { bcnm-waitif -d 2 lo }
-exit 0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies
deleted file mode 100644
index 61c05ca..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/down b/layout/rootfs/etc/s6-rc/source-base/init-route/down
index a498b23..4a9bd4e 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-route/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-route/down
@@ -1,2 +1 @@
foreground { ip route del default }
-exit 0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc
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 7f1874b..7a93ed2 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
-echo $VALUE
+s6-echo $VALUE
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/down b/layout/rootfs/etc/s6-rc/source-base/init-utmp/down
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/down
@@ -0,0 +1 @@
+
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/type b/layout/rootfs/etc/s6-rc/source-base/init-utmp/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/up b/layout/rootfs/etc/s6-rc/source-base/init-utmp/up
new file mode 100644
index 0000000..6d61a8b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/up
@@ -0,0 +1,3 @@
+backtick -E kversion { uname -r }
+if { utmps-write -t 2000 -uw -l reboot -p 0 -h ${kversion} -- "~~" BOOT_TIME "~" }
+ utmps-write -t 2000 -uw -l runlevel -p 20018 -h ${kversion} -- "~~" RUN_LVL "~"
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/run b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
index 90e474b..cad8883 100755
--- a/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
s6-setuidgid kllog
exec -c
s6-log t s1000000 n20 /var/log/klogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/run b/layout/rootfs/etc/s6-rc/source-base/klogd/run
index 95dc7e8..c6df5ee 100755
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/run
@@ -1,6 +1,5 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
fdmove -c 2 1
redirfd -r 0 /proc/kmsg
-# s6-setuidgid klog
exec -c
ucspilogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
deleted file mode 100644
index 690f6cf..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-mount-sys
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
index 1d4e4e3..32dcd46 100755
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
@@ -1,3 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
+
exec -c
-mdevd -D 3 -b 200000
+mdevd -D3 -O4
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev
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 f352659..3d5707d 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
@@ -1,2 +1,2 @@
-if { mkdir -p -m 0755 -- /dev/pts }
-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts
+if { s6-mkdir -p -m 0755 -- /dev/pts }
+s6-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
deleted file mode 100644
index 9c13766..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
+++ /dev/null
@@ -1,2 +0,0 @@
-mount-rwfs
-mount-userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00
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 249f8e9..f198029 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
@@ -1 +1 @@
-mount -wt proc proc /proc
+s6-mount -wt proc proc /proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
deleted file mode 100644
index bee63cb..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug
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 2205619..00b6eb1 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 @@
-umount /mnt/rwfs
+s6-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 f7984e2..f5bee4c 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 @@
-mount -wt ext4 /dev/vdb /mnt/rwfs
+s6-mount -wt ext4 /dev/vdb /mnt/rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00
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 bd46374..780be7b 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
@@ -1 +1 @@
-mount -wt sysfs sys /sys
+s6-mount -wt sysfs sys /sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00
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 a321930..9eaeab4 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
@@ -1 +1 @@
-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp
+s6-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
deleted file mode 100644
index bee63cb..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug
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 8eaa02c..2583c7d 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 @@
-umount /mnt/userfs
+s6-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 b702681..5ccc55e 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 @@
-mount -wt ext4 /dev/vdc /mnt/userfs
+s6-mount -wt ext4 /dev/vdc /mnt/userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
deleted file mode 100644
index c9d2af7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
+++ /dev/null
@@ -1,4 +0,0 @@
-mount-proc
-mount-sys
-mount-devpts
-mount-tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents
deleted file mode 100644
index 11e9fd9..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents
+++ /dev/null
@@ -1,4 +0,0 @@
-init-lo
-init-eth0
-init-route
-sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4 b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
deleted file mode 100644
index 2d907c7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-mdevd
-syslogd-pipeline
-klogd-pipeline
-mount-disks
-mount-virtual
-fifodir-cleanup
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
index e40c2af..8e5d30a 100755
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
s6-setuidgid sshlog
exec -c
s6-log t s1000000 n20 /var/log/sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies
deleted file mode 100644
index 8aee9b6..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp
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 9af7f3d..1b5f9a0 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
+#!/command/execlineb -S1
fdmove -c 2 1
fdmove 1 3
s6-tcpserver4 -v 2 -1 -- 10.0.2.1 22
-s6-tcpserver-access -v 2 -DRHl0 -t 5000 -i data/rules --
+s6-tcpserver-access -v 2 -RHl0 -t 5000 -i data/rules --
dropbear -i -K 60
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
index b04f309..5c6cf65 100755
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
s6-setuidgid sysllog
exec -c
s6-log t s1000000 n20 /var/log/syslogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/run b/layout/rootfs/etc/s6-rc/source-base/syslogd/run
index 2462989..7ac1f47 100755
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/run
@@ -1,5 +1,5 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
s6-envuidgid syslog
fdclose 0
exec -c
-socklog
+s6-socklog -d3
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/run b/layout/rootfs/etc/s6-rc/source-base/wtmpd/run
new file mode 100755
index 0000000..a49e0de
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/run
@@ -0,0 +1,7 @@
+#!/command/execlineb -S1
+fdmove -c 2 1
+s6-setuidgid utmp
+cd /var/log/wtmpd
+fdmove 1 3
+s6-ipcserver -1 -c 1000 -- /run/utmps/.wtmpd-socket
+utmps-wtmpd
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/type b/layout/rootfs/etc/s6-rc/source-base/wtmpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/type
@@ -0,0 +1 @@
+longrun
diff --git a/layout/rwfs/var/log/btmp b/layout/rwfs/var/log/btmp
new file mode 120000
index 0000000..66d392b
--- /dev/null
+++ b/layout/rwfs/var/log/btmp
@@ -0,0 +1 @@
+wtmpd/btmp \ No newline at end of file
diff --git a/layout/rwfs/var/log/wtmp b/layout/rwfs/var/log/wtmp
new file mode 120000
index 0000000..fc2e242
--- /dev/null
+++ b/layout/rwfs/var/log/wtmp
@@ -0,0 +1 @@
+wtmpd/wtmp \ No newline at end of file
diff --git a/lh-config.dist b/lh-config.dist
index 4fe15fe..2292afd 100644
--- a/lh-config.dist
+++ b/lh-config.dist
@@ -8,7 +8,7 @@ NORMALUSER=nobody
# The C compiler for your BUILD system.
# Leave empty if you're using your distro's native compiler.
-# BUILD_BUILD_CC=
+# BUILD_CC=
# The toolchain for your TARGET system
@@ -18,7 +18,7 @@ NORMALUSER=nobody
# Set this to true if you want your created rootfs to be statically linked.
# By default, it will be true for musl toolchains, false for glibc toolchains.
-# BUILD_HOST_STATIC=false
+# TARGET_STATIC=false
# Whether or not you want to copy the shared libc from the toolchain.
# By default, the shared libs are copied if the build isn't static.
diff --git a/make b/make
index b8648d0..9cba8aa 100755
--- a/make
+++ b/make
@@ -21,29 +21,29 @@ if test $OUTPUT = ${OUTPUT#/} ; then
OUTPUT="$WD/$OUTPUT"
fi
-BUILD_BUILD_CC=${BUILD_BUILD_CC:-gcc}
-BUILD_HOST_CC="$TRIPLE-${CROSS_CC:-gcc}"
+BUILD_CC=${BUILD_CC:-gcc}
+TARGET_CC="$TRIPLE-${CROSS_CC:-gcc}"
ROOTFS_SIZE=${ROOTFS_SIZE:-1024M}
RWFS_SIZE=${RWFS_SIZE:-512M}
USERFS_SIZE=${USERFS_SIZE:-512M}
LH_DEV=${DEVELOPMENT:-false}
-build=`${BUILD_BUILD_CC} -dumpmachine`
+build=`${BUILD_CC} -dumpmachine`
if echo "$build" | grep -q -- '-.*-.*-' ; then
BUILD_QUADRUPLE="$build"
else
BUILD_QUADRUPLE="${build%%-*}-none-${build#*-}"
fi
-if test -z "$BUILD_HOST_STATIC" ; then
+if test -z "$TARGET_STATIC" ; then
case "$TRIPLE" in
- *-*-musl*) BUILD_HOST_STATIC=true ;;
- *) BUILD_HOST_STATIC=false ;;
+ *-*-musl*) TARGET_STATIC=true ;;
+ *) TARGET_STATIC=false ;;
esac
fi
if test -z "$LIBC_COPY" ; then
- case "$BUILD_HOST_STATIC" in
+ case "$TARGET_STATIC" in
true) LIBC_COPY=false ;;
*) LIBC_COPY=true ;;
esac
@@ -53,13 +53,13 @@ if test -n "$CROSS_BASE" ; then
crossenv=""
else
crossenv="LH_MAKE_CROSS=1"
- CROSS_BASE="$OUTPUT/build-host/$TRIPLE"
+ CROSS_BASE="$OUTPUT/build-$TRIPLE/$TRIPLE"
fi
-BUILD_HOST_CC_FULL="$CROSS_BASE/bin/$BUILD_HOST_CC"
-BUILD_HOST_SYSROOT="$CROSS_BASE/$TRIPLE"
-BUILD_HOST_PREFIX="$CROSS_BASE/bin/$TRIPLE"
-LIBC_SYSROOT=${LIBC_SYSROOT:-$(${BUILD_HOST_CC_FULL} -print-sysroot)}
+TARGET_CC_FULL="$CROSS_BASE/bin/$TARGET_CC"
+TARGET_SYSROOT="$CROSS_BASE/$TRIPLE"
+TARGET_PREFIX="$CROSS_BASE/bin/$TRIPLE"
+LIBC_SYSROOT=${LIBC_SYSROOT:-$(${TARGET_CC_FULL} -print-sysroot)}
hostarch=$(echo $TRIPLE | cut -f1 -d-)
# This is used extensively throughout the whole build: different subsystems have different names for the architecture
@@ -72,13 +72,13 @@ case $hostarch in
esac
KERNEL_CONFIG=${KERNEL_CONFIG:-sub/kernel/qemu-system-${hostarch}-config}
-PATH="$WD/bin:$OUTPUT/build-build/command:$OUTPUT/build-build/bin:$OUTPUT/build-host/bin:$CROSS_BASE/bin:$PATH"
+PATH="$WD/bin:$OUTPUT/build-build/command:$OUTPUT/build-build/bin:$OUTPUT/build-$TRIPLE/bin:$CROSS_BASE/bin:$PATH"
umask 022
exec env -i $crossenv LH_MAKE_MARKER=1 "WD=$WD" "NORMALUSER=$NORMALUSER" "TRIPLE=$TRIPLE" "OUTPUT=$OUTPUT" "PATH=$PATH" \
"ROOTFS_SIZE=$ROOTFS_SIZE" "RWFS_SIZE=$RWFS_SIZE" "USERFS_SIZE=$USERFS_SIZE" \
- "BUILD_HOST_STATIC=$BUILD_HOST_STATIC" "LIBC_SYSROOT=$LIBC_SYSROOT" "LIBC_COPY=$LIBC_COPY" "LH_DEV=$LH_DEV" \
- "BUILD_HOST_CC=$BUILD_HOST_CC" "BUILD_HOST_CC_FULL=$BUILD_HOST_CC_FULL" "BUILD_HOST_SYSROOT=$BUILD_HOST_SYSROOT" "BUILD_HOST_PREFIX=$BUILD_HOST_PREFIX" \
+ "TARGET_STATIC=$TARGET_STATIC" "LIBC_SYSROOT=$LIBC_SYSROOT" "LIBC_COPY=$LIBC_COPY" "LH_DEV=$LH_DEV" \
+ "TARGET_CC=$TARGET_CC" "TARGET_CC_FULL=$TARGET_CC_FULL" "TARGET_SYSROOT=$TARGET_SYSROOT" "TARGET_PREFIX=$TARGET_PREFIX" \
"KERNEL_ARCH=$KERNEL_ARCH" "KERNEL_GENERIC_ARCH=$KERNEL_GENERIC_ARCH" "QEMU_ARCH=$QEMU_ARCH" "KERNEL_CONFIG=$KERNEL_CONFIG" \
- "BUILD_QUADRUPLE=$BUILD_QUADRUPLE" "BUILD_BUILD_CC=$BUILD_BUILD_CC" SHELL=/bin/sh "CONSOLE=$CONSOLE" "TERM=$TERM" \
+ "BUILD_QUADRUPLE=$BUILD_QUADRUPLE" "BUILD_CC=$BUILD_CC" SHELL=/bin/sh "CONSOLE=$CONSOLE" "TERM=$TERM" \
make "$@"
diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile
index 8226bbe..84048ca 100644
--- a/sub/bearssl/Makefile
+++ b/sub/bearssl/Makefile
@@ -1,7 +1,7 @@
BEARSSL_NAME := bearssl
-# latest version from 2021-01-28
-BEARSSL_VERSION := 79b1a9996c094ff593ae50bc4edc1f349f39dd6d
+# latest version from 2022-06-22
+BEARSSL_VERSION := 46f7dddce75227f2e40ab94d66ceb9f19ee6b1b0
BEARSSL_URLDIR := https://www.bearssl.org/git
$(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled: | $(OUTPUT)/build-build/.lh_skarnet_installed
@@ -10,20 +10,20 @@ $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled: | $(OUTPUT)/build-build/.lh_skarnet_
exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/sources/BearSSL $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) git checkout $(BEARSSL_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
+ exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION) git checkout $(BEARSSL_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC="$(BUILD_HOST_CC)" LD="$(BUILD_HOST_CC)" LDDLL="$(BUILD_HOST_CC)"
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC="$(TARGET_CC)" LD="$(TARGET_CC)" LDDLL="$(TARGET_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec s6-mkdir -p $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib
- exec cp $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/
- exec s6-hiercopy $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/inc $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
+ exec cp $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/
+ exec s6-hiercopy $(OUTPUT)/build-$(TRIPLE)/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/inc $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
exec chown -R root:root $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include
exec makenamelink $(OUTPUT)/rootfs/opt $(BEARSSL_NAME) $(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile
index 422c90a..6d5d754 100644
--- a/sub/busybox/Makefile
+++ b/sub/busybox/Makefile
@@ -1,12 +1,12 @@
-# Version from 2021-02-27
-BUSYBOX_VERSION := 9b6bcfda0e11c0e73a966a77110f6c68425cff34
+# Version from 2023-01-05
+BUSYBOX_VERSION := f15dfd86c4fba78881071dd0f5c63466fa9737a2
clean-busybox:
rm -f $(OUTPUT)/sources/.lh_bb_cloned
rm -rf $(OUTPUT)/sources/busybox
rm -f $(OUTPUT)/sources/.lh_bb_dled
- rm -rf $(OUTPUT)/build-host/.lh_bb_*
- rm -rf $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)
+ rm -rf $(OUTPUT)/build-$(TRIPLE)/.lh_bb_*
+ rm -rf $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)
$(OUTPUT)/sources/.lh_bb_cloned: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
@@ -19,25 +19,25 @@ $(OUTPUT)/sources/.lh_bb_dled: $(OUTPUT)/sources/.lh_bb_cloned | $(OUTPUT)/build
exec setuidgid $(NORMALUSER) touch $@
-$(OUTPUT)/build-host/.lh_bb_copied: $(OUTPUT)/sources/.lh_bb_dled | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_prepared
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/busybox $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/.lh_bb_copied: $(OUTPUT)/sources/.lh_bb_dled | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_prepared
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)
+ exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/busybox $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config: $(OUTPUT)/build-host/.lh_bb_copied sub/busybox/host-full-config | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_prepared
-ifeq ($(BUILD_HOST_STATIC),true)
+$(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)/.config: $(OUTPUT)/build-$(TRIPLE)/.lh_bb_copied sub/busybox/host-full-config | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_prepared
+ifeq ($(TARGET_STATIC),true)
exec setuidgid $(NORMALUSER) redirfd -w 1 $@ sed -e 's/# CONFIG_STATIC is not set/CONFIG_STATIC=y/' $(WD)/sub/busybox/host-full-config
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-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)"
+$(OUTPUT)/build-$(TRIPLE)/.lh_bb_built: $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)/.config $(OUTPUT)/build-$(TRIPLE)/.lh_utmps_installed $(OUTPUT)/build-$(TRIPLE)/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC="$(TARGET_CC)" HOSTCC="$(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
+$(OUTPUT)/build-$(TRIPLE)/.lh_bb_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_bb_built $(OUTPUT)/tmp/.lh_layout_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
exec s6-rmrf $(OUTPUT)/rootfs/opt/busybox-$(BUSYBOX_VERSION)
- exec cp -RP $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/_install $(OUTPUT)/rootfs/opt/busybox-$(BUSYBOX_VERSION)
+ exec cp -RP $(OUTPUT)/build-$(TRIPLE)/busybox-$(BUSYBOX_VERSION)/_install $(OUTPUT)/rootfs/opt/busybox-$(BUSYBOX_VERSION)
exec makenamelink $(OUTPUT)/rootfs/opt busybox busybox-$(BUSYBOX_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/busybox/bin
exec makelinks $(OUTPUT)/rootfs /bin /opt/busybox/sbin
diff --git a/sub/dev/Makefile.curl b/sub/dev/Makefile.curl
index 1b0ea66..efe21ce 100644
--- a/sub/dev/Makefile.curl
+++ b/sub/dev/Makefile.curl
@@ -1,6 +1,6 @@
-CURL_VERSION ?= 7.75.0
-CURL_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-all-static,)
+CURL_VERSION ?= 7.87.0
+CURL_STATIC := $(if $(filter true,$(TARGET_STATIC)),-all-static,)
CURL_CONF_ARGS := \
--disable-silent-rules \
@@ -90,30 +90,30 @@ CURL_CONF_ARGS := \
CURL_MAKE_ARGS := LDFLAGS="-L$(OUTPUT)/rootfs/opt/bearssl/lib -L$(OUTPUT)/rootfs/opt/zlib/lib $(CURL_STATIC)"
clean-curl:
- rm -f $(OUTPUT)/build-host/.lh_curl_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_curl_*
$(OUTPUT)/sources/curl-$(CURL_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://curl.se/download/curl-$(CURL_VERSION).tar.xz
-$(OUTPUT)/build-host/.lh_curl_dled: $(OUTPUT)/sources/curl-$(CURL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_dled: $(OUTPUT)/sources/curl-$(CURL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_curl_copied: $(OUTPUT)/build-host/.lh_curl_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/curl-$(CURL_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -Jxpvf $(OUTPUT)/sources/curl-$(CURL_VERSION).tar.xz
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -Jxpvf $(OUTPUT)/sources/curl-$(CURL_VERSION).tar.xz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_curl_configured: $(OUTPUT)/build-host/.lh_curl_copied $(OUTPUT)/build-host/.lh_bearssl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/curl-$(CURL_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --build=$(BUILD_QUADRUPLE) --host=$(TRIPLE) --prefix=/opt/curl-$(CURL_VERSION) $(CURL_CONF_ARGS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_copied $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION) export CC "$(TARGET_CC)" ./configure --build=$(BUILD_QUADRUPLE) --host=$(TRIPLE) --prefix=/opt/curl-$(CURL_VERSION) $(CURL_CONF_ARGS)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_curl_built: $(OUTPUT)/build-host/.lh_curl_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/curl-$(CURL_VERSION) $(MAKE) $(CURL_MAKE_ARGS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_built: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION) $(MAKE) $(CURL_MAKE_ARGS)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_curl_installed: $(OUTPUT)/build-host/.lh_curl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/curl-$(CURL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_curl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/curl-$(CURL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt curl curl-$(CURL_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/curl/bin
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.git b/sub/dev/Makefile.git
index d9348bd..dc487aa 100644
--- a/sub/dev/Makefile.git
+++ b/sub/dev/Makefile.git
@@ -1,36 +1,36 @@
-GIT_VERSION ?= 2.30.0
-GIT_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-static,)
+GIT_VERSION ?= 2.39.1
+GIT_STATIC := $(if $(filter true,$(TARGET_STATIC)),-static,)
GIT_CONF_ARGS := --enable-pthreads --without-expat --without-iconv --with-shell=/bin/sh --with-perl=/bin/perl --without-python --with-zlib=$(OUTPUT)/rootfs/opt/zlib --without-tcltk --with-openssl=$(OUTPUT)/rootfs/opt/libressl ac_cv_fread_reads_directories=true ac_cv_snprintf_returns_bogus=false
GIT_MAKE_ARGS := LDFLAGS="-s $(GIT_STATIC)" NO_GETTEXT=YesPlease NO_PERL=YesPlease DEFAULT_HELP_FORMAT=html INSTALL_SYMLINKS=YesPlease
clean-git:
- rm -f $(OUTPUT)/build-host/.lh_git_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_git_*
$(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://www.kernel.org/pub/software/scm/git/git-$(GIT_VERSION).tar.gz
-$(OUTPUT)/build-host/.lh_git_dled: $(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_dled: $(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_git_copied: $(OUTPUT)/build-host/.lh_git_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/git-$(GIT_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -zxpvf $(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_git_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -zxpvf $(OUTPUT)/sources/git-$(GIT_VERSION).tar.gz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_git_configured: $(OUTPUT)/build-host/.lh_git_copied $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/git-$(GIT_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/git-$(GIT_VERSION) $(GIT_CONF_ARGS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_git_copied $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION) export CC "$(TARGET_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/git-$(GIT_VERSION) $(GIT_CONF_ARGS)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_git_built: $(OUTPUT)/build-host/.lh_git_configured $(OUTPUT)/build-host/.lh_libressl_installed $(OUTPUT)/build-host/.lh_curl_installed $(OUTPUT)/build-host/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/git-$(GIT_VERSION) $(MAKE) $(GIT_MAKE_ARGS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_built: $(OUTPUT)/build-$(TRIPLE)/.lh_git_configured $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_curl_installed $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION) $(MAKE) $(GIT_MAKE_ARGS)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_git_installed: $(OUTPUT)/build-host/.lh_git_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/git-$(GIT_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs $(GIT_MAKE_ARGS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_git_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_git_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/git-$(GIT_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs $(GIT_MAKE_ARGS)
exec makenamelink $(OUTPUT)/rootfs/opt git git-$(GIT_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/git/bin
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.libressl b/sub/dev/Makefile.libressl
index c7f6254..e30146d 100644
--- a/sub/dev/Makefile.libressl
+++ b/sub/dev/Makefile.libressl
@@ -1,32 +1,32 @@
-LIBRESSL_VERSION ?= 3.2.3
-LIBRESSL_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS="-s -all-static",LDFLAGS=-s)
+LIBRESSL_VERSION ?= 3.7.0
+LIBRESSL_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS="-s -all-static",LDFLAGS=-s)
clean-libressl:
- rm -f $(OUTPUT)/build-host/.lh_libressl_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_*
$(OUTPUT)/sources/libressl-$(LIBRESSL_VERSION).tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-$(LIBRESSL_VERSION).tar.gz
-$(OUTPUT)/build-host/.lh_libressl_dled: $(OUTPUT)/sources/libressl-$(LIBRESSL_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_dled: $(OUTPUT)/sources/libressl-$(LIBRESSL_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_libressl_copied: $(OUTPUT)/build-host/.lh_libressl_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/libressl-$(LIBRESSL_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -zxpvf $(OUTPUT)/sources/libressl-$(LIBRESSL_VERSION).tar.gz
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -zxpvf $(OUTPUT)/sources/libressl-$(LIBRESSL_VERSION).tar.gz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_libressl_configured: $(OUTPUT)/build-host/.lh_libressl_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/libressl-$(LIBRESSL_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/libressl-$(LIBRESSL_VERSION) --disable-tests
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION) export CC "$(TARGET_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/libressl-$(LIBRESSL_VERSION) --disable-tests
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_libressl_built: $(OUTPUT)/build-host/.lh_libressl_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/libressl-$(LIBRESSL_VERSION) $(MAKE) $(LIBRESSL_MAKE_STATIC)
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_built: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION) $(MAKE) $(LIBRESSL_MAKE_STATIC)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_libressl_installed: $(OUTPUT)/build-host/.lh_libressl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/libressl-$(LIBRESSL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_libressl_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_libressl_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/libressl-$(LIBRESSL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt libressl libressl-$(LIBRESSL_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/libressl/bin
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.make b/sub/dev/Makefile.make
index dc5872d..6eaa00c 100644
--- a/sub/dev/Makefile.make
+++ b/sub/dev/Makefile.make
@@ -1,32 +1,32 @@
-MAKE_VERSION ?= 4.3
-MAKE_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS=-static,)
+MAKE_VERSION ?= 4.4
+MAKE_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS=-static,)
clean-make:
- rm -f $(OUTPUT)/build-host/.lh_make_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_make_*
$(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://ftp.gnu.org//gnu/make/make-$(MAKE_VERSION).tar.gz
-$(OUTPUT)/build-host/.lh_make_dled: $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_dled: $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_make_copied: $(OUTPUT)/build-host/.lh_make_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/make-$(MAKE_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -zxpvf $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_make_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -zxpvf $(OUTPUT)/sources/make-$(MAKE_VERSION).tar.gz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_make_configured: $(OUTPUT)/build-host/.lh_make_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) export CC "$(BUILD_HOST_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/make-$(MAKE_VERSION) --disable-nls --disable-rpath
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_make_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION) export CC "$(TARGET_CC)" ./configure --host=$(TRIPLE) --prefix=/opt/make-$(MAKE_VERSION) --disable-nls --disable-rpath
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_make_built: $(OUTPUT)/build-host/.lh_make_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) $(MAKE) $(MAKE_MAKE_STATIC)
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_built: $(OUTPUT)/build-$(TRIPLE)/.lh_make_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION) $(MAKE) $(MAKE_MAKE_STATIC)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_make_installed: $(OUTPUT)/build-host/.lh_make_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/make-$(MAKE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_make_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_make_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/make-$(MAKE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt make make-$(MAKE_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/make/bin
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.strace b/sub/dev/Makefile.strace
index 4fe07ad..469dbbc 100644
--- a/sub/dev/Makefile.strace
+++ b/sub/dev/Makefile.strace
@@ -1,32 +1,32 @@
-STRACE_VERSION ?= 5.10
-STRACE_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),LDFLAGS=-static,)
+STRACE_VERSION ?= 6.1
+STRACE_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),LDFLAGS=-static,)
clean-strace:
- rm -f $(OUTPUT)/build-host/.lh_strace_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_strace_*
$(OUTPUT)/sources/strace-$(STRACE_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://strace.io/files/$(STRACE_VERSION)/strace-$(STRACE_VERSION).tar.xz
-$(OUTPUT)/build-host/.lh_strace_dled: $(OUTPUT)/sources/strace-$(STRACE_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_dled: $(OUTPUT)/sources/strace-$(STRACE_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_strace_copied: $(OUTPUT)/build-host/.lh_strace_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/strace-$(STRACE_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -Jxpvf $(OUTPUT)/sources/strace-$(STRACE_VERSION).tar.xz
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -Jxpvf $(OUTPUT)/sources/strace-$(STRACE_VERSION).tar.xz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_strace_configured: $(OUTPUT)/build-host/.lh_strace_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/strace-$(STRACE_VERSION) export CC "$(BUILD_HOST_CC)" export LIBS "-lrt -lpthread" ./configure --host=$(TRIPLE) --prefix=/opt/strace-$(STRACE_VERSION) --enable-mpers=no
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION) export CC "$(TARGET_CC)" export LIBS "-lrt -lpthread" ./configure --host=$(TRIPLE) --prefix=/opt/strace-$(STRACE_VERSION) --enable-mpers=no
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_strace_built: $(OUTPUT)/build-host/.lh_strace_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/strace-$(STRACE_VERSION) $(MAKE) $(STRACE_MAKE_STATIC)
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_built: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION) $(MAKE) $(STRACE_MAKE_STATIC)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_strace_installed: $(OUTPUT)/build-host/.lh_strace_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/strace-$(STRACE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_strace_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_strace_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/strace-$(STRACE_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt strace strace-$(STRACE_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/strace/bin
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dev/Makefile.zlib b/sub/dev/Makefile.zlib
index 21bb432..e2c4ee6 100644
--- a/sub/dev/Makefile.zlib
+++ b/sub/dev/Makefile.zlib
@@ -1,30 +1,30 @@
-ZLIB_VERSION ?= 1.2.11
+ZLIB_VERSION ?= 1.2.13
clean-zlib:
- rm -f $(OUTPUT)/build-host/.lh_zlib_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_*
$(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://zlib.net/zlib-$(ZLIB_VERSION).tar.xz
-$(OUTPUT)/build-host/.lh_zlib_dled: $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_dled: $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_zlib_copied: $(OUTPUT)/build-host/.lh_zlib_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -Jxpvf $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.xz
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -Jxpvf $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.xz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_zlib_configured: $(OUTPUT)/build-host/.lh_zlib_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) export CC "$(BUILD_HOST_CC)" export CHOST "$(TRIPLE)" ./configure --prefix=/opt/zlib-$(ZLIB_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION) export CC "$(TARGET_CC)" export CHOST "$(TRIPLE)" ./configure --prefix=/opt/zlib-$(ZLIB_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_zlib_built: $(OUTPUT)/build-host/.lh_zlib_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) $(MAKE)
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_built: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION) $(MAKE)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_zlib_installed: $(OUTPUT)/build-host/.lh_zlib_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_zlib_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_zlib_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/zlib-$(ZLIB_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt zlib zlib-$(ZLIB_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile
index 515ed51..76f897c 100644
--- a/sub/dropbear/Makefile
+++ b/sub/dropbear/Makefile
@@ -1,39 +1,39 @@
-DROPBEAR_VERSION ?= 2020.81
-DROPBEAR_CONF_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),--enable-static,)
-DROPBEAR_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-static,)
+DROPBEAR_VERSION ?= 2022.83
+DROPBEAR_CONF_STATIC := $(if $(filter true,$(TARGET_STATIC)),--enable-static,)
+DROPBEAR_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),-static,)
clean-dropbear:
- rm -f $(OUTPUT)/build-host/.lh_dropbear_*
+ rm -f $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_*
$(OUTPUT)/sources/dropbear-$(DROPBEAR_VERSION).tar.bz2: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget https://dropbear.nl/mirror/dropbear-$(DROPBEAR_VERSION).tar.bz2
-$(OUTPUT)/build-host/.lh_dropbear_dled: $(OUTPUT)/sources/dropbear-$(DROPBEAR_VERSION).tar.bz2 | $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_dled: $(OUTPUT)/sources/dropbear-$(DROPBEAR_VERSION).tar.bz2 | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_dropbear_copied: $(OUTPUT)/build-host/.lh_dropbear_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar -jxpvf $(OUTPUT)/sources/dropbear-$(DROPBEAR_VERSION).tar.bz2
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_copied: $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar -jxpvf $(OUTPUT)/sources/dropbear-$(DROPBEAR_VERSION).tar.bz2
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_dropbear_patched: $(OUTPUT)/build-host/.lh_dropbear_copied sub/dropbear/localoptions.h
- exec setuidgid $(NORMALUSER) cp -f sub/dropbear/localoptions.h $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)/localoptions.h
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_patched: $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_copied sub/dropbear/localoptions.h
+ exec setuidgid $(NORMALUSER) cp -f sub/dropbear/localoptions.h $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION)/localoptions.h
exec setuidgid $(NORMALUSER) s6-touch $@
-$(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)
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_patched $(OUTPUT)/build-$(TRIPLE)/.lh_utmps_installed $(OUTPUT)/build-$(TRIPLE)/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC "$(TARGET_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
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) $(MAKE) ARCH=$(KERNEL_ARCH) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_built: $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION) $(MAKE) ARCH=$(KERNEL_ARCH) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_dropbear_installed: $(OUTPUT)/build-host/.lh_dropbear_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_dropbear_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt dropbear dropbear-$(DROPBEAR_VERSION) $(OUTPUT)/tmp
- exec cp -f $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)/scp $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/scp
+ exec cp -f $(OUTPUT)/build-$(TRIPLE)/dropbear-$(DROPBEAR_VERSION)/scp $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/scp
exec mv -f $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/sbin/dropbear $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/dropbear
exec rmdir $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/sbin
exec makelinks $(OUTPUT)/rootfs /bin /opt/dropbear/bin
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile
index 969df9b..b2f6528 100644
--- a/sub/kernel/Makefile
+++ b/sub/kernel/Makefile
@@ -4,7 +4,7 @@ KERNEL_VERSION ?= 5.10.19
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" HOST_LFS_CFLAGS= HOST_LFS_LDFLAGS= HOST_LFS_LIBS=
+KERNEL_ENV := HOSTCC=$(BUILD_CC) DEPMOD=$(OUTPUT)/build-build/opt/kmod/bin/depmod INSTALL_MOD_PATH=$(OUTPUT)/rootfs CROSS_COMPILE=$(TARGET_PREFIX)- ARCH=$(KERNEL_GENERIC_ARCH) INSTALL_MOD_STRIP="-R .note -R .comment -R .note.GNU-stack --strip-debug" HOST_LFS_CFLAGS= HOST_LFS_LDFLAGS= HOST_LFS_LIBS=
$(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared
cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) wget https://cdn.kernel.org/pub/linux/kernel/v$(KERNEL_MAJOR).x/linux-$(KERNEL_VERSION).tar.xz
@@ -22,47 +22,47 @@ $(OUTPUT)/build-build/.lh_kernel_headers_installed: $(OUTPUT)/build-build/.lh_ke
exec setuidgid $(NORMALUSER) touch $@
-$(OUTPUT)/build-host/kernel/.lh_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-host/kernel
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-$(TRIPLE)/kernel
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/kernel/.lh_configured: $(OUTPUT)/build-host/kernel/.lh_unpacked $(KERNEL_CONFIG) | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cp -f $(KERNEL_CONFIG) $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/.config
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) olddefconfig $(KERNEL_ENV)
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_configured: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_unpacked $(KERNEL_CONFIG) | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cp -f $(KERNEL_CONFIG) $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION)/.config
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) olddefconfig $(KERNEL_ENV)
exec setuidgid $(NORMALUSER) s6-touch $@
-kernel-menuconfig: $(OUTPUT)/build-host/kernel/.lh_configured $(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_installed | $(OUTPUT)/build-build/.lh_skarnet_installed $(WD)/bin/fake-pkg-config
+kernel-menuconfig: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_configured $(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_installed | $(OUTPUT)/build-build/.lh_skarnet_installed $(WD)/bin/fake-pkg-config
exec setuidgid $(NORMALUSER) s6-ln -nsf $(WD)/bin/fake-pkg-config $(OUTPUT)/build-build/bin/pkg-config
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) menuconfig $(KERNEL_ENV)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) menuconfig $(KERNEL_ENV)
exec setuidgid $(NORMALUSER) rm -f $(OUTPUT)/build-build/bin/pkg-config
-$(OUTPUT)/build-host/kernel/.lh_prepared: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_prepared: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec s6-mkdir -p $(OUTPUT)/rootfs/opt/linux-kernel-headers-$(KERNEL_VERSION)
exec makenamelink $(OUTPUT)/rootfs/opt linux-kernel-headers linux-kernel-headers-$(KERNEL_VERSION) $(OUTPUT)/tmp
- exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-host/kernel
+ exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-$(TRIPLE)/kernel
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/kernel/.lh_headers_installed: $(OUTPUT)/build-host/kernel/.lh_prepared $(OUTPUT)/build-host/kernel/.lh_built | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) headers_install $(KERNEL_ENV) INSTALL_HDR_PATH=$(OUTPUT)/rootfs/opt/linux-kernel-headers-$(KERNEL_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_headers_installed: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_prepared $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_built | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) headers_install $(KERNEL_ENV) INSTALL_HDR_PATH=$(OUTPUT)/rootfs/opt/linux-kernel-headers-$(KERNEL_VERSION)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/kernel/.lh_built: $(OUTPUT)/build-host/kernel/.lh_configured | $(OUTPUT)/build-build/.lh_kmod_installed $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) modules_prepare $(KERNEL_ENV)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) all $(KERNEL_ENV)
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_built: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_configured | $(OUTPUT)/build-build/.lh_kmod_installed $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) modules_prepare $(KERNEL_ENV)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) all $(KERNEL_ENV)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/kernel/.lh_installed: $(OUTPUT)/build-host/kernel/.lh_built | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/System.map $(OUTPUT)/rootfs/boot/System.map-$(KERNEL_VERSION)
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_installed: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_built | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cp -f $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION)/System.map $(OUTPUT)/rootfs/boot/System.map-$(KERNEL_VERSION)
exec s6-ln -sf System.map-$(KERNEL_VERSION) $(OUTPUT)/rootfs/boot/System.map
- cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/bzImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/zImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/Image $(OUTPUT)/kernel
+ cp -f $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/bzImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/zImage $(OUTPUT)/kernel || cp -f $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION)/arch/$(KERNEL_GENERIC_ARCH)/boot/Image $(OUTPUT)/kernel
ifeq ($(KERNEL_GENERIC_ARCH),x86)
exec cp -f $(OUTPUT)/kernel $(OUTPUT)/rootfs/boot/vmlinuz-$(KERNEL_VERSION)
exec s6-ln -sf vmlinuz-$(KERNEL_VERSION) $(OUTPUT)/rootfs/boot/vmlinuz
endif
exec setuidgid $(NORMALUSER) s6-touch $@
-$(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)
+$(OUTPUT)/build-$(TRIPLE)/kernel/.lh_modules_installed: $(OUTPUT)/build-$(TRIPLE)/kernel/.lh_built | $(OUTPUT)/build-build/.lh_kmod_installed $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/kernel/linux-$(KERNEL_VERSION) $(MAKE) modules_install $(KERNEL_ENV)
exec s6-rmrf $(OUTPUT)/rootfs/lib/modules/$(KERNEL_FULLVERSION)/build $(OUTPUT)/rootfs/lib/modules/$(KERNEL_FULLVERSION)/source
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/kernel/Makefile.ncurses b/sub/kernel/Makefile.ncurses
index 509a669..3493e1e 100644
--- a/sub/kernel/Makefile.ncurses
+++ b/sub/kernel/Makefile.ncurses
@@ -1,6 +1,6 @@
NCURSES_NAME := ncurses
-NCURSES_VERSION := 6.2-20210123
+NCURSES_VERSION := 6.4-20230128
NCURSES_URLDIR := https://invisible-mirror.net/archives/$(NCURSES_NAME)/current
NCURSES_TAREXT := tgz
NCURSES_TARLETTER := z
@@ -25,7 +25,7 @@ $(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_copied: $(OUTPUT)/sources/.lh_$(NCURSE
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_configured: $(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NCURSES_NAME)-$(NCURSES_VERSION)/src export CC "$(BUILD_BUILD_CC)" ./configure --prefix=$(OUTPUT)/build-build/opt/$(NCURSES_NAME)-$(NCURSES_VERSION) $(NCURSES_CONFIGURE_OPTIONS)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NCURSES_NAME)-$(NCURSES_VERSION)/src export CC "$(BUILD_CC)" ./configure --prefix=$(OUTPUT)/build-build/opt/$(NCURSES_NAME)-$(NCURSES_VERSION) $(NCURSES_CONFIGURE_OPTIONS)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_built: $(OUTPUT)/build-build/.lh_$(NCURSES_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile
index 0513abb..a3af0fc 100644
--- a/sub/kmod/Makefile
+++ b/sub/kmod/Makefile
@@ -1,6 +1,6 @@
KMOD_NAME := kmod
-KMOD_VERSION := 28
+KMOD_VERSION := 30
KMOD_URLDIR := https://cdn.kernel.org/pub/linux/utils/kernel/$(KMOD_NAME)
KMOD_TAREXT := tar.xz
KMOD_TARLETTER := J
@@ -28,7 +28,7 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied: $(OUTPUT)/sources/.lh_$(KMOD_NAME
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied $(OUTPUT)/build-build/.lh_xz_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC "$(BUILD_BUILD_CC)" export liblzma_CFLAGS "-I$(OUTPUT)/build-build/opt/xz/include -L$(OUTPUT)/build-build/opt/xz/lib" export liblzma_LIBS "-llzma" export CFLAGS "$(KMOD_CFLAGS)" export LDFLAGS "$(KMOD_LDFLAGS)" export LIBS "$(KMOD_LIBS)" ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC "$(BUILD_CC)" export liblzma_CFLAGS "-I$(OUTPUT)/build-build/opt/xz/include -L$(OUTPUT)/build-build/opt/xz/lib" export liblzma_LIBS "-llzma" export CFLAGS "$(KMOD_CFLAGS)" export LDFLAGS "$(KMOD_LDFLAGS)" export LIBS "$(KMOD_LIBS)" ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
@@ -36,7 +36,7 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_N
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_installed: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) install CC="$(BUILD_BUILD_CC)"
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) install CC="$(BUILD_CC)"
exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(KMOD_NAME) $(KMOD_NAME)-$(KMOD_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) rm -f $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bin/depmod
exec setuidgid $(NORMALUSER) s6-ln -s kmod $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bin/depmod
diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile
index 6cb76cd..7cc6612 100644
--- a/sub/skarnet.org/Makefile
+++ b/sub/skarnet.org/Makefile
@@ -1,30 +1,81 @@
-
-# Sources
-
-url := git://git.skarnet.org
-suffix :=
-
-SKALIBS_VERSION := 025e5ed74528cc2e8676268ad07b169949d89ae3
-UTMPS_VERSION := ae14b1b6d6a8e3efc5f6a04a0b23807f0afe47a5
-EXECLINE_VERSION := 6ff749e62652103b3ab84ef145691602ed6e0fea
-S6_PORTABLE_UTILS_VERSION := 8a3b18c61d42d822cc25c74d5c04c53c7b053643
-S6_LINUX_UTILS_VERSION := 137f093d2d4964d253d740cbc101f53ba3a6fd99
-S6_DNS_VERSION := 04199d6a903c7ecad0bada112949b0b0590b1236
-S6_NETWORKING_VERSION := 6389224bab4269d3f87bcbb125bb23187c8ffd78
-S6_VERSION := 61a6affb7edecd181f8daf61b124acdd032caed1
-S6_RC_VERSION := 5e009777db90c9e69e62115c29eafff910d43a0d
-S6_LINUX_INIT_VERSION := 174d12ab273a2e124e80a04b429633071352f393
-MDEVD_VERSION := 05024f93d3cd75c86a89ed1ae6fea0c2b1f1c187
-BCNM_VERSION := 24e9a12b027ff8bf946ed2f8a4a96aafef339490
-
-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)
-SKALIBS_FIND_OPTIONS := --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-dynlib=$(OUTPUT)/rootfs/package/prog/skalibs/library.so
-UTMPS_FIND_OPTIONS := --enable-utmps --with-include=$(OUTPUT)/rootfs/package/admin/utmps/include --with-lib=$(OUTPUT)/rootfs/package/admin/utmps/library --with-dynlib=$(OUTPUT)/rootfs/package/admin/utmps/library.so
-EXECLINE_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-dynlib=$(OUTPUT)/rootfs/package/admin/execline/library.so
-S6_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library --with-dynlib=$(OUTPUT)/rootfs/package/admin/s6/library.so
-S6_DNS_FIND_OPTIONS := --with-include=$(OUTPUT)/rootfs/package/web/s6-dns/include --with-lib=$(OUTPUT)/rootfs/package/web/s6-dns/library --with-dynlib=$(OUTPUT)/rootfs/package/web/s6-dns/library.so
-
+SKAWARE := SKALIBS UTMPS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS S6_DNS S6_NETWORKING MDEVD BCNM
+
+# SKALIBS_VERSION := v2.13.1.0
+SKALIBS_VERSION := a10514072f27ff9f4a6ab308b3bccfd4628ef2aa
+UTMPS_VERSION := v0.1.2.1
+# EXECLINE_VERSION := v2.9.2.0
+EXECLINE_VERSION := 9c2bebec16aafefb9067c1db83ef3c765e13610b
+# S6_VERSION := v2.11.3.0
+S6_VERSION := 47e886410b0e1e9e2f40a3447d6a9a9c1c07928f
+# S6_RC_VERSION := v0.5.3.4
+S6_RC_VERSION := 949964fa25c8b4cd088f34ccad636e185a878da5
+S6_LINUX_INIT_VERSION := v1.0.8.1
+S6_PORTABLE_UTILS_VERSION := v2.2.5.1
+# S6_LINUX_UTILS_VERSION := v2.6.1.0
+S6_LINUX_UTILS_VERSION := 3caba3fd8f3825544c065ec62e4298c6edc76b28
+S6_DNS_VERSION := v2.3.5.5
+# S6_NETWORKING_VERSION := v2.5.1.3
+S6_NETWORKING_VERSION := 850ab0b4dc5546c408cd8566dafd5e2416d60f43
+MDEVD_VERSION := v0.1.6.1
+BCNM_VERSION := v0.0.1.6
+
+
+SKALIBS_DEPENDENCIES :=
+UTMPS_DEPENDENCIES := SKALIBS
+EXECLINE_DEPENDENCIES := SKALIBS
+S6_DEPENDENCIES := SKALIBS EXECLINE
+S6_RC_DEPENDENCIES := SKALIBS EXECLINE S6
+S6_LINUX_INIT_DEPENDENCIES := SKALIBS EXECLINE S6
+S6_PORTABLE_UTILS_DEPENDENCIES := SKALIBS
+S6_LINUX_UTILS_DEPENDENCIES := SKALIBS
+S6_DNS_DEPENDENCIES := SKALIBS
+S6_NETWORKING_DEPENDENCIES := SKALIBS EXECLINE S6 S6_DNS
+MDEVD_DEPENDENCIES := SKALIBS
+BCNM_DEPENDENCIES := SKALIBS
+
+SKALIBS_CATEGORY := prog
+UTMPS_CATEGORY := admin
+EXECLINE_CATEGORY := admin
+S6_CATEGORY := admin
+S6_RC_CATEGORY := admin
+S6_LINUX_INIT_CATEGORY := admin
+S6_PORTABLE_UTILS_CATEGORY := admin
+S6_LINUX_UTILS_CATEGORY := admin
+S6_DNS_CATEGORY := web
+S6_NETWORKING_CATEGORY := net
+MDEVD_CATEGORY := admin
+BCNM_CATEGORY := admin
+
+SKALIBS_TOKEN := libskarnet.a.xyzzy
+UTMPS_TOKEN := utmps-utmpd
+EXECLINE_TOKEN := execlineb
+S6_TOKEN := s6-supervise
+S6_RC_TOKEN := s6-rc
+S6_LINUX_INIT_TOKEN := s6-linux-init-maker
+S6_PORTABLE_UTILS_TOKEN := s6-test
+S6_LINUX_UTILS_TOKEN := s6-ps
+S6_DNS_TOKEN := s6-dnsip4
+S6_NETWORKING_TOKEN := s6-tlsd-io
+MDEVD_TOKEN := mdevd
+BCNM_TOKEN := bcnm-waitif
+
+SKAWARE_ENV := (if $(filter true,$(TARGET_STATIC)),,env LDFLAGS=-Wl,-rpath-link,$(OUTPUT)/rootfs/library.so)
+SKAWARE_OPTIONS := --enable-slashpackage $(if $(filter true,$(TARGET_STATIC)),--enable-static-libc --disable-shared,--enable-shared --disable-allstatic)
+SKAWARE_BUILD_OPTIONS := --enable-slashpackage --disable-shared --enable-allstatic
+SKALIBS_OPTIONS := --with-default-path=/command:/usr/bin:/bin --with-sysdep-devurandom=yes --with-sysdep-grndinsecure=no
+UTMPS_OPTIONS := --enable-libc-includes
+EXECLINE_OPTIONS := --disable-pedantic-posix --enable-multicall
+S6_OPTIONS :=
+S6_RC_OPTIONS :=
+S6_LINUX_INIT_OPTIONS :=
+S6_PORTABLE_UTILS_OPTIONS :=
+S6_LINUX_UTILS_OPTIONS :=
+S6_DNS_OPTIONS :=
+S6_NETWORKING_OPTIONS := --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/staging-$(ARCH)
+MDEVD_OPTIONS :=
+BCNM_OPTIONS :=
+
+$(OUTPUT)/build-$(TRIPLE)/s6-networking-$(S6_NETWORKING_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/.lh_bearssl_installed
ifeq ($(CONSOLE),)
EARLY_GETTY :=
@@ -32,371 +83,51 @@ else
EARLY_GETTY := -G "getty -H lh-$(word 1,$(subst -, ,$(TRIPLE))) 115200 $(CONSOLE)"
endif
-$(OUTPUT)/sources/.lh_skalibs_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/skalibs ; then cd $(OUTPUT)/sources/skalibs && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/skalibs$(suffix) skalibs ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/skalibs && git checkout $(SKALIBS_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_utmps_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/utmps ; then cd $(OUTPUT)/sources/utmps && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/utmps$(suffix) utmps ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/utmps && git checkout $(UTMPS_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_execline_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/execline ; then cd $(OUTPUT)/sources/execline && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/execline$(suffix) execline ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/execline && git checkout $(EXECLINE_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_s6pu_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/s6-portable-utils ; then cd $(OUTPUT)/sources/s6-portable-utils && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-portable-utils$(suffix) s6-portable-utils ; fi
- 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"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_s6net_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/s6-networking ; then cd $(OUTPUT)/sources/s6-networking && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-networking$(suffix) s6-networking ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-networking && git checkout $(S6_NETWORKING_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_s6_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/s6 ; then cd $(OUTPUT)/sources/s6 && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6$(suffix) s6 ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6 && git checkout $(S6_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_s6rc_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/s6-rc ; then cd $(OUTPUT)/sources/s6-rc && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-rc$(suffix) s6-rc ; fi
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources/s6-rc git checkout $(S6_RC_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources/s6-rc redirfd -w 1 package/deps-build true
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_s6li_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/s6-linux-init ; then cd $(OUTPUT)/sources/s6-linux-init && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/s6-linux-init$(suffix) s6-linux-init ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/s6-linux-init && git checkout $(S6_LINUX_INIT_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_mdevd_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/mdevd ; then cd $(OUTPUT)/sources/mdevd && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/mdevd$(suffix) mdevd ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/mdevd && git checkout $(MDEVD_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/sources/.lh_bcnm_cloned: | $(OUTPUT)/tmp/.lh_prepared
- if test -d $(OUTPUT)/sources/bcnm ; then cd $(OUTPUT)/sources/bcnm && setuidgid $(NORMALUSER) git fetch ; else cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone $(url)/bcnm$(suffix) bcnm ; fi
- exec setuidgid $(NORMALUSER) sh -c "cd $(OUTPUT)/sources/bcnm && git checkout $(BCNM_VERSION) && :> package/deps-build"
- exec setuidgid $(NORMALUSER) touch $@
-
-
-
-# Build-build
-
-$(OUTPUT)/build-build/.lh_skalibs_copied: $(OUTPUT)/sources/.lh_skalibs_cloned
- exec setuidgid $(NORMALUSER) rm -rf -- $(OUTPUT)/build-build/tmp/skalibs
- exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/skalibs $(OUTPUT)/build-build/tmp/skalibs
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_skalibs_configured: $(OUTPUT)/build-build/.lh_skalibs_copied
- cd $(OUTPUT)/build-build/tmp/skalibs && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin --disable-shared --with-sysdep-devurandom=yes
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_skalibs_built: $(OUTPUT)/build-build/.lh_skalibs_configured
- cd $(OUTPUT)/build-build/tmp/skalibs && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_skalibs_installed: $(OUTPUT)/build-build/.lh_skalibs_built
- cd $(OUTPUT)/build-build/tmp/skalibs && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_utmps_copied: $(OUTPUT)/sources/.lh_utmps_cloned
- exec setuidgid $(NORMALUSER) rm -rf -- $(OUTPUT)/build-build/tmp/utmps
- exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/utmps $(OUTPUT)/build-build/tmp/utmps
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_utmps_configured: $(OUTPUT)/build-build/.lh_utmps_copied $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/utmps && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --enable-libc-includes --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_utmps_built: $(OUTPUT)/build-build/.lh_utmps_configured $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/utmps && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_utmps_installed: $(OUTPUT)/build-build/.lh_utmps_built
- cd $(OUTPUT)/build-build/tmp/utmps && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_execline_copied: $(OUTPUT)/sources/.lh_execline_cloned
- exec setuidgid $(NORMALUSER) rm -rf -- $(OUTPUT)/build-build/tmp/execline
- exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/execline $(OUTPUT)/build-build/tmp/execline
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_execline_configured: $(OUTPUT)/build-build/.lh_execline_copied $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/execline && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_execline_built: $(OUTPUT)/build-build/.lh_execline_configured $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/execline && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_execline_installed: $(OUTPUT)/build-build/.lh_execline_built
- cd $(OUTPUT)/build-build/tmp/execline && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_s6pu_copied: $(OUTPUT)/sources/.lh_s6pu_cloned
- exec setuidgid $(NORMALUSER) rm -rf -- $(OUTPUT)/build-build/tmp/s6-portable-utils
- exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/s6-portable-utils $(OUTPUT)/build-build/tmp/s6-portable-utils
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6pu_configured: $(OUTPUT)/build-build/.lh_s6pu_copied $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/s6-portable-utils && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6pu_built: $(OUTPUT)/build-build/.lh_s6pu_configured $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/s6-portable-utils && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6pu_installed: $(OUTPUT)/build-build/.lh_s6pu_built
- cd $(OUTPUT)/build-build/tmp/s6-portable-utils && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_s6_copied: $(OUTPUT)/sources/.lh_s6_cloned
- exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/tmp/s6
- exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6 $(OUTPUT)/build-build/tmp/s6
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6_configured: $(OUTPUT)/build-build/.lh_s6_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed
- cd $(OUTPUT)/build-build/tmp/s6 && setuidgid $(NORMALUSER) export CC "$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6_built: $(OUTPUT)/build-build/.lh_s6_configured $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed
- cd $(OUTPUT)/build-build/tmp/s6 && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6_installed: $(OUTPUT)/build-build/.lh_s6_built
- cd $(OUTPUT)/build-build/tmp/s6 && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_s6li_copied: $(OUTPUT)/sources/.lh_s6li_cloned
- exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/tmp/s6-linux-init
- exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6-linux-init $(OUTPUT)/build-build/tmp/s6-linux-init
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6li_configured: $(OUTPUT)/build-build/.lh_s6li_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_utmps_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed
- cd $(OUTPUT)/build-build/tmp/s6-linux-init && setuidgid $(NORMALUSER) export CC "$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --enable-utmps --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/utmps/include --with-lib=$(OUTPUT)/build-build/package/admin/utmps/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/build-build/package/admin/s6/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6li_built: $(OUTPUT)/build-build/.lh_s6li_configured $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed
- cd $(OUTPUT)/build-build/tmp/s6-linux-init && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6li_installed: $(OUTPUT)/build-build/.lh_s6li_built sub/skarnet.org/rc.init sub/skarnet.org/rc.shutdown sub/skarnet.org/rc.shutdown.final sub/skarnet.org/runlevel
- exec setuidgid $(NORMALUSER) mkdir -p $(OUTPUT)/build-build/etc/s6-linux-init/skel
- cd $(OUTPUT)/build-build/tmp/s6-linux-init && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) s6-hiercopy sub/skarnet.org/rc.init $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.init
- exec setuidgid $(NORMALUSER) s6-hiercopy sub/skarnet.org/rc.shutdown $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.shutdown
- exec setuidgid $(NORMALUSER) s6-hiercopy sub/skarnet.org/rc.shutdown.final $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.shutdown.final
- exec setuidgid $(NORMALUSER) s6-hiercopy sub/skarnet.org/runlevel $(OUTPUT)/build-build/etc/s6-linux-init/skel/runlevel
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_s6dns_copied: $(OUTPUT)/sources/.lh_s6dns_cloned
- exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/tmp/s6-dns
- exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6-dns $(OUTPUT)/build-build/tmp/s6-dns
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6dns_configured: $(OUTPUT)/build-build/.lh_s6dns_copied $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/s6-dns && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6dns_built: $(OUTPUT)/build-build/.lh_s6dns_configured $(OUTPUT)/build-build/.lh_skalibs_installed
- cd $(OUTPUT)/build-build/tmp/s6-dns && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6dns_installed: $(OUTPUT)/build-build/.lh_s6dns_built
- cd $(OUTPUT)/build-build/tmp/s6-dns && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-
-$(OUTPUT)/build-build/.lh_s6rc_copied: $(OUTPUT)/sources/.lh_s6rc_cloned
- exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/tmp/s6-rc
- exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6-rc $(OUTPUT)/build-build/tmp/s6-rc
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6rc_configured: $(OUTPUT)/build-build/.lh_s6rc_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed
- cd $(OUTPUT)/build-build/tmp/s6-rc && setuidgid $(NORMALUSER) env CC="$(BUILD_BUILD_CC)" ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/build-build/package/admin/s6/library
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6rc_built: $(OUTPUT)/build-build/.lh_s6rc_configured $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed
- cd $(OUTPUT)/build-build/tmp/s6-rc && setuidgid $(NORMALUSER) $(MAKE) all strip
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_s6rc_installed: $(OUTPUT)/build-build/.lh_s6rc_built
- cd $(OUTPUT)/build-build/tmp/s6-rc && setuidgid $(NORMALUSER) $(MAKE) install update global-links DESTDIR=$(OUTPUT)/build-build
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-build/.lh_skarnet_installed: $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6pu_installed $(OUTPUT)/build-build/.lh_s6_installed $(OUTPUT)/build-build/.lh_s6li_installed $(OUTPUT)/build-build/.lh_s6dns_installed $(OUTPUT)/build-build/.lh_s6rc_installed
- exec setuidgid $(NORMALUSER) touch $@
-
+.PHONY: skaware-install
+define skaware_rules_definition
-# Build-host
+$(1)_NAME := $(subst _,-,$(shell echo $(1) | tr A-Z a-z))
+$(1)_INCLUDE_LOCATION := $(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include
+$(1)_LIBRARY_LOCATION := $(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/library
+$(1)_DYNLIB_LOCATION := $(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/library.so
+.PHONY: $$($(1)_NAME)-download $$($(1)_NAME)-prepare $$($(1)_NAME)-configure $$($(1)_NAME)-build $$($(1)_NAME)-install
-$(OUTPUT)/build-host/.lh_skalibs_copied: $(OUTPUT)/sources/.lh_skalibs_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/skalibs
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/skalibs $(OUTPUT)/build-host/skalibs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_skalibs_configured: $(OUTPUT)/build-host/.lh_skalibs_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/skalibs ./configure --host=$(TRIPLE) --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin $(SKARNET_CONF_STATIC) --with-sysdep-devurandom=yes
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_skalibs_built: $(OUTPUT)/build-host/.lh_skalibs_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/skalibs $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_skalibs_installed: $(OUTPUT)/build-host/.lh_skalibs_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- cd $(OUTPUT)/build-host/skalibs && $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) touch $@
+$$($(1)_NAME)-download: $(OUTPUT)/sources/$$($(1)_NAME)/Makefile
+$$($(1)_NAME)-prepare: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/Makefile
+$$($(1)_NAME)-configure: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak
+$$($(1)_NAME)-build: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN)
+$$($(1)_NAME)-install: $(OUTPUT)/staging-$(TRIPLE)/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h
+$(OUTPUT)/sources/$$($(1)_NAME)/Makefile: | $(OUTPUT)/tmp/.lh_prepared
+ exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/sources/$$($(1)_NAME)
+ cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) git clone git://git.skarnet.org/$$($(1)_NAME)
+ exec setuidgid $(NORMALUSER) touch $$@
-$(OUTPUT)/build-host/.lh_utmps_copied: $(OUTPUT)/sources/.lh_utmps_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/utmps
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/utmps $(OUTPUT)/build-host/utmps
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/Makefile: $(OUTPUT)/sources/$$($(1)_NAME)/Makefile | $(OUTPUT)/tmp/.lh_prepared
+ exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)
+ exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/$$($(1)_NAME) $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)
+ cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) git checkout $$($(1)_VERSION) && rm -rf .git
+ exec touch $$@
-$(OUTPUT)/build-host/.lh_utmps_configured: $(OUTPUT)/build-host/.lh_utmps_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/utmps $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage --enable-libc-includes $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/Makefile $$(foreach dep,$$($(1)_DEPENDENCIES),$(OUTPUT)/rootfs/package/$$($$(dep)_CATEGORY)/$$($$(dep)_NAME)/include/$$($$(dep)_NAME)/config.h)
+ cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) $(SKAWARE_ENV) ./configure --host=$(TRIPLE) $(SKAWARE_OPTIONS) $$($(1)_OPTIONS)
-$(OUTPUT)/build-host/.lh_utmps_built: $(OUTPUT)/build-host/.lh_utmps_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/utmps $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN): $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak
+ cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) $(MAKE) all strip
-$(OUTPUT)/build-host/.lh_utmps_installed: $(OUTPUT)/build-host/.lh_utmps_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/utmps $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h: $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN)
+ cd $(OUTPUT)/build-$(TRIPLE)/$$($(1)_NAME)-$$($(1)_VERSION) && $(MAKE) -L install update global-links DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed: $(OUTPUT)/rootfs/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h
-$(OUTPUT)/build-host/.lh_execline_copied: $(OUTPUT)/sources/.lh_execline_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/execline
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/execline $(OUTPUT)/build-host/execline
- exec setuidgid $(NORMALUSER) s6-touch $@
+endef
-$(OUTPUT)/build-host/.lh_execline_configured: $(OUTPUT)/build-host/.lh_execline_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/execline $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(foreach pkg,$(SKAWARE),$(eval $(call skaware_rules_definition,$(pkg))))
-$(OUTPUT)/build-host/.lh_execline_built: $(OUTPUT)/build-host/.lh_execline_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/execline $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_execline_installed: $(OUTPUT)/build-host/.lh_execline_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/execline $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-
-$(OUTPUT)/build-host/.lh_s6dns_copied: $(OUTPUT)/sources/.lh_s6dns_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6-dns
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-dns $(OUTPUT)/build-host/s6-dns
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6dns_configured: $(OUTPUT)/build-host/.lh_s6dns_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-dns $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6dns_built: $(OUTPUT)/build-host/.lh_s6dns_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-dns $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6dns_installed: $(OUTPUT)/build-host/.lh_s6dns_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6-dns $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-
-$(OUTPUT)/build-host/.lh_s6net_copied: $(OUTPUT)/sources/.lh_s6net_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6-networking
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-networking $(OUTPUT)/build-host/s6-networking
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6net_configured: $(OUTPUT)/build-host/.lh_s6net_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_bearssl_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-networking $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl $(SKALIBS_FIND_OPTIONS) $(EXECLINE_FIND_OPTIONS) $(S6_FIND_OPTIONS) $(S6_DNS_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6net_built: $(OUTPUT)/build-host/.lh_s6net_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_bearssl_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-networking $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6net_installed: $(OUTPUT)/build-host/.lh_s6net_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6-networking $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-
-$(OUTPUT)/build-host/.lh_s6_copied: $(OUTPUT)/sources/.lh_s6_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6 $(OUTPUT)/build-host/s6
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6_configured: $(OUTPUT)/build-host/.lh_s6_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6 $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS) $(EXECLINE_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6_built: $(OUTPUT)/build-host/.lh_s6_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6 $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6_installed: $(OUTPUT)/build-host/.lh_s6_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6 $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-
-$(OUTPUT)/build-host/.lh_s6rc_copied: $(OUTPUT)/sources/.lh_s6rc_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6-rc
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-rc $(OUTPUT)/build-host/s6-rc
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6rc_configured: $(OUTPUT)/build-host/.lh_s6rc_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-rc $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS) $(EXECLINE_FIND_OPTIONS) $(S6_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-host/.lh_s6rc_built: $(OUTPUT)/build-host/.lh_s6rc_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-rc $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6rc_installed: $(OUTPUT)/build-host/.lh_s6rc_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6-rc $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-
-$(OUTPUT)/build-host/.lh_s6li_copied: $(OUTPUT)/sources/.lh_s6li_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6-linux-init
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-linux-init $(OUTPUT)/build-host/s6-linux-init
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6li_configured: $(OUTPUT)/build-host/.lh_s6li_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_utmps_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-init $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS) $(UTMPS_FIND_OPTIONS) $(EXECLINE_FIND_OPTIONS) $(S6_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/build-host/.lh_s6li_built: $(OUTPUT)/build-host/.lh_s6li_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-init $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6li_installed: $(OUTPUT)/build-host/.lh_s6li_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6-linux-init $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+$(OUTPUT)/build-$(TRIPLE)/.lh_s6li_laidout: $(OUTPUT)/build-$(TRIPLE)/.lh_s6li_installed | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
exec mkdir -p $(OUTPUT)/rootfs/etc/s6-linux-init
exec rm -rf $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir
exec s6-linux-init-maker -u $(NORMALUSER) $(EARLY_GETTY) -1 -p /command:/bin -s /run/kernel_env -U utmp -f $(OUTPUT)/build-build/etc/s6-linux-init/skel -- $(OUTPUT)/rootfs/etc/s6-linux-init/s6lidir
@@ -408,62 +139,49 @@ $(OUTPUT)/build-host/.lh_s6li_laidout: $(OUTPUT)/build-host/.lh_s6li_installed |
exec $(OUTPUT)/build-build/command/s6-chmod 02750 $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/uncaught-logs
exec $(OUTPUT)/build-build/command/s6-chown -u 99 -g 99 -- $(OUTPUT)/rootfs/etc/s6-linux-init/current/run-image/utmps
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 $@
-
+ exec setuidgid $(NORMALUSER) touch $@
-$(OUTPUT)/build-host/.lh_s6lu_copied: $(OUTPUT)/sources/.lh_s6lu_cloned | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/s6-linux-utils
- exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-linux-utils $(OUTPUT)/build-host/s6-linux-utils
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_s6li_laidout
-$(OUTPUT)/build-host/.lh_s6lu_configured: $(OUTPUT)/build-host/.lh_s6lu_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-utils $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS)
+$(OUTPUT)/build-$(TRIPLE)/.lh_skarnet_installed:
exec setuidgid $(NORMALUSER) touch $@
-$(OUTPUT)/build-host/.lh_s6lu_built: $(OUTPUT)/build-host/.lh_s6lu_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-utils $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_s6lu_installed: $(OUTPUT)/build-host/.lh_s6lu_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/s6-linux-utils $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
+SKAWARE_BUILD := SKALIBS EXECLINE S6 S6_RC S6_LINUX_INIT S6_PORTABLE_UTILS S6_LINUX_UTILS
-$(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
- exec setuidgid $(NORMALUSER) s6-touch $@
+define skaware_build_rules_definition
-$(OUTPUT)/build-host/.lh_mdevd_configured: $(OUTPUT)/build-host/.lh_mdevd_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/mdevd $(SKARNET_ENV) ./configure --host=$(TRIPLE) --enable-slashpackage $(SKARNET_CONF_STATIC) $(SKALIBS_FIND_OPTIONS)
- exec setuidgid $(NORMALUSER) touch $@
+$(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/Makefile: $(OUTPUT)/sources/$$($(1)_NAME)/Makefile | $(OUTPUT)/tmp/.lh_prepared
+ exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)
+ exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/$$($(1)_NAME) $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)
+ cd $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) git checkout $$($(1)_VERSION) && rm -rf .git
+ exec touch $$@
-$(OUTPUT)/build-host/.lh_mdevd_built: $(OUTPUT)/build-host/.lh_mdevd_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/mdevd $(MAKE) all strip
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak: $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/Makefile $$(foreach dep,$$($(1)_DEPENDENCIES),$(OUTPUT)/build-build/package/$$($$(dep)_CATEGORY)/$$($$(dep)_NAME)/include/$$($$(dep)_NAME)/config.h)
+ cd $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) env CC="$(BUILD_CC)" ./configure $(SKAWARE_BUILD_OPTIONS) $$($(1)_OPTIONS)
-$(OUTPUT)/build-host/.lh_mdevd_installed: $(OUTPUT)/build-host/.lh_mdevd_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/mdevd $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs
- exec setuidgid $(NORMALUSER) s6-touch $@
+$(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN): $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/config.mak
+ cd $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION) && setuidgid $(NORMALUSER) $(MAKE) all strip
+$(OUTPUT)/build-build/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h: $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION)/$$($(1)_TOKEN)
+ cd $(OUTPUT)/build-build/$$($(1)_NAME)-$$($(1)_VERSION) && $(MAKE) -L install update global-links DESTDIR=$(OUTPUT)/build-build
-$(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-build/.lh_skarnet_installed: $(OUTPUT)/build-build/package/$$($(1)_CATEGORY)/$$($(1)_NAME)/include/$$($(1)_NAME)/config.h
-$(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 $@
+endef
-$(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 $@
+$(foreach pkg,$(SKAWARE_BUILD),$(eval $(call skaware_build_rules_definition,$(pkg))))
-$(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-build/etc/s6-linux-init/skel/rc.init: $(OUTPUT)/build-build/package/admin/s6-linux-init/include/s6-linux-init/config.h sub/skarnet.org/rc.init sub/skarnet.org/rc.shutdown sub/skarnet.org/rc.shutdown.final sub/skarnet.org/runlevel
+ exec setuidgid $(NORMALUSER) mkdir -p $(OUTPUT)/build-build/etc/s6-linux-init/skel
+ exec setuidgid $(NORMALUSER) cp -f sub/skarnet.org/rc.shutdown $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.shutdown
+ exec setuidgid $(NORMALUSER) cp -f sub/skarnet.org/rc.shutdown.final $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.shutdown.final
+ exec setuidgid $(NORMALUSER) cp -f sub/skarnet.org/runlevel $(OUTPUT)/build-build/etc/s6-linux-init/skel/runlevel
+ exec setuidgid $(NORMALUSER) cp -f sub/skarnet.org/rc.init $@
+ exec setuidgid $(NORMALUSER) touch $@
+$(OUTPUT)/build-build/.lh_skarnet_installed: $(OUTPUT)/build-build/etc/s6-linux-init/skel/rc.init
-$(OUTPUT)/build-host/.lh_skarnet_installed: $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_utmps_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 $@
+$(OUTPUT)/build-build/.lh_skarnet_installed:
+ exec setuidgid $(NORMALUSER) touch $@
diff --git a/sub/socklog/Makefile b/sub/socklog/Makefile
deleted file mode 100644
index 003d613..0000000
--- a/sub/socklog/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-
-SOCKLOG_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-static,)
-
-$(OUTPUT)/sources/socklog-2.1.0.tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget http://smarden.org/socklog/socklog-2.1.0.tar.gz
-
-$(OUTPUT)/sources/.lh_socklog_dled: $(OUTPUT)/sources/socklog-2.1.0.tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_socklog_copied: $(OUTPUT)/sources/.lh_socklog_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/package/admin/socklog-2.1.0
- exec setuidgid $(NORMALUSER) s6-mkdir -p -- $(OUTPUT)/build-host/package
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package tar -zxpvf $(OUTPUT)/sources/socklog-2.1.0.tar.gz
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_socklog_patched: $(OUTPUT)/build-host/.lh_socklog_copied sub/socklog/patch.sed | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) redirfd -w 1 $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile.patched sed -f sub/socklog/patch.sed $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_socklog_configured: $(OUTPUT)/build-host/.lh_socklog_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) redirfd -w 1 $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-cc s6-echo "$(BUILD_HOST_CC) -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h"
- exec setuidgid $(NORMALUSER) redirfd -w 1 $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-ld s6-echo "$(BUILD_HOST_CC) $(SOCKLOG_STATIC)"
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_socklog_built: $(OUTPUT)/build-host/.lh_socklog_configured $(OUTPUT)/build-host/.lh_socklog_patched | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src $(MAKE) -f Makefile.patched socklog
- exec setuidgid $(NORMALUSER) s6-touch $@
-
-$(OUTPUT)/build-host/.lh_socklog_installed: $(OUTPUT)/build-host/.lh_socklog_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec s6-mkdir -p -m 0755 $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command
- exec makenamelink $(OUTPUT)/rootfs/package/admin socklog socklog-2.1.0 $(OUTPUT)/tmp
- exec cp -f $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/socklog $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command/socklog
- exec makelinks $(OUTPUT)/rootfs /command /package/admin/socklog/command
- exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/socklog/patch.sed b/sub/socklog/patch.sed
deleted file mode 100644
index 0540d27..0000000
--- a/sub/socklog/patch.sed
+++ /dev/null
@@ -1,5 +0,0 @@
-s/choose compile load tryshsgr\.c hasshsgr\.h1 hasshsgr\.h2 chkshsgr /choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 /
-s/ar cr /$(TRIPLE)-ar cr /
-s/ranlib /$(TRIPLE)-ranlib /
-s%\./chkshsgr ||%true ||%
-s%\./choose clr tryshsgr hasshsgr\.h1 hasshsgr\.h2 > hasshsgr\.h%cat hasshsgr.h1 > hasshsgr.h%
diff --git a/sub/xz/Makefile b/sub/xz/Makefile
index 97e19f8..741ba12 100644
--- a/sub/xz/Makefile
+++ b/sub/xz/Makefile
@@ -1,11 +1,11 @@
XZ_NAME := xz
-XZ_VERSION := 5.2.5
+XZ_VERSION := 5.4.1
XZ_URLDIR := https://tukaani.org/$(XZ_NAME)
XZ_TAREXT := tar.xz
XZ_TARLETTER := J
-XZ_CONF_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),--disable-shared,)
-XZ_MAKE_STATIC := $(if $(filter true,$(BUILD_HOST_STATIC)),-static,)
+XZ_CONF_STATIC := $(if $(filter true,$(TARGET_STATIC)),--disable-shared,)
+XZ_MAKE_STATIC := $(if $(filter true,$(TARGET_STATIC)),-static,)
XZ_CONFIGURE_OPTIONS := --disable-nls --with-gnu-ld --enable-threads=posix --disable-scripts --disable-doc --disable-lzma-links --disable-lzmainfo --disable-lzmadec --disable-xzdec --disable-xz
XZ_CFLAGS := ""
XZ_CONFLDFLAGS := "-s $(XZ_MAKE_STATIC)"
@@ -27,34 +27,34 @@ $(OUTPUT)/build-build/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dl
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src export CC "$(BUILD_BUILD_CC)" export CFLAGS $(XZ_CFLAGS) export LDFLAGS -s ./configure --prefix=$(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src export CC "$(BUILD_CC)" export CFLAGS $(XZ_CFLAGS) export LDFLAGS -s ./configure --prefix=$(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS)
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) CC="$(BUILD_BUILD_CC)" LDFLAGS=-s
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) CC="$(BUILD_CC)" LDFLAGS=-s
exec setuidgid $(NORMALUSER) s6-touch $@
$(OUTPUT)/build-build/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) install CC="$(BUILD_BUILD_CC)"
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) install CC="$(BUILD_CC)"
exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(XZ_NAME) $(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/tmp
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION)
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar $(XZ_TARLETTER)xpvf $(OUTPUT)/sources/$(XZ_NAME)-$(XZ_VERSION).$(XZ_TAREXT)
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-$(TRIPLE)/$(XZ_NAME)-$(XZ_VERSION)
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE) tar $(XZ_TARLETTER)xpvf $(OUTPUT)/sources/$(XZ_NAME)-$(XZ_VERSION).$(XZ_TAREXT)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) export CC "$(BUILD_HOST_CC)" export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) $(XZ_CONF_STATIC)
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(XZ_NAME)-$(XZ_VERSION) export CC "$(TARGET_CC)" export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) $(XZ_CONF_STATIC)
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC="$(BUILD_HOST_CC)"
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-$(TRIPLE)/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC="$(TARGET_CC)"
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
- exec cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install CC="$(BUILD_HOST_CC)" DESTDIR=$(OUTPUT)/rootfs
+$(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-$(TRIPLE)/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed
+ exec cd $(OUTPUT)/build-$(TRIPLE)/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install CC="$(TARGET_CC)" DESTDIR=$(OUTPUT)/rootfs
exec makenamelink $(OUTPUT)/rootfs/opt $(XZ_NAME) $(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/tmp
exec makelinks $(OUTPUT)/rootfs /bin /opt/$(XZ_NAME)/bin
exec setuidgid $(NORMALUSER) s6-touch $@