diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 16:03:51 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-14 16:03:51 +0100 |
commit | 55c0efbdbd7d1e1673fed1b036997a8bed52e704 (patch) | |
tree | e7da843f23ea197eaa9477594488510596195757 /scripts | |
parent | 8f39dc5c8c3d0b77daebd90f927e0bc78bca7d1d (diff) |
fix recompile BUG of PKG_MULTI packages
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/rstrip.sh | 2 | ||||
-rw-r--r-- | scripts/split-cfg.sh | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 591c5bb07..0c7550d8e 100644 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -33,10 +33,8 @@ find $TARGETS -type f -a -exec file {} \; | \ T=$T$stripcomm case $line in *ELF*executable*statically\ linked*) - echo >&2 "$SELF: *WARNING* '$V' is not dynamically linked!" ;; *ELF*relocatable*,\ not\ stripped*) - echo >&2 "$SELF: *WARNING* '$V' is a relocatable!" ;; esac case $line in diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh index 297d42beb..f5d2db07f 100644 --- a/scripts/split-cfg.sh +++ b/scripts/split-cfg.sh @@ -62,28 +62,22 @@ for oldfile in $oldfiles; do done print -nu2 '\r' -# now scan for dependencies of packages; the information -# should probably be in build_mipsel because it's generated -# at build time, but OTOH, soon enough, parts of Makefile -# and the entire Config.in will be auto-generated anyway, -# so we're better off placing it here -#XXX this is too slow @868 configure options +# now handle package dependencies cd $TOPDIR/.cfg_${TARGET}_${LIBC} rm -f $TOPDIR/package/*/info.mk for option in *; do pbar="$option ..." print -nu2 "$pbar\r" ao=: - fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \ + fgrep -l $option $TOPDIR/package/*/Config.* 2>&- | \ while read line; do print -r -- ${line%/*}/info.mk done | while read fname; do [[ $ao = *:$fname:* ]] && continue ao=$ao$fname: - echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname + if [ "$option" != "ADK_HAVE_DOT_CONFIG" ];then + echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname + fi done done -pbar=done -print -u2 "$pbar" - exit 0 |