summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2020-12-09 12:49:04 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2020-12-09 12:49:04 (EST)
commit836ff2e22ceddbcce97599edbb67ca1617b1cd74 (patch)
tree73590f0251503216e53071b839590797901a11cb /patches
parentfeaf36286db7517afa93a1165a713c11ee3d4f6f (diff)
patches: Fix dep fields with substvars
Diffstat (limited to 'patches')
-rw-r--r--patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch b/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch
new file mode 100644
index 0000000..4649a4f
--- /dev/null
+++ b/patches/0003-ob-gencontrol-Reduce-deps-after-substvars.patch
@@ -0,0 +1,37 @@
+From 58940e7e9ee1b02c454b6164c60e6333307b6ba3 Mon Sep 17 00:00:00 2001
+From: Patrick McDermott <patrick.mcdermott@libiquity.com>
+Date: Wed, 9 Dec 2020 12:44:35 -0500
+Subject: [PATCH] ob-gencontrol: Reduce deps after substvars
+
+---
+ src/ob-gencontrol.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
+index 1c0da12..5a103a0 100644
+--- a/src/ob-gencontrol.sh
++++ b/src/ob-gencontrol.sh
+@@ -164,18 +164,18 @@ gen_control_bin()
+ 'Essential')
+ ;;
+ 'Depends' | 'Recommends' | 'Suggests' | 'Pre-Depends')
++ value="$(ob_substvars "${value}" "${binary}")"
+ value="$(ob_reduce_deps \
+ -a "${OPK_HOST_ARCH}" \
+ -p "${OPK_HOST_PLAT}" \
+ -- "${value}")"
+- value="$(ob_substvars "${value}" "${binary}")"
+ ;;
+ 'Conflicts' | 'Provides' | 'Replaces')
++ value="$(ob_substvars "${value}" "${binary}")"
+ value="$(ob_reduce_deps \
+ -a "${OPK_HOST_ARCH}" \
+ -p "${OPK_HOST_PLAT}" \
+ -u -- "${value}")"
+- value="$(ob_substvars "${value}" "${binary}")"
+ ;;
+ esac
+ printf '%s: %s\n' "${name}" "${value}" | sed 's/[, ]*$//' >&3
+--
+2.11.0
+