tazpkg rev 659
tazpkg/get-scripts: auto complete deps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Feb 16 18:44:58 2014 +0000 (2014-02-16) |
parents | 7b8440c89f58 |
children | 972d8b809068 |
files | tazpkg |
line diff
1.1 --- a/tazpkg Sun Feb 16 17:38:09 2014 +0100 1.2 +++ b/tazpkg Sun Feb 16 18:44:58 2014 +0000 1.3 @@ -743,6 +743,7 @@ 1.4 TARBALL WGET_URL CONFIG_FILES SUGGESTED PROVIDE DEPENDS 1.5 set -e 1.6 . $SCRIPT 1.7 + set +e 1.8 1.9 if [ ! -s $PACKAGE-$VERSION/receipt ]; then 1.10 cat > $PACKAGE-$VERSION/receipt <<EOT 1.11 @@ -761,6 +762,16 @@ 1.12 done >> $PACKAGE-$VERSION/receipt 1.13 fi 1.14 1.15 + DEPENDS="$(unset DEPENDS; . $PACKAGE-$VERSION/receipt ; echo $DEPENDS)" 1.16 + for i in $(find_depends $PACKAGE-$VERSION/fs); do 1.17 + case " $DEPENDS " in 1.18 + *\ $i\ *) continue;; 1.19 + esac 1.20 + grep -q '^DEPENDS="' $PACKAGE-$VERSION/receipt || 1.21 + echo 'DEPENDS=""' >> $PACKAGE-$VERSION/receipt 1.22 + sed -i "s/^DEPENDS=\"/&$i /" $PACKAGE-$VERSION/receipt 1.23 + done 1.24 + 1.25 tazpkg pack $PACKAGE-$VERSION 1.26 1.27 # Clean to save RAM memory before installation 1.28 @@ -1143,7 +1154,7 @@ 1.29 $TMPLOCALSTATE/undigest/*/files.list.lzma ; do 1.30 [ -f $i ] && lzma d $i -so >> $TMP_DIR/files.list 1.31 done 1.32 - find $TMP_DIR/$file/fs -type f | while read chkfile ; do 1.33 + find ${1:-$TMP_DIR/$file/fs} -type f | while read chkfile ; do 1.34 is_elf $chkfile || continue 1.35 case "$chkfile" in 1.36 *.o|*.ko|*.ko.gz) continue;; 1.37 @@ -1153,7 +1164,7 @@ 1.38 statically|linux-gate.so*|ld-*.so|*/ld-*.so) 1.39 continue;; 1.40 esac 1.41 - find $TMP_DIR/$file/fs | grep -q /$lib$ && continue 1.42 + find ${1:-$TMP_DIR/$file/fs} | grep -q /$lib$ && continue 1.43 for dep in $(fgrep $lib files.list | cut -d: -f1); do 1.44 case " $DEFAULT_DEPENDS " in 1.45 *\ $dep\ *) continue 2;;