diff options
Diffstat (limited to 'build/install')
| -rw-r--r-- | build/install/apt-ftparchive-deb.conf | 6 | ||||
| -rw-r--r-- | build/install/apt-ftparchive-release.conf | 10 | ||||
| -rwxr-xr-x | build/install/install.sh | 16 |
3 files changed, 15 insertions, 17 deletions
diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf index 0d15aec6f..edcb1f2a4 100644 --- a/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf @@ -17,15 +17,13 @@ TreeDefault { }; BinDirectory "pool/main" { - Packages "dists/trusty/main/binary-amd64/Packages"; - BinOverride "./indices/override.trusty.main"; - ExtraOverride "./indices/override.trusty.extra.main"; + Packages "dists/mos9.0/main/binary-amd64/Packages"; }; Default { Packages { Extensions ".deb"; - Compress ". gzip"; + Compress ". gzip bzip2"; }; }; diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf index 02706bd7d..e40ff68b4 100644 --- a/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf @@ -8,11 +8,11 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -APT::FTPArchive::Release::Origin "Ubuntu"; -APT::FTPArchive::Release::Label "Ubuntu"; -APT::FTPArchive::Release::Suite "trusty"; -APT::FTPArchive::Release::Version "1.04"; -APT::FTPArchive::Release::Codename "trusty"; +APT::FTPArchive::Release::Origin "Mirantis"; +APT::FTPArchive::Release::Label "mos9.0"; +APT::FTPArchive::Release::Suite "mos9.0"; +APT::FTPArchive::Release::Version "14.04"; +APT::FTPArchive::Release::Codename "mos9.0"; APT::FTPArchive::Release::Architectures "amd64"; APT::FTPArchive::Release::Components "main"; APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS"; diff --git a/build/install/install.sh b/build/install/install.sh index 866d30419..d1a49f35f 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -393,8 +393,7 @@ copy_packages() { printf "\n\n" | tee -a $REPORTFILE for line in `cat $TOP/patch-packages/release/patch-replacements` do - echo "Did not expect a line here, not supported" - exit 1 + echo "Processing $line ..." frompkg=`echo $line | cut -d ">" -f 1` topkg=`echo $line | cut -d ">" -f 2` echo "CM: Applying patch to $frompkg" | tee -a $REPORTFILE @@ -414,9 +413,11 @@ copy_packages() { exit 1 else echo "Adding $topkg to repo" - cp $TOP/patch-packages/release/packages/$topkg . + pkg_dest=$(dirname $frompkg) + cp $TOP/patch-packages/release/packages/$topkg $pkg_dest/ fi + pushd $pkg_dest > /dev/null patchname=`get_deb_name $topkg` patchrev=`get_deb_rev $topkg` echo "Correcting dependencies towards $patchname rev $patchrev - old rev $oldrev" | tee -a $REPORTFILE @@ -424,6 +425,7 @@ copy_packages() { if [ $PIPESTATUS -ne 0 ]; then exit 1 fi + popd > /dev/null done popd > /dev/null fi @@ -436,9 +438,7 @@ copy_packages() { APT_DEB_CONF="$TOP/install/apt-ftparchive-deb.conf" APT_UDEB_CONF="$TOP/install/apt-ftparchive-udeb.conf" - echo Not running echo apt-ftparchive -c "${APT_REL_CONF}" generate "${APT_DEB_CONF}" - echo Not running apt-ftparchive -c "${APT_REL_CONF}" generate "${APT_DEB_CONF}" - echo Not running apt-ftparchive generate "${APT_UDEB_CONF}" + apt-ftparchive -c "${APT_REL_CONF}" generate "${APT_DEB_CONF}" echo Not running apt-ftparchive generate "${APT_UDEB_CONF}" # Fuel also needs this index file @@ -447,8 +447,8 @@ copy_packages() { # /^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml # cp ubuntu-versions.yaml $DEST - # apt-ftparchive -c "${APT_REL_CONF}" release dists/trusty/ > dists/trusty/Release - # gzip -9cf dists/trusty/Release > dists/trusty/Release.gz + apt-ftparchive -c "${APT_REL_CONF}" release dists/mos9.0/ > dists/mos9.0/Release + gzip -9cf dists/mos9.0/Release > dists/mos9.0/Release.gz popd > /dev/null |