@@ -14,8 +14,12 @@ include $(MAKEROOT)/makedefs.mk

 export PATH := $(SRCROOT)/tools/bin:$(PATH)

 ifdef PHOTON_CACHE_PATH

+PHOTON_PACKAGES_MICRO := packages-cached

+PHOTON_PACKAGES_MINIMAL := packages-cached

 PHOTON_PACKAGES := packages-cached

 else

+PHOTON_PACKAGES_MICRO := packages-micro

+PHOTON_PACKAGES_MINIMAL := packages-minimal

 PHOTON_PACKAGES := packages

 endif

@@ -40,27 +44,60 @@ clean-install clean-chroot

 all: iso

-minimal: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

-	@echo "Building Photon ISO..."

-	@cp -f $(PHOTON_INSTALLER_DIR)/build_install_options_minimal.json $(PHOTON_INSTALLER_DIR)/install_options.json

+micro: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

+	@echo "Building Photon Micro ISO..."

+	@cd $(PHOTON_INSTALLER_DIR) && \

+        $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon-micro.iso \

+                -w $(PHOTON_STAGE)/photon_iso \

+                -l $(PHOTON_STAGE)/LOGS \

+                -r $(PHOTON_STAGE)/RPMS \

+                -p $(PHOTON_DATA_DIR)/build_install_options_micro.json \

+                -f > \

+                $(PHOTON_LOGS_DIR)/installer.log 2>&1

+

+packages-micro: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

+	@echo "Building all Micro RPMS..."

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+        $(PHOTON_PACKAGE_BUILDER) -o full \

+                -s $(PHOTON_SPECS_DIR) \

+                -r $(PHOTON_RPMS_DIR) \

+                -x $(PHOTON_SRCS_DIR) \

+                -b $(PHOTON_CHROOT_PATH) \

+                -l $(PHOTON_LOGS_DIR) \

+                -p $(PHOTON_PUBLISH_RPMS_DIR) \

+                -j $(PHOTON_DATA_DIR)/build_install_options_micro.json

+

+minimal: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

+	@echo "Building Photon Minimal ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon-minimal.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

-                -p $(PHOTON_INSTALLER_DIR)/install_options.json \

+                -p $(PHOTON_DATA_DIR)/build_install_options_minimal.json \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

+packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

+	@echo "Building all RPMS..."

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+        $(PHOTON_PACKAGE_BUILDER) -o full \

+                -s $(PHOTON_SPECS_DIR) \

+                -r $(PHOTON_RPMS_DIR) \

+                -x $(PHOTON_SRCS_DIR) \

+                -b $(PHOTON_CHROOT_PATH) \

+                -l $(PHOTON_LOGS_DIR) \

+                -p $(PHOTON_PUBLISH_RPMS_DIR) \

+                -j $(PHOTON_DATA_DIR)/build_install_options_minimal.json

+

 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

-	@echo "Building Photon ISO..."

-	@cp -f $(PHOTON_INSTALLER_DIR)/build_install_options_all.json $(PHOTON_INSTALLER_DIR)/install_options.json

+	@echo "Building Photon FUll ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

-                -p $(PHOTON_INSTALLER_DIR)/install_options.json \

+                -p $(PHOTON_DATA_DIR)/build_install_options_all.json \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

@@ -74,7 +111,7 @@ packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)

                 -b $(PHOTON_CHROOT_PATH) \

                 -l $(PHOTON_LOGS_DIR) \

                 -p $(PHOTON_PUBLISH_RPMS_DIR) \

-                -j $(PHOTON_PACKAGE_LIST)

+                -j $(PHOTON_DATA_DIR)/build_install_options_all.json

 packages-cached:

 	@echo "Using cached RPMS..."

new file mode 100644

@@ -0,0 +1,33 @@

+{

+    "iso_packages" : {

+        "order" : 0,

+        "type" : "iso",

+        "title" : "ISO Packages",

+        "file" : "packages_iso.json",

+        "visible" : false

+    },

+    "micro_packages" : {

+        "order" : 1,

+        "type" : "micro",

+        "title" : "1. Photon Micro",

+        "file" : "packages_micro.json",

+        "visible" : true

+

+    },

+    "minimal_packages" : {

+        "order" : 2,

+        "type" : "minimal",

+        "title" : "2. Photon Minimal",

+        "file" : "packages_minimal.json",

+        "visible" : true

+    },

+    "full_packages" : {

+        "order" : 3,

+        "type" : "full",

+        "title" : "3. Photon Full",

+        "file" : "packages_full.json",

+        "visible" : true

+    }

+}

+

+

new file mode 100644

@@ -0,0 +1,16 @@

+{

+    "iso_packages" : {

+        "order" : 0,

+        "type" : "iso",

+        "title" : "ISO Packages",

+        "file" : "packages_iso.json",

+        "visible" : false

+    },

+    "micro_packages" : {

+        "order" : 1,

+        "type" : "micro",

+        "title" : "Photon Micro",

+        "file" : "packages_micro.json",

+        "visible" : true

+    }

+}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,16 @@

+{

+    "iso_packages" : {

+        "order" : 0,

+        "type" : "iso",

+        "title" : "ISO Packages",

+        "file" : "packages_iso.json",

+        "visible" : false

+    },

+    "minimal_packages" : {

+        "order" : 1,

+        "type" : "minimal",

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal.json",

+        "visible" : true

+    }

+}

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,29 @@

+{

+    "packages":["unzip", "gmp-devel", "sudo", "bzip2-devel", "XML-Parser", "intltool", "mercurial", "libsigc++", "boost", 

+                "libgomp-devel", "libstdc++-devel", "libgcc-devel", "gcc", "bison", "gdb", "libpipeline", "python2-devel", 

+                "python2-tools", "linux-api-headers","gawk","check", "libltdl", "libltdl-devel", "pcre-devel", "glib-devel", 

+                "glibc-devel", "glibc-lang", "zlib-devel", "gettext", "git", "git-lang", "autoconf", "perl", "perl-DBI","perl-Config-IniFiles",

+                "perl-DBIx-Simple", "perl-DBD-SQLite","perl-Exporter-Tiny","perl-JSON-XS","perl-List-MoreUtils","perl-Module-Install",

+                "perl-Module-ScanDeps","perl-Types-Serialiser","perl-WWW-Curl","perl-YAML-Tiny","perl-YAML","perl-common-sense","perl-libintl","tcsh",

+                "gobject-introspection", "gobject-introspection-devel", "gobject-introspection-python", "procps-ng-devel", 

+                "bash-lang", "kbd", "coreutils-lang", "libxslt", "docbook-xml", "docbook-xsl", "gtk-doc", "popt-devel", "texinfo", "tar", 

+                "kubernetes", "cyrus-sasl", "openldap", "binutils-devel", "python-iniparse", "psmisc", "etcd", "openssl-devel", 

+                "util-linux-lang", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 

+                "automake", "libpcap", "tcpdump", "elfutils-libelf-devel", "elfutils", "elfutils-devel", "elfutils-devel-static", "elfutils-libelf-devel-static", 

+                "go", "grub-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 

+                "hawkey-devel", "python-hawkey", "libxml2-devel", "ruby", "readline-devel", "wget",

+                "Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "which", "less",

+                "cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 

+                "nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", 

+                "libarchive", "libsoup", "asciidoc", "mkinitcpio",

+                "ostree", "tdnf-devel", "librepo-devel", "libhif", "libhif-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",

+                "rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper",

+                "acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel",

+                "device-mapper-event-libs","libacl","libacl-devel","libselinux-devel","libselinux-python","libselinux-utils","libsepol-devel",

+                "libaio","libaio-devel","thin-provisioning-tools","lvm2","lvm2-devel","lvm2-libs","lvm2-python-libs","lzo","lzo-devel","lzo-minilzo","swig",

+                "rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python",

+                "haveged", "haveged-devel",

+                "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "zookeeper", "fuse"]

+}

+

+

new file mode 100644

@@ -0,0 +1,19 @@

+{

+    "packages":["glibc", "zlib", "filesystem",

+                "binutils", "gmp", "mpfr", "libgcc", "libstdc++", 

+                "sed", "bzip2", "pkg-config", "readline", "ncurses", "bash",

+                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", "procps-ng", 

+                "coreutils", "iana-etc", "grep", "bc", "libtool",

+                "inetutils", "findutils",

+                "xz", "grub", "iproute2", "kmod",

+                "util-linux", "e2fsprogs",

+                "libffi", "expat",

+                "linux", "cpio",

+                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

+                "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

+                "gptfdisk", "tar", "gzip", "openssl", "python2", "python2-libs", "python-requests",

+                "pcre", "glib", "parted", "libsigc++", "XML-Parser", "glibmm", "dparted",

+                "libgsystem", "ostree"]

+}

+

+

new file mode 100644

@@ -0,0 +1,20 @@

+{

+    "packages":["glibc","zlib", "filesystem",

+                "gmp", "mpfr", "libgcc", "libstdc++",

+                "bzip2", "pkg-config", "ncurses", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "e2fsprogs",

+                "iana-etc", "readline", "coreutils", "bash", "bc", "libtool",

+                "inetutils",

+                "xz", "grub", "iproute2", "kbd", "kmod", "libpipeline",

+                "util-linux",

+                "openssl", "libffi", "expat",

+                "linux", "curl",

+                "iptables", "ca-certificates",

+                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

+                "sqlite-autoconf", "elfutils-libelf", "elfutils-libelf-devel",

+                "nspr", "nss", "popt", "lua", "rpm", "openssh",

+                "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "pcre", "glib", "tdnf",

+                "photon-release"

+                ]

+}

+

+

new file mode 100644

@@ -0,0 +1,15 @@

+{

+    "packages":["glibc", "zlib", "filesystem", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp", 

+                "pkg-config", "ncurses", "readline", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils",

+                "findutils", "xz", "grub", "iproute2", "util-linux", "openssl", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

+                "attr", "libcap", "systemd", "expat", "dbus", "file", "e2fsprogs", "elfutils-libelf", "lua", "popt", "sqlite-autoconf", "nspr", "nss", "rpm",

+                "openssh", "libffi", "gdbm", "python2", "python2-libs", "pcre", "glib", "libxml2",

+                "photon-release",

+                "sed", "grep", "cpio", "gzip", "nano", "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "tdnf",

+                "libdnet", "xerces-c", "xml-security-c", "libmspack", "open-vm-tools",

+                "docker","bridge-utils",

+                "libyaml", "PyYAML", "python-requests", "python-prettytable", "python-jsonpointer", "python-jsonpatch", "python-six", "python-configobj", "cloud-init",

+		         "krb5", "e2fsprogs-devel"]

+}

+

+

deleted file mode 100644

@@ -1,33 +0,0 @@

-{

-    "iso_packages" : {

-        "order" : 0,

-        "type" : "iso",

-        "title" : "ISO Packages",

-        "file" : "packages_iso.json",

-        "visible" : false

-    },

-    "micro_packages" : {

-        "order" : 1,

-        "type" : "micro",

-        "title" : "1. Photon Micro",

-        "file" : "packages_micro.json",

-        "visible" : true

-

-    },

-    "minimal_packages" : {

-        "order" : 2,

-        "type" : "minimal",

-        "title" : "2. Photon Minimal",

-        "file" : "packages_minimal.json",

-        "visible" : true

-    },

-    "full_packages" : {

-        "order" : 3,

-        "type" : "full",

-        "title" : "3. Photon Full",

-        "file" : "packages_full.json",

-        "visible" : true

-    }

-}

-

-

deleted file mode 100644

@@ -1,16 +0,0 @@

-{

-    "iso_packages" : {

-        "order" : 0,

-        "type" : "iso",

-        "title" : "ISO Packages",

-        "file" : "packages_iso.json",

-        "visible" : false

-    },

-    "minimal_packages" : {

-        "order" : 1,

-        "type" : "micro",

-        "title" : "Photon Minimal",

-        "file" : "packages_minimal.json",

-        "visible" : true

-    }

-}

\ No newline at end of file

@@ -4,6 +4,8 @@

 #

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

+from optparse import OptionParser

+import os.path

 import curses

 import sys

 import subprocess

@@ -65,7 +67,7 @@ class IsoInstaller(object):

         print "Failed to mount the cd, exiting the installer, check the logs for more details"

         raise Exception("Can not mount the cd")

-    def __init__(self, stdscreen):

+    def __init__(self, stdscreen, options_file):

         self.screen = stdscreen

         # Init the colors

@@ -95,8 +97,7 @@ class IsoInstaller(object):

         license_agreement = License(self.maxy, self.maxx)

         select_disk = SelectDisk(self.maxy, self.maxx, self.install_config)

-        package_selector = PackageSelector(self.maxy, self.maxx, self.install_config)

-        custom_package_selector = CustomPackageSelector(self.maxy, self.maxx, self.install_config)

+        package_selector = PackageSelector(self.maxy, self.maxx, self.install_config, options_file)

         hostname_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, False,  'Choose the hostname for your system',

             'Hostname:', 

             2, self.install_config)

@@ -112,7 +113,6 @@ class IsoInstaller(object):

                     (license_agreement.display, False),

                     (select_disk.display, True),

                     (package_selector.display, True),

-                    (custom_package_selector.display, False),

                     (hostname_reader.get_user_string, True),

                     (root_password_reader.get_user_string, True),

                  ]

@@ -135,4 +135,9 @@ class IsoInstaller(object):

                     index = 0

 if __name__ == '__main__':

-    curses.wrapper(IsoInstaller)

+    usage = "Usage: %prog [options]"

+    parser = OptionParser(usage)

+    parser.add_option("-j",  "--json-file", dest="options_file",  default="input.json")

+

+    (options,  args) = parser.parse_args()

+    curses.wrapper(IsoInstaller, options.options_file)

@@ -30,7 +30,8 @@ ISO_OUTPUT_NAME=$1

 RPMS_PATH=$2

 PACKAGE_LIST_FILE=$3

 RPM_LIST=$4

-

+PHOTON_COMMON_DIR=$(dirname "${PACKAGE_LIST_FILE}")

+PACKAGE_LIST_FILE_BASE_NAME=$(basename "${PACKAGE_LIST_FILE}")

 #- Step 3 Setting up the boot loader

 WORKINGDIR=${BUILDROOT}

 BUILDROOT=${BUILDROOT}/photon-chroot

@@ -42,9 +43,8 @@ find ${BUILDROOT} -name linux-[0-9]*.rpm | head -1 | xargs rpm2cpio | cpio -iv -

 rm -f ${BUILDROOT}/installer/*.pyc

 rm -rf ${BUILDROOT}/installer/BUILD_DVD

-# replace default package_list with specific one

-cp $PACKAGE_LIST_FILE ${BUILDROOT}/installer/package_list.json

-

+# Copy package list json files

+cp -rf $PHOTON_COMMON_DIR ${BUILDROOT}/installer/

 #ID in the initrd.gz now is PHOTON_VMWARE_CD . This is how we recognize that the cd is actually ours. touch this file there.

 touch ${WORKINGDIR}/PHOTON_VMWARE_CD

@@ -69,7 +69,7 @@ cp BUILD_DVD/fstab ${BUILDROOT}/etc/fstab

 cat >> ${BUILDROOT}/bin/bootphotoninstaller << EOF

 #!/bin/bash

 cd /installer

-./isoInstaller.py 2> /var/log/installer && shutdown -r now

+./isoInstaller.py --json-file=./data/$PACKAGE_LIST_FILE_BASE_NAME 2> /var/log/installer && shutdown -r now

 /bin/bash

 EOF

@@ -94,7 +94,10 @@ rm -rf ${BUILDROOT}/RPMS

 cd ${RPMS_PATH}

 mkdir ${WORKINGDIR}/RPMS

 for rpm_name in $RPM_LIST; do

-    cp --parent `find . -name "$rpm_name-[0-9]*" -type f` ${WORKINGDIR}/RPMS/;

+    FILENAME="`find . -name "$rpm_name-[0-9]*" -type f`"

+    if [ -n "$FILENAME" ]; then

+        cp --parent $FILENAME ${WORKINGDIR}/RPMS/;

+    fi

 done

 )

deleted file mode 100644

@@ -1,74 +0,0 @@

-{

-    "iso_packages":["glibc", "zlib", "filesystem",

-                "binutils", "gmp", "mpfr", "libgcc", "libstdc++", 

-                "sed", "bzip2", "pkg-config", "readline", "ncurses", "bash",

-                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", "procps-ng", 

-                "coreutils", "iana-etc", "grep", "bc", "libtool",

-                "inetutils", "findutils",

-                "xz", "grub", "iproute2", "kmod",

-                "util-linux", "e2fsprogs",

-                "libffi", "expat",

-                "linux", "cpio",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

-                "gptfdisk", "tar", "gzip", "openssl", "python2", "python2-libs", "python-requests",

-                "pcre", "glib", "parted", "libsigc++", "XML-Parser", "glibmm", "dparted",

-                "libgsystem", "ostree"],

-

-    "micro_packages":["glibc","zlib", "filesystem",

-                "gmp", "mpfr", "libgcc", "libstdc++",

-                "bzip2", "pkg-config", "ncurses", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "e2fsprogs",

-                "iana-etc", "readline", "coreutils", "bash", "bc", "libtool",

-                "inetutils",

-                "xz", "grub", "iproute2", "kbd", "kmod", "libpipeline",

-                "util-linux",

-                "openssl", "libffi", "expat",

-                "linux", "curl",

-                "iptables", "ca-certificates",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "sqlite-autoconf", "elfutils-libelf", "elfutils-libelf-devel",

-                "nspr", "nss", "popt", "lua", "rpm", "openssh",

-                "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "pcre", "glib", "tdnf",

-                "photon-release"

-                ],

-

-    "minimal_packages":["glibc", "zlib", "filesystem", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp", 

-                "pkg-config", "ncurses", "readline", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils",

-                "findutils", "xz", "grub", "iproute2", "util-linux", "openssl", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

-                "attr", "libcap", "systemd", "expat", "dbus", "file", "e2fsprogs", "elfutils-libelf", "lua", "popt", "sqlite-autoconf", "nspr", "nss", "rpm",

-                "openssh", "libffi", "gdbm", "python2", "python2-libs", "pcre", "glib", "libxml2",

-                "photon-release",

-                "sed", "grep", "cpio", "gzip", "nano", "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "tdnf",

-                "libdnet", "xerces-c", "xml-security-c", "libmspack", "open-vm-tools",

-                "docker","bridge-utils",

-                "libyaml", "PyYAML", "python-requests", "python-prettytable", "python-jsonpointer", "python-jsonpatch", "python-six", "python-configobj", "cloud-init",

-		"krb5", "e2fsprogs-devel"],

-

-    "optional_packages":["unzip", "gmp-devel", "sudo", "bzip2-devel", "XML-Parser", "intltool", "mercurial", "libsigc++", "boost", 

-                "libgomp-devel", "libstdc++-devel", "libgcc-devel", "gcc", "bison", "gdb", "libpipeline", "python2-devel", 

-                "python2-tools", "linux-api-headers","gawk","check", "libltdl", "libltdl-devel", "pcre-devel", "glib-devel", 

-                "glibc-devel", "glibc-lang", "zlib-devel", "gettext", "git", "git-lang", "autoconf", "perl", "perl-DBI","perl-Config-IniFiles",

-                "perl-DBIx-Simple", "perl-DBD-SQLite","perl-Exporter-Tiny","perl-JSON-XS","perl-List-MoreUtils","perl-Module-Install",

-                "perl-Module-ScanDeps","perl-Types-Serialiser","perl-WWW-Curl","perl-YAML-Tiny","perl-YAML","perl-common-sense","perl-libintl","tcsh",

-                "gobject-introspection", "gobject-introspection-devel", "gobject-introspection-python", "procps-ng-devel", 

-                "bash-lang", "kbd", "coreutils-lang", "libxslt", "docbook-xml", "docbook-xsl", "gtk-doc", "popt-devel", "texinfo", "tar", 

-                "kubernetes", "cyrus-sasl", "openldap", "binutils-devel", "python-iniparse", "psmisc", "etcd", "openssl-devel", 

-                "util-linux-lang", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 

-                "automake", "libpcap", "tcpdump", "elfutils-libelf-devel", "elfutils", "elfutils-devel", "elfutils-devel-static", "elfutils-libelf-devel-static", 

-                "go", "grub-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 

-                "hawkey-devel", "python-hawkey", "busybox", "libxml2-devel", "ruby", "readline-devel", "wget", "cifs-utils", 

-                "Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "which", "less",  

-                "cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 

-                "nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", 

-                "libarchive", "libsoup", "asciidoc", "mkinitcpio",

-                "ostree", "tdnf-devel", "librepo-devel", "libhif", "libhif-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",

-                "rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper",

-                "acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel",

-                "device-mapper-event-libs","libacl","libacl-devel","libselinux-devel","libselinux-python","libselinux-utils","libsepol-devel",

-                "libaio","libaio-devel","thin-provisioning-tools","lvm2","lvm2-devel","lvm2-libs","lvm2-python-libs","lzo","lzo-devel","lzo-minilzo","swig",

-                "rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python",

-                "haveged", "haveged-devel",

-                "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "zookeeper", "fuse"]

-}

-

-

deleted file mode 100644

@@ -1,29 +0,0 @@

-{

-    "packages":["unzip", "gmp-devel", "sudo", "bzip2-devel", "XML-Parser", "intltool", "mercurial", "libsigc++", "boost", 

-                "libgomp-devel", "libstdc++-devel", "libgcc-devel", "gcc", "bison", "gdb", "libpipeline", "python2-devel", 

-                "python2-tools", "linux-api-headers","gawk","check", "libltdl", "libltdl-devel", "pcre-devel", "glib-devel", 

-                "glibc-devel", "glibc-lang", "zlib-devel", "gettext", "git", "git-lang", "autoconf", "perl", "perl-DBI","perl-Config-IniFiles",

-                "perl-DBIx-Simple", "perl-DBD-SQLite","perl-Exporter-Tiny","perl-JSON-XS","perl-List-MoreUtils","perl-Module-Install",

-                "perl-Module-ScanDeps","perl-Types-Serialiser","perl-WWW-Curl","perl-YAML-Tiny","perl-YAML","perl-common-sense","perl-libintl","tcsh",

-                "gobject-introspection", "gobject-introspection-devel", "gobject-introspection-python", "procps-ng-devel", 

-                "bash-lang", "kbd", "coreutils-lang", "libxslt", "docbook-xml", "docbook-xsl", "gtk-doc", "popt-devel", "texinfo", "tar", 

-                "kubernetes", "cyrus-sasl", "openldap", "binutils-devel", "python-iniparse", "psmisc", "etcd", "openssl-devel", 

-                "util-linux-lang", "db-docs", "linux-dev", "linux-docs", "mpc", "json-glib", "json-glib-devel", 

-                "automake", "libpcap", "tcpdump", "elfutils-libelf-devel", "elfutils", "elfutils-devel", "elfutils-devel-static", "elfutils-libelf-devel-static", 

-                "go", "grub-lang", "diffutils", "groff", "man-db", "mpfr-devel", "man-pages", 

-                "hawkey-devel", "python-hawkey", "busybox", "libxml2-devel", "ruby", "readline-devel", "wget", "cifs-utils", 

-                "Linux-PAM-lang", "make", "bindutils", "gperf", "lua-devel", "which", "less",  

-                "cmake", "gpgme-devel", "parted", "vim", "xz-devel", "xerces-c-devel", "xml-security-c-devel", 

-                "nss-devel", "ncurses-devel", "tzdata", "itstool", "sed-lang", "gptfdisk", "ntp", "flex", "patch", "m4", "dracut", "dracut-tools", 

-                "libarchive", "libsoup", "asciidoc", "mkinitcpio",

-                "ostree", "tdnf-devel", "librepo-devel", "libhif", "libhif-devel", "rpm-ostree", "createrepo", "glibmm", "deltarpm", "cdrkit", "dparted", "libgsystem",

-                "rpm-ostree-toolbox","libsepol","libselinux","device-mapper-libs","device-mapper",

-                "acl","btrfs-progs","btrfs-progs-devel","device-mapper-devel","device-mapper-event","device-mapper-event-devel",

-                "device-mapper-event-libs","libacl","libacl-devel","libselinux-devel","libselinux-python","libselinux-utils","libsepol-devel",

-                "libaio","libaio-devel","thin-provisioning-tools","lvm2","lvm2-devel","lvm2-libs","lvm2-python-libs","lzo","lzo-devel","lzo-minilzo","swig",

-                "rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python",

-                "haveged", "haveged-devel",

-                "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "zookeeper", "fuse"]

-}

-

-

deleted file mode 100644

@@ -1,19 +0,0 @@

-{

-    "packages":["glibc", "zlib", "filesystem",

-                "binutils", "gmp", "mpfr", "libgcc", "libstdc++", 

-                "sed", "bzip2", "pkg-config", "readline", "ncurses", "bash",

-                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", "procps-ng", 

-                "coreutils", "iana-etc", "grep", "bc", "libtool",

-                "inetutils", "findutils",

-                "xz", "grub", "iproute2", "kmod",

-                "util-linux", "e2fsprogs",

-                "libffi", "expat",

-                "linux", "cpio",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

-                "gptfdisk", "tar", "gzip", "openssl", "python2", "python2-libs", "python-requests",

-                "pcre", "glib", "parted", "libsigc++", "XML-Parser", "glibmm", "dparted",

-                "libgsystem", "ostree"]

-}

-

-

deleted file mode 100644

@@ -1,20 +0,0 @@

-{

-    "packages":["glibc","zlib", "filesystem",

-                "gmp", "mpfr", "libgcc", "libstdc++",

-                "bzip2", "pkg-config", "ncurses", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "e2fsprogs",

-                "iana-etc", "readline", "coreutils", "bash", "bc", "libtool",

-                "inetutils",

-                "xz", "grub", "iproute2", "kbd", "kmod", "libpipeline",

-                "util-linux",

-                "openssl", "libffi", "expat",

-                "linux", "curl",

-                "iptables", "ca-certificates",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "sqlite-autoconf", "elfutils-libelf", "elfutils-libelf-devel",

-                "nspr", "nss", "popt", "lua", "rpm", "openssh",

-                "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "pcre", "glib", "tdnf",

-                "photon-release"

-                ]

-}

-

-

deleted file mode 100644

@@ -1,15 +0,0 @@

-{

-    "packages":["glibc", "zlib", "filesystem", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp", 

-                "pkg-config", "ncurses", "readline", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "iana-etc", "coreutils", "bc", "libtool", "inetutils",

-                "findutils", "xz", "grub", "iproute2", "util-linux", "openssl", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

-                "attr", "libcap", "systemd", "expat", "dbus", "file", "e2fsprogs", "elfutils-libelf", "lua", "popt", "sqlite-autoconf", "nspr", "nss", "rpm",

-                "openssh", "libffi", "gdbm", "python2", "python2-libs", "pcre", "glib", "libxml2",

-                "photon-release",

-                "sed", "grep", "cpio", "gzip", "nano", "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "tdnf",

-                "libdnet", "xerces-c", "xml-security-c", "libmspack", "open-vm-tools",

-                "docker","bridge-utils",

-                "libyaml", "PyYAML", "python-requests", "python-prettytable", "python-jsonpointer", "python-jsonpatch", "python-six", "python-configobj", "cloud-init",

-		         "krb5", "e2fsprogs-devel"]

-}

-

-

@@ -5,6 +5,7 @@

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

 import json

+import os

 import curses

 from sets import Set

 from jsonwrapper import JsonWrapper

@@ -13,7 +14,7 @@ from window import Window

 from actionresult import ActionResult

 class PackageSelector(object):

-    def __init__(self,  maxy, maxx, install_config):

+    def __init__(self,  maxy, maxx, install_config, options_file):

         self.install_config = install_config

         self.maxx = maxx

         self.maxy = maxy

@@ -25,12 +26,13 @@ class PackageSelector(object):

         self.menu_starty = self.win_starty + 3

-        self.load_package_list()

+        self.load_package_list(options_file)

         self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx, 'Select Installation', True, self.package_menu)

-    def load_package_list(self):

-        json_wrapper_option_list = JsonWrapper("install_options.json")

+    def load_package_list(self, options_file):

+        base_path = os.path.dirname(options_file)

+        json_wrapper_option_list = JsonWrapper(options_file)

         option_list_json = json_wrapper_option_list.read()

         options_sorted = sorted(option_list_json.items(), key=lambda item: item[1]['order'])

@@ -38,7 +40,8 @@ class PackageSelector(object):

         for install_option in options_sorted:

             if install_option[1]["visible"] == True:

-                json_wrapper_package_list = JsonWrapper(install_option[1]["file"])

+                file_path = os.path.join(base_path, install_option[1]["file"])

+                json_wrapper_package_list = JsonWrapper(file_path)

                 package_list_json = json_wrapper_package_list.read()

                 self.package_menu_items.append((install_option[1]["title"], self.exit_function, [install_option[1]["type"], package_list_json["packages"]] ))

@@ -77,15 +77,18 @@ def create_vmdk_and_partition(config, vmdk_path):

         elif line.startswith("ROOT_PARTITION="):

             partitions_data['root'] = line.replace("ROOT_PARTITION=", "").strip()

             count += 1

-    

+

     return partitions_data, count == 2

+

 def create_rpm_list_to_copy_in_iso(build_install_option):

+    base_path = os.path.dirname(build_install_option)

     json_wrapper_option_list = JsonWrapper(build_install_option)

     option_list_json = json_wrapper_option_list.read()

     options_sorted = sorted(option_list_json.items(), key=lambda item: item[1]['order'])

     packages = []

     for install_option in options_sorted:

-        json_wrapper_package_list = JsonWrapper(install_option[1]["file"])

+        file_path = os.path.join(base_path, install_option[1]["file"])

+        json_wrapper_package_list = JsonWrapper(file_path)

         package_list_json = json_wrapper_package_list.read()

         packages = packages + package_list_json["packages"]

     return packages

@@ -100,7 +103,7 @@ if __name__ == '__main__':

     parser.add_option("-l",  "--log-path",  dest="log_path", default="../stage/LOGS")

     parser.add_option("-r",  "--rpm-path",  dest="rpm_path", default="../stage/RPMS")

     parser.add_option("-f", "--force", action="store_true", dest="force", default=False)

-    parser.add_option("-p", "--package-list-file", dest="package_list_file", default="package_list.json")

+    parser.add_option("-p", "--package-list-file", dest="package_list_file", default="../common/data/build_install_options_all.json")

     (options,  args) = parser.parse_args()

@@ -143,26 +146,20 @@ if __name__ == '__main__':

         else:

             config['password'] = crypt.crypt(config['password']['text'], "$6$" + "".join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]))

-

     # Check the installation type

-    package_list_iso = JsonWrapper("packages_iso.json").read()

-    package_list_micro = JsonWrapper("packages_micro.json").read()

-    package_list_minimal = JsonWrapper("packages_minimal.json").read()

-    package_list_full = JsonWrapper("packages_full.json").read()

-

-

+    json_wrapper_option_list = JsonWrapper(options.package_list_file)

+    option_list_json = json_wrapper_option_list.read()

+    options_sorted = sorted(option_list_json.items(), key=lambda item: item[1]['order'])

+    packages = []

+    base_path = os.path.dirname(options.package_list_file)

+    for install_option in options_sorted:

+        print install_option

+        if (config['iso_system'] == True and install_option[1]['type'] == "iso") or (install_option[1]['type'] == config['type']):

+            json_wrapper_package_list = JsonWrapper(os.path.join(base_path, install_option[1]["file"]))

+            package_list_json = json_wrapper_package_list.read()

+            packages = package_list_json["packages"]

+            break

-    if config['iso_system']:

-        packages = package_list_iso["packages"]

-    elif config['type'] == 'micro':

-        packages = package_list_micro["packages"]

-    elif config['type'] == 'minimal':

-        packages = package_list_minimal["packages"]

-    elif config['type'] == 'full':

-        packages = package_list_minimal["packages"] + package_list_full["packages"]

-    else:

-        #TODO: error

-        packages = []

     config['packages'] = packages

     # Cleanup the working directory

@@ -22,6 +22,8 @@ PHOTON_STAGE?=$(SRCROOT)/stage

 PHOTON_LOGS_DIR=$(PHOTON_STAGE)/LOGS

 PHOTON_RPMS_DIR=$(PHOTON_STAGE)/RPMS

 PHOTON_SPECS_DIR?=$(SRCROOT)/SPECS

+PHOTON_COMMON_DIR?=$(SRCROOT)/common

+PHOTON_DATA_DIR?=$(PHOTON_COMMON_DIR)/data

 PHOTON_SRCS_DIR=$(PHOTON_STAGE)/SOURCES

 PHOTON_PUBLISH_RPMS_DIR=$(PHOTON_STAGE)/PUBLISHRPMS

@@ -120,10 +120,8 @@ def buildAPackage(package):

     pkgManager.buildPackages(listPackages)

 def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger):

-    jsonData=open(inputJSONFile)

-    jsonObj = json.load(jsonData)

-    jsonData.close()

-    listPackages=jsonObj[buildOption]

+    listPackages = get_all_package_names(inputJSONFile)

+

     listPackagesToBuild=[]

     for pkg in listPackages:

         p =  pkg.encode('utf-8')

@@ -133,6 +131,22 @@ def buildPackagesFromGivenJSONFile(inputJSONFile,buildOption,logger):

     pkgManager = PackageManager()

     pkgManager.buildPackages(listPackagesToBuild)

- 

+def get_all_package_names(build_install_option):

+    base_path = os.path.dirname(build_install_option)

+    jsonData = open(build_install_option)

+    option_list_json = json.load(jsonData)

+    jsonData.close()

+    options_sorted = sorted(option_list_json.items(), key=lambda item: item[1]['order'])

+    packages = []

+

+    for install_option in options_sorted:

+        filename = os.path.join(base_path, install_option[1]["file"])

+        jsonData=open(filename)

+        package_list_json = json.load(jsonData)

+        jsonData.close()

+        packages = packages + package_list_json["packages"]

+

+    return packages

+

 if __name__=="__main__":

     main()