diff options
| -rw-r--r-- | trunk/doc/CHANGELOG | 2 | ||||
| -rwxr-xr-x | trunk/src/simplaret | 11 | ||||
| -rwxr-xr-x | trunk/utils/metapkg (renamed from trunk/src/metapkg) | 11 |
3 files changed, 20 insertions, 4 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index cd9001a..6e09588 100644 --- a/trunk/doc/CHANGELOG +++ b/trunk/doc/CHANGELOG @@ -2,10 +2,12 @@ simplepkg changelog ------------------- 0.4.9pre24: subversion repository support for templates + metapkg moved to utils/ simplaret: - new config variables: - STORE_ROOT_PATCHES_ON_PATCHES_DIR - SIGNATURE_CHECKING + - ROOT=/otherroot works for --install, --remove and --upgrade - signature checking - dependency checking through slack-required mkjail: diff --git a/trunk/src/simplaret b/trunk/src/simplaret index 870fbf6..6ac93d7 100755 --- a/trunk/src/simplaret +++ b/trunk/src/simplaret @@ -718,13 +718,16 @@ function simplaret_get_jail_patches { function simplaret_get_patches { - local jailpath oldroot + local jailpath if [ "$1" == "--upgrade" ]; then IS_UPGRADE="1" fi - oldroot="$ROOT" + if [ ! -z "$ROOT" ]; then + simplaret_get_jail_patches $ROOT + return $? + fi # first get patches from the root system simplaret_get_jail_patches @@ -739,7 +742,7 @@ function simplaret_get_patches { done fi - ROOT="$oldroot" + ROOT="" } @@ -991,7 +994,7 @@ case $1 in "--purge" | "purge") shift ; simplaret_purge $* ;; "--install" | "install") shift ; simplaret_install $* ;; "--upgrade" | "upgrade") simplaret_get_patches --upgrade ;; - "--remove" | "remove") removepkg $2 ;; + "--remove" | "remove") ROOT=/$ROOT removepkg $2 ;; *) simplaret_usage ;; esac diff --git a/trunk/src/metapkg b/trunk/utils/metapkg index d86807e..e3db602 100755 --- a/trunk/src/metapkg +++ b/trunk/utils/metapkg @@ -21,6 +21,17 @@ # Remeber that mkjail template == metapkg metapackage. # +# +# TODO +# +# In the mean term, metapkg will not be developed, but the code will rest +# until someone need it. Some ideas to think for the future of metapkg would +# be a better integration with simplepkg structure, like: +# +# - By default metapkg searches by a slack-required in the package/slackbuilds repos +# - With -f, metapkg uses a local file (template, slack-required or tagfile) +# + COMMON="/usr/libexec/simplepkg/common.sh" BASENAME="`basename $0`" ROOT="/" |