Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (796aae68ea88bd1b361d9fa696e7b60a02e192fc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (796aae68ea88bd1b361d9fa696e7b60a02e192fc)
  • Date: Fri, 2 Jul 2021 22:17:14 +0000

GIT changes to devel-sobukus-protection sorcery by Thomas Orgis
<sobukus AT sourcemage.org>:

ChangeLog | 3 +++
Makefile | 7 ++++++-
usr/sbin/scribe | 6 +++++-
3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit c727bb844d7464bf4e49bff1ce3c37c8e0d69dce
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

Makefile: fix archive rule to include HEAD revision

commit 878079e1d3d4c982e220a5d7284eec2f6519b47c
Author: Pavel Vinogradov <vin.public AT gmail.com>
Commit: Ismael Luceno <ismael AT sourcemage.org>

scribe: don't download/clone all over again when updating

commit ad0e5bf125932b600116c81477ceeddf82cb903c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

install: revert last commit, was accident

The idea went into the Makefile. This line was noise.

commit 9d93120666d78f683cf249c775e68dda5909ecdb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

install: add devinst target for usable version from git

commit 806df14f7b7c2b2ff45453a0623069a1edaa020c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

Makefile: add devinst target

It makes sense to have the current date and the commit ID reported
by sorcery --version when having it installed from a git checkout.
Otherwise, it reports a wildly inaccurate stable release version which
confuses the developer testing differing branches/releases.

commit c42677de4c5321d09f0889a220deec1bafdd573d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libdepengine: more avoidance of casts after failures

commit 18a0f4352f1ecc392d8b7ac1fba2e2502a55290b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

protected: also /bin/login, got bitten by failed shadow install

commit f64e9a892b0c57f763137718a652ccde048d5fca
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libgrimoire: half of RAM as default size of TMPFS source directories

commit e7ab3e8f6918b496012cb51307c2243b6d95da22
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

protected: egrep is needed in sorcery itself, even, but also installs

commit 4b741dfb06c3f332bdb6f16531d449f22e1e0163
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libdepengine: add short cut for grey dependency loops

The repeated dive into the same branches of the dependency tree
can be very wasteful. Lots of calls to recurse_depends can be
avoided when it is already known that a spell recursion will
turn up aborted because of a dependency loop (grey dependency).

This assumes that the situation only possibly changes when a spell
is actually cast.

I am not sure if my analysis is correct. I had the rather fatal
situation of a sorcery rebuild spinning for hours in a rendering
of dependency hell trying to decide what to build next after some
successful initial casts. This patch avoids that situation at least.

I also for some time whitnessed an immense delay on removing dependees
of a failed spell. I am not sure if this is now gone or could still
reappear. The whole dependency engine needs an overhaul in all its
wastefulness.

commit aae3c866337f7325d7703d99989ab13979a859f9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cast: more debugging, tell differing subshells apart

commit 155d8c0362a10f3fe67a8fc9ff0924ab45415fff
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

Revert "libmisc: Implement one-shot specfile selection"

This reverts commit 615b00c28da7e62b0b31098b0229b0f9a04de0d2.

This broke things by not setting specdir appropriately, causing
later attempts to fix that. Those attempts break for differing
arch selections as they are not all in the same path depth.

We shall never guess specdir after the fact. Use the values
we know!

commit 1b679999e2cc426054e35a406367c455d519c985
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libdepengine: more debugging

commit d4faf47101a6f1ee7c354813624968e3a6d671df
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libmisc: more robust debugging of parallel work

This prints out the whole debugging line on one go to reduce interference
of printouts from multiple sorcery processes (subshells for cast passes).
Debugging is a nightmare when data within a line is already interleaved!
This is still not proper, but we don't want to bring things to a crawl by
i/o locking. An alternative might be to write output to per-process files.
But then, we also should implement timestamps in the output. Pro-tip: use
ts from moreutils in a tail -f | ts configuration to put them on closely
after the fact.

Also, to actually tell the differing subshells of the cast process apart,
the variable $$ is not enough. Bash offers an alternative. This is used
with $$ as fallback now. We may want to check what to do for other shells
that we want to be able to run sorcery properly.

diff --git a/ChangeLog b/ChangeLog
index 40bf8b2..1955b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2021-02-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * Makefile: added devinst target to mark installs from git checkout
+
2020-10-01 Thomas Orgis <sobukus AT sourcemage.org>
* protected: add /bin/login (!!)

diff --git a/Makefile b/Makefile
index 9ceb372..35a9437 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ ts-scm = .git/refs/heads/master

$(release): $(ts-scm)
tmp="$$(mktemp -p .)" \
- && git archive --prefix=sorcery/ | bzip2 > "$$tmp" \
+ && git archive --prefix=sorcery/ HEAD | bzip2 > "$$tmp" \
&& mv "$$tmp" $(release) \
|| rm -f "$$tmp"

@@ -29,7 +29,12 @@ bump-devel:

bump: bump-$(BRANCH)

+devinst: install
+ date +%Y%m%d | tr '\n' - > /etc/sorcery/version
+ git show --oneline | head -n 1 | cut -f 1 -d ' ' >>
/etc/sorcery/version
+
#HELP: install - Install sorcery
+#HELP: devinst - Install with version vom active branch
#HELP: uninstall - Uninstall sorcery
#HELP: convert - Convert from Pre 0.8.x grimoire to new codex format
script-targets = install uninstall convert
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 3aa58a5..f0197ed 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -281,7 +281,11 @@ scribe_add_update_worker() {

# download it
local scribe_target scribe_type
- url_download "$grim_target" "$from" "" scribe_target scribe_type
+ if [[ $add_or_update == update ]]; then
+ url_download "$grim_name" "$from" "" scribe_target scribe_type
+ else
+ url_download "$grim_target" "$from" "" scribe_target scribe_type
+ fi

#check the success of the download
if [ $? != 0 ]; then



  • [SM-Commit] GIT changes to devel-sobukus-protection sorcery by Thomas Orgis (796aae68ea88bd1b361d9fa696e7b60a02e192fc), Thomas Orgis, 07/02/2021

Archive powered by MHonArc 2.6.24.

Top of Page