diff for duplicates of <200901031929.32074.rob@landley.net> diff --git a/a/1.txt b/N1/1.txt index 3ebae68..7870f20 100644 Binary files a/a/1.txt and b/N1/1.txt differ diff --git a/a/content_digest b/N1/content_digest index da79f6b..02c521e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,107 +11,11 @@ "\00:1\0" "b\0" "From: Rob Landley <rob@landley.net>\n" - "\n" "Convert kernel/cpu/mkcapflags.pl to kernel/cpu/mkcapflags.sh.\n" - "\n" "This script generates kernel/cpu/capflags.c from include/asm/cpufeature.h.\n" - "\n" - "Changes from last time: changed shebang to #!/bin/sh and tested under bash\n" - "and dash.\n" - "\n" - "Signed-off-by: Rob Landley <rob@landley.net>\n" - "---\n" - "\n" - " arch/x86/kernel/cpu/Makefile | 4 +--\n" - " arch/x86/kernel/cpu/mkcapflags.pl | 32 ----------------------------\n" - " arch/x86/kernel/cpu/mkcapflags.sh | 28 ++++++++++++++++++++++++\n" - " 3 files changed, 30 insertions(+), 34 deletions(-)\n" - "\n" - "diff -ruN linux-2.6.28/arch/x86/kernel/cpu/Makefile linux-2.6.28-new/arch/x86/kernel/cpu/Makefile\n" - "--- linux-2.6.28/arch/x86/kernel/cpu/Makefile\t2008-12-24 17:26:37.000000000 -0600\n" - "+++ linux-2.6.28-new/arch/x86/kernel/cpu/Makefile\t2009-01-02 01:10:00.000000000 -0600\n" - "@@ -23,10 +23,10 @@\n" - " obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o\n" - " \n" - " quiet_cmd_mkcapflags = MKCAP $@\n" - "- cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@\n" - "+ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@\n" - " \n" - " cpufeature = $(src)/../../include/asm/cpufeature.h\n" - " \n" - " targets += capflags.c\n" - "-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE\n" - "+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE\n" - " \t$(call if_changed,mkcapflags)\n" - "diff -ruN linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.pl linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.pl\n" - "--- linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.pl\t2008-12-24 17:26:37.000000000 -0600\n" - "+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.pl\t1969-12-31 18:00:00.000000000 -0600\n" - "@@ -1,32 +0,0 @@\n" - "-#!/usr/bin/perl\n" - "-#\n" - "-# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h\n" - "-#\n" - "-\n" - "-($in, $out) = @ARGV;\n" - "-\n" - "-open(IN, \"< $in\\0\") or die \"$0: cannot open: $in: $!\\n\";\n" - "-open(OUT, \"> $out\\0\") or die \"$0: cannot create: $out: $!\\n\";\n" - "-\n" - "-print OUT \"#include <asm/cpufeature.h>\\n\\n\";\n" - "-print OUT \"const char * const x86_cap_flags[NCAPINTS*32] = {\\n\";\n" - "-\n" - "-while (defined($line = <IN>)) {\n" - "-\tif ($line =~ /^\\s*\\#\\s*define\\s+(X86_FEATURE_(\\S+))\\s+(.*)$/) {\n" - "-\t\t$macro = $1;\n" - "-\t\t$feature = $2;\n" - "-\t\t$tail = $3;\n" - "-\t\tif ($tail =~ /\\/\\*\\s*\\\"([^\"]*)\\\".*\\*\\//) {\n" - "-\t\t\t$feature = $1;\n" - "-\t\t}\n" - "-\n" - "-\t\tif ($feature ne '') {\n" - "-\t\t\tprintf OUT \"\\t%-32s = \\\"%s\\\",\\n\",\n" - "-\t\t\t\t\"[$macro]\", \"\\L$feature\";\n" - "-\t\t}\n" - "-\t}\n" - "-}\n" - "-print OUT \"};\\n\";\n" - "-\n" - "-close(IN);\n" - "-close(OUT);\n" - "diff -ruN linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.sh linux-2.6.28-\n" - "new/arch/x86/kernel/cpu/mkcapflags.sh\n" - "--- linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.sh\t1969-12-31 18:00:00.000000000 -0600\n" - "+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.sh\t2009-01-02 01:10:00.000000000 -0600\n" - "@@ -0,0 +1,28 @@\n" - "+#!/bin/sh\n" - "+#\n" - "+# Generate the x86_cap_flags[] array from include/asm/cpufeature.h\n" - "+#\n" - "+\n" - "+IN=$1\n" - "+OUT=$2\n" - "+\n" - "+(\n" - "+\techo \"#include <asm/cpufeature.h>\"\n" - "+\techo \"\"\n" - "+\techo \"const char * const x86_cap_flags[NCAPINTS*32] = {\"\n" - "+\n" - "+\t# Iterate through any input lines starting with #define X86_FEATURE_\n" - "+\tsed -n -e 's/\\t/ /g' -e 's/^ *# *define *X86_FEATURE_//p' $IN |\n" - "+\twhile read i\n" - "+\tdo\n" - "+\t\t# Name is everything up to the first whitespace\n" - "+\t\tNAME=\"$(echo \"$i\" | sed 's/ .*//')\"\n" - "+\n" - "+\t\t# If the /* comment */ starts with a quote string, grab that.\n" - "+\t\tVALUE=\"$(echo \"$i\" | sed -n 's@.*/\\* *\\(\"[^\"]*\"\\).*\\*/@\\1@p')\"\n" - "+\t\t[ -z \"$VALUE\" ] && VALUE=\"\\\"$(echo \"$NAME\" | tr A-Z a-z)\\\"\"\n" - "+\n" - "+\t\t[ \"$VALUE\" != '\"\"' ] && echo \"\t[X86_FEATURE_$NAME] = $VALUE,\"\n" - "+\tdone\n" - "+\techo \"};\"\n" - "+) > $OUT\n" - "\0" + "Changes from last time: changed shebang to #!/bin/sh and tested under bashand dash.\n" + "Signed-off-by: Rob Landley <rob@landley.net>---\n" + " arch/x86/kernel/cpu/Makefile | 4 +-- arch/x86/kernel/cpu/mkcapflags.pl | 32 ---------------------------- arch/x86/kernel/cpu/mkcapflags.sh | 28 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 34 deletions(-)\n" + "diff -ruN linux-2.6.28/arch/x86/kernel/cpu/Makefile linux-2.6.28-new/arch/x86/kernel/cpu/Makefile--- linux-2.6.28/arch/x86/kernel/cpu/Makefile\t2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/arch/x86/kernel/cpu/Makefile\t2009-01-02 01:10:00.000000000 -0600@@ -23,10 +23,10 @@ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o quiet_cmd_mkcapflags = MKCAP $@- cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@+ cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@ cpufeature = $(src)/../../include/asm/cpufeature.h targets += capflags.c-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE \t$(call if_changed,mkcapflags)diff -ruN linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.pl linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.pl--- linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.pl\t2008-12-24 17:26:37.000000000 -0600+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.pl\t1969-12-31 18:00:00.000000000 -0600@@ -1,32 +0,0 @@-#!/usr/bin/perl-#-# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h-#--($in, $out) = @ARGV;--open(IN, \"< $in\\0\") or die \"$0: cannot open: $in: $!\\n\";-open(OUT, \"> $out\\0\") or die \"$0: cannot create: $out: $!\\n\";--print OUT \"#include <asm/cpufeature.h>\\n\\n\";-print OUT \"const char * const x86_cap_flags[NCAPINTS*32] = {\\n\";--while (defined($line = <IN>)) {-\tif ($line =~ /^\\s*\\#\\s*define\\s+(X86_FEATURE_(\\S+))\\s+(.*)$/) {-\t\t$macro = $1;-\t\t$feature = $2;-\t\t$tail = $3;-\t\tif ($tail =~ /\\/\\*\\s*\\\"([^\"]*)\\\".*\\*\\//) {-\t\t\t$feature = $1;-\t\t}--\t\tif ($feature ne '') {-\t\t\tprintf OUT \"\\t%-32s = \\\"%s\\\",\\n\",-\t\t\t\t\"[$macro]\", \"\\L$feature\";-\t\t}-\t}-}-print OUT \"};\\n\";--close(IN);-close(OUT);diff -ruN linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.sh linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.sh--- linux-2.6.28/arch/x86/kernel/cpu/mkcapflags.sh\t1969-12-31 18:00:00.000000000 -0600+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.sh\t2009-01-02 01:10:00.000000000 -0600@@ -0,0 +1,28 @@+#!/bin/sh+#+# Generate the x86_cap_flags[] array from include/asm/cpufeature.h+#++IN=$1+OUT=$2++(+\techo \"#include <asm/cpufeature.h>\"+\techo \"\"+\techo \"const char * const x86_cap_flags[NCAPINTS*32] = {\"++\t# Iterate through any input lines starting with #define X86_FEATURE_+\tsed -n -e 's/\\t/ /g' -e 's/^ *# *define *X86_FEATURE_//p' $IN |+\twhile read i+\tdo+\t\t# Name is everything up to the first whitespace+\t\tNAME=\"$(echo \"$i\" | sed 's/ .*//')\"++\t\t# If the /* comment */ starts with a quote string, grab that.+\t\tVALUE=\"$(echo \"$i\" | sed -n 's@.*/\\* *\\(\"[^\"]*\"\\).*\\*/@\\1@p')\"+\t\t[ -z \"$VALUE\" ] && VALUE=\"\\\"$(echo \"$NAME\" | tr A-Z a-z)\\\"\"++\t\t[ \"$VALUE\" != '\"\"' ] && echo \"\t[X86_FEATURE_$NAME] = $VALUE,\"+\tdone+\techo \"};\"+) > $OUT\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" -a57aaccf837b8bd4ca3d6628adf3410b11f127df77c9bc79063ad24efe56927f +30235d67b345c81010e35385594ddbee5840e6ee9706be0ebc7d07835e73f336
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.