o MDist-ize the gsi-openssh bundle module.

diff --git a/bundle/mdist.conf b/bundle/mdist.conf
new file mode 100644 (file)
index 0000000..10b5fd1
--- /dev/null
+++ b/bundle/mdist.conf
@@ -0,0 +1,31 @@
+<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>
+        <Tools>
+            <Tool>gpt-3.0</Tool>
+        </Tools>
+
+        <File name="gsi_openssh_bundle-2.6-src.tar.gz" />
+
+        <Steps>
+            <Step>
+                <Description>
+                    Creating bundle...
+                </Description>
+                <Command>
+                    ./scripts/make-src-bundle
+                </Command>
+            </Step>
+        </Steps>
+    </Dist>
+</Package>

diff --git a/bundle/scripts/gsi_openssh_bundle-src.xml b/bundle/scripts/gsi_openssh_bundle-src.xml
new file mode 100644 (file)
index 0000000..9f8bc17
--- /dev/null
+++ b/bundle/scripts/gsi_openssh_bundle-src.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE GPTBundleData SYSTEM "gpt_bundle.dtd">
+<GPTBundleData Name="gsi_openssh" >
+<BundleInfo >
+<Description >EMPTY</Description>
+<ContactInfo ContactEmail="EMPTY" ContactName="EMPTY" />
+<BundleDocs BundleDocsDesc="EMPTY" BundleDocsURL="EMPTY" />
+</BundleInfo>
+<BundleReleaseInfo >
+<BundleStability Release="EMPTY" />
+<BundleVersion Age="EMPTY" Major="EMPTY" Minor="EMPTY" />
+<VersionLabel >EMPTY</VersionLabel>
+<TypeOfBundle ContentsType="src" />
+</BundleReleaseInfo>
+<PackageList >
+<IncludedPackages >
+<Package PackageFlavor="ANY" PackageName="gsi_openssh" PackageType="src" />
+<Package PackageFlavor="ANY" PackageName="gsi_openssh_setup" PackageType="src" />
+</IncludedPackages>
+<ExcludedPackages >
+</ExcludedPackages>
+<PackageFlags >
+</PackageFlags>
+</PackageList>
+</GPTBundleData>

diff --git a/bundle/make-src-bundle b/bundle/scripts/make-src-bundle
similarity index 90%
rename from bundle/make-src-bundle
rename to bundle/scripts/make-src-bundle
index c5a993659b35774cbc1760912f88808b5e3ffaf6..a5907bacb9ce8ae41c61d52cf9a6d5b25f31aee5 100755 (executable)
--- a/bundle/make-src-bundle
+++ b/bundle/scripts/make-src-bundle
@@ -7,7 +7,7 @@
 #        ./make-src-bundle
 #
 
-source version.sh
+source ./scripts/version.sh
 
 NAME="gsi_openssh_bundle-$VERSION-src.tar.gz"
 XML="gsi_openssh_bundle-src.xml"
@@ -20,7 +20,7 @@ if [ ! -e output/$NAME ]; then
     if [ ! -e work/ ]; then
         WORK_SCRIPTCREATED="1"
         mkdir -p work/
-        cp $XML work/
+        cp scripts/$XML work/
     fi
 
     if [ ! -e work/sources/ ]; then
@@ -29,7 +29,7 @@ if [ ! -e output/$NAME ]; then
 
     cd work/
     $GPT_LOCATION/sbin/gpt-bundle -nodeps -nosetups -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
-    mv $NAME ../output/
+    mv $NAME ../
     cd ../
 
     if [ "x$WORK_SCRIPTCREATED" != "x" ]; then

diff --git a/bundle/version.sh b/bundle/scripts/version.sh
similarity index 100%
rename from bundle/version.sh
rename to bundle/scripts/version.sh