Merge branch 'nitsky-master-patch-69562' into 'master'

Do not invoke apk if no .so files are found in .rpaths. See merge request alpine/abuild!130
abuild-rootbld: copy SRCDEST value from host to chroot
2024-04-26 07:44:14 +00:00 · 2024-04-26 00:24:09 +02:00 · 2024-04-21 10:37:44 +02:00 · 2021-12-28 04:12:50 +00:00
1 changed files with 5 additions and 2 deletions
--- a/abuild.in
+++ b/abuild.in
@ -782,7 +782,7 @@ postcheck() {
 	msg "Running postcheck for $name"
 	# checking for FHS compat
 	if ! options_has "!fhs"; then
-		for i in srv usr/local opt var/run tmp var/tmp var/lock var/empty home sys proc mnt dev; do
+		for i in srv usr/local opt tmp var/tmp var/lock var/empty home sys proc mnt dev; do
 			for j in "$dir"/"$i"/* "$dir"/"$i"/.[!.]* "$dir"/"$i"/..?*; do
 				if [ -L "$j" ] || [ -e "$j" ]; then
 					error "Packages must not put anything under /$i"
@ -1516,7 +1516,9 @@ trace_apk_deps() {
 	if [ -f "$dir"/.rpaths ]; then
 		local so_files=$(find_so_files "$dir"/.rpaths $missing) \
 			|| return 1
-		deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1
+		if [ ! -z $so_files ]; then	
+			deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1
+		fi
 	fi

 	for found in $deppkgs; do
@ -2625,6 +2627,7 @@ rootbld() {
 		--setenv CARCH "$CARCH" \
 		--setenv HOME "$HOME" \
 		--setenv REPODEST "$REPODEST" \
+		--setenv SRCDEST "$SRCDEST" \
 		--setenv ABUILD_USERDIR "$ABUILD_USERDIR" \
 		${ABUILD_BOOTSTRAP:+--setenv ABUILD_BOOTSTRAP "$ABUILD_BOOTSTRAP"} \
 		${APORTS_BOOTSTRAP:+--setenv APORTS_BOOTSTRAP "$APORTS_BOOTSTRAP"} \
Author	SHA1	Message	Date
David Yamnitsky	880cdbd5f7	Merge branch 'nitsky-master-patch-69562' into 'master' Do not invoke apk if no .so files are found in .rpaths. See merge request alpine/abuild!130	2024-04-26 07:44:14 +00:00
Piraty	a45d12d4c3	abuild-rootbld: copy SRCDEST value from host to chroot Otherwise the default hardcoded in abuild-fetch (var/cache/distfiles) is used. (in the same vein as `6864df03aa`) Fixes: `1582617` ("abuild-rootbld: clear environment for bwrap container")	2024-04-26 00:24:09 +02:00
Natanael Copa	68d6aa65f4	abuild: skip /var/run in fhs check We have many package containing directories under /var/run. Allow those for now. Partially reverts commit `08d2d81587` (abuild: extend fhs check)	2024-04-21 10:37:44 +02:00
David Yamnitsky	3271c2ba55	Do not invoke apk if no .so files are found in .rpaths.	2021-12-28 04:12:50 +00:00