From 62449968fac254e8f6c39e10be7aa6be2e874487 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 27 Dec 2021 13:56:55 -0600 Subject: [PATCH 1/2] add alpine edge CI build Mainly to get a musl build in there. Signed-off-by: Serge Hallyn --- .builds/alpine-edge.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .builds/alpine-edge.yml diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml new file mode 100644 index 00000000..ec5355bb --- /dev/null +++ b/.builds/alpine-edge.yml @@ -0,0 +1,32 @@ +image: alpine/latest +# apk add --update alpine-sdk +packages: + - cmd:setcap + - autoconf + - automake + - byacc + - expect + - gettext + - gettext-dev + - gettext-lang + - libcap-dev + - libtool + - linux-pam-dev + - sed +sources: + - https://github.com/shadow-maint/shadow +tasks: + - build: | + cd shadow + ./autogen.sh --without-selinux --disable-man --disable-nls + grep ENABLE_ config.status + - tasks: | + cd shadow + cat /proc/self/uid_map + cat /proc/self/status + make + make DESTDIR=/tmp/shadow-inst install + sudo make install + #TODO - fix up the tests. Let's merge what's here now as it + #at least tests build. + #(cd tests; sudo ./run_some || { cat testsuite.log; false; }) From 4ce27b5e60c1c8ef1f645f613f61541ff3960ca1 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 27 Dec 2021 15:26:27 -0600 Subject: [PATCH 2/2] nss test_range: make sure /etc/nsswitch.conf and /etc/subuid exists Signed-off-by: Serge Hallyn --- tests/libsubid/04_nss/test_range | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/libsubid/04_nss/test_range b/tests/libsubid/04_nss/test_range index 356764fb..ee25080f 100755 --- a/tests/libsubid/04_nss/test_range +++ b/tests/libsubid/04_nss/test_range @@ -5,6 +5,7 @@ set -x echo "starting check_range tests" export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH +touch /etc/nsswitch.conf mount --bind ./nsswitch3.conf /etc/nsswitch.conf cleanup1() { umount /etc/nsswitch.conf @@ -34,6 +35,7 @@ fi umount /etc/nsswitch.conf mount --bind ./nsswitch1.conf /etc/nsswitch.conf +touch /etc/subuid /etc/subgid mount --bind ./empty /etc/subuid cleanup2() {