From e420c83e4c619226f42560608946db2ffaf8cd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Prochera?= <saturniak8888@gmail.com>
Date: Tue, 18 Jan 2022 22:30:47 +0100
Subject: [PATCH] Unconditional Remove_packages calls in binary_rootfs (Closes:
 #994982)

That prevents potential errors during future Remove_packages calls without APT indices available. In such cases, APT tries to remove packages with unrecognized names, which results in an error and fails the script execution. An example of this would be installing apt-utils in chroot_archives with --apt-indices option set to false.
---
 scripts/build/binary_rootfs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 973adf620..af8448d8f 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -135,6 +135,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 				du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 
+				# Removing depends
+				Remove_packages
+				
 				if [ -e chroot/chroot.cache ]
 				then
 					Remove_lockfile
@@ -150,9 +153,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
 					touch .lock
 				else
 					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_packages
 				fi
 				;;
 
@@ -201,6 +201,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				# Move image
 				mv chroot/filesystem.jffs2 binary/${INITFS}
 
+				# Removing depends
+				Remove_packages
+
 				if [ -e chroot/chroot.cache ]
 				then
 					Remove_lockfile
@@ -216,9 +219,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
 					touch .lock
 				else
 					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_packages
 				fi
 				;;
 
@@ -341,6 +341,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				mv chroot/filesystem.squashfs binary/${INITFS}
 				rm -f chroot/squashfs.sort
 
+				# Removing depends
+				Remove_packages
+
 				if [ -e chroot/chroot.cache ]
 				then
 					Remove_lockfile
@@ -356,9 +359,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
 					touch .lock
 				else
 					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_packages
 				fi
 				;;