From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a05:6512:3d29:b0:47f:739d:b042 with SMTP id d41-20020a0565123d2900b0047f739db042mr11101700lfv.88.1656398979132; Mon, 27 Jun 2022 23:49:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f16:b0:449:f5bf:6f6a with SMTP id y22-20020a0565123f1600b00449f5bf6f6als1762897lfa.2.gmail; Mon, 27 Jun 2022 23:49:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uv6QK2XmYUeJaGer+2qXTtAu4hUjbYrp9KpSgwZwJQgh7/jA18ml5mrRUI26BEcdJk+0Ga X-Received: by 2002:a05:6512:b21:b0:47f:752a:c140 with SMTP id w33-20020a0565120b2100b0047f752ac140mr10347495lfu.349.1656398977933; Mon, 27 Jun 2022 23:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398977; cv=none; d=google.com; s=arc-20160816; b=ZmYx7cpsopu0ZbiTzKeOc0bsUBA1axJAMvaUFpHhDE1qH47Kmm61zxaLQf2eVOOneA /DrEVS9hfHJTMImNzmJNSBg9Ni4BuQpAufSVUQEAye4EdVGZYNFb29UjglLQXdmmdlYA YVc+Yp/LmyfaTa2mV/TwZ3nSBMqk/UiN4FoRbyS3MOgRHoZW/ZZLLHGTwZV1JDFMWSPq 0zAKNvyop/KHTe4iPgNXbrCctL2zjZAp56Q+I35t52dQnAbQbo75bY8MZM2iPtyGANx8 RpCvm1go0wqts1zmAeW8v4bhE2FdSxjcgqYzuyH3hD8jZa1QE/Qdyy8GGf/7Q11veWCz Z7bA== 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=pGOU0NGSH/jRqrHuYe9lwJc/Nv512aeXetuFXQMvsruO+OqCRPGGkVliEasJ93J3ev fnwAWz0dbY07XiQ2OjVmqcZOJsQzXeM0ZptLDnJlFNsS52+EwrdegWiRbsObcj/dC64e kLPs7aYsShex5Vne8esCIYhhObFiu3uw0Wl9obiNnL4zIAjQzqLIbZzbK3Pd/5MGopL1 ZX6y53MoICWqCD5nxkmZkjpcyGMXqAMHb4EsdUQVIS4IPylraJ3svdp7nvpxDu8nX2jh iVykYx07YJ+TooHLBFAbw/tq2RsQmk+X+FmWII6EfR9umIXTf3ZAzGSNUc2yFgNEqJ2i YZtQ== 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 h6-20020a05651c124600b0025a45f568e9si443571ljh.0.2022.06.27.23.49.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:37 -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-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMSH030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:37 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v12 13/21] sbuild: Use .dsc file instead of source directory Date: Tue, 28 Jun 2022 09:49:05 +0300 Message-Id: <20220628064913.27938-14-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-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: AdtpwLX4wKRg 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