diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /scripts | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/reloc.sh | 16 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 12 |
2 files changed, 16 insertions, 12 deletions
diff --git a/scripts/reloc.sh b/scripts/reloc.sh new file mode 100755 index 000000000..f7a0a1e3b --- /dev/null +++ b/scripts/reloc.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +# execute this after relocation of adk directory + +olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2) +newdir=$(pwd) + +if [ "$olddir" != "$newdir" ];then + echo "adk directory relocated!" + echo "old directory: $olddir" + echo "new directory: $newdir" + sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.pc|xargs) + sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.la|xargs) + sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs) + sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf + sed -i -e "s#$olddir#$newdir#" prereq.mk +fi diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index b08cafc95..a7b3cf492 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -85,11 +85,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_INTL="$NEED_INTL xkeyboard-config" fi -if [[ -n $ADK_PACKAGE_GLIB ]]; then - NEED_GLIBZWO="$NEED_GLIBZWO glib" - NEED_GETTEXT="$NEED_GETTEXT glib" -fi - if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then NEED_FLEX="$NEED_FLEX libpcap" NEED_BISON="$NEED_BISON libpcap" @@ -269,13 +264,6 @@ if [[ -n $NEED_XKBCOMP ]]; then fi fi -if [[ -n $NEED_GLIBZWO ]]; then - if ! which glib-genmarshal >/dev/null 2>&1; then - echo >&2 You need libglib2.0-dev to build $NEED_GLIBZWO - out=1 - fi -fi - if [[ -n $NEED_RPM ]]; then if ! which rpmbuild >/dev/null 2>&1; then echo >&2 You need rpmbuild to to use $NEED_RPM package backend |