summaryrefslogtreecommitdiff
path: root/system/abuild/fix-apk-invocation.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-27 10:58:33 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-27 10:58:33 +0000
commit15f770e3558fdcfca24ea50d66bd95e41c9d3f2b (patch)
tree54bf78f59bddabf0186ffc7ea0125e036f0c3827 /system/abuild/fix-apk-invocation.patch
parentb69f6a06f8698c72c30465dbfa1cc91334551b03 (diff)
downloadpackages-15f770e3558fdcfca24ea50d66bd95e41c9d3f2b.tar.gz
packages-15f770e3558fdcfca24ea50d66bd95e41c9d3f2b.tar.bz2
packages-15f770e3558fdcfca24ea50d66bd95e41c9d3f2b.tar.xz
packages-15f770e3558fdcfca24ea50d66bd95e41c9d3f2b.zip
system/abuild: Fix apk invocation for tracedeps
Diffstat (limited to 'system/abuild/fix-apk-invocation.patch')
-rw-r--r--system/abuild/fix-apk-invocation.patch29
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
+