public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v2 3/9] Add clean and cleanall tasks
Date: Tue, 13 Feb 2018 21:05:21 +0100	[thread overview]
Message-ID: <7078af24253ae6fb0758a0a4fb225de44da7cd1d.1518552327.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1518552327.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1518552327.git.jan.kiszka@siemens.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

Derived from OE, this adds clean and cleanall tasks for Isar. The clean
task comes with CLEANFUNCS hook, we just run them prior to cleaning the
WORKDIR. This is used by dpkg-base to remove all packages from isar-apt
that the build may have deployed.

As we are at it, also do a repo clean prior to deploying a package -
just in case something triggers a partial rebuild without prior
cleaning...

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/base.bbclass      | 35 ++++++++++++++++++++++++++++++++++-
 meta/classes/dpkg-base.bbclass | 14 ++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0fa27db..b0e174e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -110,4 +110,37 @@ python base_do_build () {
     bb.note("Try running the 'listtasks' task against a .bb to see what tasks are defined.")
 }
 
-EXPORT_FUNCTIONS do_clean do_mrproper do_build
+EXPORT_FUNCTIONS do_build
+
+CLEANFUNCS ?= ""
+
+# Derived from OpenEmbedded Core: meta/classes/utility-tasks.bbclass
+addtask clean
+do_clean[nostamp] = "1"
+python do_clean() {
+    import subprocess
+
+    for f in (d.getVar('CLEANFUNCS', True) or '').split():
+        bb.build.exec_func(f, d)
+
+    dir = d.expand("${WORKDIR}")
+    subprocess.call('sudo rm -rf ' + dir, shell=True)
+
+    dir = "%s.*" % bb.data.expand(d.getVar('STAMP', False), d)
+    subprocess.call('sudo rm -rf ' + dir, shell=True)
+}
+
+# Derived from OpenEmbedded Core: meta/classes/base.bbclass
+addtask cleanall after do_clean
+do_cleanall[nostamp] = "1"
+python do_cleanall() {
+    src_uri = (d.getVar('SRC_URI', True) or "").split()
+    if len(src_uri) == 0:
+        return
+
+    try:
+        fetcher = bb.fetch2.Fetch(src_uri, d)
+        fetcher.clean()
+    except bb.fetch2.BBFetchException as e:
+        bb.fatal(str(e))
+}
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 69c8ad5..a45fbce 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -31,8 +31,22 @@ do_build() {
     sudo rmdir ${BUILDROOT} 2>/dev/null || true
 }
 
+CLEANFUNCS += "repo_clean"
+
+repo_clean() {
+    PACKAGES=$(cd ${WORKDIR}; ls *.deb | sed 's/\([^_]*\).*/\1/')
+    if [ -n "${PACKAGES}" ]; then
+        reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
+                 --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
+                 -C main \
+                 remove ${DEBDISTRONAME} \
+                 ${PACKAGES}
+    fi
+}
+
 # Install package to Isar-apt
 do_deploy_deb() {
+    repo_clean
     reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
              --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
              -C main \
-- 
2.13.6


  parent reply	other threads:[~2018-02-13 20:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13 20:05 [PATCH v2 0/9] Add support for automatic partial rebuilds on recipe changes Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 1/9] dpkg-raw: Install hooks automatically Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 2/9] Fix indention of base_do_build Jan Kiszka
2018-02-13 20:05 ` Jan Kiszka [this message]
2018-02-14 15:14   ` [PATCH v3 3/9] Add clean and cleanall tasks Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 4/9] Enable recipe caching Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 5/9] Move buildchroot mounts into dpkg-base class Jan Kiszka
2018-02-13 20:17   ` Alexander Smirnov
2018-02-13 20:47     ` Jan Kiszka
2018-02-14  5:54       ` Alexander Smirnov
2018-02-14  8:37         ` Jan Kiszka
2018-02-14  8:52   ` [PATCH v3 " Jan Kiszka
2018-02-14  9:09     ` Alexander Smirnov
2018-02-14  9:16       ` Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 6/9] Enable proper rebuilds on dependency changes Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 7/9] dpkg-raw: Clean DEBIAN dir prior to filling it Jan Kiszka
2018-02-15  9:14   ` Claudius Heine
2018-02-15  9:18     ` Jan Kiszka
2018-02-15 10:26       ` Claudius Heine
2018-02-15 10:30         ` Alexander Smirnov
2018-02-15 10:53           ` [PATCH] dpkg-raw: Fix creation of DEBIAN folder Jan Kiszka
2018-02-15 15:39             ` Alexander Smirnov
2018-02-26 11:39             ` Andreas Reichel
2018-02-26 12:03               ` Jan Kiszka
2018-02-26 12:27               ` Andreas Reichel
2018-02-15 12:20           ` [PATCH v2 7/9] dpkg-raw: Clean DEBIAN dir prior to filling it Claudius Heine
2018-02-13 20:05 ` [PATCH v2 8/9] isar-image-base: Clean rootfs folder prior to building Jan Kiszka
2018-02-13 20:05 ` [PATCH v2 9/9] buildchroot: Clean up rootfs prior to populating it Jan Kiszka
2018-02-14 17:43   ` Alexander Smirnov
2018-02-14 17:48     ` Jan Kiszka
2018-02-14 11:33 ` [PATCH v2 0/9] Add support for automatic partial rebuilds on recipe changes Alexander Smirnov
2018-02-14 12:41   ` Jan Kiszka
2018-02-14 12:57     ` Alexander Smirnov
2018-02-14 13:10       ` Jan Kiszka
2018-02-14 13:29         ` Jan Kiszka
2018-02-14 13:38           ` Jan Kiszka
2018-02-14 13:49             ` Jan Kiszka
2018-02-14 14:06               ` Alexander Smirnov
2018-02-14 14:03             ` Alexander Smirnov
2018-02-14 14:10               ` Jan Kiszka
2018-02-14 17:51 ` Alexander Smirnov
2018-02-14 17:54   ` Jan Kiszka
2018-02-14 17:57     ` Alexander Smirnov
2018-02-14 18:02       ` Jan Kiszka
2018-02-14 18:34         ` Alexander Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7078af24253ae6fb0758a0a4fb225de44da7cd1d.1518552327.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox