unos-repository

commit 499afd347fe205aaed63d5455bd745af279e61cc
parent 5a767a333cdae0123a81af56ea7dd45a676c4089
Author: Robin Bron <robin.bron@yourhosting.nl>
Date:   Fri, 25 Sep 2026 01:34:06 +0200

Package fixes

Diffstat:
M
.conductor.yml
 | 
54
+++++++++++++++++++++++++++---------------------------
M
mk/ci-setup.sh
 | 
1
+
M
mk/gen-pipeline.sh
 | 
2
+-
M
packages/glibc/template
 | 
5
++++-

4 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/.conductor.yml b/.conductor.yml
@@ -51,7 +51,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh zlib --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh zlib --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" zlib
@@ -64,7 +64,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh openssl --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh openssl --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" openssl
@@ -79,7 +79,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh apk-tools --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh apk-tools --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" apk-tools
@@ -92,7 +92,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh base-files --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh base-files --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" base-files
@@ -105,7 +105,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh busybox --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh busybox --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" busybox
@@ -120,7 +120,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh curl --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh curl --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" curl
@@ -133,7 +133,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh dosfstools --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh dosfstools --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" dosfstools
@@ -146,7 +146,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh e2fsprogs --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh e2fsprogs --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" e2fsprogs
@@ -159,7 +159,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh efivar --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh efivar --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" efivar
@@ -172,7 +172,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh popt --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh popt --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" popt
@@ -187,7 +187,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh efibootmgr --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh efibootmgr --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" efibootmgr
@@ -200,7 +200,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh glibc --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh glibc --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" glibc
@@ -213,7 +213,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh libstdc++ --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh libstdc++ --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" libstdc++
@@ -229,7 +229,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh gptfdisk --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh gptfdisk --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" gptfdisk
@@ -242,7 +242,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh xz --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh xz --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" xz
@@ -256,7 +256,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh grub --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh grub --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" grub
@@ -269,7 +269,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh libmnl --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh libmnl --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" libmnl
@@ -282,7 +282,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh libcap --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh libcap --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" libcap
@@ -297,7 +297,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh iproute2 --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh iproute2 --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" iproute2
@@ -310,7 +310,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh linkd --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh linkd --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linkd
@@ -323,7 +323,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh linux-longterm --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh linux-longterm --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linux-longterm
@@ -336,7 +336,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh linux-mainline --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh linux-mainline --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linux-mainline
@@ -349,7 +349,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh linux-stable --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh linux-stable --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" linux-stable
@@ -363,7 +363,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh smartmontools --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh smartmontools --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" smartmontools
@@ -376,7 +376,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh tinyssh --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh tinyssh --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" tinyssh
@@ -389,7 +389,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh unos-firstboot --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh unos-firstboot --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" unos-firstboot
@@ -402,7 +402,7 @@ tasks:
     arch: [x86_64]
     requires: [unos-sign-key]
     script:
-      - ./mk/check-revision.sh unos-keys --repo "$BUCKET_PUBLIC_URL" || exit 0
+      - ./mk/check-revision.sh unos-keys --repo "${BUCKET_PUBLIC_URL%/}/$ARCH" || exit 0
       - ./mk/ci-setup.sh
       - ./mk/bootstrap-host.sh
       - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" unos-keys
diff --git a/mk/ci-setup.sh b/mk/ci-setup.sh
@@ -53,6 +53,7 @@ if [ "${CHECK_ONLY}" = "0" ]; then
     flex \
     gawk \
     make \
+    mandoc \
     perl \
     python3 \
     sed \
diff --git a/mk/gen-pipeline.sh b/mk/gen-pipeline.sh
@@ -108,7 +108,7 @@ HEADER
     # The feature provides UNOS_KEY_APK_RSA_PRI, which mk/sign-key.inc reads.
     printf '    requires: [unos-sign-key]\n'
     printf '    script:\n'
-    printf '      - ./mk/check-revision.sh %s --repo "$BUCKET_PUBLIC_URL" || exit 0\n' "$p"
+    printf '      - ./mk/check-revision.sh %s --repo "${BUCKET_PUBLIC_URL%%/}/$ARCH" || exit 0\n' "$p"
     printf '      - ./mk/ci-setup.sh\n'
     printf '      - ./mk/bootstrap-host.sh\n'
     printf '      - ./mk/sysroot.sh --arch "$ARCH" --repo "$BUCKET_PUBLIC_URL" %s\n' "$p"
diff --git a/packages/glibc/template b/packages/glibc/template
@@ -50,5 +50,8 @@ do_install() {
   make install DESTDIR="${DESTDIR}"
   # make install does not create the locale dir itself
   mkdir -p "${DESTDIR}/usr/lib/locale"
-  ./locale/localedef --prefix="${DESTDIR}" -i C -f UTF-8 C.UTF-8
+  # localedef is linked against the just-built libc (2.44) but the host is
+  # bookworm (2.36); run it against its own libs so GLIBC_2.38+ symbols resolve.
+  LD_LIBRARY_PATH="${WORK}/build:${WORK}/build/elf${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" \
+    ./locale/localedef --prefix="${DESTDIR}" -i C -f UTF-8 C.UTF-8
 }