From 0d7a599f002cce26b9e30ffb5a0456546d40e3cb Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Sat, 29 May 2021 01:56:34 +0200
Subject: Disable package upgrades by default and add option to build,sh

Upgrading openwrt-keyring fails because a file conflicts with base-files.

 * check_data_file_clashes: Package openwrt-keyring wants to install
   file /tmp/build.759637/rootfs/etc/opkg/keys/f94b9dd6febac963
   But that file is already provided by package  * base-files

Disable upgrades for now since upgrades aren't fully supported by OpenWrt
anyway and other packages might break in the future.

Closes: #29
---
 build.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index db1c1fc..81f2b25 100755
--- a/build.sh
+++ b/build.sh
@@ -9,16 +9,17 @@ type=lxd
 super=fakeroot
 # iptables-mod-checksum is required by the work-around inserted by files/etc/uci-defaults/70_fill-dhcp-checksum.
 packages=iptables-mod-checksum
+upgrade=
 
 # Workaround for Debian/Ubuntu systems which use C.UTF-8 which is unsupported by OpenWrt
 export LC_ALL=C
 
 usage() {
-	echo "Usage: $0 [-a|--arch x86_64|i686|aarch64|aarch32] [-v|--version <version>] [-p|--packages <packages>] [-f|--files] [-t|--type lxd|plain] [-s|--super fakeroot|sudo] [--help]"
+	echo "Usage: $0 [-a|--arch x86_64|i686|aarch64|aarch32] [-v|--version <version>] [-p|--packages <packages>] [-f|--files] [-t|--type lxd|plain] [-s|--super fakeroot|sudo] [-u|--upgrade] [--help]"
 	exit 1
 }
 
-temp=$(getopt -o "a:v:p:f:t:s:" -l "arch:,version:,packages:,files:,type:,super:,help" -- "$@")
+temp=$(getopt -o "a:v:p:f:t:s:u" -l "arch:,version:,packages:,files:,type:,super:,upgrade,help" -- "$@")
 eval set -- "$temp"
 while true; do
 	case "$1" in
@@ -50,6 +51,10 @@ while true; do
 		*)
 			usage;;
 		esac;;
+	-u|--upgrade)
+		upgrade="1"
+		shift 1
+		;;
 	--help)
 		usage;;
 	--)
@@ -240,7 +245,7 @@ build_tarball() {
 	if test ${type} = lxd; then
 		opts="$opts -m $metadata"
 	fi
-	if test ${ver} != snapshot; then
+	if test "${upgrade}" = "1"; then
 		opts="$opts --upgrade"
 	fi
 	local allpkgs="${packages}"
-- 
cgit v1.2.3