New commits:
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
diff --git a/usr/sbin/delve b/usr/sbin/delve
index cca8862..5d10783 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -388,9 +388,14 @@ function main() {
STATES=$(delve_make_continuation start end)
fi
- if [[ -z $CHROOT_CHECK ]] && ! is_castfs_installed
+ 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
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 7388468..c1fe952 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -58,6 +58,8 @@ function run_build_spell() {
if ! is_castfs_installed
then
STAGED_INSTALL=off
+ else
+ STAGED_INSTALL=on
fi
#---------------------------------------------------------------------
## @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/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 7422b0c..b01de55 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -524,6 +524,7 @@ function filter() {
# 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
[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (ddfee90c37f8cfe8b9c631beee611c9cf2051248),
David Brown, 11/29/2006