o Update to bundle module to make bundles using gpt 2.2.

  o Remove the gpt3 bundle definition file.

diff --git a/bundle/mdist.conf b/bundle/mdist.conf
index bbfec6906072298c9110c6e8a240a2c29c770112..801bd972a1f49b16ee0211480054c4c797f06f06 100644 (file)
--- a/bundle/mdist.conf
+++ b/bundle/mdist.conf
@@ -16,7 +16,7 @@
 
     <Dist>
         <Tools>
-            <Tool>gpt-3.0</Tool>
+            <Tool>gpt-2.2.10</Tool>
         </Tools>
 
         <File name="gsi_openssh_bundle-2.6-src.tar.gz" />

diff --git a/bundle/scripts/gsi_openssh_bundle-src.xml b/bundle/scripts/gsi_openssh_bundle-src.xml
deleted file mode 100644 (file)
index 9f8bc17..0000000
--- a/bundle/scripts/gsi_openssh_bundle-src.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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/scripts/make-src-bundle b/bundle/scripts/make-src-bundle
index d30cde3f30e5c7d4aead667c78c1e9e757113c48..d4e0402e5026c2792400b8d4762f4c3775655f58 100755 (executable)
--- a/bundle/scripts/make-src-bundle
+++ b/bundle/scripts/make-src-bundle
@@ -1,20 +1,11 @@
 #!/bin/sh
 #
-# Usage:
-#
-#   1) Run the src-bundle creation script:
-#
-#        ./make-src-bundle
-#
 
 source ./scripts/version.sh
 
 NAME="gsi_openssh_bundle-$VERSION-src.tar.gz"
-XML="gsi_openssh_bundle-src.xml"
-
-cp scripts/$XML work/
 
 cd work/
-$GPT_LOCATION/sbin/gpt-bundle -nodeps -nosetups -srcdir=sources/ -output=$NAME -bv=$VERSION -xml=$XML
-mv $NAME ../
+$GPT_LOCATION/sbin/gpt-bundle -nodeps -srcdir=sources/ -output=$NAME gsi_openssh gsi_openssh_setup
+mv sources/gsi_openssh_bundle-$VERSION-src_src.tar.gz ../$NAME
 cd ../