]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Revert "build_debs: horrible hack to remove libbabeltrace from wheezy build deps"
authorSage Weil <sage@redhat.com>
Fri, 22 Aug 2014 20:37:52 +0000 (13:37 -0700)
committerSage Weil <sage@redhat.com>
Fri, 22 Aug 2014 20:37:52 +0000 (13:37 -0700)
This reverts commit 40a6547fbd2260b4d2e3277242fe97348a826cb9.

This doesn't work.

build_debs.sh

index db88ef65f59ec7ddf2eba619c48b07e24ae3ff20..c3b5e4dc2daf6f43fe5fb0f35a2864c369c1da03 100755 (executable)
@@ -37,16 +37,6 @@ do
 
 #[ "$dist" = "sid" ] && dist="wheezy"
 
-    # big fat hack: do not require libbabeltrace for wheezy
-    if [ "$dist" = "wheezy" ]; then
-       echo "doing horribly ugly things to patch the wheezy debian/control file to remove libbabeltrace"
-       mv $releasedir/$cephver/ceph_$cephver.orig.tar.gz $releasedir/$cephver/backup.tgz
-       tar zxvf $releasedir/$cephver/backup.tgz
-       grep -v babeltrace ceph-$cephver/debian/control > ceph-$cephver/debian/control.new
-       mv ceph-$cephver/debian/control.new ceph-$cephver/debian/control
-       tar zcvf $releasedir/$cephver/ceph_$cephver.orig.tar.gz ceph-$cephver
-    fi
     $bindir/update_pbuilder.sh $pbuilddir $dist
 
     echo building debs for $dist
@@ -69,11 +59,6 @@ do
             $releasedir/$cephver/ceph_$bpvers.dsc
     fi
  
-    if [ "$dist" = "wheezy" ]; then
-       echo "restoring original tarball (end wheezy hack)"
-       mv $releasedir/$cephver/backup.tgz $releasedir/$cephver/ceph_$cephver.orig.tar.gz
-    fi
-
 done
 
 # do lintian checks