From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a5d:4989:0:b0:20a:c907:2110 with SMTP id r9-20020a5d4989000000b0020ac9072110mr21178593wrq.476.1651761597978; Thu, 05 May 2022 07:39:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6d84:0:b0:20c:7b09:42a4 with SMTP id l4-20020a5d6d84000000b0020c7b0942a4ls1926856wrs.2.gmail; Thu, 05 May 2022 07:39:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw37P/psALYEUBJvc+FFhHRkv6KcViD6I6c9O4zA7pDhp2fSYTIthX2QY6h1B7oxvdXZ1bI X-Received: by 2002:a5d:5984:0:b0:20c:7ec1:499 with SMTP id n4-20020a5d5984000000b0020c7ec10499mr7429370wri.178.1651761597222; Thu, 05 May 2022 07:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761597; cv=none; d=google.com; s=arc-20160816; b=bsEibG3BM3mVPrBR4G0YaZjyb0YbBWLm0uO2Sx2SRJ3jJfpZrIX9Xvtda4lmGKh+gz +KckGtocmobvB3Zenkuvwe5BTGkWwV8SMT32o/L/yc2xh7rnmaSL764JW96gRjCDxvdb YbqykyOpbVngzu/GJDLZL1/IhrE2gIY5CcjbFZUza3/1LQ7J11kv/97wXnltn0zsQs1A fC4iY6+vxvhLKV62sIYlDt00RWoa1JdqKob11UQ5xin6KIGSayHxgtN2+mbdKryGxzKl WtFk/YYxbERWzouZpC7aSHzChM6IH4wQP732IiAseN65k1WRE6AAAReIJs2nj4e+msTs IJRw== 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=mzN06Xl5ouXVrpIO7tnutvcwNt4ghv6H8RfwalCDPiY=; b=OZR9SCPyaCSgvVXfFs6s/3nWhyp/XvwWN5GuB6bWFtmVweOf/GmbWDmvsmlgcBR+F/ Zix816ntzfi4NBAPOUvy/q4bFF5bEzF1vLSiWa2wjxyoGbD9SjdneO4apDCtVT/W+PM/ d8sjLymnqXOX+jvw0PURyPWOdjVmhKsAsk4Avt86mD6cN2oym7Qs7tUEz0t2cm3VErQB Aaabkk/e2aP6Dvo6IFh2oO+IIpuEdhCxWKp7cLTd0FlCQmLBA2DpaTZFlg3DZfzIv8it 5c3QUIeGvZUR6SA8a8QdikWLwf9L/fA3pG8cGGUo5xiF4y1YZcBIQ9G1JfcyVCQVlNPx xZLQ== 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 z6-20020a056000110600b0020c71ce1c26si66237wrw.6.2022.05.05.07.39.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:57 -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-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7f014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:56 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely Subject: [PATCH v10 13/19] sbuild: Use .dsc file instead of source directory Date: Thu, 5 May 2022 17:39:28 +0300 Message-Id: <20220505143934.16096-14-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-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: aeb6ZJBOiKhH From: Uladzimir Bely This makes build more Debian-like and avoids additional execution of "dh clean" by sbuild before dependencies resolved and build started. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index d92135c..564e654 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -61,6 +61,10 @@ dpkg_runbuild() { echo '$apt_keep_downloaded_packages = 1;' >> ${SBUILD_CONFIG} + # Create a .dsc file from source directory to use it with sbuild + sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" + DSC=$(head -n1 ${WORKDIR}/${PPS}/debian/changelog | awk '{gsub(/[()]/,""); printf "%s_%s.dsc", $1, $2}') + sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${SBUILD_HOST_ARCH} ${profiles} \ --no-run-lintian --no-run-piuparts --no-run-autopkgtest \ @@ -68,7 +72,7 @@ dpkg_runbuild() { --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="cp -n --no-preserve=owner ${deb_dir}/*.deb -t ${ext_deb_dir}/ || :" \ --debbuildopts="--source-option=-I" \ - --build-dir=${WORKDIR} ${WORKDIR}/${PPS} + --build-dir=${WORKDIR} --dist="isar" ${WORKDIR}/${DSC} deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" -- 2.17.1