From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6497245309302734848 X-Received: by 10.223.169.146 with SMTP id b18mr1870272wrd.16.1512758178253; Fri, 08 Dec 2017 10:36:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.185.105 with SMTP id b38ls541618wrg.1.gmail; Fri, 08 Dec 2017 10:36:18 -0800 (PST) X-Google-Smtp-Source: AGs4zMZvSPlwC1gqLz8d8TyLf4GRPHKrrtuuLVAEvQMfomRTHhsoLvoaQPgi4rEooAN1+eAMLyPz X-Received: by 10.28.191.90 with SMTP id p87mr660890wmf.26.1512758178002; Fri, 08 Dec 2017 10:36:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512758177; cv=none; d=google.com; s=arc-20160816; b=G62NdyCwtDowqifxTm7xIscB44RPnAx1JX8/bhQDtfqKKob58zTNYBfvNqOE+0Lusf Y99LoDnm4qJJ4TueNHmf1ausz2TgMceetg31ItnmSbok3YtLBZjF/F1xwLhbBP06Dxc3 uqenY769Zw/CzW5b0xKP/7XZuYKXQeDPqUNWRiS7Zdf5Ze6/8sGDz60kdqELRJcrt+LP PjwLO51cELdV8QakxUPXjTiPwbVC/U8EBxIECuLNiSUWdQRD04f9dgiR67l0zrjzgXuq mZSm8N667MXZVth8WSRieGMKhxLFd9tejJZbBqWr+tXzSijVq0ivu4gbGWgYkyK7FylV QO+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:to:from:date:arc-authentication-results; bh=yoAIbEYbt7x09kZ0uC/Qz9+xP9WyEcwA1G1DyIB2VIU=; b=0Ge7IaJmvHEmhdee3vlCDysEb9ob6JSCSFPx4V89CBYNg4SYB8zy/jfE3aULucpaCO m65pkyQyx3jaY/vi5uJQj/8FN6wrX2F61RGImW7GIs/+OXH+TYVN2y7gnDh210ASwN9V ye5T5ABgb+DWZxohlAXlqHgwTUXKhDvteVrPsMTdXmabBzmdFs+VRH5f/7rFKOdHsyLQ mfRvFcACbhAV/uf5hmy3O0URDaeOh69kEHsCAl8CYU6MQYnbKljJA1vG6YWuOAluBsIo tQCte9eLCahcCuNsMVRrFZHgYtMHvTU9Xam7phKVFfsc1p8PfDe+kvBBKZQq8WAZeVrO 5akA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id r70si309009wmg.2.2017.12.08.10.36.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Dec 2017 10:36:17 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id vB8IaHG6004775 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 8 Dec 2017 19:36:17 +0100 Received: from md1em3qc (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id vB8IaHm5018316 for ; Fri, 8 Dec 2017 19:36:17 +0100 Date: Fri, 8 Dec 2017 19:36:16 +0100 From: Henning Schild To: isar-users Subject: Re: [PATCH 1/3] image: fix do_populate package-name assumption Message-ID: <20171208193616.1eb653b9@md1em3qc> In-Reply-To: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> References: <52fcea5998778d3372bdecd9f87c0fd36fc43ad6.1512757716.git.henning.schild@siemens.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: yypOJbqsZC67 These patches are currently being build by CI, you know which branch and how to find it. Just as a sidenote, from now on all of the patches i post will have gone through CI or are currently running. Henning Am Fri, 8 Dec 2017 19:30:02 +0100 schrieb 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 > --- > 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 > } >