public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
* [PATCH 1/3] image: fix do_populate package-name assumption
@ 2017-12-08 18:30 Henning Schild
  2017-12-08 18:30 ` [PATCH 2/3] multistrap: Include -updates suite for distros that support it Henning Schild
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Henning Schild @ 2017-12-08 18:30 UTC (permalink / raw)
  To: isar-users; +Cc: Henning Schild

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 <henning.schild@siemens.com>
---
 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


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-11 13:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-08 18:30 [PATCH 1/3] image: fix do_populate package-name assumption Henning Schild
2017-12-08 18:30 ` [PATCH 2/3] multistrap: Include -updates suite for distros that support it Henning Schild
2017-12-08 18:30 ` [PATCH 3/3] multistrap: include security " Henning Schild
2017-12-08 18:36 ` [PATCH 1/3] image: fix do_populate package-name assumption Henning Schild
2017-12-11 13:14 ` Alexander Smirnov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox