changeset 759:79baef2e88cc

Update perl removal patches to the versions submitted to linux-kernel. (Mostly description tweak.)
author Rob Landley <rob@landley.net>
date Tue, 23 Jun 2009 19:39:51 -0500
parents 75835debe6b5
children 2537f30c2397
files sources/patches/linux-2.6.25-rc1-noperl.patch sources/patches/linux-2.6.28-perl2.patch sources/patches/linux-2.6.28-perl3.patch
diffstat 3 files changed, 54 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/sources/patches/linux-2.6.25-rc1-noperl.patch	Tue Jun 23 19:38:24 2009 -0500
+++ b/sources/patches/linux-2.6.25-rc1-noperl.patch	Tue Jun 23 19:39:51 2009 -0500
@@ -1,33 +1,19 @@
-From: Rob Landley <rob@landley.net>
-
-Replace kernel/timeconst.pl with kernel/timeconst.sh.  The new shell script
-is much simpler, about 1/4 the size, and runs on Red Hat 9 from 2003.
-
-It requires a shell which can do 64 bit math, such as bash, busybox ash,
-or dash running on a 64 bit host.
-
-Changes from previous version:
-
-Redo ADJ32 math to avoid integer overflow for small HZ sizes (such as 24 or
-122).  In the pathological case (HZ=1) both versions now produce
-USEC_TO_HZ_ADJ32 of 0x7ffff79c842fa.  (See source comments for details.)
-
-Also expand usage message, add error message when no 64 bit math available in
-shell (and suggest some shells that support it), add whitespace around
-operators in equations, added underscores before __KERNEL_TIMECONST_H, change
-makefile so script is responsible for creating output file, make script delete 
-output file on error, change shebang to #!/bin/sh and test with dash and bash.
-
-Signed-off-by: Rob Landley <rob@landley.net>
----
-
- kernel/Makefile     |    4 
- kernel/timeconst.pl |  378 ------------------------------------------
- kernel/timeconst.sh |  149 ++++++++++++++++
- 3 files changed, 151 insertions(+), 380 deletions(-)
-
---- linux-2.6.28/kernel/timeconst.pl	2008-12-24 17:26:37.000000000 -0600
-+++ /dev/null	2008-11-21 04:46:41.000000000 -0600
+diff -ruN linux-2.6.30/kernel/Makefile linux-2.6.30.new/kernel/Makefile
+--- linux-2.6.30/kernel/Makefile	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30.new/kernel/Makefile	2009-06-22 14:29:16.000000000 -0500
+@@ -122,7 +122,7 @@
+ $(obj)/time.o: $(obj)/timeconst.h
+ 
+ quiet_cmd_timeconst  = TIMEC   $@
+-      cmd_timeconst  = $(PERL) $< $(CONFIG_HZ) > $@
++      cmd_timeconst  = $(CONFIG_SHELL) $< $(CONFIG_HZ) $@
+ targets += timeconst.h
+-$(obj)/timeconst.h: $(src)/timeconst.pl FORCE
++$(obj)/timeconst.h: $(src)/timeconst.sh FORCE
+ 	$(call if_changed,timeconst)
+diff -ruN linux-2.6.30/kernel/timeconst.pl linux-2.6.30.new/kernel/timeconst.pl
+--- linux-2.6.30/kernel/timeconst.pl	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30.new/kernel/timeconst.pl	1969-12-31 18:00:00.000000000 -0600
 @@ -1,378 +0,0 @@
 -#!/usr/bin/perl
 -# -----------------------------------------------------------------------
@@ -407,9 +393,10 @@
 -	output($hz, @val);
 -}
 -exit 0;
---- /dev/null	2008-11-21 04:46:41.000000000 -0600
-+++ linux-2.6.28-new/kernel/timeconst.sh	2009-01-03 15:24:01.000000000 -0600
-@@ -0,0 +1,147 @@
+diff -ruN linux-2.6.30/kernel/timeconst.sh linux-2.6.30.new/kernel/timeconst.sh
+--- linux-2.6.30/kernel/timeconst.sh	1969-12-31 18:00:00.000000000 -0600
++++ linux-2.6.30.new/kernel/timeconst.sh	2009-06-22 14:29:16.000000000 -0500
+@@ -0,0 +1,148 @@
 +#!/bin/sh
 +
 +if [ $# -ne 2 ]
@@ -460,11 +447,12 @@
 +
 +# For both Milliseconds and Microseconds
 +
-+for i in "MSEC 1000" "USEC 1000000"
++cat << EOF |
++MSEC 1000
++USEC 1000000
++EOF
++while read NAME PERIOD
 +do
-+	NAME=$(echo $i | cut -d ' ' -f 1)
-+	PERIOD=$(echo $i | cut -d ' ' -f 2)
-+
 +	# Find greatest common denominator (using Euclid's algorithm)
 +
 +	A=$HZ
@@ -557,15 +545,3 @@
 +trap "" EXIT
 +
 +exit 0
---- linux-2.6.28/kernel/Makefile	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28-new/kernel/Makefile	2009-01-03 00:40:21.000000000 -0600
-@@ -116,7 +116,7 @@
- $(obj)/time.o: $(obj)/timeconst.h
- 
- quiet_cmd_timeconst  = TIMEC   $@
--      cmd_timeconst  = $(PERL) $< $(CONFIG_HZ) > $@
-+      cmd_timeconst  = $(CONFIG_SHELL) $< $(CONFIG_HZ) $@
- targets += timeconst.h
--$(obj)/timeconst.h: $(src)/timeconst.pl FORCE
-+$(obj)/timeconst.h: $(src)/timeconst.sh FORCE
- 	$(call if_changed,timeconst)
--- a/sources/patches/linux-2.6.28-perl2.patch	Tue Jun 23 19:38:24 2009 -0500
+++ b/sources/patches/linux-2.6.28-perl2.patch	Tue Jun 23 19:39:51 2009 -0500
@@ -5,19 +5,21 @@
 implementation.  The new shell script is a single for loop calling sed and
 piping its output through unifdef to produce the target file.
 
-Updated for 2.6.29 and Mike Frysinger's Jan 2 commit adding asm/inline/volatile.
-
 Signed-off-by: Rob Landley <rob@landley.net>
 ---
 
+Changes from previous version (http://lkml.org/lkml/2009/1/2/22):
+
+Updated for Mike Frysinger's Jan 2 commit adding asm/inline/volatile.
+
  scripts/Makefile.headersinst |    6 ++--
  scripts/headers_install.pl   |   49 ---------------------------------
  scripts/headers_install.sh   |   39 ++++++++++++++++++++++++++
  3 files changed, 42 insertions(+), 52 deletions(-)
 
-diff -ruN linux-old/scripts/headers_install.pl linux-2.6.29-rc7/scripts/headers_install.pl
---- linux-old/scripts/headers_install.pl	2009-03-03 19:05:22.000000000 -0600
-+++ linux-2.6.29-rc7/scripts/headers_install.pl	1969-12-31 18:00:00.000000000 -0600
+diff -ruN linux-2.6.30.old/scripts/headers_install.pl linux-2.6.30/scripts/headers_install.pl
+--- linux-2.6.30.old/scripts/headers_install.pl	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30/scripts/headers_install.pl	1969-12-31 18:00:00.000000000 -0600
 @@ -1,49 +0,0 @@
 -#!/usr/bin/perl -w
 -#
@@ -68,9 +70,9 @@
 -	unlink $tmpfile;
 -}
 -exit 0;
-diff -ruN linux-old/scripts/headers_install.sh linux-2.6.29-rc7/scripts/headers_install.sh
---- linux-old/scripts/headers_install.sh	1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.29-rc7/scripts/headers_install.sh	2009-03-11 12:52:59.000000000 -0500
+diff -ruN linux-2.6.30.old/scripts/headers_install.sh linux-2.6.30/scripts/headers_install.sh
+--- linux-2.6.30.old/scripts/headers_install.sh	1969-12-31 18:00:00.000000000 -0600
++++ linux-2.6.30/scripts/headers_install.sh	2009-06-22 16:21:23.000000000 -0500
 @@ -0,0 +1,39 @@
 +#!/bin/sh
 +
@@ -111,10 +113,10 @@
 +done
 +
 +exit 0
-diff -ruN linux-old/scripts/Makefile.headersinst linux-2.6.29-rc7/scripts/Makefile.headersinst
---- linux-old/scripts/Makefile.headersinst	2009-03-03 19:05:22.000000000 -0600
-+++ linux-2.6.29-rc7/scripts/Makefile.headersinst	2009-03-11 13:24:04.000000000 -0500
-@@ -44,8 +44,8 @@
+diff -ruN linux-2.6.30.old/scripts/Makefile.headersinst linux-2.6.30/scripts/Makefile.headersinst
+--- linux-2.6.30.old/scripts/Makefile.headersinst	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30/scripts/Makefile.headersinst	2009-06-22 16:21:23.000000000 -0500
+@@ -46,8 +46,8 @@
  quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
                              file$(if $(word 2, $(all-files)),s))
        cmd_install = \
@@ -125,7 +127,7 @@
          touch $@
  
  quiet_cmd_remove = REMOVE  $(unwanted)
-@@ -64,7 +64,7 @@
+@@ -66,7 +66,7 @@
  	@:
  
  targets += $(install-file)
--- a/sources/patches/linux-2.6.28-perl3.patch	Tue Jun 23 19:38:24 2009 -0500
+++ b/sources/patches/linux-2.6.28-perl3.patch	Tue Jun 23 19:39:51 2009 -0500
@@ -4,21 +4,22 @@
 
 This script generates kernel/cpu/capflags.c from include/asm/cpufeature.h.
 
-Changes from last time: changed shebang to #!/bin/sh and tested under bash
-and dash.
-
 Signed-off-by: Rob Landley <rob@landley.net>
 ---
 
+Changes from previous version (http://lkml.org/lkml/2009/1/2/24):
+
+None, just a rediff.
+
  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(-)
 
-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	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28-new/arch/x86/kernel/cpu/Makefile	2009-01-02 01:10:00.000000000 -0600
-@@ -23,10 +23,10 @@
+diff -ruN linux-2.6.30.old/arch/x86/kernel/cpu/Makefile linux-2.6.30/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.30.old/arch/x86/kernel/cpu/Makefile	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30/arch/x86/kernel/cpu/Makefile	2009-06-22 16:39:06.000000000 -0500
+@@ -30,10 +30,10 @@
  obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
  
  quiet_cmd_mkcapflags = MKCAP   $@
@@ -31,9 +32,9 @@
 -$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE
 +$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
  	$(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	2008-12-24 17:26:37.000000000 -0600
-+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.pl	1969-12-31 18:00:00.000000000 -0600
+diff -ruN linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.pl linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.pl
+--- linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.pl	2009-06-09 22:05:27.000000000 -0500
++++ linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.pl	1969-12-31 18:00:00.000000000 -0600
 @@ -1,32 +0,0 @@
 -#!/usr/bin/perl
 -#
@@ -67,9 +68,9 @@
 -
 -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	1969-12-31 18:00:00.000000000 -0600
-+++ linux-2.6.28-new/arch/x86/kernel/cpu/mkcapflags.sh	2009-01-02 01:10:00.000000000 -0600
+diff -ruN linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.sh linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.sh
+--- linux-2.6.30.old/arch/x86/kernel/cpu/mkcapflags.sh	1969-12-31 18:00:00.000000000 -0600
++++ linux-2.6.30/arch/x86/kernel/cpu/mkcapflags.sh	2009-06-22 16:39:06.000000000 -0500
 @@ -0,0 +1,28 @@
 +#!/bin/sh
 +#