From 483800ef9ecf5ce98c0f6894e222bf08a68bb617 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 16 Jun 2019 01:22:16 -0400
Subject: ob-buildopk: Make archive member owners/groups deterministic

---
(limited to 'src')

diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index 11a16d9..dc5dae4 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -32,6 +32,9 @@ build_opk()
 		"${binary}_${version}_${arch}_${plat}.opk"
 
 	find "${binary}.control" "${binary}.data" | xargs touch -d "${date}"
+	# This utility runs with (fake) privileges, so we can chown what we're
+	# about to tar.
+	find "${binary}.control" "${binary}.data" | xargs chown 0:0
 	(cd -- "${binary}.control" && find '.' \! -type d | LC_ALL=C sort -r | \
 		tar -czf '../control.tar.gz' -T -)
 	(cd -- "${binary}.data"    && find '.' \! -type d | LC_ALL=C sort -r | \
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index dd2dfc2..e04249d 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -279,7 +279,8 @@ build_source()
 	if ! OB_DO_SOURCE='true' "${bindir}/ob-gencontrol"; then
 		return 1
 	fi
-	if ! OB_DO_SOURCE='true' "${bindir}/ob-buildopk"; then
+	if ! OB_DO_SOURCE='true' "${opt_uid0_cmd}" -- "${bindir}/ob-buildopk"
+	then
 		return 1
 	fi
 	if ! OB_DO_SOURCE='true' "${bindir}/ob-genchanges"; then
--
cgit v0.9.1