From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
Baurzhan Ismagulov <ibr@radix50.net>,
chombourger@gmail.com,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCHv3 3/9] rootfs: rename ROOTFS_INSTALL_COMMAND lock to "isar-apt-lock"
Date: Thu, 7 Nov 2019 19:55:57 +0100 [thread overview]
Message-ID: <20191107185603.9077-4-henning.schild@siemens.com> (raw)
In-Reply-To: <20191107185603.9077-1-henning.schild@siemens.com>
From: Henning Schild <henning.schild@siemens.com>
The new name should make clear what gets (un)-locked here. No functional
change.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta/classes/rootfs.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 61d7883..72303fe 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -94,7 +94,7 @@ EOSUDO
ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update"
rootfs_install_pkgs_update[weight] = "5"
-rootfs_install_pkgs_update[isar-lock] = "acquire-before"
+rootfs_install_pkgs_update[isar-apt-lock] = "acquire-before"
rootfs_install_pkgs_update() {
sudo -E chroot '${ROOTFSDIR}' /usr/bin/apt-get update \
-o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \
@@ -110,7 +110,7 @@ rootfs_install_resolvconf() {
ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download"
rootfs_install_pkgs_download[weight] = "600"
-rootfs_install_pkgs_download[isar-lock] = "release-after"
+rootfs_install_pkgs_download[isar-apt-lock] = "release-after"
rootfs_install_pkgs_download() {
sudo -E chroot '${ROOTFSDIR}' \
/usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES}
@@ -157,13 +157,13 @@ python do_rootfs_install() {
for cmd in cmds:
progress_reporter.next_stage()
- if (d.getVarFlag(cmd, 'isar-lock') or "") == "acquire-before":
+ if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "acquire-before":
lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock",
shared=True)
bb.build.exec_func(cmd, d)
- if (d.getVarFlag(cmd, 'isar-lock') or "") == "release-after":
+ if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "release-after":
bb.utils.unlockfile(lock)
progress_reporter.finish()
}
--
2.23.0
next prev parent reply other threads:[~2019-11-07 18:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 18:55 [PATCHv3 0/9] a few cleanups a bug and a feature Henning Schild
2019-11-07 18:55 ` [PATCHv3 1/9] rootfs: fix incorrect feature name in comment Henning Schild
2019-11-07 18:55 ` [PATCHv3 2/9] base_apt_helper: change variable names to increase readability Henning Schild
2019-11-07 18:55 ` Henning Schild [this message]
2019-11-07 18:55 ` [PATCHv3 4/9] dpkg-base: remove pointless ";" s at end of line Henning Schild
2019-11-07 18:55 ` [PATCHv3 5/9] dpkg-base: fix indentation from tabs to spaces Henning Schild
2019-11-07 18:56 ` [PATCHv3 6/9] base: implement BB_NO_NETWORK for apt-get Henning Schild
2019-11-07 18:56 ` [PATCHv3 7/9] meta: do not equip rootfss with resolv.conf when BB_NO_NETWORK Henning Schild
2019-11-07 18:56 ` [PATCHv3 8/9] bootstrap: fix debootstrap gpg issue when base-apt is not signed Henning Schild
2019-11-14 20:11 ` Jan Kiszka
2019-11-14 21:45 ` Henning Schild
2019-11-15 6:07 ` Baurzhan Ismagulov
2019-11-07 18:56 ` [PATCHv3 9/9] meta: dpkg-gbp: remove unneeded proxy export Henning Schild
2019-11-12 16:39 ` [PATCHv3 0/9] a few cleanups a bug and a feature Baurzhan Ismagulov
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=20191107185603.9077-4-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=chombourger@gmail.com \
--cc=ibr@radix50.net \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.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