diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-11-16 08:40:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-16 08:40:40 +0000 |
| commit | da5ed062277da74d394202a97ffa9344fe88ea2a (patch) | |
| tree | e71e707c1584e94f74925400dd59fcc87b5428ee /build/install | |
| parent | d4b0f79649da3ad7a3f3f59d3b92ea230f5b1826 (diff) | |
| parent | 9f8aff6636e0d86834178b461802f3e7cb95189d (diff) | |
Merge "Uplift to Fuel 10.0/Newton"
Diffstat (limited to 'build/install')
| -rw-r--r-- | build/install/apt-ftparchive-deb.conf | 2 | ||||
| -rw-r--r-- | build/install/apt-ftparchive-release.conf | 10 | ||||
| -rwxr-xr-x | build/install/install.sh | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf index edcb1f2a4..0f03305b6 100644 --- a/build/install/apt-ftparchive-deb.conf +++ b/build/install/apt-ftparchive-deb.conf @@ -17,7 +17,7 @@ TreeDefault { }; BinDirectory "pool/main" { - Packages "dists/mos9.0/main/binary-amd64/Packages"; + Packages "dists/mos10.0/main/binary-amd64/Packages"; }; Default { diff --git a/build/install/apt-ftparchive-release.conf b/build/install/apt-ftparchive-release.conf index e40ff68b4..4425f2e34 100644 --- a/build/install/apt-ftparchive-release.conf +++ b/build/install/apt-ftparchive-release.conf @@ -9,10 +9,10 @@ ############################################################################## 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::Label "mos10.0"; +APT::FTPArchive::Release::Suite "mos10.0"; +APT::FTPArchive::Release::Version "16.04"; +APT::FTPArchive::Release::Codename "mos10.0"; APT::FTPArchive::Release::Architectures "amd64"; APT::FTPArchive::Release::Components "main"; -APT::FTPArchive::Release::Description "Ubuntu Trusty Tahr 14.04 LTS"; +APT::FTPArchive::Release::Description "Ubuntu 16.04.1 LTS"; diff --git a/build/install/install.sh b/build/install/install.sh index d1a49f35f..198f26cb5 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -390,6 +390,7 @@ copy_packages() { if [ -f $TOP/patch-packages/release/patch-replacements ]; then echo "Applying package patches" | tee -a $REPORTFILE pushd $REPO/pool/main > /dev/null + echo "CM: I am now in $(pwd)" printf "\n\n" | tee -a $REPORTFILE for line in `cat $TOP/patch-packages/release/patch-replacements` do @@ -447,8 +448,10 @@ copy_packages() { # /^Version:/{print pkg ": \"" $2 "\""}' > ubuntu-versions.yaml # cp ubuntu-versions.yaml $DEST - 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 + echo apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release + apt-ftparchive -c "${APT_REL_CONF}" release dists/mos10.0/ > dists/mos10.0/Release + echo gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz + gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz popd > /dev/null |