Fix OSTree TLS dependencies in ISO installer to let pull from https w…

…ork.

Makefile

@@ -128,7 +128,7 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo
                 -f > \
                 $(PHOTON_LOGS_DIR)/installer.log 2>&1
 
-live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)
+live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso
 	@echo "Building Photon Minimal LIVE ISO..."
 	@cd $(PHOTON_INSTALLER_DIR) && \
         $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon-live-iso.iso \
@@ -305,7 +305,11 @@ install-docker-image: docker-image
 
 ostree-repo: $(PHOTON_PACKAGES)
 	@echo "Creating OSTree repo from local PRMs in ostree-repo.tar.gz..."
-	$(SRCROOT)/support/ostree-tools/make-ostree-image.sh $(SRCROOT)
+	@if [ -f  $(PHOTON_STAGE)/ostree-repo.tar.gz ]; then \
+		echo "ostree-repo.tar.gz already present, not creating again..."; \
+	else \
+		$(SRCROOT)/support/ostree-tools/make-ostree-image.sh $(SRCROOT); \
+	fi
 
 clean: clean-install clean-chroot
 	@echo "Deleting Photon ISO..."

SPECS/glib-networking/glib-networking.spec

@@ -42,8 +42,7 @@ These are the additional language files of glib-networking.
 %build
 export CFLAGS="%{optflags}"
 ./configure  --prefix=%{_prefix} \
-    --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \
-    --disable-static
+    --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt
 
 make %{?_smp_mflags}
 

common/data/packages_iso.json

@@ -21,5 +21,7 @@
                 "libgpg-error", "libhif", "libhif-devel",
                 "librepo", "librepo-devel", "libsoup", "libsoup-devel",
                 "libxml2", "mkinitcpio", "openssl-devel",
-                "yum", "ostree" ,"dosfstools", "pciutils", "efivar", "efibootmgr"]
+                "yum", "libtasn1", "nettle", "nettle-devel", "gnutls",
+                "gnutls-devel", "glib-networking", "ostree", "gmp",
+                "dosfstools", "pciutils", "efivar", "efibootmgr"]
 }

installer/isoInstaller.py

@@ -114,7 +114,8 @@ def __init__(self, stdscreen, options_file):
         # This represents the installer screen, the bool indicated if I can go back to this window or not
         items = []
         if not ks_config:
-            random_hostname = "photon-" + '%12x' % random.randrange(16**12)
+            random_id = '%12x' % random.randrange(16**12)
+            random_hostname = "photon-" + random_id.strip()
             install_config = {'iso_system': False}
             license_agreement = License(self.maxy, self.maxx)
             select_disk = SelectDisk(self.maxy, self.maxx, install_config)