# HG changeset patch # User Antoine Bodin # Date 1297706986 -3600 # Node ID 0b4cf0d9e1b5028d65d9facad3376fcf430c392a # Parent 42dbbdbd65b2713f01c44556af974ca34cbb012d Fix: replace exit 1 by return 1 in receipts (exit broke cook-list function) diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 accessx/receipt --- a/accessx/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/accessx/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -17,7 +17,7 @@ mv $PACKAGE $PACKAGE-$VERSION 2> /dev/null cd $src # Patch for deprecated - patch -p0 < ../stuff/accessx.diff || exit 1 + patch -p0 < ../stuff/accessx.diff || return 1 make } diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 aircrack-ng/receipt --- a/aircrack-ng/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/aircrack-ng/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -15,11 +15,11 @@ compile_rules() { cd $src - sed -i s#/usr/local#/usr#g common.mak || exit 1 - sed -i s#/man/man1#/share/man/man1# common.mak || exit 1 + sed -i s#/usr/local#/usr#g common.mak || return 1 + sed -i s#/man/man1#/share/man/man1# common.mak || return 1 # fix build with gcc45 - sed -i s/-Werror// common.mak || exit 1 + sed -i s/-Werror// common.mak || return 1 make && make DESTDIR=$PWD/_pkg install diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 bcrypt/receipt --- a/bcrypt/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/bcrypt/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -16,7 +16,7 @@ compile_rules() { cd $src - make || exit 1 + make } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 cdrkit/receipt --- a/cdrkit/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/cdrkit/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -17,7 +17,7 @@ cd $src sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \ genisoimage/CMakeLists.txt - #patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || exit 1 + #patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1 #grep -qs 'define u8' libusal/scsi-linux-sg.c || #sed -i 's|#include |#define u8 __u8\n&|' libusal/scsi-linux-sg.c make && diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 compcache/receipt --- a/compcache/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/compcache/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -19,7 +19,7 @@ cd $src # Fix build with kernel 2.6.34 - patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || exit 1 + patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || return 1 find -name Makefile | xargs sed -i \ "s|/lib/modules/\$(shell uname -r)/build|/usr/src/linux|" diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 coreutils/receipt --- a/coreutils/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/coreutils/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -33,8 +33,8 @@ uname.u EOT - sed -i 's/1.10a/1.10.2/' configure.ac || exit 1 - sed -i 's/dist-xz/dist-lzma/' configure.ac || exit 1 + sed -i 's/1.10a/1.10.2/' configure.ac || return 1 + sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1 ./configure \ --prefix=/usr \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 faac/receipt --- a/faac/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/faac/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -15,7 +15,7 @@ compile_rules() { cd $src/common/mp4v2 - patch -p0 < ../../../stuff/gcc44.patch || exit 1 + patch -p0 < ../../../stuff/gcc44.patch || return 1 cd ../.. ./configure \ --prefix=/usr \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 ffmpeg/receipt --- a/ffmpeg/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/ffmpeg/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -20,7 +20,7 @@ cd $src # Fix gcc45 build. - patch -p1 < ../stuff/ffmpeg-0.5.1-gcc45.u || exit 1 + patch -p1 < ../stuff/ffmpeg-0.5.1-gcc45.u || return 1 ./configure \ --prefix=/usr \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 fltk/receipt --- a/fltk/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/fltk/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -16,7 +16,7 @@ compile_rules() { cd $src - patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 + patch -p 0 < ../stuff/filename_list-dirent.patch || return 1 ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 gcc/receipt --- a/gcc/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/gcc/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -106,7 +106,7 @@ { # Use libiberty.a from binutils. sed -i 's/install_to_$(INSTALL_DEST) //' \ - $PACKAGE-$VERSION/libiberty/Makefile.in || exit 1 + $PACKAGE-$VERSION/libiberty/Makefile.in || return 1 mkdir -p gcc-build && cd gcc-build $src/configure --enable-nls \ --enable-languages=c,c++,objc,fortran --enable-shared --with-system-zlib \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 gtkdialog/receipt --- a/gtkdialog/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/gtkdialog/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -16,7 +16,7 @@ { cd $src # Fix libgalde support - patch -p 0 < ../stuff/glade_support.patch || exit 1 + patch -p 0 < ../stuff/glade_support.patch || return 1 ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 guile/receipt --- a/guile/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/guile/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -16,7 +16,7 @@ cd $src # http://bugs.gentoo.org/show_bug.cgi?id=317175 - patch -p1 < ../stuff/guile-1.8.7-gcc45.u || exit 1 + patch -p1 < ../stuff/guile-1.8.7-gcc45.u || return 1 ./configure \ --prefix=/usr \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 hal/receipt --- a/hal/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/hal/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -27,8 +27,8 @@ { cd $src zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && - patch -p1 < ../stuff/hal-scripts.u || exit 1 && - #patch -p1 < ../stuff/hal-udev.patch || exit 1 && + patch -p1 < ../stuff/hal-scripts.u || return 1 && + #patch -p1 < ../stuff/hal-udev.patch || return 1 && grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c || sed -i 's|#include |#define u8 __u8\n&|' \ hald/linux/probing/linux_dvd_rw_utils.c diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 hardinfo/receipt --- a/hardinfo/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/hardinfo/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -17,7 +17,7 @@ cd $src while read file; do [ -f done.$file ] && continue - patch -p0 < ../stuff/$file || exit 1 + patch -p0 < ../stuff/$file || return 1 touch done.$file done </dev/null || exit 1 + #mv mozilla $PACKAGE-$VERSION 2>/dev/null || return 1 mv comm-1.9.1 $PACKAGE-$VERSION 2>/dev/null cp -a stuff/seamonkey.mozconfig $src/.mozconfig cd $src - patch -p1 -i ../stuff/google-breakpad.u || exit 1 + patch -p1 -i ../stuff/google-breakpad.u || return 1 cat >> layout/build/Makefile.in << "EOF" ifdef MOZ_ENABLE_CANVAS EXTRA_DSO_LDOPTS += $(XLDFLAGS) -lX11 -lXrender diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 setserial/receipt --- a/setserial/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/setserial/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -17,7 +17,7 @@ # http://bugs.gentoo.org/309883 # & remove warnings - patch -p1 < ../stuff/setserial-2.17.u || exit 1 + patch -p1 < ../stuff/setserial-2.17.u || return 1 ./configure --prefix=/usr --infodir=/usr/share/info \ --mandir=/usr/share/man $CONFIGURE_ARGS && diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 slim/receipt --- a/slim/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/slim/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -21,7 +21,7 @@ compile_rules() { cd $src - patch -p1 < ../stuff/NoPwdForCmd.patch || exit 1 + patch -p1 < ../stuff/NoPwdForCmd.patch || return 1 make && make DESTDIR=$src/_pkg install } diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 squidguard/receipt --- a/squidguard/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/squidguard/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -20,7 +20,7 @@ # Security patches while read patch_file; do echo "Apply $patch_file" - tar xvzf ../stuff/$patch_file || exit 1 + tar xvzf ../stuff/$patch_file || return 1 cp -a $(basename $patch_file .tar.gz)/* src done </dev/null - [ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; exit 1) + [ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; return 1) status # add config cp -a stuff/thunderbird.mozconfig.conf $src/.mozconfig diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 valgrind/receipt --- a/valgrind/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/valgrind/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -21,7 +21,7 @@ # Fix build with glibc 2.11 #http://www.linuxfromscratch.org/patches/downloads/valgrind/valgrind-3.5.0-glibc-2.11.patch - patch -p1 < ../stuff/valgrind-3.6.0-glibc211.u || exit 1 + patch -p1 < ../stuff/valgrind-3.6.0-glibc211.u || return 1 autoconf ./configure \ diff -r 42dbbdbd65b2 -r 0b4cf0d9e1b5 vzctl/receipt --- a/vzctl/receipt Mon Feb 14 18:33:51 2011 +0100 +++ b/vzctl/receipt Mon Feb 14 19:09:46 2011 +0100 @@ -23,7 +23,7 @@ continue fi echo "Apply $patch_file" - patch -p1 < ../stuff/$patch_file || exit 1 + patch -p1 < ../stuff/$patch_file || return 1 touch done.$patch_file done <