public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 1/3] image: fix do_populate package-name assumption
Date: Fri,  8 Dec 2017 19:30:02 +0100	[thread overview]
Message-ID: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> (raw)

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


             reply	other threads:[~2017-12-08 18:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-08 18:30 Henning Schild [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox