# HG changeset patch # User Aleksej Bobylev # Date 1500516453 -10800 # Node ID 48b237fbb76063bacc83085f6f73738ac033aa41 # Parent 1b74677e163fcedc2662078a14febb8d678b57f7 cook: specify we use busybox fold (don't fail when remove coreutils-file-format or coreutils-multicall containing fold); cooker: remove package from packages.info DB too. diff -r 1b74677e163f -r 48b237fbb760 cook --- a/cook Mon Jul 17 09:42:35 2017 +0100 +++ b/cook Thu Jul 20 05:07:33 2017 +0300 @@ -534,7 +534,7 @@ newline; newline # Keep the last diff for debug and info. mv -f $diff $CACHE/installed.diff - } | fold -sw80 + } | busybox fold -sw80 } @@ -1426,9 +1426,11 @@ DEPENDS=$(echo $DEPENDS) # remove newlines, tabs and multiple spaces from variable # Calculate release checksum: usually it does not change on "just recook". - # Release checksum is md5sum of file containing md5sums of all files, receipts and description.txts. + # Release checksum is md5sum of file containing md5sums of: + # a) all files, b) receipt, and c) description.txt. # Md5sum of the package file will change every time because of embedded timestamps; # release checksum based only on files content, and will change only when files change. + # (Pitfall: ownership and permissions...) rsumf=$(mktemp) cp $pack/md5sum $rsumf md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf diff -r 1b74677e163f -r 48b237fbb760 cooker --- a/cooker Mon Jul 17 09:42:35 2017 +0100 +++ b/cooker Thu Jul 20 05:07:33 2017 +0300 @@ -604,6 +604,7 @@ fi rm -rf $wok/$pkg $LOGS/$pkg.log sed -i "/^${pkg}$/d" $blocked $broken $commits.tmp + sed -i "/^$pkg\t/d" $PKGS/packages.info fi if [ -d "$wok/$pkg/stuff" ]; then if [ ! -d "$wok-hg/$pkg/stuff" ]; then