summaryrefslogtreecommitdiffstats
path: root/build/install/install.sh
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-09-29 16:48:29 +0300
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-10-20 16:55:36 +0300
commite37746b93c622ddddeb44bc5791c8da4a98fff7f (patch)
treec8e112e34ca16079c510220ace0d4d2968d262f6 /build/install/install.sh
parentc24e8e0e96772941ad46045edd3b05b74d74bd8d (diff)
Update cirros image
To properly handle source routing passing by dhcpd inside instance get latest cirros image. JIRA: FUEL-202 Change-Id: Icd44ebbdd7b4aa0cb55c080e614616a7b0198c0f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'build/install/install.sh')
-rwxr-xr-xbuild/install/install.sh16
1 files changed, 8 insertions, 8 deletions
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