Hi!
Le Fri, 12 Aug 2016 19:53:58 +0200,
Laurent Bercot <ska-skaw...@skarnet.org> a écrit :
> On 12/08/2016 12:23, Laurent Bercot wrote:
> > I need a more invasive patch. Going to work on it.
>
> That was painful.
> Eric: please test the current git versions of the whole skarnet.org
> stack (compatibility's broken with the previous versions, next
> release will have major version bumps) and tell me whether it works
> with uclibc-ng.
This looks good! I had to patch here and there for the static build to
work (see attached patches), but now it is possible to build
buildroot-s6 with uclibc-ng using the HEAD of the feature/uclibc branch
(commit 207c36f) [1].
The following configurations have been tested OK:
- demo_s6_uclibc_shared_qemu_x86_defconfig
- demo_s6_uclibc_static_qemu_x86_defconfig
I'll give a spin to demo_s6_uclibc_both_qemu_x86_defconfig later. I'll
do the same for the glibc/musl ones too, to see that nothing is broken.
Once the stable versions of skarnet programs and libraries will be
available, I'll respin the patch series I sent to upstream Buildroot.
Note that this series contains a patch for skalibs to check target
endianness using pre-processor directives instead of a runtime test. It
looks like the same can be used for size type check, so I'll work on
this too [2].
Thank you very much!
[1] https://github.com/elebihan/buildroot-s6/tree/feature/uclibc
[2] http://lists.busybox.net/pipermail/buildroot/2016-August/169456.html
--
ELB
>From 564e3178b135b4b24d0d1da5ac35ac9e35d9c489 Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan....@free.fr>
Date: Tue, 16 Aug 2016 12:28:18 +0200
Subject: [PATCH] Fix spawn_lib dependency for s6-rc-init
Signed-off-by: Eric Le Bihan <eric.le.bihan....@free.fr>
---
package/deps.mak | 2 +-
src/s6-rc/deps-exe/s6-rc-init | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/deps.mak b/package/deps.mak
index 3e3938a..054d439 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -46,7 +46,7 @@ s6-rc-dryrun: EXTRA_LIBS := ${TAINNOW_LIB}
s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet
s6-rc-fdholder-filler: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet
-s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB}
+s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} ${SPAWN_LIB}
s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet
s6-rc-oneshot-run: EXTRA_LIBS :=
s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -lskarnet
diff --git a/src/s6-rc/deps-exe/s6-rc-init b/src/s6-rc/deps-exe/s6-rc-init
index b5622f9..5fb6d66 100644
--- a/src/s6-rc/deps-exe/s6-rc-init
+++ b/src/s6-rc/deps-exe/s6-rc-init
@@ -3,3 +3,4 @@ ${LIBS6RC}
-lskarnet
${TAINNOW_LIB}
${SOCKET_LIB}
+${SPAWN_LIB}
--
2.4.11
>From d56f2e2f79e7dcb9265373e97d2485bf40ab8d49 Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan....@free.fr>
Date: Tue, 16 Aug 2016 10:24:51 +0200
Subject: [PATCH] Fix spawn_lib support
Signed-off-by: Eric Le Bihan <eric.le.bihan....@free.fr>
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index ab7279f..66a76f4 100755
--- a/configure
+++ b/configure
@@ -289,7 +289,7 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
exit 1
fi
-rt_lib=$(cat $sysdeps/rt.lib)
+spawn_lib=$(cat $sysdeps/spawn.lib)
socket_lib=$(cat $sysdeps/socket.lib)
sysclock_lib=$(cat $sysdeps/sysclock.lib)
tainnow_lib=$(cat $sysdeps/tainnow.lib)
@@ -365,7 +365,7 @@ sproot := $sproot
version := $version
home := $home
exthome := $exthome
-RT_LIB := ${rt_lib}
+SPAWN_LIB := ${spawn_lib}
SOCKET_LIB := ${socket_lib}
SYSCLOCK_LIB := ${sysclock_lib}
TAINNOW_LIB := ${tainnow_lib}
--
2.4.11
>From 9e4cdfedafb4fd73ab3674e9139d63a4ee0c8adb Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan....@free.fr>
Date: Tue, 16 Aug 2016 12:24:28 +0200
Subject: [PATCH] Fix spawn_lib dependency for s6-svwait
Signed-off-by: Eric Le Bihan <eric.le.bihan....@free.fr>
---
package/deps.mak | 2 +-
src/supervision/deps-exe/s6-svwait | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/deps.mak b/package/deps.mak
index 7f77678..216f8cf 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -242,5 +242,5 @@ s6-svscanctl: EXTRA_LIBS :=
s6-svscanctl: src/supervision/s6-svscanctl.o ${LIBS6} -lskarnet
s6-svstat: EXTRA_LIBS := ${SYSCLOCK_LIB}
s6-svstat: src/supervision/s6-svstat.o ${LIBS6} -lskarnet
-s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-svwait: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
s6-svwait: src/supervision/s6-svwait.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lskarnet
diff --git a/src/supervision/deps-exe/s6-svwait b/src/supervision/deps-exe/s6-svwait
index b71e12f..ab449ac 100644
--- a/src/supervision/deps-exe/s6-svwait
+++ b/src/supervision/deps-exe/s6-svwait
@@ -3,3 +3,4 @@ ${LIBS6}
-lskarnet
${SOCKET_LIB}
${TAINNOW_LIB}
+${SPAWN_LIB}
--
2.4.11
>From e09d1e79aacd5d8546eb8d85e28e844dd7aaff67 Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan....@free.fr>
Date: Tue, 16 Aug 2016 12:19:39 +0200
Subject: [PATCH] Fix spawn_lib dependency for foreground
Signed-off-by: Eric Le Bihan <eric.le.bihan....@free.fr>
---
package/deps.mak | 2 +-
src/execline/deps-exe/foreground | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/deps.mak b/package/deps.mak
index 709808d..c29928b 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -110,7 +110,7 @@ fdswap: EXTRA_LIBS :=
fdswap: src/execline/fdswap.o -lskarnet
forbacktickx: EXTRA_LIBS :=
forbacktickx: src/execline/forbacktickx.o -lskarnet
-foreground: EXTRA_LIBS :=
+foreground: EXTRA_LIBS := ${SPAWN_LIB}
foreground: src/execline/foreground.o ${LIBEXECLINE} -lskarnet
forstdin: EXTRA_LIBS := ${SPAWN_LIB}
forstdin: src/execline/forstdin.o ${LIBEXECLINE} -lskarnet
diff --git a/src/execline/deps-exe/foreground b/src/execline/deps-exe/foreground
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/foreground
+++ b/src/execline/deps-exe/foreground
@@ -1,2 +1,3 @@
${LIBEXECLINE}
-lskarnet
+${SPAWN_LIB}
--
2.4.11
