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 9ef208eb4298153305bbc1f4829e24689ead30b0..ba6c59c2b7c72f1bfadb6988719f67a3f23ea441 100755 (executable)
--- 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 a27710cd9aa2f4ddfb8e252c0ba53d67ecc2d047..ff1379cdfa48f5f2a3ca6c9b72958d64eaeb2f1e 100755 (executable)
--- 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 4adce4f7f7e8abe1bf369cf92a868f6c5166e3d7..9676de53c4a08a6dcbecfb194774bfb2840d0b44 100755 (executable)
--- 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 5ad33cac5f8d250ede0989fec078088dc9bd2698..4db5cfb64155bd0dddda59956af919e192ee058b 100755 (executable)
--- 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 2d056f7e710d3d7e486ba4cbc3ccea4183506c7b..90502279d962d18b47745d3b664df3a93b02ce81 100755 (executable)
--- 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 2ff4656310c72937af33505ad2bd0ef7dedd9326..19730b341ebe0bd0dd3a9b861968700771c9de40 100755 (executable)
--- 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
 }