sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master sorcery by Andrew Stitt (42e5da86b46ff0af1d0213905ca74a9e675eb70a)

From: Andrew Stitt <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master sorcery by Andrew Stitt (42e5da86b46ff0af1d0213905ca74a9e675eb70a)
Date: Thu, 30 Nov 2006 21:13:08 -0600

GIT changes to master sorcery by Andrew Stitt <astitt AT sourcemage.org>:

ChangeLog | 32 ++++++++++
etc/sorcery/compile_config | 1
etc/sorcery/config | 22 +------
etc/sorcery/version | 2
usr/sbin/confmeld | 2
usr/sbin/delve | 96
++++++++++++++++++++++++-------
var/lib/sorcery/build/run_compiler | 1
var/lib/sorcery/modules/build_api/api2 | 47 +++++++++------
var/lib/sorcery/modules/build_api/common | 6 +
var/lib/sorcery/modules/libapi | 31 ++++++++--
var/lib/sorcery/modules/libcast | 18 +++--
var/lib/sorcery/modules/libgrimoire | 14 ++++
var/lib/sorcery/modules/libsorcery | 58 +++++++++++++++---
var/lib/sorcery/modules/libspell | 2
var/lib/sorcery/modules/libstage | 23 +------
var/lib/sorcery/modules/libtrack | 76 +++++++++++++-----------
16 files changed, 296 insertions(+), 135 deletions(-)

New commits:
commit 42e5da86b46ff0af1d0213905ca74a9e675eb70a
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

delete TODO file, update version

commit 6664cf4fdaacac566997d980ceb5894471f8e21e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

ChangeLog entry for all the devel-stage-root stuff

commit ddfee90c37f8cfe8b9c631beee611c9cf2051248
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

libapi added the two functions for installing extras and transfer so
people will know there's two new stages really

commit 175dcf4593d000115e3171109d54b0edc83ea1ce
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

changed STAGED_INSTALL to be either on or off so grimoire team can see of
sorcery is stage root capable

commit a0280b99a3b55eebff7688bccf8b28901fdc86af
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot to make sure the tmp file exists so cat will not error

commit 82e7eba14478633bc22afecb4bc6be49226830be
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Okay implemented the !filter syntax in both filter() and filter_in()
functions

commit 2d030b788aac48cae3ee434ae4587ad3aea8bb79
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added recursive mount check to rm_source_dir so having castfs mounted
under deaddir should not happen anymore

commit b45dc1548f39e669ec139ba7b0738c42850248da
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

libstage updated installing a directory to the system to include
INSTALL_ROOT variable

commit 324c74374b191aaa55a964235e23b363c5d341a7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

made distcc use source directory instead of modifying users distcc dir in
home dir

commit e745f260b8d8dd858997547e801f5ebe13d699be
Author: root <root@kajit-master.(none)>
Commit: root <root@kajit-master.(none)>

Okay added install extras stage and transfer stage to delve and build
api2 also fixed delve to check proper file in each state

commit fee3392d96163cbca420a7664809c5c9316b5005
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

is castfs installed checks for fuse device and cleanes up the grep for
the in kernel support

commit 459132333766a5ba3c2ca34de3d4ce51a52ad51b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

libtrack is_castfs_installed check for fuse built in by grepping proc
filesystems

commit 5c8100c806f8f8d8a8df21fa19003b5464cc07bd
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

confmeld fixed the removal of the config stage directory in the file name
so it will work all the time

commit 71338c83b782ed1a1ca990e58bd6b6025a9651fe
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

add the ccache dir to the ignore list

commit 2e2ba3299bc717d47e9691c636cd176212dd1147
Author: root <root@kajit-master.(none)>
Commit: root <root@kajit-master.(none)>

delve removed superphilous echo statements

commit 36c27950f60d81f446c8e127ef0286beb0c030d3
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

libstage made copy symlink function actually use ln instead of copy

commit 2ed612bd55fc3f9a4b155523c52b352c1eee4a14
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

this should fix when castfs is either installed manually (by a castfs
dev) or the state where castfs is uninstalled but the binary saved

commit a32b957d396f9c3e2beb47f8f9d58b2cb09ff4f8
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

delve: did a check to see if we had already done this check, this makes
sure the modprobe fuse call in is_castfs_installed doesn't get tracked by
every spell
build_api/common: added another dirty hack to export LD_RUN_PATH and
LD_LIBRARY_PATH for libraries that were just saved... this does need to be
re-thought...
libtrack: added removal of '/' to the install log this prevents odd
messages when archiving

commit 1048c98b2b64cdb1cfbbfd6ee4b10400cc20ec4d
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

added the is_castfs_installed check to delve

commit fd22f2d02a6d3f8643dfbc45fbf178de2992911d
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

made delve do all the work with the chroot so had to rip out what I was
doing in cast also made the check for fuse include a modprobe to make sure
its there

commit 055cf3717759575a490a0f255f007fd59e3577cb
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

initial commit to make stage root work with castfs

commit d3fa2b1dae96653287bac89da260d1896f09835c
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated save_binaries to not have problems with symlinks... and also
updated the hack to go along with it

commit e2d740dd0d216b731cfcfa8cf6fa8cb1e3326071
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

didn't add the translation directory to the path for setting stage
directory paths

commit 5c7c1affe72a8effa36d62654710975e3440032c
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added save_binaries function and the dirty hack to make it work

commit 44bf3bab534ac66e815d46c27592be088f114e0c
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to create installwatch dbglog files along with the compile log

commit cc3cfc9a02c12ec93c9e4994a12fc7f10af49402
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated grimoire man page to reflect some of the security changes
required of POST_INSTALL to access files in the stage area

commit 6273271c047eedaf97c66d7e4b5672c11ee2bd54
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to cd to stage directory instead of including transl this will
make spells try to access files with the prefix transl which could be a
default safety check

commit 108ae4efe085ffe8e1c1d46924a434a75703ac30
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

removed lots of the && that were causing parse errors

commit ed87c0e1a24b19c2a79af097703112c6b5eeddfb
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added quotes everywhere fixed cd'ing to home instead of install root by
adding / and removed the rm's during staging because it's not needed and
calling rm in random places could cause problems

commit 042cbc750952e570c0692a56acad0fc1754e2346
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

if removing source dir fails don't fail to remove the stage directory

commit 2062bee451541700a391b2e5de132b54d0929cf8
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix api2 to properly change directories when there is no stage-root

commit a27ed36c2c2c780eda1c72ace9f67a6a40b824ae
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated grimoire man page to reflect the stage root functionality for
POST_INSTALL and the current working directories for every stage

commit cfe7959183d12d74e3d6b2ddd80d26985ca5d511
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

changed checking to destroy stage root to only happen if STAGED_INSTALL
is not equal to off instead of if CLEAN_SOURCE is on

commit 3f56f0ffb2650090878e69072f20e90830b6cf39
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to remove stage directory on spell success instead of right after
its use

commit 16cd77933230feb15d56e1a2efefec7c342d51c4
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

added setting the environmental vars before the delve calls

commit 4d5e8fb4503f16d4f54c676c702bcfdfea45dcd7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated adding the set_stage_root_paths to the states that need it

commit b756d41d9b184252ded4719c042bf0218caa4a61
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated run_install to prepend the stage directory bin and lib files to
LD_LIBRARY_PATH so things will still function

commit a88b555537f831aa85566a4516b90ac52530ecea
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

moved gcc2_prepend_path to libmisc and renamed to envar_prepend_path

commit 343721d2e9dc759c609aab2ee9f274c25f0705aa
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

if the spell is api1 or staged install is off this file won't be created
so check if its there before moving it

commit 1e016a58f4b61c18c49f5d3d1c001b6b618d154f
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated delve to also check the installwatch version to make sure we can
stage spells

commit 21215a91b354b9ed20ab97468760b3a9fd920617
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

*sigh* yeah it needs to be off if installwatch isn't able to do staging

commit 8476f078cce027857ac5ed9df619d7ae34d748f5
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

swapped invoke_installwatch to after the stage directory check... and
added the devoke destroy and turning off stage install before running final

commit ae3be0cd26b3d9c78e6ed03692cd89f54e746463
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

this is kinda a hack but we can't remove the stage directory or
installwatch will break on any system call when cast calls delve the stage
root will already be created so we don't want to call mk_source_dir or it
will break installwatch

commit cc77953650b0d8aa6dbd50f59eb87dfd3a75e2de
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated libtrack to make the MINOR_VER var local in
installwatch_is_stageable

commit 537038e2ab9dd6254e36361f2af1d41df51bd45a
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

damnit wrong variable name

commit 24ed1d815ca351ef423fcf72c381bf9e5e48ab49
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to turn off stage root via the variable instead of adding the
extra check at key points for stage root

commit 9b11e8afa338a4055f20a98a0c38a705070b4ab6
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to fix confmeld after su'ing to root dropping back down and
calling main again

commit 50973fa57afdddce2914c21d96048069988ef146
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated to add check for installwatch 6

commit 498a2ca1b7cd0c78663dfde81cf9ecab23fc0e8b
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated TODO to reflect what's left

commit eb75b4f7676c24de5a13445b790aab8fdcfce057
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated todo list

commit cd35f4ad4879b4239f0e80a1552303a6bbc42561
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

removed tabs

commit 0bbe91ae1cc3082590b6ab595a8eef28c81d130e
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

made api1 spells with stage install off explicitly

commit eea1c31a1995b368d2f301b4b6fcd03a30e90fa7
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

moved pwd issues between states to the state itself and removed them from
other locations

commit 67f80e55ec886b53be7000138f6e351bc1de09db
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated confmeld with chuid code

commit 3c3f16a6ada2388953a214d53d77640a56ba43bd
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

updated redundant code in libtrack and tab switch in api2

commit 04604ac865982719a1f897ffa8e51b3bacad639d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

removed url_git_git it doesn't make sense

commit 13240b7852d04ba728febc4af4aec5ac147b5a2d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed depends_message to have the correct function

commit afc55dd5d66ed84ca9c68bbd6c70a856505a1403
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "forgot to merge these changes"
got the wrong duplicate function

This reverts 914c288d36e36a5a4cfc1cc906d4527a19d9f8cc commit.

commit 914c288d36e36a5a4cfc1cc906d4527a19d9f8cc
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot to merge these changes

commit a26fced35621bd68cf52ce4f210cf9d0e7250836
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

factor cast --queue code out of argument parsing, doing this fixes the
return code issues
(cherry picked from ee80631dbd1695bf18fd00a205ec128ec339d469 commit)

commit 9de0e8a8903c4d44628e217f8d14b6ab83636d33
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot *
(cherry picked from 6ee1f91f1f4aac4ed00f5c68b8be23f79e2e978e commit)

commit a3ca518f37a988f013f101f8e7f6edb40e0da8c5
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fix bug 12327
(cherry picked from 26a9582e7352c6ed49874c22d56b7dab877b74f7 commit)

commit 09615f85b4596804c8c739e8fa1d4d90274166bb
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

workaround bash 3.0 brokenness
(cherry picked from 5bbff845c2c92fbdd7f3b1b78db17f05dbba8877 commit)

commit 2f2c3ac210f3fde93ff7977b378ea52854eda7ee
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: David Brown <dmlb2000 AT gmail.com>

fix bug 11902, multi-spell conflicts
(cherry picked from f70b117c83926df0af3b134778c1bc13810c5ae2 commit)

commit cd6843adb7ebad10a074042772c21906d97da058
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fix bug 11864, add gaze system-info
(cherry picked from 3fe57aca0c3a80d78785a3636e3fb7841647450c commit)

commit 868e7ec49a464b158b2231c959e3b521291e34c2
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: David Brown <dmlb2000 AT gmail.com>

fix bug 10459, make gaze maintainer show the grimoire
(cherry picked from 2c96a46d5ec5175656ae0aff21ee5ce5ab9f18d1 commit)

commit 7cc2cfe20d5b940e82b016f7669f60270b436c08
Author: Andrew Stitt <afrayedknot@thefrayedknot.(none)>
Commit: David Brown <dmlb2000 AT gmail.com>

update build to work with git (first real git based commit)
(cherry picked from dd55abb091f02a130784f20528daec1150f7f65b commit)

commit 943bc8f42b4b3600b5a009e49c0b70006d6f7a82
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

when dealing with anything other than config files we should force the cp
just in case the file is in use, this is for spells like bash

commit 264f98210d2363dcde58e6f8f3ee53305b2eb0a6
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 41
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 20:55:44 -0700
message:
updated bzr pull to pull from the tag specified

commit 4fe6ed1d5f7c6960bb7a7d0391fca395c0bde461
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 40
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 11:00:51 -0700
message:
typo fixes

commit 452f76d02e9335e996360e77a33304f82343b18f
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 39
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 10:50:58 -0700
message:
added use of GIT_TAG which should really be GIT_BRANCH but it works the
same

commit 230214885ced298d77251529f74dbe3ce7602b99
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 38
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 10:44:44 -0700
message:
forgot to strip off git_http instead of git

commit 4ea223a4d4dc13065e3f78e56ce13cd2cfebf99c
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 37
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 10:40:59 -0700
message:
moved git_git back not needed and forgot a function in url_git_http

commit 4308efaa100461a64dde56672188410dba3373c2
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 36
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-05-14 10:38:36 -0700
message:
added the url_git_http and moved git to git_git

commit 530d7d2ffb8474436cefd5cc8589e717534a186d
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 35
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sat 2006-05-13 01:39:05 -0700
message:
added comment to explain the prepare_stage_root stuff

commit db242350d57f322eaf245221a9c1e395464a8d9c
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 34
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-05-12 11:03:13 -0700
message:
cleaned up exports close to delve and exported the log files and such
when they
are declaired

commit d9b12703747e0b3301df65c48c6442f71c57cf17
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 33
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-05-12 10:48:01 -0700
message:
updated to remove useless assigns to the same variables on the exports

commit 9cb9f9102207812b48c5084d5ab466a244bf72dc
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 32
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-05-12 10:35:12 -0700
message:
removed parallel remove of rm_source_dir

commit 927db8a825576dca56f2dc9719efc91f5e28418a
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 31
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-05-12 10:16:54 -0700
message:
yet another merge from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060512170259-0e067d1d70af4458
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Fri 2006-05-12 10:02:59 -0700
message:
fix bug 11413, untar permissions

commit 9ead37da72913111075c48a01039aa6714ed5b7d
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 30
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-05-12 09:30:52 -0700
message:
merged from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060512161557-39a54ca728ba9f94
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Fri 2006-05-12 09:15:57 -0700
message:
fix bug 11767

commit 64eb93191bcc6880a32906dfffa931dd11e143bc
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 29
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Thu 2006-05-11 11:35:02 -0700
message:
merged from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060511155153-d7229a5809196534
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Thu 2006-05-11 08:51:53 -0700
message:
fix typo
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060510044819-edce224db15a17cf
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:48:19 -0700
message:
add -g parameter to cast
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060510043308-c5450a0ec2db0cd1
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:33:08 -0700
message:
remove cast --fix and --nofix
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060510042430-82130c6d041a37a1
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:24:30 -0700
message:
fix spelling nit
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060510035735-3e25971a21f63021
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 20:57:35 -0700
message:
teach gaze dependencies about new functions
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060510035320-c47fa850092c512a
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 20:53:20 -0700
message:
add runtime/suggested dependencies bugs 10110 and 10790

commit 56b634be92698e752dfacbeb7b01c5bd127645b4
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 28
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-05-03 14:45:22 -0700
message:
integrated/merged from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060503162727-30bf6bdd952a0473
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Wed 2006-05-03 09:27:27 -0700
message:
fix bug 10528, install_config_files marks files as new or old
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060503162222-f839f07c85be2b9b
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Wed 2006-05-03 09:22:22 -0700
message:
fix bug 10465, gaze grimoire selection

commit 2a98a5c8b53c8d81e9b2eed49ab9dfaf52b8619a
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 27
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-05-02 09:42:14 -0700
message:
merged from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060502053138-3addebab507aad1d
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-05-01 22:31:38 -0700
message:
fix search for default provider

commit ca634842e5897350063d53470668a6ae92fd0410
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 26
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-04-23 21:22:09 -0700
message:
merged from devel sorcery
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060424014818-3d7be36d78d14708
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 18:48:18 -0700
message:
fix bug 8070, make changelog viewing timeout
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060424004600-7410dcc139b66a71
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 17:46:00 -0700
message:
fix bug 9415, add some sanity checking to summon
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060424001110-98d1bde767df28d7
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 17:11:10 -0700
message:
svn should be non-interactive
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060421153115-bb5ea4d0fd2f72f4
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Fri 2006-04-21 08:31:15 -0700
message:
fix bug 11372, and some other summon issues

commit 24fc3293baf9a72e9900f201ab239e7fe5f1ea70
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 25
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Mon 2006-04-17 12:51:48 -0700
message:
added comment explaining why important things won't get removed by the
calls to
rm_source_dir in confmeld main function

commit 5cfa66030f0e43e19d26d687e17d2afe8541fe1a
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 24
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sat 2006-04-15 14:42:08 -0700
message:
merged from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414161156-e7e2e0f2178d7d7e
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Fri 2006-04-14 09:11:56 -0700
message:
fix bug 9386 -- optimize tablet_import_repair_files
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414070549-73f8d2b8f9a06a26
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Fri 2006-04-14 00:05:49 -0700
message:
Optimize tablet_import_repair_files, now runs about 10 times faster.
Completes in about 6 seconds for me, compared with over 60 seconds.

* Removed all but one fork (from codex in-memory cache creation).
* Replace codex_set_current_spell_by_name with
codex_get_spell_paths and
hash_get_ref on the in-memory cache.
* Move tablet lookups for version, updated, and patchlevel to
tablet_check_repair_file, so they are only run when actually
needed.
* replace find -type f -mindepth 1 -maxdepth 1 .... with glob
pattern
plus a [[ -f ]]
* use smgl_basename and smgl_dirname where possible
* replace $(cat) with $(<)

Also had to update cleanse routines since they tie into the repair
file routines
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414061038-ccd58caf381a28c4
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 23:10:38 -0700
message:
add function to pass up hash values by reference instead of using
stdout
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414060954-9cd051f486683914
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 23:09:54 -0700
message:
improve in-memory cache creation by providing an option to only
store
info for spells that are actually installed (easy 10x speedup
for typical installs)
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414043631-fe729b362d0cfd7f
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:36:31 -0700
message:
add routines to create in-memory spell lookup table
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414043417-6913968692c52e4d
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:34:17 -0700
message:
move common code for setting spell paths into a seperate function
this is one of many things necessary to make
tablet_import_repair_files as
fast as possible
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414041654-c932672e93e14ae0
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:16:54 -0700
message:
add smgl_basename and smgl_dirname functions

commit 6dd6c90580533a4e78ca727560a787289de4a28d
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 23
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-04-14 13:48:17 -0700
message:
okay added back in the date so it should actually parallelize the rm
source
dirs

commit 30f5cb19cd3544247fc23ab28469d668cbefd5d2
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 22
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-04-14 13:36:37 -0700
message:
swaped out explicit use of /usr/src with $BUILD_DIRECTORY

commit ae1ec0ada1fbf05bff46315f20054283a5841064
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 21
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-04-14 13:33:24 -0700
message:
updated to prevent race condition by serializing the rm -rf's of the
deaddir

commit 1952fdaeb39cb8ba7f73948945aaadb31310ee1e
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 20
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Fri 2006-04-14 13:06:08 -0700
message:
removed all `` and replaced with $()
added $INSTALL_ROOT to the install location for the config file
changed the rm -rf's with rm_source_dir's

commit c0e7aed0d5f515a760d26ba65fffa3cfdf0a1687
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 19
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Thu 2006-04-13 23:41:04 -0700
message:
merged libsorcery from devel
made libgrimoire rm_source_dir's rm -rf in parallel so stuff can
continue with
out a problem
------------------------------------------------------------
merged: root@courier-20060414040742-0bcc0d5048229ea5
committer: root <root@courier>
branch nick: devel
timestamp: Thu 2006-04-13 21:07:42 -0700
message:
fix bug 10282

commit 5f8e6961fe14e80c309705136c098d2de0a94852
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 18
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 22:29:40 -0700
message:
forgot about checking staged install for moving the staged configs to
the success date directory

commit 3a961150d2556fa25574a07d0ed25ca5cf72b7c5
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 17
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 14:21:55 -0700
message:
final commit of confmeld so it can be audited now

commit ccf740df792fb93671dbb0e008a3086a3972eff0
Author: root <root@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 16
committer: root <root@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 12:49:12 -0700
message:
more messing around with confmeld instead of pipe I'm going to have to
use a for loop and hopefully that will fix last_spell not being set

commit 206b4fca215915c6d5d2585b908b34e6553c5e7d
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 15
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 11:59:22 -0700
message:
updated confmeld to run through all the configs in the staged config
directory
pretty basic now, go thru everything if the regular file exists in the
staged
directory call install_config_file on the damn thing

but I need to do a tablet_set_spell or something before because
install_config_file needs that stuff

commit bafe8c3e9498b99b17d113c640afc8117d24cdd8
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 14
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 11:57:17 -0700
message:
moved the making of the current config stage directory so it will be
made no
matter what

also did some formating of the main install_staged_spell function

also removed the touching of the config file this makes sorcery think
the file
is getting installed by the spell and then removes the modified config
next cast
and that's a bad thing... :*(

commit 1c31d0af98266165f64c6594102c5e11df53f8cf
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 13
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Wed 2006-04-12 10:52:48 -0700
message:
pulled from devel
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060412163402-a458969d50004404
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:34:02 -0700
message:
fix bug 10682
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060412162233-5d4267d942c9b71d
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:22:33 -0700
message:
fix bug 10144

commit 86a5eec3186b8c24a5cc4b1e9dc1514227eefedc
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 12
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 23:52:28 -0700
message:
added gpl to the bottom of the file

commit 5bc76b4541d8335a7ec95ec6cefb27525fc9996f
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 11
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 23:24:47 -0700
message:
updated to make the current directory in the config
stage directory so that it can be moved to the
correct dated directory when spell success is reached

commit 94efce9a63cf95ccde3e31ded2014dd633f2842b
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 10
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 22:32:44 -0700
message:
more updates for confmeld
talked to sandall about it since I'm really writing the thing and I am
making
something uniq (to us) I have the copyright to it and I'm giving that
to the
Source Mage Developers :) so I don't need to have any of the other
copyright
stuff on there since they have nothing to do with this.

also added functions to list off files and uniq files but those are
going to
change since the directory structure changed

commit d9cbe3983ce73660d20113b64dbab01af83dde8c
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 9
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 22:29:08 -0700
message:
changed where the config files get staged to look more like the tablet
directory
structure

commit e7ccf202b0e0b060b1318eb61ad89e43efc7fb49
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 8
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Tue 2006-04-11 22:27:44 -0700
message:
reset INSTALLWATCH_UNSTAGED_PATHS to null before going thru the for loop

commit 194f6a26df238fab89753ea8692b2aaf9fe50639
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 7
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Mon 2006-04-10 11:57:52 -0700
message:
make staged install off after the install is done.
This is for the install_config_file function which
is sometimes called in FINAL and since we don't
translate in that stage of the build process we
should make sure STAGED_INSTALL=off

commit de931196f736076b56643628235aa00e88ff8e7f
Author: David Brown <dmlb2000@dmlb2004>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 6
committer: David Brown <dmlb2000@dmlb2004>
branch nick: stage-root
timestamp: Sun 2006-04-09 11:40:41 -0700
message:
added confmeld script initial commit has basic usage setup and that's
about it

commit 0644e4a2ff6cced1ff6333dbc962466cdbd8b307
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 5
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: stage-root
timestamp: Sun 2006-04-09 11:15:45 -0700
message:
merge from devel
------------------------------------------------------------
merged: afrayedknot@thefrayedknot-20060408182817-806d51b60a397f33
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Sat 2006-04-08 11:28:17 -0700
message:
fix bug 10855 and 10900
------------------------------------------------------------
merged: afrayedknot@thefrayedknot-20060406230530-99adef386c0e7b62
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Thu 2006-04-06 16:05:30 -0700
message:
fix bug 10869
------------------------------------------------------------
merged: afrayedknot@thefrayedknot-20060405191259-0ad80a60cffa45ea
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Wed 2006-04-05 12:12:59 -0700
message:
merge changes from lynxlynxlynx. modified removal of $ to be \$.
------------------------------------------------------------
merged: jakakranjc AT email.si-20060405134200-64dce620d0902f7e
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Wed 2006-04-05 15:42:00 +0200
message:
update?
------------------------------------------------------------
merged: jakakranjc AT email.si-20060403170110-652215b453dd1556
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Mon 2006-04-03 19:01:10 +0200
message:
removed two "$" from help to prevent expanding to null
------------------------------------------------------------
merged: jakakranjc AT email.si-20060403164157-369e2d9de99836c1
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Mon 2006-04-03 18:41:57 +0200
message:
added support for viewing {,PRE_}SUB_DEPENDS files to gaze
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060405040653-f9885a4b86bb0c39
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Tue 2006-04-04 21:06:53 -0700
message:
fix bug 10538
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060405031228-7eb3f4671bb69fe2
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Tue 2006-04-04 20:12:28 -0700
message:
fix bug 10357
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403162207-de72e5702557a733
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:22:07 -0700
message:
remove test file
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403162033-fb5c0d119b182db0
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:20:33 -0700
message:
another change to test file
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403161634-0caff2c11862d140
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:16:34 -0700
message:
add test file
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403161157-1c20dcda70461380
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:11:57 -0700
message:
add svn_https handler, bug 10370
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403160601-7d933875ae056365
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:06:01 -0700
message:
fix bug 10588
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403024954-f3ae7a714ad77275
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Sun 2006-04-02 19:49:54 -0700
message:
version value now gets filled in by the build script
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403021643-4c3b1a1169efc26a
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Sun 2006-04-02 19:16:43 -0700
message:
fix bug 10183
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060403011754-bb2dfb298e61f182
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-clean
timestamp: Sun 2006-04-02 18:17:54 -0700
message:
add support for building from bzr repos

commit 3b8cc38ea012730390adb323d1f1d9c45b799b2f
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 4
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: stage-root
timestamp: Sun 2006-04-09 11:10:39 -0700
message:
populate from proj/proj1 (stage-root)

diff --git a/ChangeLog b/ChangeLog
index 05a1f4f..f770263 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,38 @@
2006-11-30 Andrew Stitt <astitt AT sourcemage.org>
* cleanse: fix typo, missing ;;

+2006-11-29 David Brown <dmlb2000 AT gmail.com>
+ * etc/sorcery/compile_config: set DISTCC_DIR env-var
+ * etc/sorcery/config: remove installwatch stuff added castfs stuff
+ * confmeld: fixed parsing of the path to generate the correct data
+ * delve: added transfer and install extras as stages also added
+ chroot checks since delve calls itself during the install stage.
+ stage install is now called transfer so lots of one liners for that
+ also swapped out installwatch checks for castfs checks
+ * var/lib/sorcery/build/run_compiler: added export of distcc dir
+ * build_api/api2: swapped out installwatch stuff for castfs stuff,
+ stuff includes checks and logfile variables. Also added the install
+ extras and transfer stages to the build process, this includes the
+ default sorcery functions and making the run functions
+ * build_api/common: added an old.libraries hack for when we remove
+ important libraries we save them first then library and run paths
+ to find them again. This is here for similar reasons as the old
+ binaries hack above it.
+ * libapi: added the new stages for install extras and transfer. Also
+ modified the comment so it reflects the changes made.
+ * libcast: swapped out installwatch log for castfs log creation
+ * libgrimoire: added some recursive umount checks for deaddir in
+ rm_source_dir so we don't remove system stuff if there's a bind
+ * libsorcery: added !filter syntax for spell filters. The !filter
+ takes presidence over the filter.
+ * libspell: added install extras and transfer magic to make sure
+ sorcery calls the new spell files if they exist
+ * libstage: swap out installwatch for castfs, this includes changing
+ out invoke devoke and prepare stage root and installwatch functions.
+ Also the installwatch check is now castfs check. The install log is
+ now created from a find of the stage root location instead of
parsing
+ installwatch logs.
+
2006-11-25 Andrew Stitt <astitt AT sourcemage.org>
* scribe: check for tar failure from unpacking, fixes bug 12387

diff --git a/etc/sorcery/compile_config b/etc/sorcery/compile_config
index d9b5785..9643e71 100644
--- a/etc/sorcery/compile_config
+++ b/etc/sorcery/compile_config
@@ -3,6 +3,7 @@
CCACHE=${CCACHE:-off}
CCACHE_DIR=${CCACHE_DIR:-/var/cache/compiler}
DISTCC_HOSTS=${DISTCC_HOSTS:-""}
+ DISTCC_DIR=${DISTCC_DIR:-"$SOURCE_DIRECTORY/.distcc"}
JOBS_PER_HOST=${JOBS_PER_HOST:-0}
MAKE_NJOBS=${MAKE_NJOBS:-1}
RUN_COMPILER_DIR=/var/lib/sorcery/build
diff --git a/etc/sorcery/config b/etc/sorcery/config
index e37d57b..005f31c 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -177,24 +177,10 @@ CONFIG_STAGE_DIRECTORY=${STATE_ROOT}/var

# this is passed directly to installwatch so it can't contain
# shell expansions or regex's
-INSTALLWATCH_UNSTAGED_PATHS=""
-for dir in /dev \
- /proc \
- /tmp \
- /var/tmp \
- /sys \
- ${BUILD_DIRECTORY} \
- ${SGL_LIBRARY} \
- ${INSTALL_ROOT}/${SGL_LIBRARY} \
- ${SOURCE_CACHE} \
- ${CONFIG_CACHE} \
- ${STATE_DIRECTORY} \
- ${LOG_DIRECTORY} ; do
- INSTALLWATCH_UNSTAGED_PATHS="${INSTALLWATCH_UNSTAGED_PATHS}${dir},"
-done
-INSTALLWATCH_UNSTAGED_PATHS=${INSTALLWATCH_UNSTAGED_PATHS%,}
-# this value can be between 0-4, 0 is nothing and 4 is everything
-INSTALLWATCH_DEBUG_LEVEL=1
+CASTFS_UNSTAGED_PATHS="/dev /proc /tmp /var/tmp /sys ${BUILD_DIRECTORY}
${SGL_LIBRARY} ${INSTALL_ROOT}/${SGL_LIBRARY} ${SOURCE_CACHE} ${CONFIG_CACHE}
${STATE_DIRECTORY} ${LOG_DIRECTORY}"
+# this value is a mask bits set mean output is done for that particular
+# component of castfs
+CASTFS_DEBUG_LEVEL=255

# this makes appending the sorcery path idempotent
[ -z ${PATH##*$SORCERY_PATH*} ] || export PATH="$PATH:$SORCERY_PATH"
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 32e03ca..3afbb68 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-20060925
+20061130
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 10138f5..530594e 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -72,7 +72,7 @@ function parse_stage_config_path()
{
local file=$1
local __tmp __spell __sdate __path
- __tmp=${file/$CONFIG_STAGE_DIRECTORY\//}
+ __tmp=$(echo $file | sed "s#^$CONFIG_STAGE_DIRECTORY/##")
__spell=$(echo $__tmp | cut -d/ -f1)
__sdate=$(echo $__tmp | cut -d/ -f2)
__path=$(echo $__tmp | cut -d/ -f3-)
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 4fc5c94..5d10783 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -87,7 +87,7 @@ function delve_log_helper() {

# these have to go somewhere where future delves can find them
C_LOG=${C_LOG:="/tmp/sorcery/delve/$SPELL.compile.log"}
- IW_DBGLOG=${IW_DBGLOG:="/tmp/sorcery/delve/$SPELL.iwdbglog"}
+ CASTFS_DBGLOG=${CASTFS_DBGLOG:="/tmp/sorcery/delve/$SPELL.iwdbglog"}
C_FIFO=${C_FIFO:="/dev/stdout"}
IW_LOG=${IW_LOG:="/tmp/sorcery/delve/$SPELL.iw"}
VOYEUR_STDOUT=${VOYEUR_STDOUT:="/dev/stdout"}
@@ -147,7 +147,7 @@ function delve_build() {

function delve_pre_install() {
debug "delve" "Running $FUNCNAME"
- delve_is_valid_step BUILD 2 || return 1
+ delve_is_valid_step PRE_INSTALL 2 || return 1
delve_log_helper
(
run_pre_install
@@ -158,24 +158,74 @@ function delve_pre_install() {
function delve_install() {
debug "delve" "Running $FUNCNAME"

- delve_is_valid_step BUILD 2 || return 1
+ delve_is_valid_step INSTALL 2 || return 1
delve_log_helper
- invoke_installwatch &&
if [[ "$STAGED_INSTALL" != "off" ]]
then
- prepare_stage_root
- invoke_stage_root
+ if [[ -z "$CHROOT_CHECK" ]]
+ then
+ prepare_stage_root &&
+ invoke_stage_root &&
+ export CHROOT_CHECK="true"
+ CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
+ fi
+ else
+ invoke_installwatch
+ fi
+ (
+ if [[ -z "$CHROOT_CMD" ]]
+ then
+ run_install || return 2
+ else
+ $CHROOT_CMD delve $SPELL INSTALL
+ fi
+ ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ > >(tee -a $C_LOG > $VOYEUR_STDOUT)
+ local rc=$?
+ if [[ $CHROOT_CMD ]]
+ then
+ devoke_stage_root
fi &&
+ return $rc
+}
+
+function delve_install_extras() {
+ debug "delve" "Running $FUNCNAME"
+
+ delve_is_valid_step INSTALL_EXTRAS 2 || return 1
+ delve_log_helper
+ if [[ "$STAGED_INSTALL" != "off" ]]
+ then
+ if [[ -z "$CHROOT_CHECK" ]]
+ then
+ invoke_stage_root &&
+ export CHROOT_CHECK="true"
+ CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
+ fi
+ else
+ invoke_installwatch
+ fi
(
- run_install || return 2
+ if [[ -z "$CHROOT_CMD" ]]
+ then
+ run_install_extras || return 2
+ else
+ $CHROOT_CMD delve $SPELL INSTALL_EXTRAS
+ fi
) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
+ local rc=$?
+ if [[ $CHROOT_CMD ]]
+ then
+ devoke_stage_root
+ fi &&
+ return $rc
}

function delve_post_build() {
debug "delve" "Running $FUNCNAME"

- delve_is_valid_step BUILD 1 || return 1
+ delve_is_valid_step POST_BUILD 1 || return 1
delve_log_helper
[ -d $SOURCE_DIRECTORY ] || {
message "Ack! there is no $SOURCE_DIRECTORY"
@@ -190,7 +240,7 @@ function delve_post_build() {

function delve_post_install() {
debug "delve" "Running $FUNCNAME"
- delve_is_valid_step BUILD 1 2 || return 1
+ delve_is_valid_step POST_INSTALL 1 2 || return 1
delve_log_helper
(
run_post_install
@@ -198,19 +248,19 @@ function delve_post_install() {
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}

-function delve_stage_install() {
+function delve_transfer() {
debug "delve" "Running $FUNCNAME"
- delve_is_valid_step BUILD 1 2 || return 1
+ delve_is_valid_step TRANSFER 2 || return 1
delve_log_helper
(
- run_stage_install
+ run_transfer
) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}

function delve_final() {
debug "delve" "Running $FUNCNAME"
- delve_is_valid_step BUILD 2 || return 1
+ delve_is_valid_step FINAL 2 || return 1
delve_log_helper
devoke_installwatch &&
STAGED_INSTALL=off
@@ -252,7 +302,7 @@ function delve_make_continuation() {
local begin=$1
local end=$2
local API1="start PRE_BUILD config_loc BUILD POST_BUILD POST_INSTALL
TRIGGERS end"
- local API2="start PRE_BUILD config_loc BUILD PRE_INSTALL INSTALL
POST_INSTALL stage_install FINAL TRIGGERS end"
+ local API2="start PRE_BUILD config_loc BUILD PRE_INSTALL INSTALL
INSTALL_EXTRAS POST_INSTALL TRANSFER FINAL TRIGGERS end"
local THIS_API
case $BUILD_API in
1) THIS_API=$API1 ;;
@@ -304,8 +354,9 @@ function process_parameters() {
PRE_INSTALL) STATES="$STATES $param" ;;
INSTALL) STATES="$STATES $param" ;;
POST_BUILD) STATES="$STATES $param" ;;
+ INSTALL_EXTRAS) STATES="$STATES $param" ;;
POST_INSTALL) STATES="$STATES $param" ;;
- stage_install) STAGES="$STAGES $param" ;;
+ TRANSFER) STAGES="$STAGES $param" ;;
FINAL) STATES="$STATES $param" ;;
TRIGGERS) STATES="$STATES $param" ;;
success) STATES="$STATES $param" ;;
@@ -337,16 +388,18 @@ function main() {
STATES=$(delve_make_continuation start end)
fi

- echo "DEBUG: $STATES"
-
- if ! installwatch_is_stageable
+ if [[ -z $CHROOT_CHECK ]]
then
- STAGED_INSTALL=off
+ if ! is_castfs_installed
+ then
+ STAGED_INSTALL=off
+ else
+ STAGED_INSTALL=on
+ fi
fi

local last_rc=0
for STATE in $STATES; do
- message "Running state $STATE"
case $STATE in
start) ;;
PRE_BUILD) delve_pre_build ;;
@@ -355,8 +408,9 @@ function main() {
PRE_INSTALL) delve_pre_install ;;
INSTALL) delve_install ;;
POST_BUILD) delve_post_build ;;
+ INSTALL_EXTRAS) delve_install_extras ;;
POST_INSTALL) delve_post_install ;;
- stage_install) delve_stage_install ;;
+ TRANSFER) delve_transfer ;;
FINAL) delve_final ;;
TRIGGERS) delve_triggers ;;
success) delve_spell_success ;;
diff --git a/var/lib/sorcery/build/run_compiler
b/var/lib/sorcery/build/run_compiler
index 425aeaa..9733720 100644
--- a/var/lib/sorcery/build/run_compiler
+++ b/var/lib/sorcery/build/run_compiler
@@ -26,6 +26,7 @@ if [[ $USE_DISTCC != off ]] &&
DISTCC=/usr/bin/distcc

export DISTCC_HOSTS
+ export DISTCC_DIR
export DISTCC_VERBOSE=0
export DISTCC_LOG=/dev/null
else
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index a9a92ee..c1fe952 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -26,15 +26,17 @@
function run_build_spell() {
debug "build_api/api2" "run_build_spell"

+ local CHROOT_CHECK=""
+
export C_LOG=$TMP_DIR/$SPELL.compile.log
- export IW_DBGLOG=$C_LOG.iwdbglog
+ export CASTFS_DBGLOG=$C_LOG.castfs.dbglog
export C_FIFO=/dev/stdout # not needed for api2 anymore, but just in case
export S_PWD=$TMP_DIR/build.saved.pwd
export VOYEUR_STDOUT VOYEUR_STDERR
export __DELVE_IN_CAST=on

- rm -f $IW_DBGLOG
- touch $IW_DBGLOG
+ rm -f $CASTFS_DBGLOG
+ touch $CASTFS_DBGLOG
rm -f $C_LOG
touch $C_LOG

@@ -53,9 +55,11 @@ function run_build_spell() {
VOYEUR_STDERR=/dev/null
fi

- if ! installwatch_is_stageable
+ if ! is_castfs_installed
then
STAGED_INSTALL=off
+ else
+ STAGED_INSTALL=on
fi

local PROTECT_SORCERY=yes
@@ -66,16 +70,14 @@ function run_build_spell() {
(
run_build &&
run_pre_install &&
- invoke_installwatch &&
- if [[ "$STAGED_INSTALL" != "off" ]]
+ if [[ $STAGED_INSTALL == off ]]
then
- prepare_stage_root &&
- invoke_stage_root
+ invoke_installwatch
fi &&
- set_stage_root_paths &&
delve $SPELL INSTALL &&
- delve $SPELL POST_INSTALL || return 2
- run_stage_install &&
+ delve $SPELL INSTALL_EXTRAS &&
+ run_post_install || return 2
+ run_transfer &&
devoke_installwatch &&
STAGED_INSTALL=off &&
run_final || return 3
@@ -189,7 +191,6 @@ function run_pre_install() {
#---------------------------------------------------------------------
function run_install() {
debug "build_api/api2" "Starting run_install()"
- set_stage_root_paths
if [ -f $S_PWD ] ; then
cd "`cat $S_PWD`"
elif [ -d $SOURCE_DIRECTORY ] ; then
@@ -208,6 +209,12 @@ function run_install() {
fi
}

+function run_install_extras() {
+
+ debug "build_api/api2" "Starting run_install_extras()"
+ run_spell_file INSTALL_EXTRAS install_extras
+}
+
#---------------------------------------------------------------------
## Checks for a POST_BUILD file in SCRIPT_DIRECTORY, and if it is
## executable, runs it. This file is run after INSTALL and before
@@ -219,7 +226,6 @@ function run_install() {
#---------------------------------------------------------------------
function run_post_install() {
debug "build_api/api2" "Starting run_post_install()"
- set_stage_root_paths
persistent_load &&
if [[ $STAGED_INSTALL != off ]]
then
@@ -230,16 +236,15 @@ function run_post_install() {
run_spell_file POST_INSTALL post_install
unlock_resources "libgrimoire" "install"
}
+
#--------------------------------------------------------------------
### Checks against STAGED_INSTALL and installs the staged spell
### accordingly
##--------------------------------------------------------------------
-function run_stage_install() {
+function run_transfer() {
if [[ "$STAGED_INSTALL" != "off" ]]
then
- set_stage_root_paths
- devoke_stage_root &&
- install_staged_spell
+ run_spell_file TRANSFER transfer
fi
}

@@ -338,7 +343,7 @@ function real_default_sorcery_install()
##
## This is identical to api1's post_build
#---------------------------------------------------------------------
-function real_default_sorcery_post_install() {
+function real_default_sorcery_install_extras() {

debug "build_api/api2" "Starting real_default_sorcery_post_install"
install_xinetd
@@ -353,6 +358,12 @@ function real_default_sorcery_post_insta

}

+function real_default_sorcery_transfer() {
+
+ debug "build_api/api2" "Starting real_default_sorcery_post_install"
+ transfer_staged_spell
+}
+
#---------------------------------------------------------------------
## @License
##
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 4e35a79..6cf3f54 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -137,6 +137,12 @@ function real_prepare_install() { (
export PATH="$dir:$PATH"
done
fi
+ if test -d "$SOURCE_DIRECTORY/old.libraries" ; then
+ for dir in $( find "$SOURCE_DIRECTORY/old.libraries" -type d); do
+ export LD_LIBRARY_PATH="$dir:$LD_LIBRARY_PATH"
+ export LD_RUN_PATH="$dir:$LD_RUN_PATH"
+ done
+ fi
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libapi b/var/lib/sorcery/modules/libapi
index b44789a..01e9fbe 100755
--- a/var/lib/sorcery/modules/libapi
+++ b/var/lib/sorcery/modules/libapi
@@ -27,8 +27,10 @@
# default_sorcery_build (build_api/...)
# default_sorcery_download (libsummon)
# default_sorcery_install (build_api/api2) (BUILD_API==2 only)
+# default_sorcery_install_extras (build_api/api2) (BUILD_API==2 only)
# default_sorcery_post_build (build_api/api1) (BUILD_API==1 only)
# default_sorcery_post_install (build_api/api2) (BUILD_API==2 only)
+# default_sorcery_transfer (build_api/api2) (BUILD_API==2 only)
# default_sorcery_pre_build (build_api/common)
# default_sorcery_pre_install (build_api/api2) (BUILD_API==2 only)
# depends (libdepends)
@@ -332,6 +334,17 @@ function default_sorcery_install () {

#---------------------------------------------------------------------
## @Type API
+## @See <@function
var.lib.sorcery.modules.libgrimoire.html,real_default_sorcery_install_extras>
for more details.
+## Only defined for BUILD_API==2
+## Installs configuration files and documentation.
+#---------------------------------------------------------------------
+function default_sorcery_install_extras () {
+ debug "libapi" "default_sorcery_install_extras - $*"
+ real_default_sorcery_install_extras "$@"
+}
+
+#---------------------------------------------------------------------
+## @Type API
## @See <@function
var.lib.sorcery.modules.libgrimoire.html,real_default_sorcery_post_build> for
more details.
## Only defined for BUILD_API==1
## Installs configuration files and documentation. Stops installwatch.
@@ -348,10 +361,8 @@ function default_sorcery_post_build () {
## @Type API
## @See <@function
var.lib.sorcery.modules.libgrimoire.html,real_default_sorcery_post_install>
for more details.
## Only defined for BUILD_API==2
-## Installs configuration files and documentation. Stops installwatch.
-## Used if no POST_INSTALL script is found for a spell.
-## equivalent to default_sorcery_post_build in BUILD_API==1
-##
+## Puts the spell at the root of the stage root so manipulation of the
+## installed files can happen
#---------------------------------------------------------------------
function default_sorcery_post_install () {
debug "libapi" "default_sorcery_post_install - $*"
@@ -360,6 +371,18 @@ function default_sorcery_post_install ()

#---------------------------------------------------------------------
## @Type API
+## @See <@function
var.lib.sorcery.modules.libgrimoire.html,real_default_sorcery_transfer> for
more details.
+## Only defined for BUILD_API==2
+## Transfers the files from the stage area to the system. Default is
+## transfer_staged_spell
+#---------------------------------------------------------------------
+function default_sorcery_transfer () {
+ debug "libapi" "default_sorcery_transfer - $*"
+ real_default_sorcery_transfer "$@"
+}
+
+#---------------------------------------------------------------------
+## @Type API
## @See <@function
var.lib.sorcery.modules.libgrimoire.html,real_default_sorcery_pre_build> for
more details.
## Creates the source directory and unpacks the source package into it.
## Used if no PRE_BUILD script is found for a spell.
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 8a6c00f..67caf74 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -637,14 +637,16 @@ function create_compile_log() {
else
$COMPRESSBIN -f < $C_LOG > $COMPILE_LOGS/$SPELL-$VERSION$EXTENSION
fi
- message "${MESSAGE_COLOR}Creating installwatch debug log" \
- "${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION.iwdbglog$EXTENSION" \
- "${DEFAULT_COLOR}"
- if [ -z "$EXTENSION" ]
- then
- cp $IW_DBGLOG $COMPILE_LOGS/$SPELL-$VERSION.iwdbglog
- else
- $COMPRESSBIN -f < $IW_DBGLOG >
$COMPILE_LOGS/$SPELL-$VERSION.iwdbglog$EXTENSION
+ if [ -f $CASTFS_DBGLOG ] ; then
+ message "${MESSAGE_COLOR}Creating castfs debug log" \
+
"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION.castfs.dbglog$EXTENSION" \
+ "${DEFAULT_COLOR}"
+ if [ -z "$EXTENSION" ]
+ then
+ cp $CASTFS_DBGLOG $COMPILE_LOGS/$SPELL-$VERSION.castfs.dbglog
+ else
+ $COMPRESSBIN -f < $CASTFS_DBGLOG >
$COMPILE_LOGS/$SPELL-$VERSION.castfs.dbglog$EXTENSION
+ fi
fi
}

diff --git a/var/lib/sorcery/modules/libgrimoire
b/var/lib/sorcery/modules/libgrimoire
index 3c8134e..e17d365 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -71,7 +71,19 @@ function real_rm_source_dir() {

pushd $BUILD_DIRECTORY 2>&1 > /dev/null

- umount -l $DEAD_DIR 2> /dev/null
+
+ # make sure nothing recursive is mounted under deaddir
+ mount |
+ while read line
+ do
+ local mount=$(echo $line | cut -d' ' -f1)
+ local mountloc=$(echo $line | cut -d' ' -f3)
+ if echo $mountloc | grep -q "^$DEAD_DIR"
+ then
+ debug "libgrimoire" "Unmounting $mount on $mountloc"
+ umount -l $mountloc 2> /dev/null
+ fi
+ done

# We don't really want to use "rm -rf", but if not using tmpfs,
# we have to. So we move the old dir to a known place before
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 12ec692..b01de55 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -492,7 +492,7 @@ function symlinks() {
##
#---------------------------------------------------------------------
function filter() {
- local thing RID_LIST
+ local thing RID_LIST NOT_RID_LIST
local files each invert
for each in $@; do
test -f $each && files="$files $each"
@@ -500,11 +500,36 @@ function filter() {

if [[ $files ]] ; then
RID_LIST=$(
- cat $files | while read thing; do
- echo -n "$thing\|"
- done
+ cat $files |
+ grep -v '^!' | while read thing; do
+ echo -n "${thing}\|"
+ done
echo -n /dev/null)
- grep -v "$RID_LIST"
+ NOT_RID_LIST=$(
+ cat $files |
+ grep '^!' | while read thing; do
+ echo -n "${thing/\!/}\|"
+ done
+ echo -n /dev/null)
+ (
+ # Okay to explain the code
+ # exec 3> is opening up the 3 file descriptor for this shell and
+ # pointing all input to that file descriptor to the stdin of the
+ # subshell with grep
+ # similarly with exec 4> line
+ # the tee line is taking the stdin from this subshell and sending
+ # it to the two file descriptors 3 and 4
+ # the filter_tmp_file is used so the output going to fds 3 & 4
+ # won't over-write each other
+
+ # And to explain the reasoning
+ # the grep -v command removes both the RID and NOT_RID lists
+ touch $TMP_DIR/filter_tmp_file
+ exec 3> >(grep -v "$NOT_RID_LIST\|$RID_LIST")
+ exec 4> >(grep "$NOT_RID_LIST" > $TMP_DIR/filter_tmp_file)
+ tee -a /proc/self/fd/3 1>&4
+ cat $TMP_DIR/filter_tmp_file
+ )
else
cat
fi
@@ -522,7 +547,7 @@ function filter() {
##
#---------------------------------------------------------------------
function filter_in() {
- local thing RID_LIST
+ local thing RID_LIST NOT_RID_LIST
local files each
for each in $@; do
test -f $each && files="$files $each"
@@ -530,11 +555,24 @@ function filter_in() {

if [[ $files ]] ; then
RID_LIST=$(
- cat $files | while read thing; do
- echo -n "$thing\|"
- done
+ cat $files |
+ grep -v '^!' | while read thing; do
+ echo -n "${thing}\|"
+ done
+ echo -n /dev/null)
+ NOT_RID_LIST=$(
+ cat $files |
+ grep '^!' | while read thing; do
+ echo -n "${thing/\!/}\|"
+ done
echo -n /dev/null)
- grep "$RID_LIST"
+ if [[ $NOT_RID_LIST ]]
+ then
+ grep "$RID_LIST" |
+ grep -v "$NOT_RID_LIST"
+ else
+ grep "$RID_LIST"
+ fi
else
cat
fi
diff --git a/var/lib/sorcery/modules/libspell
b/var/lib/sorcery/modules/libspell
index 79ecde0..f708e92 100644
--- a/var/lib/sorcery/modules/libspell
+++ b/var/lib/sorcery/modules/libspell
@@ -36,7 +36,9 @@ BUILD:build
PRE_INSTALL:pre_install
INSTALL:install
POST_BUILD:post_build
+INSTALL_EXTRAS:install_extras
POST_INSTALL:post_install
+TRANSFER:transfer
FINAL:final

UP_TRIGGERS:up_triggers
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 40b2a31..72d7058 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -10,7 +10,7 @@
## Main for installing staged spell called imediatly after devoking
## installwatch and stage root
#---------------------------------------------------------------------
-function install_staged_spell()
+function transfer_staged_spell()
{
mkdir -p "$CONFIG_STAGE_DIRECTORY/$SPELL/current"
stage_install_configs
@@ -84,7 +84,7 @@ function stage_install_directory()
chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR" &&
chown $OWNER:$GROUP "${INSTALL_ROOT}/$DIR"
else
- mkdir "$DIR" &&
+ mkdir "${INSTALL_ROOT}/$DIR" &&
chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR" &&
chown $OWNER:$GROUP "${INSTALL_ROOT}/$DIR"
fi
@@ -126,13 +126,13 @@ function stage_install_symlink()
then
touch "${INSTALL_ROOT}/$FILE" &&
mkdir -p $(dirname $SAVE) &&
- cp -dp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$SAVE"
+ ln -sfn $(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
"${INSTALL_ROOT}/$SAVE"
else
- cp -dp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
+ ln -sfn $(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
"${INSTALL_ROOT}/$FILE"
fi
;;
*)
- cp -dp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
+ ln -sfn $(readlink "$STAGE_DIRECTORY/TRANSL/$FILE")
"${INSTALL_ROOT}/$FILE"
;;
esac
}
@@ -199,19 +199,6 @@ function stage_install_char_block()
esac
}

-function set_stage_root_paths()
-{
- local bindir libdir
- for bindir in /bin /sbin /usr/bin /usr/sbin
- do
- export PATH=$( envar_prepend_path "$STAGE_DIRECTORY/TRANSL/$bindir"
"$PATH" )
- done
- for libdir in /lib /usr/lib
- do
- export LD_LIBRARY_PATH=$( envar_prepend_path
$STAGE_DIRECTORY/TRANSL/$libdir $LD_LIBRARY_PATH )
- done
-}
-
#---------------------------------------------------------------------
## @param file
## install the file from the stage root to the system does check for
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 86bfac8..cdf1b87 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -55,10 +55,20 @@ function real_track_manual() {
#---------------------------------------------------------------------
function real_invoke_stage_root()
{
- export INSTW_TRANSL=1
- export INSTW_LOGFILE=/dev/null
- export DOCUMENT_DIRECTORY=${DOCUMENT_DIRECTORY#$INSTALL_ROOT}
- unset INSTALL_ROOT
+ export CASTFS_LOGFILE=${CASTFS_DBGLOG}
+ export CASTFS_DBGLVL=${CASTFS_DEBUG_LEVEL}
+ local CASTFS_IGNORE_LIST=""
+ local LOCAL_IGNORE_DIRS="${CCACHE_DIR} ${DISTCC_DIR}"
+ # this forks and daemonizes so it will exit you simply unmount the dir to
stop the process
+ for dir in ${CASTFS_UNSTAGED_PATHS} ${LOCAL_IGNORE_DIRS}
+ do
+ CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$dir"
+ done &&
+ castfs "${STAGE_DIRECTORY}/MOUNT" -o "stage=${STAGE_DIRECTORY}/TRANSL"
$CASTFS_IGNORE_LIST &&
+ for dir in /dev /dev/pts /proc /sys
+ do
+ mount -o bind "$dir" "${STAGE_DIRECTORY}/MOUNT$dir"
+ done
}

#---------------------------------------------------------------------
@@ -68,11 +78,13 @@ function real_invoke_stage_root()
#---------------------------------------------------------------------
function real_devoke_stage_root()
{
- export INSTW_TRANSL=0
- export INSTW_LOGFILE=$IW_LOG
- [ -f $ROOTS_CONFIG ] && source $ROOTS_CONFIG
- export DOCUMENT_DIRECTORY=${INSTALL_ROOT}/${DOCUMENT_DIRECTORY}
- return 0
+ unset CASTFS_LOGFILE
+ unset CASTFS_DBGLVL
+ for dir in /dev/pts /dev /proc /sys
+ do
+ umount -l "${STAGE_DIRECTORY}/MOUNT$dir"
+ done &&
+ umount -l "${STAGE_DIRECTORY}/MOUNT"
}

#---------------------------------------------------------------------
@@ -82,7 +94,9 @@ function real_devoke_stage_root()
#---------------------------------------------------------------------
function prepare_stage_root()
{
- mk_source_dir $STAGE_DIRECTORY
+ mk_source_dir "${STAGE_DIRECTORY}" &&
+ mk_source_dir "${STAGE_DIRECTORY}/TRANSL" &&
+ mk_source_dir "${STAGE_DIRECTORY}/MOUNT"
}

#---------------------------------------------------------------------
@@ -103,13 +117,6 @@ function destroy_stage_root()
function real_invoke_installwatch() {
if [ -e /usr/lib/installwatch.so ]; then
export INSTALLWATCHFILE=$IW_LOG
- export INSTW_LOGFILE=$IW_LOG
- export INSTW_DBGFILE="$IW_DBGLOG"
- export INSTW_ROOTPATH=$STAGE_DIRECTORY
- export INSTW_TRANSL=0
- export INSTW_BACKUP=0
- export INSTW_DBGLVL=${INSTALLWATCH_DEBUG_LEVEL}
- export INSTW_EXCLUDE="$INSTALLWATCH_UNSTAGED_PATHS"
export LD_PRELOAD=/usr/lib/installwatch.so
fi
}
@@ -122,19 +129,11 @@ function real_invoke_installwatch() {
function real_devoke_installwatch() {
unset LD_PRELOAD
unset INSTALLWATCHFILE
- unset INSTW_LOGFILE
- unset INSTW_DBGFILE
- unset INSTW_ROOTPATH
- unset INSTW_TRANSL
- unset INSTW_BACKUP
- unset INSTW_DBGLVL
- unset INSTW_EXCLUDE
}

-function installwatch_is_stageable()
+function is_castfs_installed()
{
- local MINOR_VER="`installed_version installwatch | cut -d. -f2`"
- if [[ $MINOR_VER == 7 ]]
+ if which castfs && ( modprobe fuse || grep -q '^nodev[[:space:]]*fuse$'
/proc/filesystems ) && [ -c /dev/fuse ]
then
return 0
else
@@ -172,14 +171,21 @@ function create_install_log() {
local OUTPUT=$2

rm -f $OUTPUT
- parse_iw $INPUT |
- sort |
- uniq |
- install_log_filter $INSTALL_ROOT "" |
- grep -v -x "" |
- filter_excluded |
- install_log_filter "" $INSTALL_ROOT |
- exists > $OUTPUT
+ if [[ $STAGED_INSTALL != off ]]
+ then
+ find "${STAGE_DIRECTORY}/TRANSL/" |
+ sed "s#${STAGE_DIRECTORY}/TRANSL##g"|
+ grep -v -x '/' > $OUTPUT
+ else
+ parse_iw $INPUT |
+ sort |
+ uniq |
+ install_log_filter $INSTALL_ROOT "" |
+ grep -v -x "" |
+ filter_excluded |
+ install_log_filter "" $INSTALL_ROOT |
+ exists > $OUTPUT
+ fi

echo "$C_LOG_COMP" >> $OUTPUT
echo "$MD5_LOG" >> $OUTPUT

[SM-Commit] GIT changes to master sorcery by Andrew Stitt (42e5da86b46ff0af1d0213905ca74a9e675eb70a), Andrew Stitt, 11/30/2006