Nils Olav Fossum escribió:
Yes, see the patch Steffen Kaiser posted some day ago,
Sorry, I thought there were diferent issues.
Im not shure if you will run into crlf issues if you edit this file under linux.. ..well, have that in the back of youre head :)
I had applied manually and extract using cvs, I hope a good soul could find some time to apply them.
copy libcap-patch under unattended/linuxboot/misc/
Note: the linux kernel configuration does not have serial ata enabled..I attached the the kernel configuration I used (minimal, only Intel sata enabled).
cool, I will test it and I will report it back.
diff -u1 -r /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/Makefile libcap-1.10/libcap/Makefile --- /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/Makefile 1999-04-18 00:16:31.000000000 +0200 +++ libcap-1.10/libcap/Makefile 2007-03-26 16:31:45.000000000 +0200 @@ -52,6 +52,5 @@ -cap_names.sed: Makefile /usr/include/linux/capability.h +cap_names.sed: Makefile $(topdir)/../linux-2.6.20.2/include/linux/capability.h @echo "=> making cap_names.c from <linux/capability.h>" - @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed -# @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed + @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < $(topdir)/../linux-2.6.20.2/include/linux/capability.h | fgrep -v 0x > cap_names.sed diff -u1 -r /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/_makenames.c libcap-1.10/libcap/_makenames.c --- /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/_makenames.c 1999-05-14 06:46:15.000000000 +0200 +++ libcap-1.10/libcap/_makenames.c 2007-03-27 09:20:29.000000000 +0200 @@ -11,3 +11,4 @@ #include <stdlib.h> -#include <linux/capability.h> +#include <sys/capability.h> +/*#include <linux/capability.h>*/ diff -u1 -r /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/cap_sys.c libcap-1.10/libcap/cap_sys.c --- /mnt/prgdist/unattend/cvs/unattended/linuxboot/libcap-1.10/libcap/cap_sys.c 1999-04-18 00:16:31.000000000 +0200 +++ libcap-1.10/libcap/cap_sys.c 2007-03-27 09:16:52.000000000 +0200 @@ -13,2 +13,3 @@ +/* _syscall2(int, capget, @@ -20,2 +21,3 @@ const cap_user_data_t, data) +*/
Index: linuxboot/Makefile =================================================================== RCS file: /cvsroot/unattended/unattended/linuxboot/Makefile,v retrieving revision 1.151 diff -r1.151 Makefile 137c137 < cd $(busybox) && patch -p1 < $(cwd)/$< --- > cd $(busybox) && patch -b -p1 < $(cwd)/$< 165c165 < cd $(dosemu) && patch -p1 < $(cwd)/$< --- > cd $(dosemu) && patch -b -p1 < $(cwd)/$< 167a168,177 > fakelib/libslang.a: $(slang)/configure > rm -f $@ > cd $(cwd)/$(slang) \ > && CC="$(CC) $(fakelib_cflags)" ./configure \ > --prefix=/usr \ > && make \ > && ln src/objs/libslang.a $(cwd)/fakelib \ > && ln src/slang.h $(cwd)/fakeinclude > [ -e $@ ] > 169c179 < $(dosemu)/configure --- > $(dosemu)/configure fakelib/libslang.a 175c185 < --prefix=/usr --with-slangdir=$(cwd)/$(slang) --- > --prefix=/usr 185c195,196 < && make MAKELEVEL=0 --- > && make MAKELEVEL=0 \ > && cp commands/exitemu.com $(cwd)/../install/dosbin/exitemu.com 309c320,324 < $(libcap)/libcap/libcap.so.1: build-$(glibc)/libc.so --- > $(libcap)/.stamp-libcap-patch: misc/libcap-patch > cd $(libcap) && patch -b -p1 < $(cwd)/$< > touch $@ > > $(libcap)/libcap/libcap.so.1: build-$(glibc)/libc.so > $(libcap)/.stamp-libcap-patch Index: linuxboot/misc/config.sys =================================================================== RCS file: /cvsroot/unattended/unattended/linuxboot/misc/config.sys,v retrieving revision 1.3 diff -r1.3 config.sys 7a8 > SHELL=COMMAND.COM /F /P Index: install/dosbin/install.pl =================================================================== RCS file: /cvsroot/unattended/unattended/install/dosbin/install.pl,v retrieving revision 1.142 diff -r1.142 install.pl 1595,1596c1595,1605 < $is_linux < and push @doit_cmds, 'xcopy /s /e /y Y:\\ C:\\'; --- > if($is_linux) { > # xcopy will copy a file that will prevent a cycling of DOSemu > # this is tested as the first command > # The filename itself > my $noCycling = "$netinst\\" . int(rand(10000000)) . ".tmp"; > # First of all, if the checkpoint file exist, leave DOSEmu > unshift @doit_cmds, "IF EXIST $noCycling EXITEMU"; > push @doit_cmds, 'xcopy /s /e /y Y:\\ C:\\'; > # have the XCOPY command copy over the checkpoint file > write_file($noCycling, 'prevent cycling of DOSemu'); > }
------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________ unattended-devel mailing list unattended-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/unattended-devel