@@ -30,19 +30,32 @@ PHOTON_PUBLISH_RPMS := publish-rpms

 endif

 .PHONY : all iso clean photon-build-machine photon-vagrant-build photon-vagrant-local \

-check check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-package-list \

+check check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

 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

+	@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 \

+                -f > \

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

+

 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

 	@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_PACKAGE_LIST) \

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

                 -f > \

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

@@ -155,7 +168,7 @@ photon-vagrant-local: check-packer check-vagrant

 		echo "Unable to find $(PHOTON_STAGE)/photon.iso ... aborting build"; \

 	fi

-check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-package-list

+check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity

 check-bison:

 	@command -v bison >/dev/null 2>&1 || { echo "Package bison not installed. Aborting." >&2; exit 1; }

@@ -175,8 +188,8 @@ check-createrepo:

 check-vagrant: check-packer

 	@command -v $(VAGRANT) >/dev/null 2>&1 || { echo "Vagrant not installed or wrong path, expecting $(VAGRANT). Aborting" >&2; exit 1; }

-check-package-list:

-	@json_pp -t null < installer/package_list.json >/dev/null 2>&1 || { echo "Invalid installer/package_list.json. Aborting" >&2; exit 1; }

+check-sanity:

+	$(SRCROOT)/support/sanity_check.sh

 ifeq ($(VAGRANT_BUILD),vcloudair)

 check-packer: check-packer-ovf-plugin

@@ -201,5 +214,3 @@ check-packer-ovf-plugin:

                               -x $(PHOTON_SRCS_DIR) \

                               -p $(PHOTON_PUBLISH_RPMS_DIR) \

                               -l $(PHOTON_LOGS_DIR)

-                              

-

@@ -7,13 +7,11 @@

     "bootstrap_packages": ["filesystem"],

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

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

                 "pkg-config", "ncurses", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow",

                 "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "inetutils",

                 "findutils", "xz", "grub", "iproute2", "util-linux", "linux",

                 "attr", "libcap", "kmod", "expat", "dbus", "file",

-                "sed", "grep", "cpio", "gzip"

-                "dracut", "dracut-tools"

-

-]

+                "sed", "grep", "cpio", "gzip",

+                "dracut", "dracut-tools"]

 }

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

+    },

+    "minimal_packages" : {

+        "order" : 1,

+        "type" : "micro",

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal.json",

+        "visible" : true

+    }

+}

\ No newline at end of file

@@ -33,20 +33,22 @@ class CustomPackageSelector(object):

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

     def load_package_list(self):

-        json_wrapper_package_list = JsonWrapper("package_list.json");

-        self.package_list_json = json_wrapper_package_list.read()

+        json_wrapper_package_list = JsonWrapper("packages_full.json");

+        package_list_json = json_wrapper_package_list.read()

-        for package in self.package_list_json["optional_packages"]:

+        for package in package_list_json["packages"]:

             self.menu_items.append((package, self.exit_function))

         self.package_menu = Menu(self.menu_starty,  self.maxx, self.menu_items, height = 18, selector_menu = True)

     def exit_function(self,  selected_indexes):

+        json_wrapper_package_list = JsonWrapper("packages_miniaml.json");

+        package_list_json = json_wrapper_package_list.read()

         selected_items = []

         for index in selected_indexes:

             selected_items.append(self.menu_items[index][0])

-        self.install_config['packages'] = self.package_list_json["minimal_packages"] + selected_items

+        self.install_config['packages'] = package_list_json["packages"] + selected_items

         return ActionResult(True, None)

     def display(self, params):

@@ -11,10 +11,10 @@

 #	End

 #

-set -o errexit		# exit if error...insurance ;)

-set -o nounset		# exit if variable not initalized

-set +h			# disable hashall

-PRGNAME=${0##*/}	# script name minus the path

+set -o errexit          # exit if error...insurance ;)

+set -o nounset          # exit if variable not initalized

+set +h                  # disable hashall

+PRGNAME=${0##*/}	    # script name minus the path

 source config.inc		#	configuration parameters

 source function.inc		#	commonn functions

 LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

@@ -29,6 +29,7 @@ fi

 ISO_OUTPUT_NAME=$1

 RPMS_PATH=$2

 PACKAGE_LIST_FILE=$3

+RPM_LIST=$4

 #- Step 3 Setting up the boot loader

 WORKINGDIR=${BUILDROOT}

@@ -87,7 +88,15 @@ sed -i "s/root:.*/root:x:0:0:root:\/root:\/bin\/bootphotoninstaller/g" ${BUILDRO

 mkdir -p ${BUILDROOT}/mnt/photon-root/photon-chroot

 rm -rf ${BUILDROOT}/RPMS

-cp -r ${RPMS_PATH} ${WORKINGDIR}/

+

+#cp -r ${RPMS_PATH} ${WORKINGDIR}/

+(

+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/;

+done

+)

 #creating rpm repo in cd..

 createrepo --database ${WORKINGDIR}/RPMS

@@ -8,17 +8,19 @@ enabled = True

 def execute(name, ks_config, config, root):

     if ks_config:

-        package_list = JsonWrapper("package_list.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()

         if ks_config['type'] == 'micro':

-            packages = package_list["micro_packages"]

+            packages = package_list_micro["packages"]

         elif ks_config['type'] == 'minimal':

-            packages = package_list["minimal_packages"]

+            packages = package_list_minimal["packages"]

         elif ks_config['type'] == 'full':

-            packages = package_list["minimal_packages"] + package_list["optional_packages"]

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

         else:

             #TODO: error

             packages = []

-        config['type'] = ks_config['type']        

+        config['type'] = ks_config['type']

         config["packages"] = packages

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", "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"]

+}

+

+

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"]

+}

+

+

@@ -30,15 +30,18 @@ class PackageSelector(object):

         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_package_list = JsonWrapper("package_list.json");

-        self.package_list_json = json_wrapper_package_list.read()

-

-        self.package_menu_items =   [

-                                        ('1. Photon OS (Micro)', self.exit_function, ['micro', self.package_list_json["micro_packages"]]),

-                                        ('2. Photon Container OS (Minimal)', self.exit_function, ['minimal', self.package_list_json["minimal_packages"]]),

-                                        ('3. Photon Full OS (All)', self.exit_function, ['full', self.package_list_json["minimal_packages"] + self.package_list_json["optional_packages"]]),

-                                        ('4. Photon Custom OS', self.custom_packages, ['custom', None])

-                                    ]

+        json_wrapper_option_list = JsonWrapper("install_options.json")

+        option_list_json = json_wrapper_option_list.read()

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

+

+        self.package_menu_items = []

+

+        for install_option in options_sorted:

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

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

+                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"]] ))

+

         self.package_menu = Menu(self.menu_starty,  self.maxx, self.package_menu_items)

     def exit_function(self,  selected_item_params):

@@ -79,6 +79,16 @@ def create_vmdk_and_partition(config, vmdk_path):

             count += 1

     return partitions_data, count == 2

+def create_rpm_list_to_copy_in_iso(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"])

+        package_list_json = json_wrapper_package_list.read()

+        packages = packages + package_list_json["packages"]

+    return packages

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

@@ -135,15 +145,21 @@ if __name__ == '__main__':

     # Check the installation type

-    package_list = JsonWrapper(options.package_list_file).read()

+    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()

+

+

+

     if config['iso_system']:

-        packages = package_list["iso_packages"]

+        packages = package_list_iso["packages"]

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

-        packages = package_list["micro_packages"]

+        packages = package_list_micro["packages"]

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

-        packages = package_list["minimal_packages"]

+        packages = package_list_minimal["packages"]

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

-        packages = package_list["minimal_packages"] + package_list["optional_packages"]

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

     else:

         #TODO: error

         packages = []

@@ -173,7 +189,8 @@ if __name__ == '__main__':

     # Making the iso if needed

     if config['iso_system']:

-        process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file])

+        rpm_list = " ".join(create_rpm_list_to_copy_in_iso(options.package_list_file))

+        process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file, rpm_list])

         retval = process.wait()

     # Cleaning up for vmdk

deleted file mode 100644

@@ -1 +0,0 @@

-"[]"

\ No newline at end of file

@@ -135,7 +135,7 @@ class PackageManager(object):

         statusEvent=threading.Event()

         numWorkerThreads=self.calculatePossibleNumWorkerThreads()

         if numWorkerThreads > 8:

-            numWorkerThreads = 8

+            numWorkerThreads = 1

         if numWorkerThreads == 0:

             self.logger.error("Unable to create worker threads. Terminating the package manager.")

             raise Exception("No Space.")

new file mode 100755

@@ -0,0 +1,8 @@

+#!/bin/bash

+

+# Sanify check for all json files.

+echo "Sanity check for all json files..."

+for i in `find . -name "*.json" -type f -not -path "*stage*"`; do echo $i; json_pp -t null < $i || break -1 ; done

+

+echo "Checking all python code is compilable..."

+for i in `find . -name "*.py" -type f -not -path "*stage*"`; do echo $i; python -m py_compile $i || break -1 ; done