o Add gsi-openssh package from cvs to the mdist-built bundle.

diff --git a/bundle/mdist.conf b/bundle/mdist.conf
index 10b5fd1d0483b55c9396c90c935987fea404e25c..920e2354e8f327cb7ea81eb420075231c4a4f972 100644 (file)
--- a/bundle/mdist.conf
+++ b/bundle/mdist.conf
@@ -1,13 +1,11 @@
 <Package name="gsi_openssh_bundle">
     <Depends>
-<!--
         <Package name="gsi_openssh">
             Module openssh
             Root :pserver:anonymous@cvs.ncsa.uiuc.edu:/CVS/openssh
             Tag OPENSSH_GSI_GPT_2_6
             Directory ./
         </Package>
--->
     </Depends>
 
     <Dist>
@@ -18,6 +16,14 @@
         <File name="gsi_openssh_bundle-2.6-src.tar.gz" />
 
         <Steps>
+            <Step>
+                <Description>
+                    Collating packages...
+                </Description>
+                <Command>
+                    ./scripts/collate-packages
+                </Command>
+            </Step>
             <Step>
                 <Description>
                     Creating bundle...

diff --git a/bundle/scripts/collate-packages b/bundle/scripts/collate-packages
new file mode 100755 (executable)
index 0000000..dc3fb9b
--- /dev/null
+++ b/bundle/scripts/collate-packages
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+
+source ./scripts/version.sh
+
+if [ ! -e sources/ ]; then
+    mkdir -p sources/
+fi
+
+cp ../packages-harvest/gsi_openssh-$VERSION-src.tar.gz