diff options
author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
---|---|---|
committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
tree | 53168212f427afbcf0693b534530a4af803152e9 /system/abuild/fix-apk-invocation.patch | |
parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip |
Merge branch 'master' into zfs
Diffstat (limited to 'system/abuild/fix-apk-invocation.patch')
-rw-r--r-- | system/abuild/fix-apk-invocation.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/system/abuild/fix-apk-invocation.patch b/system/abuild/fix-apk-invocation.patch new file mode 100644 index 000000000..71bc3d1c9 --- /dev/null +++ b/system/abuild/fix-apk-invocation.patch @@ -0,0 +1,29 @@ +From 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 27 Feb 2020 04:41:04 -0600 +Subject: [PATCH] abuild: Use $APK instead of apk + +This is the only appearance of `apk` in the source. Appears accidental. + +Fixes: 41343329 ("abuild: fix dependency tracing for cross builds") +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index 2212789..7daa366 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1255,7 +1255,7 @@ trace_apk_deps() { + autodeps="$autodeps pc:$pcprefix$i" + elif subpkg_provides_pc "$i" \ + || $APK $apkroot info --quiet --installed "pc:$i"; then +- local provider="$(apk $apkroot search --quiet "pc:$i")" ++ local provider="$($APK $apkroot search --quiet "pc:$i")" + if list_has "$provider" $depends_dev; then + warning "$provider should be removed from depends_dev" + fi +-- +2.25.1 + |