wok-stable rev 6113
cdparanoia-III, cdrdao, dmraid, hal, libburn, libcdio, lshw, testdisk, udev, util-linux-ng: fix scsi/scsi.h case
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Sep 04 16:02:13 2010 +0200 (2010-09-04) |
parents | ae97a9aa5f66 |
children | 821620a99cc0 |
files | cdparanoia-III/receipt cdrdao/receipt dmraid/receipt hal/receipt libburn/receipt libcdio/receipt lshw/receipt testdisk/receipt udev/receipt util-linux-ng/receipt |
line diff
1.1 --- a/cdparanoia-III/receipt Sat Sep 04 14:56:38 2010 +0200 1.2 +++ b/cdparanoia-III/receipt Sat Sep 04 16:02:13 2010 +0200 1.3 @@ -13,6 +13,9 @@ 1.4 compile_rules() 1.5 { 1.6 cd $src 1.7 + grep -qs 'define u8' interface/low_interface.h || 1.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 1.9 + interface/low_interface.h 1.10 ./configure \ 1.11 --prefix=/usr \ 1.12 --infodir=/usr/share/info \
2.1 --- a/cdrdao/receipt Sat Sep 04 14:56:38 2010 +0200 2.2 +++ b/cdrdao/receipt Sat Sep 04 16:02:13 2010 +0200 2.3 @@ -22,6 +22,9 @@ 2.4 done 2.5 find -name '*.c' | xargs sed -i -e 's/getline/get_line/' \ 2.6 -e 's/fexecve/fexec_ve/' scsilib/include/schily.h 2.7 + grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c || 2.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 2.9 + scsilib/libscg/scsi-linux-sg.c 2.10 ./configure --prefix=/usr --with-lame && 2.11 make && 2.12 make DESTDIR=$PWD/_pkg install
3.1 --- a/dmraid/receipt Sat Sep 04 14:56:38 2010 +0200 3.2 +++ b/dmraid/receipt Sat Sep 04 16:02:13 2010 +0200 3.3 @@ -17,6 +17,8 @@ 3.4 mv $PACKAGE/$VERSION $src && rmdir $PACKAGE 2> /dev/null 3.5 cd $src 3.6 #sed -i 's/sed --quiet/sed/' configure configure.in 3.7 + grep -qs 'define u8' lib/device/scsi.c || 3.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' lib/device/scsi.c 3.9 ./configure --prefix=/usr --infodir=/usr/share/info \ 3.10 --mandir=/usr/share/man \ 3.11 $CONFIGURE_ARGS &&
4.1 --- a/hal/receipt Sat Sep 04 14:56:38 2010 +0200 4.2 +++ b/hal/receipt Sat Sep 04 16:02:13 2010 +0200 4.3 @@ -29,6 +29,9 @@ 4.4 zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && 4.5 patch -p1 < ../stuff/hal-scripts.u || exit 1 && 4.6 #patch -p1 < ../stuff/hal-udev.patch || exit 1 && 4.7 + grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c || 4.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 4.9 + hald/linux/probing/linux_dvd_rw_utils.c 4.10 ./configure \ 4.11 --prefix=/usr \ 4.12 --libexecdir=/usr/lib/hal \
5.1 --- a/libburn/receipt Sat Sep 04 14:56:38 2010 +0200 5.2 +++ b/libburn/receipt Sat Sep 04 16:02:13 2010 +0200 5.3 @@ -13,6 +13,8 @@ 5.4 compile_rules() 5.5 { 5.6 cd $src 5.7 + grep -qs 'define u8' libburn/sg-linux.c || 5.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' libburn/sg-linux.c 5.9 ./configure --prefix=/usr --infodir=/usr/share/info \ 5.10 --mandir=/usr/share/man $CONFIGURE_ARGS && 5.11 make &&
6.1 --- a/libcdio/receipt Sat Sep 04 14:56:38 2010 +0200 6.2 +++ b/libcdio/receipt Sat Sep 04 16:02:13 2010 +0200 6.3 @@ -15,6 +15,9 @@ 6.4 compile_rules() 6.5 { 6.6 cd $src 6.7 + grep -qs 'define u8' lib/driver/gnu_linux.c || 6.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 6.9 + lib/driver/gnu_linux.c 6.10 ./configure --prefix=/usr --disable-vcd-info && 6.11 make && 6.12 make DESTDIR=$PWD/_pkg install
7.1 --- a/lshw/receipt Sat Sep 04 14:56:38 2010 +0200 7.2 +++ b/lshw/receipt Sat Sep 04 16:02:13 2010 +0200 7.3 @@ -17,6 +17,9 @@ 7.4 7.5 cd $src 7.6 sed -i 's/hwNode::hwNode/hwNode/' src/core/scsi.cc 7.7 + grep -qs 'define u8' src/core/scsi.cc src/core/burner.cc || 7.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 7.9 + src/core/scsi.cc src/core/burner.cc 7.10 make && 7.11 make DESTDIR=$PWD/_pkg install 7.12 }
8.1 --- a/testdisk/receipt Sat Sep 04 14:56:38 2010 +0200 8.2 +++ b/testdisk/receipt Sat Sep 04 16:02:13 2010 +0200 8.3 @@ -16,6 +16,8 @@ 8.4 compile_rules() 8.5 { 8.6 cd $src 8.7 + grep -qs 'define u8' src/hdaccess.c || 8.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' src/hdaccess.c 8.9 ./configure \ 8.10 --prefix=/usr \ 8.11 --mandir=/usr/share/man \
9.1 --- a/udev/receipt Sat Sep 04 14:56:38 2010 +0200 9.2 +++ b/udev/receipt Sat Sep 04 16:02:13 2010 +0200 9.3 @@ -16,8 +16,10 @@ 9.4 compile_rules() 9.5 { 9.6 gzip -d /usr/share/misc/pci.ids.gz 9.7 - #sed -i s/u8/__u8/ /usr/include/scsi/scsi.h 9.8 cd $src 9.9 + grep -qs 'define u8' extras/*_id/*.c || 9.10 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \ 9.11 + extras/scsi_id/scsi_serial.c extras/ata_id/ata_id.c 9.12 ./configure \ 9.13 --prefix=/usr \ 9.14 --exec-prefix="" \
10.1 --- a/util-linux-ng/receipt Sat Sep 04 14:56:38 2010 +0200 10.2 +++ b/util-linux-ng/receipt Sat Sep 04 16:02:13 2010 +0200 10.3 @@ -19,6 +19,8 @@ 10.4 if ! grep 'tty:x:4:' /etc/group; then 10.5 addgroup -g 4 tty 10.6 fi 10.7 + grep -qs 'define u8' fdisk/fdisksunlabel.c || 10.8 + sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' fdisk/fdisksunlabel.c 10.9 ./configure \ 10.10 --prefix=/usr \ 10.11 --sysconfdir=/etc \