# HG changeset patch # User Christophe Lincoln # Date 1304808027 -7200 # Node ID cbfb348cb173917265a5f850c0a57ae012caceb6 # Parent fc20a2fab76c726a74f3a1bfb187084798e30453 Be less entousiast and sed only 13 pkgs :-) diff -r fc20a2fab76c -r cbfb348cb173 accessx/receipt --- a/accessx/receipt Sat May 07 17:51:17 2011 +0000 +++ b/accessx/receipt Sun May 08 00:40:27 2011 +0200 @@ -17,7 +17,7 @@ mv $PACKAGE $PACKAGE-$VERSION 2> /dev/null cd $src # Patch for deprecated - patch -p0 < ../stuff/accessx.diff || return 1 + patch -p0 < $stuff/accessx.diff || return 1 make } diff -r fc20a2fab76c -r cbfb348cb173 aiksaurus/receipt --- a/aiksaurus/receipt Sat May 07 17:51:17 2011 +0000 +++ b/aiksaurus/receipt Sun May 08 00:40:27 2011 +0200 @@ -15,7 +15,7 @@ compile_rules() { cd $src - patch -Np0 -i ../stuff/aiksaurus-gcc44.patch + patch -Np0 -i $stuff/aiksaurus-gcc44.patch ./configure --with-gtk && make && make -j1 DESTDIR=$DESTDIR install } diff -r fc20a2fab76c -r cbfb348cb173 airpwn/receipt --- a/airpwn/receipt Sat May 07 17:51:17 2011 +0000 +++ b/airpwn/receipt Sun May 08 00:40:27 2011 +0200 @@ -16,7 +16,7 @@ { cd $src # Patch configure to link libcrypto - patch -Np1 -i ../stuff/link-libcrypto.patch + patch -Np1 -i $stuff/link-libcrypto.patch # Fix airpwn files so we can use it with a Python version other than 2.4. PYTHON_VERSION1=$(python -c 'import sys; print sys.version[:3]') diff -r fc20a2fab76c -r cbfb348cb173 arj/receipt --- a/arj/receipt Sat May 07 17:51:17 2011 +0000 +++ b/arj/receipt Sun May 08 00:40:27 2011 +0200 @@ -20,7 +20,7 @@ ./configure --prefix=/usr --infodir=/usr/share/info \ --mandir=/usr/share/man $CONFIGURE_ARGS cd .. - busybox patch -p0 < ../stuff/fardata.u + busybox patch -p0 < $stuff/fardata.u make -k -j1 make DESTDIR=$PWD/_pkg install } diff -r fc20a2fab76c -r cbfb348cb173 aufs/receipt --- a/aufs/receipt Sat May 07 17:51:17 2011 +0000 +++ b/aufs/receipt Sun May 08 00:40:27 2011 +0200 @@ -36,7 +36,7 @@ sed -i 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' \ config.mk || return 1 - #patch -Np1 -i ../stuff/aufs2-module-2.6.36.patch + #patch -Np1 -i $stuff/aufs2-module-2.6.36.patch #make KDIR=/usr/src/linux clean # build, sed fixes are from gentoo portage build sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile diff -r fc20a2fab76c -r cbfb348cb173 broadcom-wl/receipt --- a/broadcom-wl/receipt Sat May 07 17:51:17 2011 +0000 +++ b/broadcom-wl/receipt Sun May 08 00:40:27 2011 +0200 @@ -21,7 +21,7 @@ mv lib src Makefile $PACKAGE-$VERSION cd $src sed -i 's|linux/autoconf.h|generated/autoconf.h|' src/include/linuxver.h - patch -Np1 -i ../stuff/semaphore.patch + patch -Np1 -i $stuff/semaphore.patch KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd` } diff -r fc20a2fab76c -r cbfb348cb173 catalyst/receipt --- a/catalyst/receipt Sat May 07 17:51:17 2011 +0000 +++ b/catalyst/receipt Sun May 08 00:40:27 2011 +0200 @@ -32,9 +32,9 @@ grep -rl linux/$i * | xargs sed -i "s|linux/$i|generated/$i|" done cd $src - patch -Np1 -i ../stuff/makefile_compat.patch - patch -Np1 -i ../stuff/$PACKAGE-${KERNEL_VERSION}.patch - patch -Np1 -i ../stuff/sema_init.patch + patch -Np1 -i $stuff/makefile_compat.patch + patch -Np1 -i $stuff/$PACKAGE-${KERNEL_VERSION}.patch + patch -Np1 -i $stuff/sema_init.patch cd $src/common/lib/modules/fglrx/build_mod cp $src/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 . cp 2.6.x/Makefile . diff -r fc20a2fab76c -r cbfb348cb173 cdrdao/receipt --- a/cdrdao/receipt Sat May 07 17:51:17 2011 +0000 +++ b/cdrdao/receipt Sun May 08 00:40:27 2011 +0200 @@ -25,7 +25,7 @@ grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c || sed -i 's|#include |#define u8 __u8\n&|' \ scsilib/libscg/scsi-linux-sg.c - patch -Np1 -i ../stuff/$PACKAGE-$VERSION-stat.patch || return 1 + patch -Np1 -i $stuff/$PACKAGE-$VERSION-stat.patch || return 1 ./configure --prefix=/usr --with-lame && make && make DESTDIR=$PWD/_pkg install diff -r fc20a2fab76c -r cbfb348cb173 cdrkit/receipt --- a/cdrkit/receipt Sat May 07 17:51:17 2011 +0000 +++ b/cdrkit/receipt Sun May 08 00:40:27 2011 +0200 @@ -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 || return 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 fc20a2fab76c -r cbfb348cb173 chkrootkit/receipt --- a/chkrootkit/receipt Sat May 07 17:51:17 2011 +0000 +++ b/chkrootkit/receipt Sun May 08 00:40:27 2011 +0200 @@ -13,7 +13,7 @@ compile_rules() { cd $src - [ -f done.chkrootkit.u ] || patch -p1 < ../stuff/chkrootkit.u + [ -f done.chkrootkit.u ] || patch -p1 < $stuff/chkrootkit.u touch done.chkrootkit.u make sense } diff -r fc20a2fab76c -r cbfb348cb173 cinepaint/receipt --- a/cinepaint/receipt Sat May 07 17:51:17 2011 +0000 +++ b/cinepaint/receipt Sun May 08 00:40:27 2011 +0200 @@ -15,10 +15,10 @@ compile_rules() { cd $src - patch -Np1 -i ../stuff/cinepaint-0.22.1-gcc43.patch - patch -Np1 -i ../stuff/cinepaint-0.22-gcc44.patch - patch -Np1 -i ../stuff/cinepaint-0.22.1-multiple_parameters_named.patch - patch -Np0 -i ../stuff/cinepaint-0.22.1-ambiguousawake.patch + patch -Np1 -i $stuff/cinepaint-0.22.1-gcc43.patch + patch -Np1 -i $stuff/cinepaint-0.22-gcc44.patch + patch -Np1 -i $stuff/cinepaint-0.22.1-multiple_parameters_named.patch + patch -Np0 -i $stuff/cinepaint-0.22.1-ambiguousawake.patch find plug-ins/print -type f -exec \ sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \; # Fix insecure rpath diff -r fc20a2fab76c -r cbfb348cb173 clutter-gtk/receipt --- a/clutter-gtk/receipt Sat May 07 17:51:17 2011 +0000 +++ b/clutter-gtk/receipt Sun May 08 00:40:27 2011 +0200 @@ -15,7 +15,7 @@ compile_rules() { cd $src - patch -Np1 -i ../stuff/fix-gir.patch + patch -Np1 -i $stuff/fix-gir.patch sed -i -e 's/GTK_WIDGET_REALIZED/gtk_widget_get_realized/' \ -e 's/GTK_WIDGET_VISIBLE/gtk_widget_get_visible/' \ clutter-gtk/gtk-clutter-embed.c diff -r fc20a2fab76c -r cbfb348cb173 compcache/receipt --- a/compcache/receipt Sat May 07 17:51:17 2011 +0000 +++ b/compcache/receipt Sun May 08 00:40:27 2011 +0200 @@ -8,52 +8,55 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://code.google.com/p/compcache/" WGET_URL="http://compcache.googlecode.com/files/$TARBALL" + DEPENDS="linux" BUILD_DEPENDS="lzma linux-module-headers" # Rules to configure and make the package. compile_rules() { - - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` - cd $src - - # Fix build with kernel 2.6.34 - patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || return 1 - - find -name Makefile | xargs sed -i \ + KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | \ + cut -d "=" -f2 | sed -e 's/"//g'` + cd $src + + # Fix build with kernel 2.6.34 + 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|" - make KBUILD=/usr/src/linux KVER=$KERNEL_VERSION + make KBUILD=/usr/src/linux KVER=$KERNEL_VERSION } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` - EXTRAVERSION=_$KERNEL_VERSION - - mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc \ - $fs/etc/init.d \ - $fs/usr/bin - - install -o root -m 644 $src/ramzswap.ko $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc - cp -a $src/sub-projects/rzscontrol/rzscontrol $fs/usr/bin - - for i in $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/*.ko ; do - lzma e $i $i.gz && rm -f $i - done - install -o root -m 755 ./stuff/compcache $fs/etc/init.d/ - install -o root -m 644 ./stuff/compcache.conf $fs/etc/ + KERNEL_VERSION=$(grep ^VERSION= $WOK/linux/receipt | \ + cut -d "=" -f2 | sed -e 's/"//g') + EXTRAVERSION=_$KERNEL_VERSION + + mkdir -p $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc \ + $fs/etc/init.d \ + $fs/usr/bin + + install -o root -m 644 $src/ramzswap.ko \ + $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc + cp -a $src/sub-projects/rzscontrol/rzscontrol $fs/usr/bin + + for i in $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/*.ko ; do + lzma e $i $i.gz && rm -f $i + done + install -o root -m 755 $stuff/compcache $fs/etc/init.d/ + install -o root -m 644 $stuff/compcache.conf $fs/etc/ } post_install() { - echo "Processing post-install commands..." - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz + echo "Processing post-install commands..." + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz } post_remove() { - echo "Processing post-remove commands..." - chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz + echo "Processing post-remove commands..." + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz }