From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.223.172.196 with SMTP id o62mr700004wrc.10.1505158082742; Mon, 11 Sep 2017 12:28:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.91.209 with SMTP id p200ls1347737wmb.17.gmail; Mon, 11 Sep 2017 12:28:02 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5FuNtzrp0d3FV2MBGU+gq1BIrmxa2N2Qx2MhB/oY30hNF7U88VlOzT8DIyLRWQE6hS/2P5 X-Received: by 10.223.172.196 with SMTP id o62mr700003wrc.10.1505158082385; Mon, 11 Sep 2017 12:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505158082; cv=none; d=google.com; s=arc-20160816; b=Ypd3qsTSU4SkT3ksMbLmbJG9n3q6ya8whnHASBRTyrZR/7N2QQdjCr70doC+k26EY5 5QI8wqp1eo0b9mphe80ZhlgDvYhHTJKd1Elp0VxXYKbTg70tm2ekAVaHIRo69HyiMTTx mhJAHPdsMBh1gE+0FUrTPQtAFAQ7T994osWwYbJuItD6mSqtr5L50DQboxBdpwH+Rrw/ rEfsDb7Z5wiNzT/1a5/bl/8g5gLEczvCnS/3yLcMntvJbly9mGW607Zl4lZ8rLtPgj0M gXcNn75M34WLgzC54c8evJCVJuYMdsxtjcAkh9TZdZDkmtFDwJRlv3psH/8EacN1sATw XsoA== 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 :arc-authentication-results; bh=6lKHI/tSQbGlKy6ev8egTvPCYU2dvmtsyM7KxH6Sxzk=; b=KmSJXUaM8GXrFvop9Irh4imN0TbA02nB192tq7oIcOcBXVbxDqetyyaHa24uNo4iqy 7m93CB04vAgq8FwGJa5AA9VquSz+caru/57l2EAkh7qbTQMtaP8EERoqUImm4eFFvUtl inZofBEM3+BixXzWXg0292z2XoCz73y6D7sV7AgAGz+4fF/V2gXJWitXS2dkGeMtTegB ZW7mZobepQtXrAqhc0UsT13YZYu3pnr5eRtWkhFukfS52E+NMO83JcMB9smmrlcfptp/ teihB66pOM6ZCFtB1b7DJfdOHtXofZW7qVArtLzNl2g9T0bD9QRxBtm77zFsqJuiXZrc xd0g== 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 c142si661343wmh.3.2017.09.11.12.28.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 12:28:02 -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 localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v8BJRjMR000908 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Sep 2017 21:27:54 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v3 5/5] class/dpkg: Unify workplace for packages Date: Mon, 11 Sep 2017 22:27:38 +0300 Message-Id: <20170911192738.1323-6-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170911192738.1323-1-asmirnov@ilbers.de> References: <20170911192738.1323-1-asmirnov@ilbers.de> X-TUID: yp1aKCyZa5f4 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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 360a95c..16b7fc5 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,17 +26,16 @@ 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 +# Unpack package and put it into working directory python do_unpack() { src_uri = (d.getVar('SRC_URI', True) or "").split() if len(src_uri) == 0: return - rootdir = d.getVar('BUILDROOT', True) + rootdir = d.getVar('WORKDIR', True) 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 -- 2.1.4