[PATCH 2/2] dpkg: Use noexec to disable unneeded apt tasks

[Jan Kiszka <jan.kiszka@siemens.com>]

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

This avoids needless waiting for isar.lock in do_apt_fetch.

Unfortunately, using an even simpler inline python function for setting
task[noexec] does not work, even when setting expand to false for
SRC_APT. So move this to the anonymous python function as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 1cac68b..1f2bebf 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -76,8 +76,6 @@ SRC_APT ?= ""
 # filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT
 python() {
     src_uri = (d.getVar('SRC_URI') or "").split()
-    if len(src_uri) == 0:
-        return
 
     prefix = "apt://"
     new_src_uri = []
@@ -90,6 +88,11 @@ python() {
 
     d.setVar('SRC_URI', ' '.join(new_src_uri))
     d.prependVar('SRC_APT', ' '.join(src_apt))
+
+    if d.getVar('SRC_APT').strip() == '':
+        d.setVarFlag('do_apt_fetch', 'noexec', '1')
+        d.setVarFlag('do_apt_unpack', 'noexec', '1')
+        d.setVarFlag('do_cleanall_apt', 'noexec', '1')
 }
 
 fetch_apt() {
@@ -105,10 +108,6 @@ fetch_apt() {
 }
 
 python do_apt_fetch() {
-    src_apt = d.getVar("SRC_APT", True)
-    if not src_apt:
-        return 0
-
     dpkg_do_mounts(d)
     try:
         isar_export_proxies(d)
@@ -139,10 +138,6 @@ unpack_apt() {
 python do_apt_unpack() {
     import shutil
 
-    src_apt = d.getVar("SRC_APT", True)
-    if not src_apt:
-        return 0
-
     srcsubdir = d.getVar('S', True)
     if os.path.exists(srcsubdir):
         shutil.rmtree(srcsubdir)
@@ -160,9 +155,6 @@ addtask apt_unpack after do_apt_fetch before do_patch
 addtask cleanall_apt before do_cleanall
 do_cleanall_apt[nostamp] = "1"
 do_cleanall_apt() {
-    if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then
-        return 0
-    fi
     for uri in "${SRC_APT}"; do
         rm -rf "${DEBSRCDIR}"/"${DISTRO}"/"$uri"
     done
-- 
2.31.1