tazwok rev 529
tazwok: Fixed making new receipts. Add $CONFIGURE_ARGS back in. Fixed gen-wok-db to build wok-depends.txt with just $WOK. This is in case there is nothing in packages.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Mon May 23 06:24:41 2011 +0000 (2011-05-23) |
parents | a34890921ac4 |
children | fbb7ef572d32 |
files | tazwok |
line diff
1.1 --- a/tazwok Sat May 21 15:44:30 2011 +0000 1.2 +++ b/tazwok Mon May 23 06:24:41 2011 +0000 1.3 @@ -1474,21 +1474,14 @@ 1.4 report step "Generating wok-wanted.txt" 1.5 gen_wan_db 1.6 report step "Generating wok-depends.txt" 1.7 - for PACKAGE in $(cut -f1 -d '|' $PACKAGES_REPOSITORY/packages.desc \ 1.8 - $INCOMING_REPOSITORY/packages.desc | sort -u); do 1.9 - RECEIPT=$WOK/$PACKAGE/receipt 1.10 - if [ -s $RECEIPT ]; then 1.11 - source_receipt 1.12 - echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ' >> $dep_db 1.13 - fi 1.14 - done 1.15 + gen_dep_db 1.16 sort_db 1.17 report close-bloc 1.18 } 1.19 1.20 gen_wan_db() 1.21 { 1.22 - rm -f $wan_db 1.23 + [ -f $wan_db ] && rm -f $wan_db 1.24 for RECEIPT in $(fgrep -l WANTED $WOK/*/receipt); do 1.25 WANTED= 1.26 source $RECEIPT 1.27 @@ -1497,6 +1490,18 @@ 1.28 done 1.29 } 1.30 1.31 +gen_dep_db() 1.32 +{ 1.33 + [ -f $dep_db ] && rm -f $dep_db 1.34 + for PACKAGE in $(ls $WOK); do 1.35 + RECEIPT=$WOK/$PACKAGE/receipt 1.36 + if [ -s $RECEIPT ]; then 1.37 + source_receipt 1.38 + echo -e $PACKAGE"\t "$DEPENDS" \t "$BUILD_DEPENDS' ' >> $dep_db 1.39 + fi 1.40 + done 1.41 +} 1.42 + 1.43 update_wan_db() 1.44 { 1.45 local PACKAGE=$PACKAGE 1.46 @@ -2913,7 +2918,7 @@ 1.47 compile_rules() 1.48 { 1.49 cd $src 1.50 - ./configure && make && make install 1.51 + ./configure $CONFIGURE_ARGS && make && make install 1.52 } 1.53 1.54 # Rules to gen a SliTaz package suitable for Tazpkg.