diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
| commit | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (patch) | |
| tree | b9aa383048f908be017cdc260cb60fa3df5699e0 /scripts | |
| parent | f3d0f13c125a7e24dda986656d42b4a28e2f8e70 (diff) | |
| parent | 4f14ea9a70f86fd29c59b617fa1449dd5b2f14ab (diff) | |
some adk devel corrections
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/package.mk
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 | ||||
| -rwxr-xr-x | scripts/tarpkg | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 0107ee4bd..a940f2bb1 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -49,14 +49,10 @@ if [[ -n $ADK_PACKAGE_SQUID ]]; then NEED_SSLDEV="$NEED_SSLDEV squid" fi -#if [[ -n $ADK_PACKAGE_RUBY ]]; then -# NEED_RUBY="$NEED_RUBY ruby" -#fi - -if [[ -n $ADK_PACKAGE_GLIB2 ]]; then - NEED_GLIBZWO="$NEED_GLIBZWO glib2" - NEED_GETTEXT="$NEED_GETTEXT glib2" - NEED_PKGCONFIG="$NEED_PKGCONFIG glib2" +if [[ -n $ADK_PACKAGE_GLIB ]]; then + NEED_GLIBZWO="$NEED_GLIBZWO glib" + NEED_GETTEXT="$NEED_GETTEXT glib" + NEED_PKGCONFIG="$NEED_PKGCONFIG glib" fi diff --git a/scripts/tarpkg b/scripts/tarpkg index c126af594..818f99ea7 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -9,16 +9,11 @@ if [ "$1" = "build" ];then pkgname=$(grep "^Package:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") version=$(grep "^Version:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") arch=$(grep "^Architecture:" $2/CONTROL/control | sed -e "s/^[^:]*:[[:space:]]*//") - cd $2 - rm -rf CONTROL - tar -czf $3/${pkgname}_${version}_${arch}.tar.gz . - cd - - exit 0 + rm -rf $2/CONTROL + (cd $2 && tar -czf $3/${pkgname}_${version}_${arch}.tar.gz .) elif [ "$1" = "install" ];then tar -xzpf $2 -C ${INSTROOT} - exit 0 else echo "unknown command" exit 1 fi -exit 0 |