[PATCH] dpkg-base: Expect *.deb relative to S not WORKDIR

[PATCH] dpkg-base: Expect *.deb relative to S not WORKDIR

[Henning Schild]

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

Re: [PATCH] dpkg-base: Expect *.deb relative to S not WORKDIR

[Alexander Smirnov]

On 05/14/2018 06:34 PM, Henning Schild wrote:
> 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.
> 

Applied to next, thanks!

Alex