From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.13.194.195 with SMTP id e186mr1095115ywd.30.1505153438409; Mon, 11 Sep 2017 11:10:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.107.133.201 with SMTP id p70ls3406388ioi.16.gmail; Mon, 11 Sep 2017 11:10:37 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD5LOKWFY2ghsjaiMpS9W0PxvrVB0nQDwFw5fB5EkL735yPxzlawqxArQzTNL9Kl5dTBwXQ X-Received: by 10.202.81.78 with SMTP id f75mr7099754oib.8.1505153437886; Mon, 11 Sep 2017 11:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505153437; cv=none; d=google.com; s=arc-20160816; b=lp83aBB30bmzoknf4ijGbCfeCvFreiRxa4XowEliHFU1ED0Q/WxKSd2CvhWAd1Uu2h nwSZq0Q6vxITpD1NNYEL4/V59O0Jy/F54AlIAlmizCnXI5y3yk/lUusw77KI+bbvo7As MeRKiPl2vLZ5/wMwhH1ia8oKGAA91pdVfElvbwguCqeWDVRT9yAU/A6g0bVFVvL1d4P4 +T7pgdv0EGtPWglrmoMz+G+H4w/P8n/XOHSpwIAzV5ZH27A/USSf324LQpMpabMNPbSI 4zoK7FFSdHAiaK02TBUp6qtovOKoNQo7kvvjloHHEfxKs8Zz770apl/zwGD1RDOoE96M TbdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :arc-authentication-results; bh=phyjRRNP73wcugE8ElAjgBtKSlPlaA+L010Vrwh1Fdk=; b=mt5v3C8PIOpttSdT6FET3Y4gubtaQkpt9dH3RAlK6hZnBefH2nOja5MLIPPqqPjSpJ 4NnhL9bnejwtSkVImDkdGVh0L1F1Fib9OiBpBDqJyGq8GXf/rBb8cUtytFtNMFk7dCXv oeh4OHLfKjsSm6Qh+JMN3MBJvAFo63Zc1OYQHtoujTaw3srQqf3tHoFY+HERk5Y8boNR xc58tRzxepXKFuCXU2kotQdKJOsKgt8VQuC65WBAeRxF+zMYE55AZEeSXRrBycy0iitL 7zmMgmD/LuzvP+ooWlS0a28YTmfvzchQtosYGo0wrAFhYQofuIYI7ltRVFV+N5MIAwqR H84g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id c82si265531itg.4.2017.09.11.11.10.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 11:10:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v8BIAXgI000421 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 11 Sep 2017 20:10:34 +0200 Subject: Re: [PATCH v2 5/5] class/dpkg: Unify workplace for packages To: Henning Schild Cc: isar-users@googlegroups.com References: <20170908155606.7654-1-asmirnov@ilbers.de> <20170908155606.7654-6-asmirnov@ilbers.de> <20170911184755.45159d91@md1em3qc> From: Alexander Smirnov Message-ID: Date: Mon, 11 Sep 2017 21:10:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170911184755.45159d91@md1em3qc> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: JmALHjvmsBLm On 09/11/2017 07:47 PM, Henning Schild wrote: > Am Fri, 8 Sep 2017 18:56:06 +0300 > schrieb Alexander Smirnov : > >> Get rid of splitting package's data between WORKDIR and BUILDCHROOT. >> Now everything is stored into WORKDIR, and BUILDCHROOT is used for >> compilation only. >> >> Signed-off-by: Alexander Smirnov >> --- >> meta/classes/dpkg.bbclass | 15 +++++++++------ >> 1 file changed, 9 insertions(+), 6 deletions(-) >> >> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass >> index 360a95c..f1a29aa 100644 >> --- a/meta/classes/dpkg.bbclass >> +++ b/meta/classes/dpkg.bbclass >> @@ -3,12 +3,11 @@ >> >> # Add dependency from buildchroot creation >> DEPENDS += "buildchroot" >> -do_unpack[deptask] = "do_build" >> +do_build[deptask] = "do_build" >> >> # Each package should have its own unique build folder, so use >> # recipe name as identifier >> PP = "/home/builder/${PN}" >> -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" >> >> do_fetch[dirs] = "${DL_DIR}" >> >> @@ -27,9 +26,8 @@ python do_fetch() { >> >> addtask fetch before do_unpack >> >> -do_unpack[dirs] = "${BUILDROOT}" >> +do_unpack[dirs] = "${WORKDIR}" >> do_unpack[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" >> -S ?= "${BUILDROOT}" >> >> # Unpack package and put it into working directory in buildchroot >> python do_unpack() { >> @@ -37,7 +35,7 @@ python do_unpack() { >> if len(src_uri) == 0: >> return >> >> - rootdir = d.getVar('BUILDROOT', True) >> + rootdir = d.getVar('WORKDIR', True) > > This change is in conflict with the comment, please fix the comment of > do_unpack. > Aah, yes. Thanks! > Henning > >> try: >> fetcher = bb.fetch2.Fetch(src_uri, d) >> @@ -48,17 +46,22 @@ python do_unpack() { >> >> addtask unpack after do_fetch before do_build >> >> +BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" >> do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" >> >> # Build package from sources using build script >> do_build() { >> + mkdir -p ${BUILDROOT} >> + sudo mount --bind ${WORKDIR} ${BUILDROOT} >> sudo chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${SRC_DIR} >> + sudo umount ${BUILDROOT} >> + rm -rf ${BUILDROOT} >> } >> >> >> # Install package to dedicated deploy directory >> do_install() { >> - install -m 644 ${BUILDROOT}/*.deb ${DEPLOY_DIR_DEB}/ >> + install -m 644 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/ >> } >> >> addtask install after do_build >