From 2f6f889a341c6c7bb3e9c8888fa654b060e78d2e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Feb 2020 12:20:49 +0100
Subject: add def/a/s6-update-symlinks

---
 def/a/s6-update-symlinks | 23 +++++++++++++++++++++++
 make-mewix-base          |  4 ++--
 relink-newroot           |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 def/a/s6-update-symlinks

diff --git a/def/a/s6-update-symlinks b/def/a/s6-update-symlinks
new file mode 100644
index 0000000..9ea7500
--- /dev/null
+++ b/def/a/s6-update-symlinks
@@ -0,0 +1,23 @@
+pkgname=s6-update-symlinks
+version=2.2.2.1
+distfiles="https://skarnet.org/software/s6-portable-utils/s6-portable-utils-${version}.tar.gz
+ https://skarnet.org/software/skalibs/skalibs-2.9.1.0.tar.gz
+"
+
+do_configure() {
+  :
+}
+do_build() {
+  (
+  cd ../skalibs-*
+  ./configure
+  make
+  )
+
+  ${CC} -static -o s6-update-symlinks src/skaembutils/s6-update-symlinks.c \
+    ${CFLAGS} -I ../skalibs-*/src/include ../skalibs-2.9.1.0/libskarnet.a.xyzzy
+}
+do_install() {
+  mkdir -p ${DESTDIR}/usr/bin
+  cp s6-update-symlinks ${DESTDIR}/usr/bin
+}
diff --git a/make-mewix-base b/make-mewix-base
index ddf9484..4c91d49 100755
--- a/make-mewix-base
+++ b/make-mewix-base
@@ -11,6 +11,6 @@ ln -s usr/bin newroot/bin
 ln -s usr/lib newroot/lib
 ln -s usr/lib newroot/lib64
 
-mkdir -p newroot/pkg/chroot/s6-update-symlinks/0/usr/bin
-cp KEEP/s6-update-symlinks.static newroot/pkg/chroot/s6-update-symlinks/0/usr/bin/s6-update-symlinks
+mkdir -p newroot/pkg/a/s6-update-symlinks/0/usr/bin
+cp KEEP/s6-update-symlinks.static newroot/pkg/a/s6-update-symlinks/0/usr/bin/s6-update-symlinks
 
diff --git a/relink-newroot b/relink-newroot
index ad765cb..ce42acd 100755
--- a/relink-newroot
+++ b/relink-newroot
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 bwrap --unshare-user --share-net --bind $PWD/newroot / --setenv PATH /bin \
-  /pkg/chroot/s6-update-symlinks/0/usr/bin/s6-update-symlinks \
+  /pkg/a/s6-update-symlinks/0/usr/bin/s6-update-symlinks \
   /usr $(find newroot/pkg -name usr -type d | sed 's/^newroot//' |sort -r)
 bwrap --unshare-user --share-net --bind $PWD/newroot / --setenv PATH /bin \
-  /pkg/chroot/s6-update-symlinks/0/usr/bin/s6-update-symlinks \
+  /pkg/a/s6-update-symlinks/0/usr/bin/s6-update-symlinks \
   /etc $(find newroot/pkg -name etc -type d | sed 's/^newroot//' |sort -r)
-- 
cgit 1.4.1