folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

photon-os-installer: Upgrade to v2.7 

- Consuming POI container changes
- Use platform provided kickstart file changes
- packages_installer_initrd.json changes as per
  https://github.com/vmware/photon-os-installer/blob/master/photon_installer/packages_installer_initrd.json
  Added:
   - stig-hardening,
   - open-vm-tools
  Removed:
   - pkg-config

Change-Id: I83a9e2d2b34725ed0de5f0dfffe36a8bf88c898c
Signed-off-by: Ankit Jain <ankit-aj.jain@broadcom.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/23966
Reviewed-by: Oliver Kurth <okurth@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
(cherry picked from commit 73011ea84f)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/24135
Reviewed-by: Bo Gan <bo.gan@broadcom.com>
This commit is contained in:
Ankit Jain 2024-05-24 06:27:13 +00:00 committed by Michelle Wang
parent 9a67b4222a
commit 8f4db5b394
3 changed files with 67 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SPECS/photon-os-installer/0001-photon-os-installer-ostreeinstaller-Fix-tmp-mountpoi.patch
View File

@ -1,33 +0,0 @@
From cc4ecce518d1d232820688595c2c2550907bbba6 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankitja@vmware.com>
Date: Wed, 25 Oct 2023 06:34:28 +0000
Subject: [PATCH] photon-os-installer: ostreeinstaller: Fix tmp mountpoint
- tmp mountpoint inside deployment is broken symlink
causing failure in tmpfs mount command.
- Fixed it by creating symlink before doing mount
Change-Id: Iab1d585151616e4fbe3a9c4890996082f79eb3b8
Signed-off-by: Ankit Jain <ankitja@vmware.com>
---
photon_installer/ostreeinstaller.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/photon_installer/ostreeinstaller.py b/photon_installer/ostreeinstaller.py
index c3e10bc..72a5fae 100755
--- a/photon_installer/ostreeinstaller.py
+++ b/photon_installer/ostreeinstaller.py
@@ -165,9 +165,9 @@ class OstreeInstaller(object):
commit_number = self.get_commit_number(self.ostree_ref)
self.do_systemd_tmpfiles_commands(commit_number)
- self.run_lambdas([lambda: self.mount_devices_in_deployment(commit_number)], "mounting done")
deployment = os.path.join(self.photon_root, f"ostree/deploy/photon/deploy/{commit_number}.0/")
self.create_symlink_directory(deployment)
+ self.run_lambdas([lambda: self.mount_devices_in_deployment(commit_number)], "mounting done")
if os.path.exists(loader1):
cmd = []
--
2.23.1

12
SPECS/photon-os-installer/photon-os-installer.spec
View File

@ -2,15 +2,15 @@
Summary: Photon OS Installer
Name: photon-os-installer
Version: 2.4
Release: 4%{?dist}
Version: 2.7
Release: 1%{?dist}
License: Apache 2.0 and GPL 2.0
Group: System Environment/Base
Vendor: VMware, Inc.
Distribution: Photon
URL: https://github.com/vmware/photon-os-installer
Source0: %{name}-%{version}.tar.gz
%define sha512 %{name}=a361c22234ed467c0cf1a827d1a3a15553ebde6f68e48c8d32f4867d26ca9326029d7840791bed0186565e935670ebcc273a5fe77c84a90dc80f2a80d5972dda
%define sha512 %{name}=9c2b6df1e9136e94db1451064b51a286b2894849b309dde9539cb9df4fc82e807c74ccb0f7795d7d1d5b2c1ea856dfb38623e1c08e94c567696a637ca6f75fe8
BuildRequires: python3-devel
BuildRequires: python3-pyinstaller
@ -41,8 +41,8 @@ Requires: lvm2
Requires: zlib
Requires: cdrkit
Requires: findutils
Patch0: 0001-photon-os-installer-ostreeinstaller-Fix-tmp-mountpoi.patch
# needed for --rpmdefine option
Requires: tdnf >= 3.5.6
%description
Installer to build Photon images
@ -66,6 +66,8 @@ rm -rf %{buildroot}
%{_bindir}/photon-iso-builder
%changelog
* Mon Jun 24 2024 Ankit Jain <ankit-aj.jain@broadcom.com> 2.7-1
- Upgrade to v2.7
* Mon Jun 03 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 2.4-4
- Bump version as a part of python3-pyOpenSSL upgrade
* Fri Apr 12 2024 Ankit Jain <ankit-aj.jain@broadcom.com> 2.4-3

119
common/data/packages_installer_initrd.json
View File

@ -1,74 +1,75 @@
{
"packages": [
"filesystem",
"grub2-theme",
"grub2-efi-image",
"glibc",
"zlib",
"file",
"gmp",
"libgcc",
"libstdc++",
"bash",
"sed",
"haveged",
"ncurses-terminfo",
"bzip2",
"pkg-config",
"python3-curses",
"ncurses",
"cracklib",
"cracklib-dicts",
"python3-cracklib",
"shadow",
"coreutils",
"grep",
"readline",
"findutils",
"xz",
"util-linux",
"e2fsprogs",
"libffi",
"expat",
"linux",
"cpio",
"Linux-PAM",
"attr",
"bash",
"btrfs-progs",
"bzip2",
"coreutils",
"cpio",
"cracklib",
"cracklib-dicts",
"curl",
"dbus",
"dosfstools",
"dracut",
"e2fsprogs",
"efibootmgr",
"efivar",
"expat",
"file",
"filesystem",
"findutils",
"glib",
"glibc",
"gmp",
"gptfdisk",
"grep",
"grub2",
"grub2-efi",
"grub2-efi-image",
"grub2-theme",
"gzip",
"haveged",
"libcap",
"libffi",
"libgcc",
"libstdc++",
"linux",
"lua",
"lvm2",
"ncurses",
"ncurses-terminfo",
"nspr",
"nss",
"open-vm-tools",
"ostree",
"ostree-grub2",
"ostree-libs",
"pcre",
"photon-os-installer",
"popt",
"python3",
"python3-cracklib",
"python3-curses",
"python3-libs",
"python3-requests",
"readline",
"rpm",
"sed",
"shadow",
"sqlite",
"stig-hardening",
"systemd",
"systemd-libs",
"systemd-pam",
"systemd-udev",
"dbus",
"gzip",
"sqlite",
"nspr",
"nss",
"popt",
"lua",
"rpm",
"gptfdisk",
"tar",
"python3",
"python3-libs",
"pcre",
"glib",
"tdnf",
"python3-requests",
"grub2",
"grub2-efi",
"efivar",
"efibootmgr",
"dracut",
"curl",
"dosfstools",
"ostree",
"ostree-grub2",
"ostree-libs",
"lvm2",
"btrfs-progs",
"util-linux",
"xfsprogs",
"photon-os-installer"
"xz",
"zlib"
],
"packages_x86_64": [
"grub2-pc"