@@ -52,7 +52,7 @@ index c72ceb1..81301cd 100755

      def __init__(self, working_directory="/mnt/photon-root",

 -                 rpm_path=os.path.dirname(__file__)+"/../stage/RPMS", log_path=os.path.dirname(__file__)+"/../stage/LOGS"):

 +                 rpm_path=os.path.dirname(__file__)+"/../stage/RPMS", log_path=os.path.dirname(__file__)+"/../stage/LOGS",

-+                 insecure_installation=False, photon_release_version='4.0'):

++                 insecure_installation=False, photon_release_version='5.0'):

          self.exiting = False

          self.interactive = False

          self.install_config = None

@@ -3,7 +3,7 @@

 Summary:       Photon OS Installer

 Name:          photon-os-installer

 Version:       2.0

-Release:       10%{?dist}

+Release:       11%{?dist}

 License:       Apache 2.0 and GPL 2.0

 Group:         System Environment/Base

 Vendor:        VMware, Inc.

@@ -54,6 +54,8 @@ rm -rf %{buildroot}

 %{_bindir}/photon-installer

 %changelog

+* Wed Jan 04 2023 Tapas Kundu <tkundu@vmware.com> 2.0-11

+- Update dist version in 0009-installer-Removed-insecure_installation-and-photon_r.patch

 * Mon Jan 02 2023 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 2.0-10

 - Rebuild with new cracklib

 * Tue Dec 06 2022 Piyush Gupta <gpiyush@vmware.com> 2.0-9

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

 Summary:        Photon release files

 Name:           photon-release

-Version:        4.0

-Release:        2%{?dist}

+Version:        5.0

+Release:        1%{?dist}

 License:        Apache License

 Group:          System Environment/Base

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

@@ -9,7 +9,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        %{name}-%{version}.tar.gz

-%define sha1    %{name}=ced639518d32f9ac8ff00a71853812057db3ab3c

+%define sha512  %{name}=a991501455f5291d3075e9b900327cf3537527cc1b2c890dc7b01555381afc6fb3d124d7f86a3c58246fdd33ea69b0dafb231b1669ce757770aba55555ff09bd

 Source1:        lsb_release

@@ -79,6 +79,8 @@ rm -rf %{buildroot}

 %config(noreplace) %{_sysconfdir}/issue.net

 %changelog

+* Wed Dec 21 2022 Tapas Kundu <tkundu@vmware.com> 5.0-1

+- Update to 5.0

 * Wed Oct 27 2021 Shreenidhi Shedi <sshedi@vmware.com> 4.0-2

 - Add lsb_release

 * Wed Oct 07 2020 Anish Swaminathan <anishs@vmware.com> 4.0-1

@@ -1,11 +1,11 @@

 Summary:        Photon repo files, gpg keys

 Name:           photon-repos

-Version:        4.0

-Release:        4%{?dist}

+Version:        5.0

+Release:        1%{?dist}

 License:        Apache License

 Group:          System Environment/Base

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

-Source0:        photon-repos-4.0.tar.gz

+Source0:        photon-repos-%{version}.tar.gz

 %define sha512  photon-repos=0ee59bd2c955d98b14dd2fee3b9e5a241ac3d3a62648853b0df1191128918af4316ec650906b70d4d1edce609180f5fd2d36b7719d08de74d3ce4260837645c0

 Source1:        VMWARE-RPM-GPG-KEY

 Source2:        VMWARE-RPM-GPG-KEY-4096

@@ -57,6 +57,8 @@ rm -rf %{buildroot}

 %config(noreplace) /etc/yum.repos.d/photon-release.repo

 %changelog

+*   Wed Dec 21 2022 Tapas Kundu <tkundu@vmware.com> 5.0-1

+-   Update to 5.0

 *   Mon Jul 18 2022 Piyush Gupta <gpiyush@vmware.com> 4.0-4

 -   Add photon-release as requires of photon-repos.

 *   Thu Feb 24 2022 Oliver Kurth <okurth@vmware.com> 4.0-3

@@ -58,11 +58,11 @@ cat > $JSONFILE << EOF

         "osname": "photon",

-        "releasever": "4.0",

+        "releasever": "5.0",

-        "ref": "photon/4.0/x86_64/minimal",

+        "ref": "photon/5.0/x86_64/minimal",

-        "automatic_version_prefix": "4.0_minimal",

+        "automatic_version_prefix": "5.0_minimal",

         "repos": ["photon", "photon-updates", "photon-extras"],

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

 Summary:        Commit RPMs to an OSTree repository

 Name:           rpm-ostree

 Version:        2022.13

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        LGPLv2+

 Group:          Applications/System

 URL:            https://github.com/projectatomic/rpm-ostree

@@ -162,6 +162,8 @@ rm -rf %{buildroot}/*

 %{_bindir}/rpm-ostree-server/mkostreerepo

 %changelog

+* Fri Jan 06 2023 Tapas Kundu <tkundu@vmware.com> 2022.13-6

+- Update dist tag

 * Fri Jan 06 2023 Piyush Gupta <gpiyush@vmware.com> 2022.13-5

 - Added requires libsolv-0.7.22.

 * Tue Jan 03 2023 Shreenidhi Shedi <sshedi@vmware.com> 2022.13-4

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

 {

     "photon-build-param" : {

             "photon-build-type" : "chroot",

-            "photon-dist-tag" : ".ph4",

-            "photon-release-version" : "4.0",

+            "photon-dist-tag" : ".ph5",

+            "photon-release-version" : "5.0",

             "threads" : 4,

             "loglevel" : "info",

             "full-package-list-file" : "build_install_options_all.json",

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 COPY [ "./stage-rpms-tdnf.conf", "./tmp/stage-rpms.repo", "/tmp/tdnf/" ]

 RUN tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf erase -y toybox

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 ADD tmp/calico/usr/bin/controller /dist/

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 # Minimum Docker API version required for libnetwork.

 ENV DOCKER_API_VERSION 1.21

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 COPY tmp/usr/bin/coredns /

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 COPY [ "./stage-rpms-tdnf.conf", "./tmp/stage-rpms.repo", "/tmp/tdnf/" ]

 RUN tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf install -y dnsmasq --refresh

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 ENV FLANNEL_ARCH=amd64

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 ADD tmp/k8heapster/usr/bin/heapster /heapster

 ADD tmp/k8heapster/usr/bin/eventer /eventer

@@ -2,6 +2,6 @@

 FROM scratch

-ADD photon-rootfs-4.0.tar.gz /

+ADD photon-rootfs-5.0.tar.gz /

 CMD ["/bin/sh"]

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 ADD tmp/k8dns/usr/bin/kube-dns /kube-dns

 ENTRYPOINT ["/kube-dns"]

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 COPY tmp/k8smetserv/usr/bin/metrics-server /

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 COPY [ "./stage-rpms-tdnf.conf", "./tmp/stage-rpms.repo", "/tmp/tdnf/" ]

 RUN tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf install -y openssl nginx shadow zlib-devel --refresh

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 ADD tmp/k8dns/usr/bin/sidecar /sidecar

@@ -1,4 +1,4 @@

-FROM k8s-base-image:4.0

+FROM k8s-base-image:5.0

 # This script may automatically configure wavefront without prompting, based on

 # these variables:

Binary files a/support/image-builder/iso/BUILD_DVD/isolinux/splash.png and b/support/image-builder/iso/BUILD_DVD/isolinux/splash.png differ

@@ -155,7 +155,7 @@ cd /installer

 ACTIVE_CONSOLE="\$(< /sys/devices/virtual/tty/console/active)"

 install() {

-  LANG=en_US.UTF-8 photon-installer -i iso -o $PACKAGE_LIST_FILE_BASE_NAME -e EULA.txt -t "VMWARE 4.0 LICENSE AGREEMENT" -v $PHOTON_RELEASE_VER && shutdown -r now

+  LANG=en_US.UTF-8 photon-installer -i iso -o $PACKAGE_LIST_FILE_BASE_NAME -e EULA.txt -t "VMWARE 5.0 LICENSE AGREEMENT" -v $PHOTON_RELEASE_VER && shutdown -r now

 }

 try_run_installer() {

@@ -3,11 +3,11 @@

     "osname": "photon",

-    "releasever": "4.0",

+    "releasever": "5.0",

-    "ref": "photon/4.0/x86_64/minimal",

+    "ref": "photon/5.0/x86_64/minimal",

-    "automatic_version_prefix": "4.0_minimal",

+    "automatic_version_prefix": "5.0_minimal",

     "repos": ["photon-ostree"],

@@ -1,5 +1,5 @@

 [photon-ostree]

-name=VMware Photon OSTree Linux 4.0(x86_64)

+name=VMware Photon OSTree Linux 5.0(x86_64)

 gpgkey=file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY-4096

 gpgcheck=0

 enabled=1

@@ -3,8 +3,8 @@

  		<Info>Information about the installed software</Info> 

  		<Product>Photon OS</Product> 

  		<Vendor>VMware Inc.</Vendor> 

- 		<Version>4.0</Version> 

- 		<FullVersion>4.0</FullVersion> 

+ 		<Version>5.0</Version> 

+ 		<FullVersion>5.0</FullVersion> 

  	</ProductSection>

 	<EulaSection>

         <Info>End User License Agreement</Info>

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

  		<Info>Information about the installed software</Info> 

  		<Product>Photon OS</Product> 

  		<Vendor>VMware Inc.</Vendor> 

- 		<Version>4.0</Version> 

- 		<FullVersion>4.0</FullVersion> 

+ 		<Version>5.0</Version> 

+ 		<FullVersion>5.0</FullVersion> 

  	</ProductSection>

 	<EulaSection>

         <Info>End User License Agreement</Info>