summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/scan-pkgs.sh12
-rwxr-xr-xscripts/tarpkg9
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