# HG changeset patch # User Aleksej Bobylev # Date 1482118935 -7200 # Node ID 9e21916774fb0d981ad2171c47a264b630a887c6 # Parent c1f4d81d16e71f6ac6a75f68f920fdbdeb86a764 Undo previous commit. Introduce `cooks` with the same purpose. diff -r c1f4d81d16e7 -r 9e21916774fb Makefile --- a/Makefile Mon Dec 19 03:15:08 2016 +0200 +++ b/Makefile Mon Dec 19 05:42:15 2016 +0200 @@ -22,6 +22,7 @@ install -m 0755 -d $(DESTDIR)$(PREFIX)/share/cook/cooktest install -m 0755 -d $(DESTDIR)$(PREFIX)/share/doc/cookutils install -m 0755 cook $(DESTDIR)$(PREFIX)/bin + install -m 0755 cooks $(DESTDIR)$(PREFIX)/bin install -m 0755 fix-desktop-file $(DESTDIR)$(PREFIX)/bin install -m 0755 cooker $(DESTDIR)$(PREFIX)/bin install -m 0755 cookiso $(DESTDIR)$(PREFIX)/bin @@ -41,6 +42,7 @@ uninstall-cook: rm -rf \ $(DESTDIR)$(PREFIX)/bin/cook \ + $(DESTDIR)$(PREFIX)/bin/cooks \ $(DESTDIR)$(PREFIX)/bin/fix-desktop-file \ $(DESTDIR)$(PREFIX)/bin/cooker \ $(DESTDIR)$(PREFIX)/bin/cookiso \ diff -r c1f4d81d16e7 -r 9e21916774fb cook --- a/cook Mon Dec 19 03:15:08 2016 +0200 +++ b/cook Mon Dec 19 05:42:15 2016 +0200 @@ -51,7 +51,6 @@ cook --clean -c $(_ 'clean the package in the wok.') --install -i $(_ 'cook and install the package.') - --wsplit -ws $(_ 'cook the package and then all the splitted ones.') --getsrc -gs $(_ 'get the package source tarball.') --block -b $(_ 'block a package so cook will skip it.') --unblock -ub $(_ 'unblock a blocked package.') @@ -2416,17 +2415,9 @@ [ -s /aufs-umount.sh ] || install_package - rm -f $command - - # Cook splitted packages that builds from the files of just builded package - if [ "$2" == '--wsplit' -o "$2" == '-ws' ]; then - splitted=$(SPLIT=''; . $WOK/$pkg/receipt; echo $SPLIT) - [ "${splitted/$pkg-dev/}" == "$splitted" ] && splitted="$pkg-dev $splitted" - for i in $splitted; do - [ -d "$WOK/$i" ] && cook $i - done - fi - ;; + # Finally we DON'T WANT to build the *-dev or packages with WANTED="$pkg" + # You want automation: use the Cooker Build Bot. + rm -f $command ;; esac exit 0 diff -r c1f4d81d16e7 -r 9e21916774fb cooks --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cooks Mon Dec 19 05:42:15 2016 +0200 @@ -0,0 +1,36 @@ +#!/bin/sh +# Cook specified package and then cook all the splitted packages +# that builds from the files of just builded package + +case "$1" in + --help|-h) + cat < + +Cook the specified package and then cook all the packages defined in the +SPLIT variable in the package receipt. +Note, *-dev packages are implicit and usually omitted. + +EOT + exit 0 + ;; +esac + +pkg="$1" +. /etc/slitaz/cook.conf + +cook "$pkg" + +# Get the list +splitted=$(SPLIT=''; . $WOK/$pkg/receipt; echo $SPLIT) + +# $SPLIT may contain the "*-dev" somewhere already if cooking order is significant. +# Cook the "*-dev" first if order is unsignificant. +[ "${splitted/$pkg-dev/}" == "$splitted" ] && splitted="$pkg-dev $splitted" + +# (re-)cook all existed packages +for i in $splitted; do + [ -d "$WOK/$i" ] && cook $i +done + +exit 0