From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6555460492505120768 X-Received: by 2002:a1c:9855:: with SMTP id a82-v6mr1206291wme.4.1526312085110; Mon, 14 May 2018 08:34:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:d78d:: with SMTP id o135-v6ls1672694wmg.5.canary-gmail; Mon, 14 May 2018 08:34:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrZw5mXRC2AsIZPs0127MR41VmAn7dUxb7PiZDeTdZlRG/txOpLmOR4udTQRRSGl9P8lyqM X-Received: by 2002:a1c:3047:: with SMTP id w68-v6mr1228304wmw.23.1526312084697; Mon, 14 May 2018 08:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526312084; cv=none; d=google.com; s=arc-20160816; b=yi+yAEGrXakL9vys2NbQHN0UpXDfP0dDPYWY/LL8n2V58A/LJeD4mqgnYbdl8AWbBn 9xBMWS7XS6XdJnpVNYHJOT/Z35+LnjMdKW3YWFRaBCH6FMBb2kzzi29My+7MDvPLWhas 2dGSveF9xw8YsbcV2ecoYnYWVFCAMGYYrhhLZwWJmC1hXArZT9enibawFGgAqQGHuZUm 7bF4q5KZv2g2j3ujEuT8ZO8HCWJCprX5eOKX8GYuVcW8jmzlFIJUZMnq+wlV2IjHAFpE unoSkRsVZDsDfuEn4k7tY9hgXziNvLykr/rIkq7QwybV1kh1KoaR2ysShaCtdkcuax5/ N58A== 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=XJNXeWxNV2rT6u+upfw2/QD7s8lqP7DfejlFRv5dw6E=; b=XWgRmEfH7gIF+ZfyO1/92wVnUdXvCJrFhxsqSyvdVSkC9rGXRliKNNvU1pZfPvqTvW ebqUGQ7x7NQErOI6u7AE8cDOSyB3Q/KR0wrxJcs8KNQAOVqHn5mnXToGAll2LFzcXDze 8+pH8FFLdJUsYVAD+Pp33OAMB7lsOU3gqHIi2bqrO1Pr/N8VkvEDyQuIFnd4TSW0qzEy F8hg9MAn7G0e9QQiuTteDzCqMMnMxLIU+RCT8Az7APJPZDnwgxe1aYH61bLSkurYb6Lo lv1AXzw1gw462XeXDoA8hCRzekQ/MGtuNV1J7v8u7bjvSjHXmo/e7f6sU02kYZw1doNf wmvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id v12-v6si306307wmc.2.2018.05.14.08.34.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 08:34:44 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w4EFYieo001646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 14 May 2018 17:34:44 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w4EFYijP026389; Mon, 14 May 2018 17:34:44 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH] dpkg-base: Expect *.deb relative to S not WORKDIR Date: Mon, 14 May 2018 17:34:42 +0200 Message-Id: <20180514153442.1409-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 X-TUID: 81wNH0PZwn4d Issue: when S=$WORKDIR/dir1/source/ instead of $WORKDIR/source/ do_deploy_deb will not be able to find the *.debs to put into the isar-apt repo. dpkg-buildpackage will always place the packages in the parent directory "..", so use S/.. instead of WORKDIR to locate them. Signed-off-by: Henning Schild --- meta/classes/dpkg-base.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 3845d8c..75b45a7 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -66,7 +66,7 @@ do_build() { CLEANFUNCS += "repo_clean" repo_clean() { - PACKAGES=$(cd ${WORKDIR}; ls *.deb | sed 's/\([^_]*\).*/\1/') + PACKAGES=$(cd ${S}/..; ls *.deb | sed 's/\([^_]*\).*/\1/') if [ -n "${PACKAGES}" ]; then reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \ --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ @@ -83,10 +83,11 @@ do_deploy_deb() { --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \ -C main \ includedeb ${DEBDISTRONAME} \ - ${WORKDIR}/*.deb + ${S}/../*.deb } addtask deploy_deb after do_build do_deploy_deb[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" do_deploy_deb[lockfiles] = "${DEPLOY_DIR_APT}/isar.lock" do_deploy_deb[depends] = "isar-apt:do_cache_config" +do_deploy_deb[dirs] = "${S}" -- 2.16.1