Browse Source

Moved patches from diff.gz to quilt.

David Martínez Moreno 12 years ago
parent
commit
078b3622bd
5 changed files with 32 additions and 3 deletions
  1. 1 1
      aoe-mkdevs
  2. 12 0
      debian/patches/01_no_bashisms
  3. 13 0
      debian/patches/02_dash_compliancy_fixes
  4. 1 0
      debian/patches/series
  5. 5 2
      debian/rules

+ 1 - 1
aoe-mkdevs

@@ -56,6 +56,6 @@ export n_partitions
 mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
 i=0
 while test $i -lt $n_shelves; do
-	$mkshelf $dir $i
+	sh $mkshelf $dir $i
 	i=`expr $i + 1`
 done

+ 12 - 0
debian/patches/01_no_bashisms

@@ -0,0 +1,12 @@
+Index: aoetools-30/aoe-mkdevs
+===================================================================
+--- aoetools-30.orig/aoe-mkdevs
++++ aoetools-30/aoe-mkdevs
+@@ -56,6 +56,6 @@ export n_partitions
+ mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
+ i=0
+ while test $i -lt $n_shelves; do
+-	sh $mkshelf $dir $i
++	$mkshelf $dir $i
+ 	i=`expr $i + 1`
+ done

+ 13 - 0
debian/patches/02_dash_compliancy_fixes

@@ -0,0 +1,13 @@
+Index: aoetools-30/aoe-flush.in
+===================================================================
+--- aoetools-30.orig/aoe-flush.in
++++ aoetools-30/aoe-flush.in
+@@ -19,7 +19,7 @@ fi
+ 
+ # make sure that each device in the whitespace-separated
+ # list exists
+-verify_devs () {
++function verify_devs () {
+ 	err=""
+ 	for d; do
+ 		aoe-stat |

+ 1 - 0
debian/patches/series

@@ -0,0 +1 @@
+01_no_bashisms

+ 5 - 2
debian/rules

@@ -3,7 +3,10 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-build: build-stamp
+# We support quilt.
+include /usr/share/quilt/quilt.make
+
+build: build-stamp $(QUILT_STAMPFN)
 build-stamp:
 	$(MAKE)
 	touch build-stamp
@@ -30,7 +33,7 @@ binary-indep:
 
 binary: binary-arch binary-indep
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	$(MAKE) clean