[PATCHv3] dpkg-base: derive "Package" and "Architecture" from .deb in cleanup

[Henning Schild <henning.schild@siemens.com>]

From: Henning Schild <henning.schild@siemens.com>

Instead of using "sed" pattern magic ask the .debs their name and
architecture and remove exactly that. Especially the hardcoded
Architecture caused problems for packages of architecture "all". If
your recipe created such a package it could never be cleaned because it
was added to all the archs of the repo, and later cleaned only from one.
Now if that package changes because you are still working on the recipe,
adding the package again would cause checksum mismatches for all but the
current architecture.
Remove the package from all archs when arch is "all".

Reported-by: Vladislav Jasek <vladislav.jasek@siemens.com>
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 742b8ad..8fb7805 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -98,13 +98,20 @@ do_build() {
 CLEANFUNCS += "repo_clean"
 
 repo_clean() {
-    PACKAGES=$(cd ${S}/..; ls *.deb | sed 's/\([^_]*\).*/\1/')
-    if [ -n "${PACKAGES}" ]; then
-        reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \
-                 --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \
-                 -C main -A ${DISTRO_ARCH} \
-                 remove ${DEBDISTRONAME} \
-                 ${PACKAGES}
+    DEBS=$( ls ${S}/../*.deb )
+    if [ -n "${DEBS}" ]; then
+        for d in ${DEBS}; do
+            p=$( dpkg-deb --show --showformat '${Package}' ${d} )
+            a=$( dpkg-deb --show --showformat '${Architecture}' ${d} )
+            # removing "all" means no arch
+            aarg="-A ${a}"
+            [ "${a}" = "all" ] && aarg=""
+            reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \
+                     --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \
+                     -C main ${aarg} \
+                     remove ${DEBDISTRONAME} \
+                     ${p}
+        done
     fi
 }
 
-- 
2.19.2