diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 08:38:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-03 08:38:09 +0100 |
| commit | b52a881b03cdd926ec06ccaca7b4d7d63fc3cb8c (patch) | |
| tree | 84ef25bc26986d91bf128cc32fddd0da2fdbe552 /scripts | |
| parent | b8baf73967b23844f8a15a9a58f0fb623a95d4f1 (diff) | |
| parent | 6d8a8d81525622bdc1d294f3368dbd301e6c4b3b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/adkprepare.sh | 10 | ||||
| -rw-r--r-- | scripts/rstrip.sh | 9 |
2 files changed, 4 insertions, 15 deletions
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 022a978c1..08d1ee1a1 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -21,17 +21,12 @@ openbsd() { PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/" export PKG_PATH pkg_add -v gmake - pkg_add -v rsync-- pkg_add -v git pkg_add -v bash - pkg_add -v unzip pkg_add -v wget pkg_add -v gtar-- pkg_add -v gawk pkg_add -v gsed - pkg_add -v xz - pkg_add -v lzop - pkg_add -v intltool pkg_add -v screen-- pkg_add -v vim--no_x11 pkg_add -v py-libxml @@ -41,16 +36,13 @@ netbsd() { echo "Preparing NetBSD for OpenADK" PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/" export PKG_PATH - pkg_add -vu xz pkg_add -vu scmgit pkg_add -vu gmake pkg_add -vu bash pkg_add -vu wget - pkg_add -vu unzip pkg_add -vu gtar pkg_add -vu gsed pkg_add -vu gawk - pkg_add -vu intltool pkg_add -vu vim pkg_add -vu screen pkg_add -vu mksh @@ -58,7 +50,7 @@ netbsd() { freebsd() { echo "Preparing FreeBSD for OpenADK" - pkg_add -r git gmake bash wget unzip gtar gsed gawk intltool screen mksh vim + pkg_add -r git gmake bash wget gtar gsed gawk screen mksh vim } case $os in diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index bacf25ca7..46a4586da 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -5,10 +5,6 @@ SELF=${0##*/} -if [[ -z $debug ]];then - debug=1 -fi - if [[ -z $prefix ]]; then echo >&2 "$SELF: strip command not defined ('prefix' variable not set)" exit 1 @@ -64,12 +60,13 @@ find $TARGETS -type f -a -exec file {} \; | \ echo "$SELF: $V:$S" echo "-> $T $F" eval "chmod u+w $F" - if [[ $debug -eq 1 ]];then + if [[ $debug -ne 0 ]];then + echo "mkdir for $D" >> /tmp/debug eval "mkdir -p $D/usr/lib/debug/$Q" eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug" fi eval "$T $F" - if [[ $debug -eq 1 ]];then + if [[ $debug -ne 0 ]];then eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F" fi done |