From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.25.23.233 with SMTP id 102mr285663lfx.25.1504886192142; Fri, 08 Sep 2017 08:56:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.229.14 with SMTP id c14ls98498wmh.3.canary-gmail; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBu63gta2UYg4hmoPCnEZ1SuZjRjy7BRdZqajpsUfKkar3PRPTmQMXeCWD0baLeuJ7Eb3LX X-Received: by 10.28.230.79 with SMTP id d76mr255476wmh.12.1504886191734; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504886191; cv=none; d=google.com; s=arc-20160816; b=mGVorSM/lo1LVZ74BYzkrB7zxf81SseW+WRsV01yIAW3MN/E8F0lG5IHc3vHwclWah zhENJ33i10KhmGZ7mAjrqe+D9WZ+R8Mzr873DO7cTeRU/gOy3cHD1mvhAI0xWUleQt5P Ux0ot0o6/NBgH+9t6R0sWIT16mrPmkKu73icmksHA8HsFNbuXOTV1Fv28djQBv3k3fek EpWA5nlDYYyuR96SOYI9sLZiytFOOYysRcjXX8TJmfmvkJIRh4Ybt7P2zgSEzSRrPlsp PilppRY8lnOxdlNYbMBm7CwVuQQRScb+yCpT2gxxLMY6Jvuf/t0dBq3noSSJ1aYZQurr B+0w== 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=VUkltlB1IyFPKEbvBh5shC/dQWj5OJYVJFcGd0nlXz8=; b=fPJzgEJ60olFSJ7uVtwndNSBwKVvMMgMXHTg1t4umUnPgZ/cE/mz3Wnaq6xwu5v8gA qPBx7wSZkGrTnmJXdt8HXzCM4Bu8BkO5fhox4FAg6PHCPIC/bJRPOBSgUWyMXzPSBREV GZM4E4reNx/SoOAPKOfVknucUXpS25fHtnPP21FLKUAf7cI/MmHiIrvYhdsEs8pvTHUF 4+shL6GoQoFPPxZ5Lt35ymVmUKHwea55oy+Vr4qIYKN/XzEd7xGS/wq3MlrOVeLXNoSi as1y9tGdxzji90fiKJEBdqVjCJVK1TdauiHtpWiWhYjq4hLbUxahw7eqigfPzAaCTtpz UVhQ== 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 r8si216923wma.4.2017.09.08.08.56.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 08:56:31 -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 v88FuCGR011354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Sep 2017 17:56:21 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 5/5] class/dpkg: Unify workplace for packages Date: Fri, 8 Sep 2017 18:56:06 +0300 Message-Id: <20170908155606.7654-6-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170908155606.7654-1-asmirnov@ilbers.de> References: <20170908155606.7654-1-asmirnov@ilbers.de> X-TUID: 9NrV7AUR+L8n 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) 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