Adjust EXTRAVERSION after checking things up. Append -libre to EXTRAVERSION, rather...

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@3929 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.23 b/deblob-2.6.23
index d547fcd4ad593260b59b101a0f541f0ca17c2493..0c7a978510d6b67e91c4d5fb45620a11254879d6 100755 (executable)
--- a/deblob-2.6.23
+++ b/deblob-2.6.23
@@ -46,8 +46,6 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.23 extra=3
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
 if unifdef /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
@@ -170,6 +168,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #

diff --git a/deblob-2.6.24 b/deblob-2.6.24
index 43f4e7e807f34810a49644c5c661e314308db064..e266430674d2d99250aac6b33d15044b97ecc80e 100755 (executable)
--- a/deblob-2.6.24
+++ b/deblob-2.6.24
@@ -46,8 +46,6 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.24 extra=3
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
 if unifdef /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
@@ -170,6 +168,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index ecaf58f5ef0f7e31a539da0cbed3a8e16e06e29a..ba50621f39e2c5be5ad88b41a0e1c5dd13fe02bd 100755 (executable)
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -46,8 +46,6 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.25 extra=3
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
 if unifdef /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
@@ -170,6 +168,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #

diff --git a/deblob-2.6.26 b/deblob-2.6.26
index 1322df09bf4a9d3cc29c88e9da3bc85fe6f2b5b3..9cf4403154f7f0cd04148204d745425f07582d56 100755 (executable)
--- a/deblob-2.6.26
+++ b/deblob-2.6.26
@@ -46,8 +46,6 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.26 extra=1
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
 if unifdef /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
@@ -170,6 +168,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index 3650d12160cd6912e4a249b8bcff3230b08658e2..180f89b84e719ed359081f5916d40c7673f61ced 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -46,8 +46,6 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.27 extra=
 
-sed -i "s,^EXTRAVERSION.*,EXTRAVERSION = -libre$extra," Makefile
-
 check=`echo $0 | sed 's,/[^/]*$,,'`/deblob-check
 if [ ! -f $check ] ; then
   echo optional deblob-check missing, will remove entire files >&2
@@ -159,6 +157,8 @@ for f in \
   fi
 done
 
+# Identify the tarball.
+sed -i "s,^EXTRAVERSION.*,&-libre$extra," Makefile
 
 #######################
 # Removed ATM Drivers #