ostree: upgrade to v2023.5

Change-Id: Icc70a9f00d38f1568eab305b6de7435bafeeff5c Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/21182 Tested-by: gerrit-photon <photon-checkins@vmware.com> Reviewed-by: Ankit Jain <ankitja@vmware.com>
vmware · Jul 5, 2023 · aa6436c · aa6436c
1 parent bc64503
commit aa6436c
Show file tree

Hide file tree

Showing 8 changed files with 153 additions and 419 deletions.
diff --git a/SPECS/libsoup/libsoup-2.72.spec b/SPECS/libsoup/libsoup-2.72.spec
diff --git a/SPECS/libsoup/libsoup.spec b/SPECS/libsoup/libsoup.spec
@@ -1,7 +1,7 @@
 Summary:         libsoup HTTP client/server library
 Name:            libsoup
 Version:         3.2.1
-Release:         6%{?dist}
+Release:         7%{?dist}
 License:         GPLv2
 URL:             http://wiki.gnome.org/LibSoup
 Group:           System Environment/Development
@@ -11,29 +11,29 @@ Distribution:    Photon
 Source0: http://ftp.gnome.org/pub/GNOME/sources/libsoup/3.2/%{name}-%{version}.tar.xz
 %define sha512 %{name}=e5f60fd700f4cda041d869eec50e787b2fbe9323949b90710405cff296e108bab6d1323ab96e89855c5396ce73c7b7574b424dbe957ae10b48740b272889be51
 
-BuildRequires:   glib-devel
-BuildRequires:   libxml2-devel
-BuildRequires:   intltool
-BuildRequires:   python3-devel
-BuildRequires:   python3-tools
-BuildRequires:   glib-networking
-BuildRequires:   autogen
-BuildRequires:   sqlite-devel
-BuildRequires:   libpsl-devel
-BuildRequires:   krb5-devel
-BuildRequires:   httpd
-BuildRequires:   meson >= 0.50
-BuildRequires:   cmake
-BuildRequires:   nghttp2-devel
-BuildRequires:   gobject-introspection-devel
-BuildRequires:   gnutls-devel
-
-Requires:        libxml2
-Requires:        glib-networking
-Requires:        sqlite-libs
-Requires:        libpsl
-Requires:        krb5
-Requires:        nghttp2
+BuildRequires: glib-devel
+BuildRequires: libxml2-devel
+BuildRequires: intltool
+BuildRequires: python3-devel
+BuildRequires: python3-tools
+BuildRequires: glib-networking
+BuildRequires: autogen
+BuildRequires: sqlite-devel
+BuildRequires: libpsl-devel
+BuildRequires: krb5-devel
+BuildRequires: httpd
+BuildRequires: meson
+BuildRequires: cmake
+BuildRequires: nghttp2-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gnutls-devel
+
+Requires: libxml2
+Requires: glib-networking
+Requires: sqlite-libs
+Requires: libpsl
+Requires: krb5
+Requires: nghttp2
 
 %description
 libsoup is HTTP client/server library for GNOME
@@ -46,6 +46,7 @@ Requires:        glib-devel
 Requires:        libxml2-devel
 Requires:        sqlite-devel
 Requires:        libpsl-devel
+Requires:        nghttp2-devel
 
 %description     devel
 Header files for libsoup.
@@ -94,6 +95,8 @@ These are the additional language files of libsoup.
 %{_datadir}/locale/*
 
 %changelog
+* Tue Jul 04 2023 Shreenidhi Shedi <sshedi@vmware.com> 3.2.1-7
+- Add nghttp2-devel to devel package requires
 * Thu May 25 2023 Ashwin Dayanand Kamat <kashwindayan@vmware.com> 3.2.1-6
 - Bump version as a part of libxml2 upgrade
 * Mon Apr 03 2023 Nitesh Kumar <kunitesh@vmware.com> 3.2.1-5

diff --git a/SPECS/ostree/dualboot-support.patch → SPECS/ostree/0001-dualboot-support.patch b/SPECS/ostree/dualboot-support.patch → SPECS/ostree/0001-dualboot-support.patch
@@ -1,16 +1,26 @@
+From 881a090a1d3bc866d6aff35a3d5667a8da3aa7af Mon Sep 17 00:00:00 2001
+From: Shreenidhi Shedi <sshedi@vmware.com>
+Date: Tue, 4 Jul 2023 15:46:41 +0530
+Subject: [PATCH 1/4] dualboot-support
+
+Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
+---
+ src/libostree/ostree-bootloader-grub2.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
 diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
-index ceea682..ee3ae6f 100644
+index e1ee786..5e6fef5 100644
 --- a/src/libostree/ostree-bootloader-grub2.c
 +++ b/src/libostree/ostree-bootloader-grub2.c
-@@ -174,6 +174,7 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot                 *sysroot
+@@ -166,6 +166,7 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot, int bootversio
 
    /* Passed from the parent */
    gboolean is_efi = g_getenv ("_OSTREE_GRUB2_IS_EFI") != NULL;
 +  gboolean is_bios = g_getenv ("_OSTREE_GRUB2_IS_BIOS") != NULL;
 
-   g_autoptr(GOutputStream) out_stream = g_unix_output_stream_new (target_fd, FALSE);
+   g_autoptr (GOutputStream) out_stream = g_unix_output_stream_new (target_fd, FALSE);
 
-@@ -219,10 +220,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot                 *sysroot
+@@ -212,10 +213,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot, int bootversio
        if (!kernel)
          return glnx_throw (error, "No \"linux\" key in bootloader config");
        g_string_append (output, "linux");
@@ -25,7 +35,7 @@ index ceea682..ee3ae6f 100644
        g_string_append_c (output, ' ');
        g_string_append (output, kernel);
 
-@@ -238,10 +241,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot                 *sysroot
+@@ -231,10 +234,12 @@ _ostree_bootloader_grub2_generate_config (OstreeSysroot *sysroot, int bootversio
        if (initrd)
          {
            g_string_append (output, "initrd");
@@ -40,3 +50,6 @@ index ceea682..ee3ae6f 100644
            g_string_append_c (output, ' ');
            g_string_append (output, initrd);
            g_string_append_c (output, '\n');
+-- 
+2.41.0
+
diff --git a/...ing-photon-config-to-boot-directory.patch → ...ing-photon-config-to-boot-directory.patch b/...ing-photon-config-to-boot-directory.patch → ...ing-photon-config-to-boot-directory.patch
@@ -1,7 +1,7 @@
-From ac64f92b68bfcdd4df1fd0833ad865649b537d11 Mon Sep 17 00:00:00 2001
+From e59899b39b2fa9fe5b827049e54c6b55d5c56819 Mon Sep 17 00:00:00 2001
 From: Ankit Jain <ankitja@vmware.com>
 Date: Sat, 28 Aug 2021 12:04:19 +0000
-Subject: [PATCH] ostree: Copying photon config to boot directory
+Subject: [PATCH 2/4] ostree: Copying photon config to boot directory
 
 Copying photon specific config files to suitable boot directory,
 to get the kernel and systemd command line parameter
@@ -13,18 +13,18 @@ Signed-off-by: Ankit Jain <ankitja@vmware.com>
  1 file changed, 68 insertions(+)
 
 diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
-index 6a13a41b..7a566529 100644
+index 2454a58..13387af 100644
 --- a/src/libostree/ostree-sysroot-deploy.c
 +++ b/src/libostree/ostree-sysroot-deploy.c
-@@ -987,6 +987,7 @@ ostree_sysroot_write_origin_file (OstreeSysroot         *sysroot,
-
- typedef struct {
-   int   boot_dfd;
-+  int   ostree_boot_dfd;
+@@ -998,6 +998,7 @@ ostree_sysroot_write_origin_file (OstreeSysroot *sysroot, OstreeDeployment *depl
+ typedef struct
+ {
+   int boot_dfd;
++  int ostree_boot_dfd;
    char *kernel_srcpath;
    char *kernel_namever;
    char *kernel_hmac_srcpath;
-@@ -994,6 +995,10 @@ typedef struct {
+@@ -1005,6 +1006,10 @@ typedef struct
    char *initramfs_srcpath;
    char *initramfs_namever;
    char *devicetree_srcpath;
@@ -33,24 +33,24 @@ index 6a13a41b..7a566529 100644
 +  char *kernelcfg_srcpath;
 +  char *kernelcfg_namever;
    char *devicetree_namever;
-   char *bootcsum;
- } OstreeKernelLayout;
-@@ -1009,6 +1014,10 @@ _ostree_kernel_layout_free (OstreeKernelLayout *layout)
+   char *aboot_srcpath;
+   char *aboot_namever;
+@@ -1022,6 +1027,10 @@ _ostree_kernel_layout_free (OstreeKernelLayout *layout)
    g_free (layout->initramfs_namever);
    g_free (layout->devicetree_srcpath);
    g_free (layout->devicetree_namever);
 +  g_free (layout->systemdcfg_srcpath);
 +  g_free (layout->systemdcfg_namever);
 +  g_free (layout->kernelcfg_srcpath);
 +  g_free (layout->kernelcfg_namever);
+   g_free (layout->aboot_srcpath);
+   g_free (layout->aboot_namever);
    g_free (layout->bootcsum);
-   g_free (layout);
- }
-@@ -1182,6 +1191,26 @@ get_kernel_from_tree_usrlib_modules (OstreeSysroot       *sysroot,
+@@ -1217,6 +1226,26 @@ get_kernel_from_tree_usrlib_modules (OstreeSysroot *sysroot, int deployment_dfd,
        ret_layout->kernel_hmac_namever = g_strdup_printf (".%s.hmac", ret_layout->kernel_namever);
      }
 
-+/* Setting the param for Copying Photon Specific config files to sutiable location */
++  /* Setting the param for Copying Photon Specific config files to sutiable location */
 +  if (!glnx_opendirat (deployment_dfd, "usr/lib/ostree-boot", FALSE, &ret_layout->ostree_boot_dfd, error))
 +       return FALSE;
 +  if (!ot_openat_ignore_enoent (ret_layout->ostree_boot_dfd, "photon.cfg", &fd, error))
@@ -70,10 +70,10 @@ index 6a13a41b..7a566529 100644
 +    }
 +  glnx_close_fd (&fd);
 +
-   char hexdigest[OSTREE_SHA256_STRING_LEN+1];
+   char hexdigest[OSTREE_SHA256_STRING_LEN + 1];
    ot_checksum_get_hexdigest (&checksum, hexdigest, sizeof (hexdigest));
    ret_layout->bootcsum = g_strdup (hexdigest);
-@@ -1897,6 +1926,33 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+@@ -2005,6 +2034,33 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
        g_ptr_array_add (overlay_initrds, g_steal_pointer (&destpath));
      }
 
@@ -107,7 +107,7 @@ index 6a13a41b..7a566529 100644
    g_autofree char *contents = NULL;
    if (!glnx_fstatat_allow_noent (deployment_dfd, "usr/lib/os-release", &stbuf, 0, error))
      return FALSE;
-@@ -1992,6 +2048,18 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
+@@ -2103,6 +2159,18 @@ install_deployment_kernel (OstreeSysroot *sysroot, int new_bootversion,
        ostree_kernel_args_replace_take (kargs, g_steal_pointer (&prepare_root_arg));
      }
 
@@ -123,9 +123,9 @@ index 6a13a41b..7a566529 100644
 +      ostree_bootconfig_parser_set (bootconfig, "kernelcfg", ph_boot_relpath);
 +    }
 +
-   if (kernel_layout->devicetree_namever)
+   const char *aboot_fn = NULL;
+   if (kernel_layout->aboot_namever)
      {
-       g_autofree char * dt_boot_relpath = g_strconcat ("/", bootcsumdir, "/", kernel_layout->devicetree_namever, NULL);
 -- 
-2.23.1
+2.41.0