diff for duplicates of <200901031928.13428.rob@landley.net> diff --git a/a/1.txt b/N1/1.txt index 6631de6..61180b6 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index 7602622..7114002 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,142 +11,12 @@ "\00:1\0" "b\0" "From: Rob Landley <rob@landley.net>\n" - "\n" - "Remove perl from make headers_install by replacing a perl script (doing\n" - "a simple regex search and replace) with a smaller and faster shell script\n" - "implementation. The new shell script is a single for loop calling sed and\n" - "piping its output through unifdef to produce the target file.\n" - "\n" - "Changes from previous version: Added help text and a check for the right\n" - "number of arguments. Removed unused ARCH input from script and makefile\n" - "(the makefile incorporates ARCH into INDIR, so the script doesn't care),\n" - "fixed a whitespace mistake in the makefile pointed out by Sam Ravnborg,\n" - "changed the shebang to #!/bin/sh and tested under bash and dash.\n" - "\n" + "Remove perl from make headers_install by replacing a perl script (doinga simple regex search and replace) with a smaller and faster shell scriptimplementation. The new shell script is a single for loop calling sed andpiping its output through unifdef to produce the target file.\n" + "Changes from previous version: Added help text and a check for the rightnumber of arguments. Removed unused ARCH input from script and makefile(the makefile incorporates ARCH into INDIR, so the script doesn't care),fixed a whitespace mistake in the makefile pointed out by Sam Ravnborg,changed the shebang to #!/bin/sh and tested under bash and dash.\n" "\n" "put_changelog_here\n" - "\n" - "Signed-off-by: Rob Landley <rob@landley.net>\n" - "---\n" - "\n" - " scripts/Makefile.headersinst | 6 ++--\n" - " scripts/headers_install.pl | 46 ---------------------------------\n" - " scripts/headers_install.sh | 36 +++++++++++++++++++++++++\n" - " 3 files changed, 39 insertions(+), 49 deletions(-)\n" - "\n" - "diff -ruN linux-2.6.28/scripts/headers_install.sh linux-2.6.28-new/scripts/headers_install.sh\n" - "--- linux-2.6.28/scripts/headers_install.sh\t1969-12-31 18:00:00.000000000 -0600\n" - "+++ linux-2.6.28-new/scripts/headers_install.sh\t2009-01-02 22:35:17.000000000 -0600\n" - "@@ -0,0 +1,36 @@\n" - "+#!/bin/sh\n" - "+\n" - "+if [ $# -lt 2 ]\n" - "+then\n" - "+\techo \"Usage: headers_install.sh INDIR OUTDIR [FILES...]\n" - "+\techo\n" - "+\techo \"Prepares kernel header files for use by user space, by removing\"\n" - "+\techo \"all compiler.h definitions and #includes, and removing any\"\n" - "+\techo \"#ifdef __KERNEL__ sections.\"\n" - "+\techo\n" - "+\techo \"INDIR: directory to read each kernel header FILE from.\"\n" - "+\techo \"OUTDIR: directory to write each userspace header FILE to.\"\n" - "+\techo \"FILES: list of header files to operate on.\"\n" - "+\n" - "+\texit 1\n" - "+fi\n" - "+\n" - "+# Grab arguments\n" - "+\n" - "+INDIR=\"$1\"\n" - "+shift\n" - "+OUTDIR=\"$1\"\n" - "+shift\n" - "+\n" - "+# Iterate through files listed on command line\n" - "+\n" - "+for i in \"$@\"\n" - "+do\n" - "+\tsed -r \\\n" - "+\t\t-e 's/([ \\t(])(__user|__force|__iomem)[ \\t]/\\1/g' \\\n" - "+\t\t-e 's/__attribute_const__([ \\t]|$)/\\1/g' \\\n" - "+\t\t-e 's@^#include <linux/compiler.h>@@' \"$INDIR/$i\" |\n" - "+\tscripts/unifdef -U__KERNEL__ - > \"$OUTDIR/$i\"\n" - "+done\n" - "+\n" - "+exit 0\n" - "diff -ruN linux-2.6.28/scripts/Makefile.headersinst linux-2.6.28-new/scripts/Makefile.headersinst\n" - "--- linux-2.6.28/scripts/Makefile.headersinst\t2008-12-24 17:26:37.000000000 -0600\n" - "+++ linux-2.6.28-new/scripts/Makefile.headersinst\t2009-01-02 22:36:42.000000000 -0600\n" - "@@ -44,8 +44,8 @@\n" - " quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\\\n" - " file$(if $(word 2, $(all-files)),s))\n" - " cmd_install = \\\n" - "- $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \\\n" - "- $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \\\n" - "+ $(CONFIG_SHELL) $< $(srctree)/$(obj) $(install) $(header-y); \\\n" - "+ $(CONFIG_SHELL) $< $(objtree)/$(obj) $(install) $(objhdr-y); \\\n" - " touch $@\n" - " \n" - " quiet_cmd_remove = REMOVE $(unwanted)\n" - "@@ -64,7 +64,7 @@\n" - " \t@:\n" - " \n" - " targets += $(install-file)\n" - "-$(install-file): scripts/headers_install.pl $(input-files) FORCE\n" - "+$(install-file): scripts/headers_install.sh $(input-files) FORCE\n" - " \t$(if $(unwanted),$(call cmd,remove),)\n" - " \t$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))\n" - " \t$(call if_changed,install)\n" - "diff -ruN linux-2.6.28/scripts/headers_install.pl linux-2.6.28-new/scripts/headers_install.pl\n" - "--- linux-2.6.28/scripts/headers_install.pl\t2008-12-24 17:26:37.000000000 -0600\n" - "+++ linux-2.6.28-new/scripts/headers_install.pl\t1969-12-31 18:00:00.000000000 -0600\n" - "@@ -1,46 +0,0 @@\n" - "-#!/usr/bin/perl -w\n" - "-#\n" - "-# headers_install prepare the listed header files for use in\n" - "-# user space and copy the files to their destination.\n" - "-#\n" - "-# Usage: headers_install.pl readdir installdir arch [files...]\n" - "-# readdir: dir to open files\n" - "-# installdir: dir to install the files\n" - "-# arch: current architecture\n" - "-# arch is used to force a reinstallation when the arch\n" - "-# changes because kbuild then detect a command line change.\n" - "-# files: list of files to check\n" - "-#\n" - "-# Step in preparation for users space:\n" - "-# 1) Drop all use of compiler.h definitions\n" - "-# 2) Drop include of compiler.h\n" - "-# 3) Drop all sections defined out by __KERNEL__ (using unifdef)\n" - "-\n" - "-use strict;\n" - "-\n" - "-my ($readdir, $installdir, $arch, @files) = @ARGV;\n" - "-\n" - "-my $unifdef = \"scripts/unifdef -U__KERNEL__\";\n" - "-\n" - "-foreach my $file (@files) {\n" - "-\tlocal *INFILE;\n" - "-\tlocal *OUTFILE;\n" - "-\tmy $tmpfile = \"$installdir/$file.tmp\";\n" - "-\topen(INFILE, \"<$readdir/$file\")\n" - "-\t\tor die \"$readdir/$file: $!\\n\";\n" - "-\topen(OUTFILE, \">$tmpfile\") or die \"$tmpfile: $!\\n\";\n" - "-\twhile (my $line = <INFILE>) {\n" - "-\t\t$line =~ s/([\\s(])__user\\s/$1/g;\n" - "-\t\t$line =~ s/([\\s(])__force\\s/$1/g;\n" - "-\t\t$line =~ s/([\\s(])__iomem\\s/$1/g;\n" - "-\t\t$line =~ s/\\s__attribute_const__\\s/ /g;\n" - "-\t\t$line =~ s/\\s__attribute_const__$//g;\n" - "-\t\t$line =~ s/^#include <linux\\/compiler.h>//;\n" - "-\t\tprintf OUTFILE \"%s\", $line;\n" - "-\t}\n" - "-\tclose OUTFILE;\n" - "-\tclose INFILE;\n" - "-\tsystem $unifdef . \" $tmpfile > $installdir/$file\";\n" - "-\tunlink $tmpfile;\n" - "-}\n" - "-exit 0;\n" - "\0" + "Signed-off-by: Rob Landley <rob@landley.net>---\n" + " scripts/Makefile.headersinst | 6 ++-- scripts/headers_install.pl | 46 --------------------------------- scripts/headers_install.sh | 36 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 49 deletions(-)\n" + "diff -ruN linux-2.6.28/scripts/headers_install.sh linux-2.6.28-new/scripts/headers_install.sh--- linux-2.6.28/scripts/headers_install.sh\t1969-12-31 18:00:00.000000000 -0600+++ linux-2.6.28-new/scripts/headers_install.sh\t2009-01-02 22:35:17.000000000 -0600@@ -0,0 +1,36 @@+#!/bin/sh++if [ $# -lt 2 ]+then+\techo \"Usage: headers_install.sh INDIR OUTDIR [FILES...]+\techo+\techo \"Prepares kernel header files for use by user space, by removing\"+\techo \"all compiler.h definitions and #includes, and removing any\"+\techo \"#ifdef __KERNEL__ sections.\"+\techo+\techo \"INDIR: directory to read each kernel header FILE from.\"+\techo \"OUTDIR: directory to write each userspace header FILE to.\"+\techo \"FILES: list of header files to operate on.\"++\texit 1+fi++# Grab arguments++INDIR=\"$1\"+shift+OUTDIR=\"$1\"+shift++# Iterate through files listed on command line++for i in \"$@\"+do+\tsed -r \\+\t\t-e 's/([ \\t(])(__user|__force|__iomem)[ \\t]/\\1/g' \\+\t\t-e 's/__attribute_const__([ \\t]|$)/\\1/g' \\+\t\t-e 's@^#include <linux/compiler.h>@@' \"$INDIR/$i\" |+\tscripts/unifdef -U__KERNEL__ - > \"$OUTDIR/$i\"+done++exit 0diff -ruN linux-2.6.28/scripts/Makefile.headersinst linux-2.6.28-new/scripts/Makefile.headersinst--- linux-2.6.28/scripts/Makefile.headersinst\t2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/scripts/Makefile.headersinst\t2009-01-02 22:36:42.000000000 -0600@@ -44,8 +44,8 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\\ file$(if $(word 2, $(all-files)),s)) cmd_install = \\- $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \\- $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \\+ $(CONFIG_SHELL) $< $(srctree)/$(obj) $(install) $(header-y); \\+ $(CONFIG_SHELL) $< $(objtree)/$(obj) $(install) $(objhdr-y); \\ touch $@ quiet_cmd_remove = REMOVE $(unwanted)@@ -64,7 +64,7 @@ \t@: targets += $(install-file)-$(install-file): scripts/headers_install.pl $(input-files) FORCE+$(install-file): scripts/headers_install.sh $(input-files) FORCE \t$(if $(unwanted),$(call cmd,remove),) \t$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) \t$(call if_changed,install)diff -ruN linux-2.6.28/scripts/headers_install.pl linux-2.6.28-new/scripts/headers_install.pl--- linux-2.6.28/scripts/headers_install.pl\t2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/scripts/headers_install.pl\t1969-12-31 18:00:00.000000000 -0600@@ -1,46 +0,0 @@-#!/usr/bin/perl -w-#-# headers_install prepare the listed header files for use in-# user space and copy the files to their destination.-#-# Usage: headers_install.pl readdir installdir arch [files...]-# readdir: dir to open files-# installdir: dir to install the files-# arch: current architecture-# arch is used to force a reinstallation when the arch-# changes because kbuild then detect a command line change.-# files: list of files to check-#-# Step in preparation for users space:-# 1) Drop all use of compiler.h definitions-# 2) Drop include of compiler.h-# 3) Drop all sections defined out by __KERNEL__ (using unifdef)--use strict;--my ($readdir, $installdir, $arch, @files) = @ARGV;--my $unifdef = \"scripts/unifdef -U__KERNEL__\";--foreach my $file (@files) {-\tlocal *INFILE;-\tlocal *OUTFILE;-\tmy $tmpfile = \"$installdir/$file.tmp\";-\topen(INFILE, \"<$readdir/$file\")-\t\tor die \"$readdir/$file: $!\\n\";-\topen(OUTFILE, \">$tmpfile\") or die \"$tmpfile: $!\\n\";-\twhile (my $line = <INFILE>) {-\t\t$line =~ s/([\\s(])__user\\s/$1/g;-\t\t$line =~ s/([\\s(])__force\\s/$1/g;-\t\t$line =~ s/([\\s(])__iomem\\s/$1/g;-\t\t$line =~ s/\\s__attribute_const__\\s/ /g;-\t\t$line =~ s/\\s__attribute_const__$//g;-\t\t$line =~ s/^#include <linux\\/compiler.h>//;-\t\tprintf OUTFILE \"%s\", $line;-\t}-\tclose OUTFILE;-\tclose INFILE;-\tsystem $unifdef . \" $tmpfile > $installdir/$file\";-\tunlink $tmpfile;-}-exit 0;\0\303\277\303\264\303\250\302\272{.n\303\207+\302\211\302\267\302\237\302\256\302\211\302\255\302\206+%\302\212\303\213\303\277\302\261\303\251\303\235\302\266\027\302\245\302\212w\303\277\302\272{.n\303\207+\302\211\302\267\302\245\302\212{\302\261\303\276G\302\253\302\235\303\251\303\277\302\212{ay\302\272\035\303\212\302\207\303\232\302\231\303\253,j\a\302\255\302\242f\302\243\302\242\302\267h\302\232\302\217\303\257\302\201\303\252\303\277\302\221\303\252\303\247z_\303\250\302\256\003(\302\255\303\251\302\232\302\216\302\212\303\235\302\242j\"\302\235\303\272\032\302\266\033m\302\247\303\277\303\277\302\276\a\302\253\303\276G\302\253\302\235\303\251\303\277\302\242\302\270?\302\231\302\250\303\250\302\255\303\232&\302\243\303\270\302\247~\302\217\303\241\302\266iO\302\225\303\246\302\254z\302\267\302\232v\303\230^\024\004\032\302\266\033m\302\247\303\277\303\277\303\203\f\303\277\302\266\303\254\303\277\302\242\302\270?\302\226I\302\245" -ab6d0a77fdc33bb7d7bcdf5610b3a1a53f171d7a590ed10ad855044d4ecbd52b +698a53f6eaf0a3f68129d514d186e590bbde531e6a27d0942b7027e1d8cb3a24
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.