Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: /
Date: Mon, 17 Jan 2022 23:13:49
Message-Id: 1642461177.301eedd615b1f9f7369f39c06831dbec84235c08.dilfridge@gentoo
1 commit: 301eedd615b1f9f7369f39c06831dbec84235c08
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 17 23:07:04 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 17 23:12:57 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=301eedd6
7
8 Place the locks in a subdirectory of /etc/xml
9
10 * $ROOT/run is not mounted in stage1root during stage1 build, which leads
11 to build failures
12 * Even if we mount it, we don't have /run/lock in there then (applies also
13 to stage2 and stage3).
14 * On systemd installs we could workaround via running systemd-tmpfiles, but
15 * On openrc installs /run/lock is created inside openrc, inaccessible for
16 a chroot.
17 * Crossdev users do not mount /run either.
18
19 While all these things could be worked around somehow, that amounts to a
20 lot of effort for no gain.
21
22 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
23
24 build-docbook-catalog | 4 ++--
25 1 file changed, 2 insertions(+), 2 deletions(-)
26
27 diff --git a/build-docbook-catalog b/build-docbook-catalog
28 index aabc756..1b4ccf3 100755
29 --- a/build-docbook-catalog
30 +++ b/build-docbook-catalog
31 @@ -8,7 +8,7 @@ ROOTCONFDIR="${EPREFIX}"/etc/xml
32 ROOTCATALOG=${ROOTCONFDIR}/catalog
33 CATALOG=${ROOTCONFDIR}/docbook
34 DOCBOOKDIR="${EPREFIX}"/usr/share/sgml/docbook
35 -LOCKDIR=${EPREFIX}/run/lock
36 +LOCKDIR=${EPREFIX}/etc/xml/.lock
37 DTDS=()
38 SIMPLE_DTDS=()
39 LATEST_DTD=
40 @@ -69,7 +69,7 @@ main() {
41
42 local lock_dir="${ROOT}${LOCKDIR}"
43 if [[ ! -d ${lock_dir} ]] ; then
44 - error "${lock_dir}: missing critical system path; please create it"
45 + mkdir -p "${lock_dir}"
46 fi
47
48 local lock="${lock_dir}/build-docbook-catalog.lock"