new file mode 100644

@@ -0,0 +1,41 @@

+Name:       basic

+Summary:    Metapackage to install minimal profile

+Version:    5.0

+Release:    1%{?dist}

+License:    Apache 2.0

+Group:      System Environment/Base

+URL:        https://vmware.github.io/photon

+Vendor:     VMware, Inc.

+Distribution:   Photon

+

+Requires: Linux-PAM

+Requires: bash

+Requires: coreutils-selinux

+Requires: cracklib

+Requires: cracklib-dicts

+Requires: dbus

+Requires: filesystem

+Requires: findutils

+Requires: grep

+Requires: grub2-efi-image

+Requires: grub2-theme

+Requires: openssh

+Requires: photon-release

+Requires: photon-repos

+Requires: sed

+Requires: systemd

+Requires: systemd-udev

+Requires: tdnf

+

+%description

+Metapackage to install minimal profile

+

+%prep

+%build

+

+%files

+%defattr(-,root,root,0755)

+

+%changelog

+* Sat Jul 15 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.0-1

+- Basic set packages required for Photon

@@ -1,55 +1,42 @@

-Name:           minimal

-Summary:        Metapackage to install minimal profile

-Version:        0.1

-Release:        7%{?dist}

-License:        Apache 2.0

-Group:          System Environment/Base

-URL:            https://vmware.github.io/photon/

-Vendor:         VMware, Inc.

+Name:       minimal

+Summary:    Metapackage to install minimal profile for cloud images

+Version:    5.0

+Release:    1%{?dist}

+License:    Apache 2.0

+Group:      System Environment/Base

+URL:        https://vmware.github.io/photon

+Vendor:     VMware, Inc.

 Distribution:   Photon

-Requires:       bc

-Requires:       bridge-utils

-Requires:       bzip2

-Requires:       cloud-init

-Requires:       cpio

-Requires:       cracklib-dicts

-Requires:       dbus

-Requires:       docker

-Requires:       e2fsprogs

-Requires:       file

-Requires:       filesystem

-Requires:       findutils

-Requires:       gdbm

-Requires:       grep

-Requires:       grub2-efi-image

-Requires:       grub2-theme

-Requires:       gzip

-Requires:       iana-etc

-Requires:       iproute2

-Requires:       iptables

-Requires:       iputils

-Requires:       Linux-PAM

-Requires:       motd

-Requires:       net-tools

-Requires:       openssh

-Requires:       photon-release

-Requires:       photon-repos

-Requires:       procps-ng

-Requires:       rpm

-Requires:       rpm-plugin-systemd-inhibit

-Requires:       sed

-Requires:       systemd

-Requires:       systemd-libs

-Requires:       systemd-pam

-Requires:       systemd-rpm-macros

-Requires:       systemd-udev

-Requires:       tdnf

-Requires:       tzdata

-Requires:       util-linux

-Requires:       vim

-Requires:       which

-Requires:       open-vm-tools-gosc

+Requires: bc

+Requires: bridge-utils

+Requires: bzip2

+Requires: cloud-init

+Requires: cpio

+Requires: docker

+Requires: dracut

+Requires: e2fsprogs

+Requires: file

+Requires: gdbm

+Requires: grep

+Requires: gzip

+Requires: iana-etc

+Requires: initramfs

+Requires: iproute2

+Requires: iptables

+Requires: iputils

+Requires: basic

+Requires: motd

+Requires: net-tools

+Requires: open-vm-tools

+Requires: open-vm-tools-gosc

+Requires: procps-ng

+Requires: rpm

+Requires: rpm-plugin-systemd-inhibit

+Requires: tzdata

+Requires: util-linux

+Requires: vim

+Requires: which

 %description

 Metapackage to install minimal profile

@@ -57,10 +44,15 @@ Metapackage to install minimal profile

 %prep

 %build

+%clean

+rm -rf %{buildroot}/*

+

 %files

 %defattr(-,root,root,0755)

 %changelog

+* Sat Jul 15 2023 Shreenidhi Shedi <sshedi@vmware.com> 5.0-1

+- Sort the require list and chop down package into basic

 * Mon Jul 18 2022 <okurth@vmware.com> 0.1-7

 - Remove pkg-config and libtool

 * Wed Oct 20 2021 Shreenidhi Shedi <sshedi@vmware.com> 0.1-6

@@ -54,11 +54,13 @@ targetDict = {

         "k8s-docker-images",

         "all-images",

         "minimal-iso",

+        "basic-iso",

         "rt-iso",

     ],

     "rpmBuild": [

         "packages",

         "packages-minimal",

+        "packages-basic",

         "packages-rt",

         "packages-initrd",

         "packages-docker",

@@ -298,6 +300,7 @@ class Utilities:

             runBashCmd(

                 f"cp {Build_Config.dataDir}/build_install_options_all.json"

                 f" {Build_Config.dataDir}/build_install_options_minimal.json"

+                f" {Build_Config.dataDir}/build_install_options_basic.json"

                 f" {Build_Config.dataDir}/build_install_options_rt.json"

                 f" {Build_Config.generatedDataPath}"

             )

@@ -790,6 +793,24 @@ class RpmBuildTarget:

             BuildEnvironmentSetup.packages_cached()

         check_prerequesite["packages-minimal"] = True

+    def packages_basic(self):

+        if check_prerequesite["packages-basic"]:

+            return

+

+        if not configdict["additional-path"]["photon-cache-path"]:

+            Builder.buildPackagesInJson(

+                os.path.join(

+                    Build_Config.dataDir, "packages_basic.json"

+                ),

+                Build_Config.buildThreads,

+                Build_Config.pkgBuildType,

+                Build_Config.pkgInfoFile,

+                self.logger,

+            )

+        else:

+            BuildEnvironmentSetup.packages_cached()

+        check_prerequesite["packages-basic"] = True

+

     def packages_rt(self):

         if check_prerequesite["packages-rt"]:

             return

@@ -1145,8 +1166,8 @@ class BuildImage:

         self.src_iso_path = None

         imgType = "photon"

-        if imgName in ["minimal-iso", "rt-iso"]:

-            flavor = imgName.split("-iso")[0]

+        if imgName in ["minimal-iso", "rt-iso", "basic-iso"]:

+            flavor = imgName.strip("-iso").replace("-", "_")

             imgType = f"photon-{flavor}"

             self.package_list_file = (

                 f"{Build_Config.dataDir}/build_install_options_{flavor}.json"

@@ -1158,7 +1179,11 @@ class BuildImage:

             )

             self.package_list_file = Build_Config.packageListFile

-        self.iso_path = f"{Build_Config.stagePath}/{imgType}-{constants.releaseVersion}-{constants.buildNumber}.{constants.currentArch}.iso"

+        self.iso_path = (

+            f"{Build_Config.stagePath}/{imgType}-"

+            f"{constants.releaseVersion}-"

+            f"{constants.buildNumber}.{constants.currentArch}.iso"

+        )

         self.debug_iso_path = self.iso_path.rpartition(".")[0] + ".debug.iso"

         if "SKIP_DEBUG_ISO" in os.environ:

@@ -1172,7 +1197,10 @@ class BuildImage:

     def img_present(self, img):

         build_num = constants.buildNumber

         release_ver = constants.releaseVersion

-        img_fn = f"{Build_Config.stagePath}/{img}/photon-{img}-{release_ver}-{build_num}.{constants.currentArch}"

+        img_fn = (

+            f"{Build_Config.stagePath}/{img}/photon-{img}-{release_ver}-"

+            f"{build_num}.{constants.currentArch}"

+        )

         if img == "ova":

             img_fn = f"{img_fn}.ova"

@@ -1180,11 +1208,20 @@ class BuildImage:

             img_fn = f"{img_fn}.tar.gz"

         elif img == "azure":

             img_fn = f"{img_fn}.vhd.tar.gz"

-        elif img in {"iso", "minimal-iso", "rt-iso", "src-iso"}:

+        elif img in {

+            "iso",

+            "rt-iso",

+            "src-iso",

+            "minimal-iso",

+            "basic-iso",

+        }:

             img = img.strip("-iso")

             if img:

                 img = f"-{img}"

-            img_fn = f"{Build_Config.stagePath}/photon{img}-{release_ver}-{build_num}.{constants.currentArch}.iso"

+            img_fn = (

+                f"{Build_Config.stagePath}/photon{img}-{release_ver}-"

+                f"{build_num}.{constants.currentArch}.iso"

+            )

         elif img in {"rpi", "ls1012afrwy"}:

             img_fn = f"{img_fn}.xz"

         else:

@@ -1206,15 +1243,17 @@ class BuildImage:

             rpmBuildTarget.packages()

         elif self.img_name == "rt-iso":

             rpmBuildTarget.packages_rt()

+        elif self.img_name == "basic-iso":

+            rpmBuildTarget.packages_basic()

         else:

             rpmBuildTarget.packages_minimal()

-        if self.img_name in ["rt-iso", "minimal-iso"]:

+        if self.img_name in ["rt-iso", "minimal-iso", "basic-iso"]:

             rpmBuildTarget.packages_initrd()

         RpmBuildTarget.create_repo()

-        if self.img_name != "minimal-iso":

+        if self.img_name not in ["minimal-iso", "basic-iso"]:

             RpmBuildTarget.ostree_repo()

         self.generated_data_path = Build_Config.generatedDataPath

@@ -1325,10 +1364,11 @@ class BuildImage:

             "all-images",

             "src-iso",

             "minimal-iso",

+            "basic-iso",

         ]

         for img in images:

             self.img_name = img

-            if img in ["iso", "src-iso", "minimal-iso"]:

+            if img in ["iso", "src-iso", "minimal-iso", "basic-iso"]:

                 self.set_Iso_Parameters(img)

                 self.build_iso()

             else:

@@ -1727,7 +1767,13 @@ def main():

         attr = None

         if targetName in targetDict["image"]:

             buildImage = BuildImage(targetName)

-            if targetName in ["iso", "src-iso", "minimal-iso", "rt-iso"]:

+            if targetName in [

+                "iso",

+                "src-iso",

+                "minimal-iso",

+                "rt-iso",

+                "basic-iso",

+            ]:

                 buildImage.set_Iso_Parameters(targetName)

                 buildImage.build_iso()

             elif targetName in buildImage.ova_cloud_images + [

new file mode 100644

@@ -0,0 +1,7 @@

+{

+    "minimal": {

+        "title": "Photon Basic package Set",

+        "packagelist_file": "packages_basic.json",

+        "visible": false

+    }

+}

new file mode 100644

@@ -0,0 +1,6 @@

+{

+    "packages": [

+        "basic",

+        "linux-esx"

+    ]

+}