From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.46.87.10 with SMTP id l10mr175143ljb.9.1504864143073; Fri, 08 Sep 2017 02:49:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.183.213 with SMTP id h204ls265007wmf.6.gmail; Fri, 08 Sep 2017 02:49:02 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDREiQODRaBVQgPlHQFD/WLxLbakz2UTYqZyKDK9JjXKpE4z8sv3hP6bcIocf3tK6H3cP/a X-Received: by 10.28.156.4 with SMTP id f4mr147250wme.16.1504864142724; Fri, 08 Sep 2017 02:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504864142; cv=none; d=google.com; s=arc-20160816; b=XdudGcsCzSDAN4cBkRcT985d8vIXC+CBuhzrog12jHKNbqr38Z+XFf4+SebNp2ZA6L TDxBRP+GbxtK5JnoREpzvdbweV3Me7aql6VfYkgq33uKuYU08ludjVq3FWsz7xX744/S E3xApCadFQNJMhQcBKNBxq98qErZgPVkWommf9NHckk0o57FjYW7OqIaBboWWZV3zBXR /950vDj/Wd+froTnPoDgqpnR4auvYd54L4Y3gLDsNZdrqbjucYkMfm+LXvGKCGBhr46O u2fSrhTUxtd4LM23aEUgHHi6ZguyJxiwqAX9ybnUlBcMr8dJZoKfeYIXFstakbmPNp4W PpVQ== 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=n9yBpsmb2pOhyemPTS2/yJMBbFwO/tF+dAi6MpORFMIYC6vRFf29SsvitaVFligA8I jCsBc+G/Hn/dIDrNlafoooaSlERjN7H1VHKDIZRJfOmDaD8fIu3kZAXowdRBg+8wVwxd yfwOLWfNMF8qfXQFbBgHsbClBsYiJ1kzWvFJ8a6SQMFSBNHccSkJmSohSJ9XxXICEpOa 0zXTAyB8apnqE9xSCR5z/7l4d4RzDQhpjaz2OzgcxqX5LTrydE22XemzG3h5v3TeEtPK JBsNJxopnvQ+/S7hA5c94eAiBz9wvnc+YQ9MCvmqq4vXXiJi4uEOWSgI4wSPInhtxNMu OLoA== 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 b130si87835wme.0.2017.09.08.02.49.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 02:49: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 v889meqM008863 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Sep 2017 11:48:48 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH 2/2] class/dpkg: Unify workplace for packages Date: Fri, 8 Sep 2017 12:48:34 +0300 Message-Id: <20170908094834.26496-3-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170908094834.26496-1-asmirnov@ilbers.de> References: <20170908094834.26496-1-asmirnov@ilbers.de> X-TUID: c/iAzaa5x3GK 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