From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6497245309302734848 X-Received: by 10.28.8.12 with SMTP id 12mr719080wmi.1.1512757807147; Fri, 08 Dec 2017 10:30:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.144.164 with SMTP id i33ls537883wri.10.gmail; Fri, 08 Dec 2017 10:30:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMa3D5jbDOj96/1G0TEavS/APYaNCULFSxnOn1ZrEHzEPx8kXyqM5RFg9TCRXTIe97KwPKoa X-Received: by 10.28.203.142 with SMTP id b136mr647939wmg.3.1512757806774; Fri, 08 Dec 2017 10:30:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512757806; cv=none; d=google.com; s=arc-20160816; b=ZiiEk7Er3lV3AFjP89RK5GbPVyHIWYH4uy5QiR/4V4VtX0tjHamyQ3U6a15JJmic+L U9HRjY0K+5ZxFdD1JVhXfhOEnPYqCu3wObs5H8UYoidmcPOQVrkh/A1d8W5e3BCVjZVR 7baEzql3+RKmggcp7iXJpv2mppBLeQtNUIJlEI0lAqrfomy5S8Qps7jNSnGA0QNjqSFg ranAODDCscvU88xf7b1ZXrMQK6VEblxicZaXTTUuyCoJPKqYUJAKmtfiUSW5X7EUJtrA T4jMszm0tJkARRjJ30Jnj6/XHNZGLTlciVzlrhzMOjbVeKOSd6Ug1yAEULzZhvDYIPzU xhUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=ANMqoF7Deu3xVKL8H0n6KXC9HDhKkHhdTVwyZ2zYSHQ=; b=e033TFAbe5yhZZYlrAhHwIxc8Kr2eOto5glwi3ppwsNUMkusvivuQqOKcU/zlvJ3VZ mODkNKEEuR6Aanl4L+XW1D+ldP5x95VR201Nuk+kERcvoGYvB1V25nsLZqlJLon0EjUQ W1rLlXLetscfDGi2iSaOiVLj4VWMNyrwy1qYvuD6D4vVETtPvXcY3ik3gvgzRo2M4oXw Ec9KMJ6UAQ7yXPZH0wb/f++vRzLJi0hjJgdlm+KooYy+pYDvcIoJMcoidMfQqrD0J4y9 2d/jcdwX+zZRKCjK3uXa+FVxgcw1JGc5cVejFRrhKkVifedK+Sduynxgi03/Tc+lsral ZBOQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 60si895288wra.5.2017.12.08.10.30.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:30:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id vB8IU6pe002110 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 8 Dec 2017 19:30:06 +0100 Received: from md1em3qc.ww002.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id vB8IU6oh015614; Fri, 8 Dec 2017 19:30:06 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 1/3] image: fix do_populate package-name assumption Date: Fri, 8 Dec 2017 19:30:02 +0100 Message-Id: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.6 X-TUID: njVh0D27dMtR do_populate assumes that every item in IMAGE_INSTALL will produce .deb-files with the name ${PN}_*.deb. But that assumption might not be correct for every recipe. One example could be a kernel-recipe where you get "linux-image", "linux-headers", "linux-firmware-image". Another example could be a recipe that just fetches a few .debs from somewhere and never even creates a ${PN}_*.deb. Instead of looping over IMAGE_INSTALL and calling reprepro multiple times, just call it once on all the .debs we find in DEPLOY_DIR_DEB. Signed-off-by: Henning Schild --- meta/classes/image.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2c2bafc..b37358e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -71,13 +71,11 @@ do_populate[stamp-extra-info] = "${DISTRO}-${MACHINE}" # Populate Isar apt repository by newly built packages do_populate() { if [ -n "${IMAGE_INSTALL}" ]; then - for p in ${IMAGE_INSTALL}; do - call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ - --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ - -C main \ - includedeb ${DEBDISTRONAME} \ - ${DEPLOY_DIR_DEB}/${p}_*.deb - done + call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ + --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ + -C main \ + includedeb ${DEBDISTRONAME} \ + ${DEPLOY_DIR_DEB}/*.deb fi } -- 2.13.6