[opkg] prevent updated dependencies from being installed in an added destination

OpenPLi uses added destinations only for picon packages, which do not have package dependencies.

Author: WanWizard

lib/python/Components/Opkg.py

@@ -138,8 +138,11 @@ def __init__(self, opkg='opkg'):
 	def setCurrentCommand(self, command=None):
 		self.currentCommand = command
 
-	def runCmdEx(self, cmd):
-		self.runCmd("%s %s" % (opkgExtraDestinations(), cmd))
+	def runCmdEx(self, cmd, addDests=False):
+		if addDests:
+			self.runCmd("%s %s" % (opkgExtraDestinations(), cmd))
+		else:
+			self.runCmd(cmd)
 
 	def runCmd(self, cmd):
 		print("executing", self.opkg, cmd)
@@ -163,10 +166,11 @@ def startCmd(self, cmd, args=None):
 						self.runCmdEx("upgrade busybox | tee -a /home/root/opkgupgrade.log")
 						break
 			self.runCmdEx("upgrade %s | tee -a /home/root/opkgupgrade.log" % append)
+			self.runCmdEx("upgrade %s | tee -a /home/root/opkgupgrade.log" % append, True)
 		elif cmd == self.CMD_LIST:
 			self.fetchedList = []
 			if args['installed_only']:
-				self.runCmdEx("list_installed")
+				self.runCmdEx("list_installed", True)
 			else:
 				self.runCmd("list")
 		elif cmd == self.CMD_INSTALL:

tools/enigma2.sh.in

@@ -101,12 +101,6 @@ while : ; do
 			rm -R /etc/enigma2
 			;;
 		42)
-			df -P | grep -v "tmpfs " | awk '{print $6}' | tail -n +3 > /tmp/upgrade_mountpoints.txt
-			while read line; do
-				if [  -f $line/var/lib/opkg/status ]; then
-				DESTS=$DESTS" --add-dest "$line":"$line
-			fi
-			done < /tmp/upgrade_mountpoints.txt
 			# bind the console (when available)
 			[ -f /sys/class/vtconsole/vtcon1/bind ] && echo 1 > /sys/class/vtconsole/vtcon1/bind
 			prevupd=0
@@ -116,13 +110,23 @@ while : ; do
 			if [ "$(opkg list-upgradable busybox)" != "" ]; then
 				opkg update busybox 2>&1 | tee -a /home/root/opkgupgrade.log
 			fi
-			# update all other packages
+			# update all other packages installed on the rootfs
 			while [ $currupd -gt 0 -a $currupd -ne $prevupd ]; do
-				opkg upgrade $DESTS 2>&1 | tee -a /home/root/opkgupgrade.log
+				opkg upgrade 2>&1 | tee -a /home/root/opkgupgrade.log
 				prevupd=$currupd
 				currupd=`opkg list-upgradable | wc -l`
 				echo "===> $currupd PACKAGE(S) REMAINING" >> /home/root/opkgupgrade.log
 			done
+			# and remaining install destinations
+			df -P | grep -v "tmpfs " | awk '{print $6}' | tail -n +3 > /tmp/upgrade_mountpoints.txt
+			while read line; do
+				if [  -f $line/var/lib/opkg/status ]; then
+				DESTS=$DESTS" --add-dest "$line":"$line
+			fi
+			done < /tmp/upgrade_mountpoints.txt
+			if [ "$DESTS" != "" ]; then
+				opkg upgrade $DESTS 2>&1 | tee -a /home/root/opkgupgrade.log
+			fi
 			/sbin/reboot
 			;;
 		43)