public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/build-docbook-catalog:master commit in: /
Date: Mon, 17 Jan 2022 23:13:43 +0000 (UTC)	[thread overview]
Message-ID: <1642461177.301eedd615b1f9f7369f39c06831dbec84235c08.dilfridge@gentoo> (raw)

commit:     301eedd615b1f9f7369f39c06831dbec84235c08
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 17 23:07:04 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 23:12:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/build-docbook-catalog.git/commit/?id=301eedd6

Place the locks in a subdirectory of /etc/xml

* $ROOT/run is not mounted in stage1root during stage1 build, which leads
  to build failures
* Even if we mount it, we don't have /run/lock in there then (applies also
  to stage2 and stage3).
* On systemd installs we could workaround via running systemd-tmpfiles, but
* On openrc installs /run/lock is created inside openrc, inaccessible for
  a chroot.
* Crossdev users do not mount /run either.

While all these things could be worked around somehow, that amounts to a
lot of effort for no gain.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 build-docbook-catalog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-docbook-catalog b/build-docbook-catalog
index aabc756..1b4ccf3 100755
--- a/build-docbook-catalog
+++ b/build-docbook-catalog
@@ -8,7 +8,7 @@ ROOTCONFDIR="${EPREFIX}"/etc/xml
 ROOTCATALOG=${ROOTCONFDIR}/catalog
 CATALOG=${ROOTCONFDIR}/docbook
 DOCBOOKDIR="${EPREFIX}"/usr/share/sgml/docbook
-LOCKDIR=${EPREFIX}/run/lock
+LOCKDIR=${EPREFIX}/etc/xml/.lock
 DTDS=()
 SIMPLE_DTDS=()
 LATEST_DTD=
@@ -69,7 +69,7 @@ main() {
 
 	local lock_dir="${ROOT}${LOCKDIR}"
 	if [[ ! -d ${lock_dir} ]] ; then
-		error "${lock_dir}: missing critical system path; please create it"
+		mkdir -p "${lock_dir}"
 	fi
 
 	local lock="${lock_dir}/build-docbook-catalog.lock"


             reply	other threads:[~2022-01-17 23:13 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-17 23:13 Andreas K. Hüttel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-04-25  3:43 [gentoo-commits] proj/build-docbook-catalog:master commit in: / Sam James
2023-04-25  3:43 Sam James
2022-01-27 20:28 Sam James
2021-10-08 12:22 Mike Frysinger
2021-10-05  1:14 Mike Frysinger
2021-10-05  1:14 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-03  4:01 Mike Frysinger
2021-10-02  6:20 Mike Frysinger
2021-10-02  6:20 Mike Frysinger
2021-10-02  6:17 Mike Frysinger

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=1642461177.301eedd615b1f9f7369f39c06831dbec84235c08.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /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