From: lxoliva <lxoliva@559672b5-ba27-0410-b829-e8f1faed8b1b>
Date: Sun, 7 Sep 2008 05:17:38 +0000 (+0000)
Subject: Adjust for compatibility with Debian's unifdef.
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=c0666f589eded2565c1324e02d6ab489755eff3c;p=releases.git

Adjust for compatibility with Debian's unifdef.
Reported by Robert Millan and Matías Fonzo.

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

diff --git a/deblob-2.6.21 b/deblob-2.6.21
index 9ef208eb429..ba6c59c2b7c 100755
--- a/deblob-2.6.21
+++ b/deblob-2.6.21
@@ -44,9 +44,9 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.21 extra=
+kver=2.6.21 extra=0++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
diff --git a/deblob-2.6.22 b/deblob-2.6.22
index a27710cd9aa..ff1379cdfa4 100755
--- a/deblob-2.6.22
+++ b/deblob-2.6.22
@@ -44,9 +44,9 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=2.6.22 extra=
+kver=2.6.22 extra=0++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
diff --git a/deblob-2.6.23 b/deblob-2.6.23
index 4adce4f7f7e..9676de53c4a 100755
--- a/deblob-2.6.23
+++ b/deblob-2.6.23
@@ -46,7 +46,7 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.23 extra=3++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
diff --git a/deblob-2.6.24 b/deblob-2.6.24
index 5ad33cac5f8..4db5cfb6415 100755
--- a/deblob-2.6.24
+++ b/deblob-2.6.24
@@ -46,7 +46,7 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.24 extra=3++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
diff --git a/deblob-2.6.25 b/deblob-2.6.25
index 2d056f7e710..90502279d96 100755
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -46,7 +46,7 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.25 extra=3++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }
 
diff --git a/deblob-2.6.26 b/deblob-2.6.26
index 2ff4656310c..19730b341eb 100755
--- a/deblob-2.6.26
+++ b/deblob-2.6.26
@@ -46,7 +46,7 @@
 # from 1 if changes are needed that require rebuilding the tarball.
 kver=2.6.26 extra=1++
 
-if unifdef /dev/null; then :; else
+if unifdef -Utest /dev/null; then :; else
     echo unifdef is required >&2
     exit 1
 fi
@@ -122,7 +122,7 @@ function clean_mk {
 function clean_ifdef {
 	#$1 = filename $2 = macro to -U
 	echo unifdefing $1 with -U$2
-	unifdef $1 -U$2 > $1.deblob
+	unifdef -U$2 $1 > $1.deblob
 	check_changed $1
 }