Merge "f_repos: Set git patch format explicitly"

[fuel.git] / build / install / install.sh

diff --git a/build/install/install.sh b/build/install/install.sh
index 4e0389e..19ff149 100755 (executable)
--- a/build/install/install.sh
+++ b/build/install/install.sh
@@ -122,17 +122,17 @@ prep_make_live() {
     ssh-copy-id root@$FUELHOST
     sshfs root@1${FUELHOST}:/ $TMP_HOSTMOUNT
 
-    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.backup ]; then
+    if [ -f  $REPO/dists/xenial/main/binary-amd64/Packages.backup ]; then
         echo "Error - found backup file for Packages!"
         exit 1
     fi
 
-    if [ -f  $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
+    if [ -f  $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup ]; then
         echo "Error - found backup file for Packages.gz!"
         exit 1
     fi
 
-    if [ -f  $REPO/dists/trusty/Release.backup ]; then
+    if [ -f  $REPO/dists/xenial/Release.backup ]; then
         echo "Error - found backup file for Release!"
         exit 1
     fi
@@ -142,9 +142,9 @@ prep_make_live() {
         exit 1
     fi
 
-    cp $REPO/dists/trusty/main/binary-amd64/Packages $REPO/dists/trusty/main/binary-amd64/Packages.backup
-    cp $REPO/dists/trusty/main/binary-amd64/Packages.gz $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup
-    cp $REPO/dists/trusty/Release $REPO/dists/trusty/Release.backup
+    cp $REPO/dists/xenial/main/binary-amd64/Packages $REPO/dists/xenial/main/binary-amd64/Packages.backup
+    cp $REPO/dists/xenial/main/binary-amd64/Packages.gz $REPO/dists/xenial/main/binary-amd64/Packages.gz.backup
+    cp $REPO/dists/xenial/Release $REPO/dists/xenial/Release.backup
     cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
 }
 
@@ -172,7 +172,7 @@ make_live() {
 prep_make_iso() {
     DEST=$TOP/newiso
     REPO=$DEST/ubuntu
-    echo "Making ISO..."
+    echo "Preparing ISO..."
     echo "Unpack of old ISO..."
     if [ -d newiso ]; then
         chmod -R 755 newiso
@@ -196,11 +196,16 @@ make_iso_image() {
     find . -name TRANS.TBL -exec rm {} \;
     rm -rf rr_moved
 
+    if [[ -z "$OPNFV_GIT_SHA" ]]; then
+        OPNFV_GIT_SHA=$(git rev-parse --verify HEAD)
+    fi
+
     mkisofs --quiet -r -V "$VOLUMEID" -publisher "$PUBLISHER" \
-        -p `git rev-parse --verify HEAD` -J -R -b isolinux/isolinux.bin \
+        -p "$OPNFV_GIT_SHA" -J -R -b isolinux/isolinux.bin \
         -no-emul-boot \
         -boot-load-size 4 -boot-info-table \
         --hide-rr-moved \
+        --joliet-long \
         -x "lost+found" -o $NEWISO .
 
     isoinfo -d -i $NEWISO
@@ -385,11 +390,13 @@ 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
             echo "Did not expect a line here, not supported"
-                   exit 1
+            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
@@ -409,9 +416,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
@@ -419,6 +428,7 @@ copy_packages() {
             if [ $PIPESTATUS -ne 0 ]; then
                 exit 1
             fi
+            popd > /dev/null
         done
         popd > /dev/null
     fi
@@ -431,19 +441,17 @@ 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}"
-    echo Not running apt-ftparchive generate "${APT_UDEB_CONF}"
 
     # Fuel also needs this index file
-    # cat dists/trusty/main/binary-amd64/Packages | \
+    # cat dists/xenial/main/binary-amd64/Packages | \
     #    awk '/^Package:/{pkg=$2}
     # /^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/mos10.0/ > dists/mos10.0/Release
+    # gzip -9cf dists/mos10.0/Release > dists/mos10.0/Release.gz
 
     popd > /dev/null