From 9c13664aef0d6ce86dba9c409332960d13f8ee7c Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 12 Mar 2023 21:00:14 -0400 Subject: [PATCH 1/2] common/travis/check-install.sh: also fail on other failure modes 11 = EINVAL, which can come from conflict check and a few other places --- common/travis/check-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh index b5268085db59..943a6bc6211c 100755 --- a/common/travis/check-install.sh +++ b/common/travis/check-install.sh @@ -21,7 +21,8 @@ while read -r pkg; do $ROOTDIR $ADDREPO \ -Sny \ "$subpkg" "$(xbps-uhelper getpkgname "$dep")" - if [ $? -eq 8 ]; then + ret="$?" + if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then /bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m" exit 1 fi From b48ce9e87d48dd72aa8351200f13023b3f6395c2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 12 Mar 2023 18:25:40 -0400 Subject: [PATCH 2/2] cross-vpkg-dummy: move to bootstrap, provide libthread_db.so.1 on glibc this should fix issues with openjdk11-jre in void-packages/CI verify repository state on cross: ``` openjdk11-jre-11.0.12+7_4: broken, unresolvable shlib `libthread_db.so.1' Transaction aborted due to unresolved shlibs. ``` --- srcpkgs/cross-vpkg-dummy/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index 75ac42f2c1ab..baf92e2560c3 100644 --- a/srcpkgs/cross-vpkg-dummy/template +++ b/srcpkgs/cross-vpkg-dummy/template @@ -1,15 +1,13 @@ # Template file for 'cross-vpkg-dummy' pkgname=cross-vpkg-dummy version=0.39 -revision=3 +revision=4 build_style=meta +depends="base-files>=0.126" short_desc="Dummy meta-pkg for cross building packages with xbps-src" maintainer="Orphaned " license="Public Domain" homepage="https://www.voidlinux.org/" - -depends="base-files>=0.126" - provides=" kernel-libc-headers-9999_1 binutils-9999_1 @@ -62,6 +60,7 @@ shlib_provides=" libgnarl-12.so libstdc++.so.6 libgfortran.so.5" +repository=bootstrap if [ "$XBPS_TARGET_LIBC" = "musl" ]; then provides+=" musl-9999_1 musl-devel-9999_1" @@ -75,5 +74,5 @@ else shlib_provides+=" libanl.so.1 libnsl.so.1 libutil.so.1" shlib_provides+=" ld-linux.so.2 ld-linux.so.3 ld-linux-x86-64.so.2" shlib_provides+=" ld-linux-armhf.so.3 ld-linux-aarch64.so.1" - shlib_provides+=" ld64.so.2 ld.so.1" + shlib_provides+=" ld64.so.2 ld.so.1 libthread_db.so.1" fi