From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a9d:710e:0:b0:60a:f5f7:dc35 with SMTP id n14-20020a9d710e000000b0060af5f7dc35mr5331710otj.308.1653316608526; Mon, 23 May 2022 07:36:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6808:4cc:b0:32b:a70:4ae2 with SMTP id a12-20020a05680804cc00b0032b0a704ae2ls2844038oie.4.gmail; Mon, 23 May 2022 07:36:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2k6g8Yr9mVAO2tOc8DlRRuu1JH+xo3VTIeZ3/T9IUElyallOkPqsVKlSUYJg4c4Y/Zv/7 X-Received: by 2002:aca:4b87:0:b0:326:b2bf:b10a with SMTP id y129-20020aca4b87000000b00326b2bfb10amr12213503oia.213.1653316608083; Mon, 23 May 2022 07:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653316608; cv=none; d=google.com; s=arc-20160816; b=odUlSft1JHWDuaZd6NWlKFggs/rTK2dzCmnTGaXQTuw30iAI41VMakprKy8JwZpuhA nT2JAcSL9HyPV+lf7Mz/8gQvoNsIIZrxpztKuB0lCYhMQoFz+GSnrAnot2mfcJnJ6aKz HUojFVUvjTa5qxkVaRLljr8Y6iXLIvFNlTRv9fdnhYzw6MSqgOudhJfzCVEGaG256cQK jKbMl6NsMLfpwKsN8mebVe+CxVORatnTb9HZc8t/8c8mQrfIQz4N+amG0CrIQ0emh4Vw FjBVDZt4YC46bhdlKkP2Ap6T6PjgkdWe6gBvCbj1X+cbOVj8+GbJ2uOfhbJIQkDvyHM8 vyaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=tg14N929ZiH9MeEpk+86CKKWwzhi/aY/E4DC5s9N33M=; b=y0Rc0s2hC24EB3q4OSKAOvQgzuUNseg7GDvk1yV23Y4tVQRx0BAU/SUr2nvpSnW9J+ Y9dKGQWeyn52ZcXv23z+SsrXdqYNPQThRXYnxIEWJvZzo1IVgoIUi5gt3pwUJsDwGDWG bL6zcAzhEyi3VYNGnwDA26sH7mk5CJs/v9twozR+hGeWISw8Ol7dS/fgYgbS3VOcb9Jq OVa0RaajOt3KS9SOLj3McaVhDN4+U9mPn73oIdeqGynpplR4c/MYmMROjzbC4zwBwo2L qormeo7unbreK6PyEnfZ+OdgXhQcsUZBlh/rhg2sxN2+Ya+8olDFjc4S2faOUbl98mBY BIkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g5-20020a056870c14500b000f1e0ccdd86si1551708oad.3.2022.05.23.07.36.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 May 2022 07:36:48 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-40-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 24NEaO3g024879 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 May 2022 16:36:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH v11 20/21] locate generated binary package in WORKDIR Date: Mon, 23 May 2022 17:36:16 +0300 Message-Id: <20220523143617.24759-21-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220523143617.24759-1-amikan@ilbers.de> References: <20220523143617.24759-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: ojAYyACb9NOM From: Felix Moessbauer With sbuilder, the generated binary packages are always emitted into the WORKDIR indepedent of the value of ${S}. Prior to this fix, this only worked if ${S} was a direct subfolder of ${WORKDIR} (but no nested folder). Signed-off-by: Felix Moessbauer --- meta/classes/dpkg-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 39ab04f..79c1ce1 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -296,7 +296,7 @@ do_clean[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb() { deb_clean repo_add_packages "${REPO_ISAR_DIR}"/"${DISTRO}" \ - "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${S}/../*.deb + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${WORKDIR}/*.deb } addtask deploy_deb after do_dpkg_build before do_build -- 2.17.1