ceph-build: build fixes

Use the deb_dists file to generate the deb repo distribution list, and set
the debian component to main.  Also, add the Contents keyword to distributions
so that repos are searchable.

diff --git a/gen_reprepro_conf.sh b/gen_reprepro_conf.sh
index a88cacd7ee8c1ed1b872c6f9a751ea2b61362dbf..41cb17720a2db6b7aefdf03b9d5e35ac4d999567 100755 (executable)
--- a/gen_reprepro_conf.sh
+++ b/gen_reprepro_conf.sh
@@ -1,29 +1,17 @@
 #!/bin/sh
 
+set -e
+
 path="$1"
-comp="$2"
-shift
-shift
-
-if [ -e "$path/conf/dists" ]; then
-    dists=`cat $path/conf/dists`
-else
-    dists="$*"
-fi
 
-if [ -e "$path/conf/components" ]; then
-    components=`cat $path/conf/components`
-    if [ -n "$comp" ]; then
-       if grep -v "\b$comp\b" $path/conf/components ; then
-           echo "adding component $comp"
-           components="$components $comp"
-           echo $components > $path/conf/components
-       fi
-    fi
-else
-    components="$comp"
+if [ ! -d $path ] ; then
+    mkdir -p $path/conf
 fi
 
+echo "$bindir" | grep -v -q '^/' && bindir=`pwd`"/$bindir"
+dists=`cat $bindir/deb_dists`
+components="main"
+
 echo "dists $dists"
 echo "components $components"
 
@@ -40,6 +28,7 @@ Origin: Inktank
 Description: Ceph distributed file system
 DebIndices: Packages Release . .gz .bz2
 DscIndices: Sources Release .gz .bz2
+Contents: .gz .bz2
 SignWith: 17ED316D
 
 EOF