RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/ostree#4f9cacf8d3f63777d4ebf5cbce1c92f952bb78f2
This commit is contained in:
parent
2644af0bc7
commit
3f83b3fd4f
84
.gitignore
vendored
84
.gitignore
vendored
@ -0,0 +1,84 @@
|
|||||||
|
/ostree-2012.12.tar.gz
|
||||||
|
/ostree-2012.13.tar.xz
|
||||||
|
/ostree-2013.2.tar.xz
|
||||||
|
/ostree-2013.3.tar.xz
|
||||||
|
/ostree-2013.4.tar.xz
|
||||||
|
/ostree-2013.5.tar.xz
|
||||||
|
/ostree-2013.6.tar.xz
|
||||||
|
/ostree-2013.7.tar.xz
|
||||||
|
/ostree-2014.1.tar.xz
|
||||||
|
/ostree-2014.2.tar.xz
|
||||||
|
/ostree-2014.3.tar.xz
|
||||||
|
/ostree-2014.3.13.g913337c.tar.xz
|
||||||
|
/ostree-2014.4.tar.xz
|
||||||
|
/ostree-2014.5.tar.xz
|
||||||
|
/ostree-2014.6.tar.xz
|
||||||
|
/ostree-2014.7.tar.xz
|
||||||
|
/ostree-2014.8.tar.xz
|
||||||
|
/ostree-2014.9.tar.xz
|
||||||
|
/ostree-2014.10.1.gedc3b9a.tar.xz
|
||||||
|
/ostree-2014.11.tar.xz
|
||||||
|
/ostree-2014.12.tar.xz
|
||||||
|
/ostree-2014.13.tar.xz
|
||||||
|
/ostree-2015.1.tar.xz
|
||||||
|
/ostree-2015.2.tar.xz
|
||||||
|
/ostree-2015.3.tar.xz
|
||||||
|
/ostree-2015.4.tar.xz
|
||||||
|
/ostree-2015.5.tar.xz
|
||||||
|
/ostree-2015.6.tar.xz
|
||||||
|
/ostree-2015.7.tar.xz
|
||||||
|
/ostree-2015.8.tar.xz
|
||||||
|
/ostree-2015.9.tar.xz
|
||||||
|
/ostree-2015.10.tar.xz
|
||||||
|
/ostree-2015.11.tar.xz
|
||||||
|
/ostree-2016.1.tar.xz
|
||||||
|
/ostree-2016.2.tar.xz
|
||||||
|
/ostree-2016.3.tar.xz
|
||||||
|
/ostree-2016.4.tar.xz
|
||||||
|
/ostree-2016.5.tar.xz
|
||||||
|
/ostree-2016.6.tar.xz
|
||||||
|
/ostree-2016.7.tar.xz
|
||||||
|
/ostree-2016.8.tar.xz
|
||||||
|
/ostree-2016.9.tar.xz
|
||||||
|
/ostree-2016.10.tar.xz
|
||||||
|
/ostree-2016.11.tar.xz
|
||||||
|
/ostree-2016.12.tar.xz
|
||||||
|
/ostree-2016.13.tar.xz
|
||||||
|
/ostree-2016.14.tar.xz
|
||||||
|
/ostree-2016.15.tar.xz
|
||||||
|
/ostree-2017.1.tar.xz
|
||||||
|
/libostree-2017.2.tar.xz
|
||||||
|
/libostree-2017.3.tar.xz
|
||||||
|
/libostree-2017.4.tar.xz
|
||||||
|
/libostree-2017.5.tar.xz
|
||||||
|
/libostree-2017.6.tar.xz
|
||||||
|
/libostree-2017.7.tar.xz
|
||||||
|
/libostree-2017.8.tar.xz
|
||||||
|
/libostree-2017.9.tar.xz
|
||||||
|
/libostree-2017.10.tar.xz
|
||||||
|
/libostree-2017.11.tar.xz
|
||||||
|
/libostree-2017.12.tar.xz
|
||||||
|
/libostree-2017.13.tar.xz
|
||||||
|
/libostree-2017.14.tar.xz
|
||||||
|
/libostree-2017.15.tar.xz
|
||||||
|
/libostree-2018.1.tar.xz
|
||||||
|
/libostree-2018.2.tar.xz
|
||||||
|
/libostree-2018.3.tar.xz
|
||||||
|
/libostree-2018.5.tar.xz
|
||||||
|
/libostree-2018.6.tar.xz
|
||||||
|
/libostree-2018.7.tar.xz
|
||||||
|
/libostree-2018.8.tar.xz
|
||||||
|
/libostree-2018.9.tar.xz
|
||||||
|
/libostree-2019.1.tar.xz
|
||||||
|
/libostree-2019.2.tar.xz
|
||||||
|
/libostree-2019.3.tar.xz
|
||||||
|
/libostree-2019.4.tar.xz
|
||||||
|
/libostree-2019.5.tar.xz
|
||||||
|
/libostree-2019.6.tar.xz
|
||||||
|
/libostree-2020.1.tar.xz
|
||||||
|
/libostree-2020.2.tar.xz
|
||||||
|
/libostree-2020.3.tar.xz
|
||||||
|
/libostree-2020.4.tar.xz
|
||||||
|
/libostree-2020.5.tar.xz
|
||||||
|
/libostree-2020.6.tar.xz
|
||||||
|
/libostree-2020.7.tar.xz
|
278
0001-deploy-Remove-deployment-bootcsum-assertion.patch
Normal file
278
0001-deploy-Remove-deployment-bootcsum-assertion.patch
Normal file
@ -0,0 +1,278 @@
|
|||||||
|
From aa2a2783ea71d956db41f0f874d596752e47449f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Colin Walters <walters@verbum.org>
|
||||||
|
Date: Thu, 24 Sep 2020 19:28:31 +0000
|
||||||
|
Subject: [PATCH] deploy: Remove deployment bootcsum assertion
|
||||||
|
|
||||||
|
When support for devicetree was added, it created a problem
|
||||||
|
because old and new ostree versions would compute different
|
||||||
|
checksums for the "boot data". The scenario here is:
|
||||||
|
|
||||||
|
- Have system with ostree < 2020.4
|
||||||
|
- Reboot into system with ostree 2020.5
|
||||||
|
- Try to perform an operation that would retain
|
||||||
|
that previous booted deployment (common)
|
||||||
|
|
||||||
|
Currently ostree iterates over all the deployments
|
||||||
|
that will be retained and calls `install_deployment_kernel()`,
|
||||||
|
even for the booted one (which is a bit silly), but
|
||||||
|
just to verify that all boot data for the targeted
|
||||||
|
deployments are installed.
|
||||||
|
|
||||||
|
This then re-computes the checksum and we'd trip this
|
||||||
|
assertion.
|
||||||
|
|
||||||
|
In practice though, we don't strictly require them to match;
|
||||||
|
the only thing that will happen if they don't is that we'll
|
||||||
|
end up with another copy of the kernel/initramfs - and
|
||||||
|
that only temporarily until the previous deployment
|
||||||
|
gets GC'd.
|
||||||
|
|
||||||
|
Longer term, I think what we really want to do anyways
|
||||||
|
is probably closer to like a little ostree repo for `/boot`
|
||||||
|
so that we can e.g. still hardlink kernels there even if
|
||||||
|
the initramfs changes, or hardlink both kernel/initramfs
|
||||||
|
if just the devicetree changes, etc.
|
||||||
|
|
||||||
|
Closes: https://github.com/ostreedev/ostree/issues/2154
|
||||||
|
---
|
||||||
|
Makefile-tests.am | 1 +
|
||||||
|
src/libostree/ostree-sysroot-deploy.c | 67 ++++++++++++++------------
|
||||||
|
src/libostree/ostree-sysroot-private.h | 1 +
|
||||||
|
src/libostree/ostree-sysroot.c | 1 +
|
||||||
|
tests/test-osupdate-dtb.sh | 62 ++++++++++++++++++++++++
|
||||||
|
5 files changed, 101 insertions(+), 31 deletions(-)
|
||||||
|
create mode 100755 tests/test-osupdate-dtb.sh
|
||||||
|
|
||||||
|
diff --git a/Makefile-tests.am b/Makefile-tests.am
|
||||||
|
index a4179377..eb110dad 100644
|
||||||
|
--- a/Makefile-tests.am
|
||||||
|
+++ b/Makefile-tests.am
|
||||||
|
@@ -105,6 +105,7 @@ _installed_or_uninstalled_test_scripts = \
|
||||||
|
tests/test-admin-deploy-nomerge.sh \
|
||||||
|
tests/test-admin-deploy-none.sh \
|
||||||
|
tests/test-admin-deploy-bootid-gc.sh \
|
||||||
|
+ tests/test-osupdate-dtb.sh \
|
||||||
|
tests/test-admin-instutil-set-kargs.sh \
|
||||||
|
tests/test-admin-upgrade-not-backwards.sh \
|
||||||
|
tests/test-admin-pull-deploy-commit.sh \
|
||||||
|
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
index 3f337a50..d97d96a8 100644
|
||||||
|
--- a/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
@@ -1028,7 +1028,8 @@ _ostree_kernel_layout_new (void)
|
||||||
|
|
||||||
|
/* See get_kernel_from_tree() below */
|
||||||
|
static gboolean
|
||||||
|
-get_kernel_from_tree_usrlib_modules (int deployment_dfd,
|
||||||
|
+get_kernel_from_tree_usrlib_modules (OstreeSysroot *sysroot,
|
||||||
|
+ int deployment_dfd,
|
||||||
|
OstreeKernelLayout **out_layout,
|
||||||
|
GCancellable *cancellable,
|
||||||
|
GError **error)
|
||||||
|
@@ -1137,37 +1138,41 @@ get_kernel_from_tree_usrlib_modules (int deployment_dfd,
|
||||||
|
g_clear_object (&in);
|
||||||
|
glnx_close_fd (&fd);
|
||||||
|
|
||||||
|
- /* Check for /usr/lib/modules/$kver/devicetree first, if it does not
|
||||||
|
- * exist check for /usr/lib/modules/$kver/dtb/ directory.
|
||||||
|
- */
|
||||||
|
- if (!ot_openat_ignore_enoent (ret_layout->boot_dfd, "devicetree", &fd, error))
|
||||||
|
- return FALSE;
|
||||||
|
- if (fd != -1)
|
||||||
|
- {
|
||||||
|
- ret_layout->devicetree_srcpath = g_strdup ("devicetree");
|
||||||
|
- ret_layout->devicetree_namever = g_strdup_printf ("devicetree-%s", kver);
|
||||||
|
- in = g_unix_input_stream_new (fd, FALSE);
|
||||||
|
- if (!ot_gio_splice_update_checksum (NULL, in, &checksum, cancellable, error))
|
||||||
|
- return FALSE;
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
+ /* Testing aid for https://github.com/ostreedev/ostree/issues/2154 */
|
||||||
|
+ const gboolean no_dtb = (sysroot->debug_flags & OSTREE_SYSROOT_DEBUG_TEST_NO_DTB) > 0;
|
||||||
|
+ if (!no_dtb)
|
||||||
|
{
|
||||||
|
- struct stat stbuf;
|
||||||
|
- /* Check for dtb directory */
|
||||||
|
- if (!glnx_fstatat_allow_noent (ret_layout->boot_dfd, "dtb", &stbuf, 0, error))
|
||||||
|
+ /* Check for /usr/lib/modules/$kver/devicetree first, if it does not
|
||||||
|
+ * exist check for /usr/lib/modules/$kver/dtb/ directory.
|
||||||
|
+ */
|
||||||
|
+ if (!ot_openat_ignore_enoent (ret_layout->boot_dfd, "devicetree", &fd, error))
|
||||||
|
return FALSE;
|
||||||
|
-
|
||||||
|
- if (errno == 0 && S_ISDIR (stbuf.st_mode))
|
||||||
|
+ if (fd != -1)
|
||||||
|
{
|
||||||
|
- /* devicetree_namever set to NULL indicates a complete directory */
|
||||||
|
- ret_layout->devicetree_srcpath = g_strdup ("dtb");
|
||||||
|
- ret_layout->devicetree_namever = NULL;
|
||||||
|
-
|
||||||
|
- if (!checksum_dir_recurse(ret_layout->boot_dfd, "dtb", &checksum, cancellable, error))
|
||||||
|
+ ret_layout->devicetree_srcpath = g_strdup ("devicetree");
|
||||||
|
+ ret_layout->devicetree_namever = g_strdup_printf ("devicetree-%s", kver);
|
||||||
|
+ in = g_unix_input_stream_new (fd, FALSE);
|
||||||
|
+ if (!ot_gio_splice_update_checksum (NULL, in, &checksum, cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
- }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ struct stat stbuf;
|
||||||
|
+ /* Check for dtb directory */
|
||||||
|
+ if (!glnx_fstatat_allow_noent (ret_layout->boot_dfd, "dtb", &stbuf, 0, error))
|
||||||
|
+ return FALSE;
|
||||||
|
|
||||||
|
+ if (errno == 0 && S_ISDIR (stbuf.st_mode))
|
||||||
|
+ {
|
||||||
|
+ /* devicetree_namever set to NULL indicates a complete directory */
|
||||||
|
+ ret_layout->devicetree_srcpath = g_strdup ("dtb");
|
||||||
|
+ ret_layout->devicetree_namever = NULL;
|
||||||
|
+
|
||||||
|
+ if (!checksum_dir_recurse(ret_layout->boot_dfd, "dtb", &checksum, cancellable, error))
|
||||||
|
+ return FALSE;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
g_clear_object (&in);
|
||||||
|
glnx_close_fd (&fd);
|
||||||
|
|
||||||
|
@@ -1336,7 +1341,8 @@ get_kernel_from_tree_legacy_layouts (int deployment_dfd,
|
||||||
|
* initramfs there, so we need to look in /usr/lib/ostree-boot first.
|
||||||
|
*/
|
||||||
|
static gboolean
|
||||||
|
-get_kernel_from_tree (int deployment_dfd,
|
||||||
|
+get_kernel_from_tree (OstreeSysroot *sysroot,
|
||||||
|
+ int deployment_dfd,
|
||||||
|
OstreeKernelLayout **out_layout,
|
||||||
|
GCancellable *cancellable,
|
||||||
|
GError **error)
|
||||||
|
@@ -1345,7 +1351,7 @@ get_kernel_from_tree (int deployment_dfd,
|
||||||
|
g_autoptr(OstreeKernelLayout) legacy_layout = NULL;
|
||||||
|
|
||||||
|
/* First, gather from usr/lib/modules/$kver if it exists */
|
||||||
|
- if (!get_kernel_from_tree_usrlib_modules (deployment_dfd, &usrlib_modules_layout, cancellable, error))
|
||||||
|
+ if (!get_kernel_from_tree_usrlib_modules (sysroot, deployment_dfd, &usrlib_modules_layout, cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
/* Gather the legacy layout */
|
||||||
|
@@ -1761,7 +1767,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||||
|
|
||||||
|
/* Find the kernel/initramfs/devicetree in the tree */
|
||||||
|
g_autoptr(OstreeKernelLayout) kernel_layout = NULL;
|
||||||
|
- if (!get_kernel_from_tree (deployment_dfd, &kernel_layout,
|
||||||
|
+ if (!get_kernel_from_tree (sysroot, deployment_dfd, &kernel_layout,
|
||||||
|
cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
@@ -1771,7 +1777,6 @@ install_deployment_kernel (OstreeSysroot *sysroot,
|
||||||
|
|
||||||
|
const char *osname = ostree_deployment_get_osname (deployment);
|
||||||
|
const char *bootcsum = ostree_deployment_get_bootcsum (deployment);
|
||||||
|
- g_assert_cmpstr (kernel_layout->bootcsum, ==, bootcsum);
|
||||||
|
g_autofree char *bootcsumdir = g_strdup_printf ("ostree/%s-%s", osname, bootcsum);
|
||||||
|
g_autofree char *bootconfdir = g_strdup_printf ("loader.%d/entries", new_bootversion);
|
||||||
|
g_autofree char *bootconf_name = g_strdup_printf ("ostree-%d-%s.conf",
|
||||||
|
@@ -2711,7 +2716,7 @@ sysroot_initialize_deployment (OstreeSysroot *self,
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
g_autoptr(OstreeKernelLayout) kernel_layout = NULL;
|
||||||
|
- if (!get_kernel_from_tree (deployment_dfd, &kernel_layout,
|
||||||
|
+ if (!get_kernel_from_tree (self, deployment_dfd, &kernel_layout,
|
||||||
|
cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h
|
||||||
|
index fa1e5336..1af2fd27 100644
|
||||||
|
--- a/src/libostree/ostree-sysroot-private.h
|
||||||
|
+++ b/src/libostree/ostree-sysroot-private.h
|
||||||
|
@@ -38,6 +38,7 @@ typedef enum {
|
||||||
|
/* This is a temporary flag until we fully drop the explicit `systemctl start
|
||||||
|
* ostree-finalize-staged.service` so that tests can exercise the new path unit. */
|
||||||
|
OSTREE_SYSROOT_DEBUG_TEST_STAGED_PATH = 1 << 3,
|
||||||
|
+ OSTREE_SYSROOT_DEBUG_TEST_NO_DTB = 1 << 4, /* https://github.com/ostreedev/ostree/issues/2154 */
|
||||||
|
} OstreeSysrootDebugFlags;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
|
||||||
|
index b211fea7..e412ea4d 100644
|
||||||
|
--- a/src/libostree/ostree-sysroot.c
|
||||||
|
+++ b/src/libostree/ostree-sysroot.c
|
||||||
|
@@ -190,6 +190,7 @@ ostree_sysroot_init (OstreeSysroot *self)
|
||||||
|
{ "test-fifreeze", OSTREE_SYSROOT_DEBUG_TEST_FIFREEZE },
|
||||||
|
{ "no-xattrs", OSTREE_SYSROOT_DEBUG_NO_XATTRS },
|
||||||
|
{ "test-staged-path", OSTREE_SYSROOT_DEBUG_TEST_STAGED_PATH },
|
||||||
|
+ { "no-dtb", OSTREE_SYSROOT_DEBUG_TEST_NO_DTB },
|
||||||
|
};
|
||||||
|
|
||||||
|
self->debug_flags = g_parse_debug_string (g_getenv ("OSTREE_SYSROOT_DEBUG"),
|
||||||
|
diff --git a/tests/test-osupdate-dtb.sh b/tests/test-osupdate-dtb.sh
|
||||||
|
new file mode 100755
|
||||||
|
index 00000000..9e0c4686
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tests/test-osupdate-dtb.sh
|
||||||
|
@@ -0,0 +1,62 @@
|
||||||
|
+#!/bin/bash
|
||||||
|
+#
|
||||||
|
+# Copyright (C) 2020 Red Hat, Inc.
|
||||||
|
+#
|
||||||
|
+# SPDX-License-Identifier: LGPL-2.0+
|
||||||
|
+#
|
||||||
|
+# This library is free software; you can redistribute it and/or
|
||||||
|
+# modify it under the terms of the GNU Lesser General Public
|
||||||
|
+# License as published by the Free Software Foundation; either
|
||||||
|
+# version 2 of the License, or (at your option) any later version.
|
||||||
|
+#
|
||||||
|
+# This library is distributed in the hope that it will be useful,
|
||||||
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+# Lesser General Public License for more details.
|
||||||
|
+#
|
||||||
|
+# You should have received a copy of the GNU Lesser General Public
|
||||||
|
+# License along with this library; if not, write to the
|
||||||
|
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
+# Boston, MA 02111-1307, USA.
|
||||||
|
+
|
||||||
|
+set -euo pipefail
|
||||||
|
+
|
||||||
|
+. $(dirname $0)/libtest.sh
|
||||||
|
+
|
||||||
|
+echo "1..1"
|
||||||
|
+
|
||||||
|
+# Exports OSTREE_SYSROOT so --sysroot not needed.
|
||||||
|
+kver="3.6.0"
|
||||||
|
+modulesdir="usr/lib/modules/${kver}"
|
||||||
|
+setup_os_repository "archive" "syslinux" ${modulesdir}
|
||||||
|
+
|
||||||
|
+cd ${test_tmpdir}
|
||||||
|
+os_repository_new_commit "test" "test with device tree directory"
|
||||||
|
+
|
||||||
|
+devicetree_path=osdata/${modulesdir}/dtb/asoc-board.dtb
|
||||||
|
+devicetree_overlay_path=osdata/${modulesdir}/dtb/overlays/overlay.dtbo
|
||||||
|
+
|
||||||
|
+mkdir -p osdata/${modulesdir}/dtb
|
||||||
|
+echo "a device tree" > ${devicetree_path}
|
||||||
|
+mkdir -p osdata/${modulesdir}/dtb/overlays
|
||||||
|
+echo "a device tree overlay" > ${devicetree_overlay_path}
|
||||||
|
+
|
||||||
|
+${CMD_PREFIX} ostree --repo=testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
||||||
|
+${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime
|
||||||
|
+${CMD_PREFIX} ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
|
||||||
|
+${CMD_PREFIX} env OSTREE_SYSROOT_DEBUG=${OSTREE_SYSROOT_DEBUG},no-dtb ostree admin deploy --os=testos testos:testos/buildmaster/x86_64-runtime
|
||||||
|
+assert_has_file sysroot/boot/ostree/testos-${bootcsum}/vmlinuz-3.6.0
|
||||||
|
+assert_not_has_file sysroot/boot/ostree/testos-${bootcsum}/dtb/asoc-board.dtb 'a device tree'
|
||||||
|
+assert_streq $(ls sysroot/boot/ostree | wc -l) 1
|
||||||
|
+assert_streq $(find sysroot/boot/ostree -name '*.dtb' | wc -l) 0
|
||||||
|
+${CMD_PREFIX} ostree --repo=testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
||||||
|
+env OSTREE_SYSROOT_DEBUG=${OSTREE_SYSROOT_DEBUG},no-dtb ${CMD_PREFIX} ostree admin upgrade --os=testos
|
||||||
|
+${CMD_PREFIX} ostree --repo=testos-repo commit --tree=dir=osdata/ -b testos/buildmaster/x86_64-runtime
|
||||||
|
+${CMD_PREFIX} ostree admin upgrade --os=testos
|
||||||
|
+assert_streq $(ls sysroot/boot/ostree | wc -l) 2
|
||||||
|
+# Note that the bootcsum computed by the test suite doesn't include devicetree
|
||||||
|
+# And currently we end up installing the dtb for the *previous* deployment
|
||||||
|
+# too which is a bug - in the future this should be fixed to assert 1.
|
||||||
|
+assert_streq $(find sysroot/boot/ostree -name '*.dtb' | wc -l) 2
|
||||||
|
+
|
||||||
|
+echo "ok update with no dtb to dtb"
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
33
0001-lib-deploy-Don-t-leak-fd-when-checksumming-dtbs.patch
Normal file
33
0001-lib-deploy-Don-t-leak-fd-when-checksumming-dtbs.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From b3dc074f5ed6d3a1e40dbc1e3315a518512d3c63 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Lebon <jonathan@jlebon.com>
|
||||||
|
Date: Wed, 7 Oct 2020 14:44:25 -0400
|
||||||
|
Subject: [PATCH] lib/deploy: Don't leak fd when checksumming dtbs
|
||||||
|
|
||||||
|
Likely the root of https://bugzilla.redhat.com/show_bug.cgi?id=1886149.
|
||||||
|
---
|
||||||
|
src/libostree/ostree-sysroot-deploy.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
index 1c4fb5dc..7b7ba5e9 100644
|
||||||
|
--- a/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
||||||
|
@@ -272,13 +272,13 @@ checksum_dir_recurse (int dfd,
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- int fd;
|
||||||
|
+ glnx_autofd int fd = -1;
|
||||||
|
|
||||||
|
if (!ot_openat_ignore_enoent (dfditer.fd, d_name, &fd, error))
|
||||||
|
return FALSE;
|
||||||
|
if (fd != -1)
|
||||||
|
{
|
||||||
|
- g_autoptr(GInputStream) in = g_unix_input_stream_new (fd, FALSE);
|
||||||
|
+ g_autoptr(GInputStream) in = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE);
|
||||||
|
if (!ot_gio_splice_update_checksum (NULL, in, checksum, cancellable, error))
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
@ -0,0 +1,30 @@
|
|||||||
|
From dec9eab2030a212b3713379af9d74c625ecce137 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jonathan Lebon <jonathan@jlebon.com>
|
||||||
|
Date: Thu, 15 Oct 2020 12:05:34 -0400
|
||||||
|
Subject: [PATCH] ostree-prepare-root: print st_dev and st_ino as 64-bit ints
|
||||||
|
|
||||||
|
This matches what systemd does and should work fine on all platforms.
|
||||||
|
|
||||||
|
Possibly resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1888436
|
||||||
|
---
|
||||||
|
src/switchroot/ostree-prepare-root.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
|
||||||
|
index 6351babb..6bc2c374 100644
|
||||||
|
--- a/src/switchroot/ostree-prepare-root.c
|
||||||
|
+++ b/src/switchroot/ostree-prepare-root.c
|
||||||
|
@@ -152,8 +152,8 @@ resolve_deploy_path (const char * root_mountpoint)
|
||||||
|
"MESSAGE_ID=" SD_ID128_FORMAT_STR,
|
||||||
|
SD_ID128_FORMAT_VAL(OSTREE_PREPARE_ROOT_DEPLOYMENT_MSG),
|
||||||
|
"DEPLOYMENT_PATH=%s", resolved_path,
|
||||||
|
- "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
|
||||||
|
- "DEPLOYMENT_INODE=%u", stbuf.st_ino,
|
||||||
|
+ "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
|
||||||
|
+ "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
|
||||||
|
NULL);
|
||||||
|
#endif
|
||||||
|
return deploy_path;
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
708
ostree.spec
Normal file
708
ostree.spec
Normal file
@ -0,0 +1,708 @@
|
|||||||
|
# Don't ship tests on RHEL > 7.
|
||||||
|
%if 0%{?rhel} > 7
|
||||||
|
%bcond_with tests
|
||||||
|
%else
|
||||||
|
%bcond_without tests
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Summary: Tool for managing bootable, immutable filesystem trees
|
||||||
|
Name: ostree
|
||||||
|
Version: 2020.7
|
||||||
|
Release: 3%{?dist}
|
||||||
|
Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
|
||||||
|
License: LGPLv2+
|
||||||
|
URL: https://ostree.readthedocs.io/en/latest/
|
||||||
|
|
||||||
|
Patch0: 0001-ostree-prepare-root-print-st_dev-and-st_ino-as-64-bi.patch
|
||||||
|
|
||||||
|
BuildRequires: git
|
||||||
|
# We always run autogen.sh
|
||||||
|
BuildRequires: autoconf automake libtool
|
||||||
|
# For docs
|
||||||
|
BuildRequires: gtk-doc
|
||||||
|
# Core requirements
|
||||||
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
BuildRequires: pkgconfig(libcurl)
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
# The tests still require soup
|
||||||
|
BuildRequires: pkgconfig(libsoup-2.4)
|
||||||
|
BuildRequires: libattr-devel
|
||||||
|
# Extras
|
||||||
|
BuildRequires: pkgconfig(libarchive)
|
||||||
|
BuildRequires: pkgconfig(liblzma)
|
||||||
|
BuildRequires: pkgconfig(libselinux)
|
||||||
|
BuildRequires: pkgconfig(mount)
|
||||||
|
BuildRequires: pkgconfig(fuse)
|
||||||
|
BuildRequires: pkgconfig(e2p)
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: gpgme-devel
|
||||||
|
BuildRequires: pkgconfig(libsystemd)
|
||||||
|
BuildRequires: /usr/bin/g-ir-scanner
|
||||||
|
BuildRequires: dracut
|
||||||
|
BuildRequires: bison
|
||||||
|
|
||||||
|
# Runtime requirements
|
||||||
|
Requires: dracut
|
||||||
|
Requires: /usr/bin/gpgv2
|
||||||
|
Requires: systemd-units
|
||||||
|
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
|
%description
|
||||||
|
libostree is a shared library designed primarily for
|
||||||
|
use by higher level tools to manage host systems (e.g. rpm-ostree),
|
||||||
|
as well as container tools like flatpak and the atomic CLI.
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: Development headers for %{name}
|
||||||
|
|
||||||
|
%description libs
|
||||||
|
The %{name}-libs provides shared libraries for %{name}.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development headers for %{name}
|
||||||
|
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
The %{name}-devel package includes the header files for the %{name} library.
|
||||||
|
|
||||||
|
%ifnarch s390 s390x
|
||||||
|
%package grub2
|
||||||
|
Summary: GRUB2 integration for OSTree
|
||||||
|
%ifnarch aarch64 %{arm}
|
||||||
|
Requires: grub2
|
||||||
|
%else
|
||||||
|
Requires: grub2-efi
|
||||||
|
%endif
|
||||||
|
Requires: ostree
|
||||||
|
|
||||||
|
%description grub2
|
||||||
|
GRUB2 integration for OSTree
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with tests}
|
||||||
|
%package tests
|
||||||
|
Summary: Tests for the %{name} package
|
||||||
|
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
|
|
||||||
|
%description tests
|
||||||
|
This package contains tests that can be used to verify
|
||||||
|
the functionality of the installed %{name} package.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -Sgit -n libostree-%{version}
|
||||||
|
|
||||||
|
%build
|
||||||
|
# gobject introspection does not work with LTO. There is an effort to fix this
|
||||||
|
# in the appropriate project upstreams, so hopefully LTO can be enabled someday
|
||||||
|
# Disable LTO.
|
||||||
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
|
env NOCONFIGURE=1 ./autogen.sh
|
||||||
|
%configure --disable-silent-rules \
|
||||||
|
--enable-gtk-doc \
|
||||||
|
--with-selinux \
|
||||||
|
--with-curl \
|
||||||
|
--with-openssl \
|
||||||
|
%{?with_tests:--enable-installed-tests=exclusive} \
|
||||||
|
--with-dracut=yesbutnoconf
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install INSTALL="install -p -c"
|
||||||
|
find %{buildroot} -name '*.la' -delete
|
||||||
|
|
||||||
|
# Needed to enable the service at compose time currently
|
||||||
|
%post
|
||||||
|
%systemd_post ostree-remount.service
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_preun ostree-remount.service
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{!?_licensedir:%global license %%doc}
|
||||||
|
%license COPYING
|
||||||
|
%doc README.md
|
||||||
|
%{_bindir}/ostree
|
||||||
|
%{_bindir}/rofiles-fuse
|
||||||
|
%{_datadir}/ostree
|
||||||
|
%{_datadir}/bash-completion/completions/*
|
||||||
|
%dir %{_prefix}/lib/dracut/modules.d/98ostree
|
||||||
|
%{_prefix}/lib/systemd/system/ostree*.*
|
||||||
|
%{_prefix}/lib/dracut/modules.d/98ostree/*
|
||||||
|
%{_mandir}/man*/*.gz
|
||||||
|
%{_prefix}/lib/systemd/system-generators/ostree-system-generator
|
||||||
|
%exclude %{_sysconfdir}/grub.d/*ostree
|
||||||
|
%exclude %{_libexecdir}/libostree/grub2*
|
||||||
|
%exclude %{_libexecdir}/libostree/ostree-trivial-httpd
|
||||||
|
%{_prefix}/lib/tmpfiles.d/*
|
||||||
|
%{_prefix}/lib/ostree
|
||||||
|
# Moved in git master
|
||||||
|
%{_libexecdir}/libostree/*
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%{_sysconfdir}/ostree
|
||||||
|
%{_libdir}/*.so.1*
|
||||||
|
%{_libdir}/girepository-1.0/OSTree-1.0.typelib
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_libdir}/lib*.so
|
||||||
|
%{_includedir}/*
|
||||||
|
%{_libdir}/pkgconfig/*
|
||||||
|
%dir %{_datadir}/gtk-doc/html/ostree
|
||||||
|
%{_datadir}/gtk-doc/html/ostree
|
||||||
|
%{_datadir}/gir-1.0/OSTree-1.0.gir
|
||||||
|
|
||||||
|
%ifnarch s390 s390x
|
||||||
|
%files grub2
|
||||||
|
%{_sysconfdir}/grub.d/*ostree
|
||||||
|
%dir %{_libexecdir}/libostree
|
||||||
|
%{_libexecdir}/libostree/grub2*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with tests}
|
||||||
|
%files tests
|
||||||
|
%{_libexecdir}/installed-tests
|
||||||
|
%{_datadir}/installed-tests
|
||||||
|
%{_libexecdir}/libostree/ostree-trivial-httpd
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Thu Oct 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.7-3
|
||||||
|
- Backport https://github.com/ostreedev/ostree/pull/2219 for
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1888436
|
||||||
|
|
||||||
|
* Wed Oct 14 2020 Colin Walters <walters@verbum.org> - 2020.7-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.7
|
||||||
|
|
||||||
|
* Wed Oct 07 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.6-5
|
||||||
|
- Backport https://github.com/ostreedev/ostree/pull/2211 for
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1886149
|
||||||
|
|
||||||
|
* Thu Sep 24 2020 Colin Walters <walters@verbum.org> - 2020.6-4
|
||||||
|
- Backport https://github.com/ostreedev/ostree/pull/2202
|
||||||
|
|
||||||
|
* Fri Sep 18 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.6-3
|
||||||
|
- Revert support for devicetrees
|
||||||
|
https://github.com/ostreedev/ostree/issues/2154
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1880499
|
||||||
|
|
||||||
|
* Thu Sep 03 2020 Colin Walters <walters@verbum.org> - 2020.6-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.6
|
||||||
|
|
||||||
|
* Tue Aug 18 2020 Colin Walters <walters@verbum.org> - 2020.5-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.5
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Colin Walters <walters@verbum.org> - 2020.4-4
|
||||||
|
- Backport patch for https://bugzilla.redhat.com/show_bug.cgi?id=1862568
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 22 2020 Colin Walters <walters@verbum.org> - 2020.4-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.4
|
||||||
|
|
||||||
|
* Tue Jun 30 2020 Jeff Law <law@redhat.com> - 2020.3-6
|
||||||
|
Disable LTO
|
||||||
|
|
||||||
|
* Thu Jun 18 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-5
|
||||||
|
- Backport patch to handle EOPNOTSUPP on NFS:
|
||||||
|
https://gitlab.gnome.org/GNOME/libglnx/-/merge_requests/18
|
||||||
|
|
||||||
|
* Thu May 21 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-4
|
||||||
|
- Backport patch to neuter sysroot.readonly for FCOS
|
||||||
|
https://github.com/coreos/fedora-coreos-tracker/issues/488
|
||||||
|
https://github.com/ostreedev/ostree/pull/2108
|
||||||
|
|
||||||
|
* Fri Apr 17 2020 Dusty Mabe <dusty@dustymabe.com> - 2020.3-3
|
||||||
|
- Backport patchset that should help us with concurrently pulling
|
||||||
|
https://github.com/ostreedev/ostree/pull/2077
|
||||||
|
|
||||||
|
* Sat Mar 14 2020 Colin Walters <walters@verbum.org> - 2020.3-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.3
|
||||||
|
|
||||||
|
* Fri Feb 21 2020 Colin Walters <walters@verbum.org> - 2020.2-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.2
|
||||||
|
|
||||||
|
* Thu Feb 20 2020 Colin Walters <walters@verbum.org> - 2020.1-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2020.1
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.6-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Dec 10 2019 Colin Walters <walters@verbum.org> - 2019.6-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.6
|
||||||
|
|
||||||
|
* Wed Oct 30 2019 Colin Walters <walters@verbum.org> - 2019.5-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.5
|
||||||
|
|
||||||
|
* Thu Sep 26 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-2
|
||||||
|
- Revert ostree-grub2 patch to fix duplicate entries
|
||||||
|
https://github.com/ostreedev/ostree/pull/1929#issuecomment-539022174
|
||||||
|
|
||||||
|
* Thu Sep 26 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-2
|
||||||
|
- Backport patch to fix duplicate GRUB2 entries when using BLS
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1751272#c27
|
||||||
|
|
||||||
|
* Wed Sep 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.4-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.4
|
||||||
|
|
||||||
|
* Thu Aug 22 2019 Colin Walters <walters@verbum.org> - 2019.3-3
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.3
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 24 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.2-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.2
|
||||||
|
|
||||||
|
* Sat Feb 09 2019 Dusty Mabe <dusty@dustymabe.com> - 2019.1-5
|
||||||
|
- Re-enable http2 in ostree build
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 17 2019 Sinny Kumari <ksinny@gmail.com> - 2019.1-3
|
||||||
|
- Backport patch to fix bare → bare imports
|
||||||
|
- Backport patch to Set xattr on correct fd for bare-user → bare-user imports
|
||||||
|
|
||||||
|
* Fri Jan 11 2019 Colin Walters <walters@verbum.org> - 2019.1-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2019.1
|
||||||
|
|
||||||
|
* Fri Jan 11 2019 Colin Walters <walters@verbum.org> - 2018.9-2
|
||||||
|
- Work around https://src.fedoraproject.org/rpms/nfs-utils/pull-request/7
|
||||||
|
|
||||||
|
* Thu Oct 25 2018 Colin Walters <walters@verbum.org> - 2018.9-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.9
|
||||||
|
|
||||||
|
* Wed Oct 17 2018 Jonathan Lebon <jonathan@jlebon.com>
|
||||||
|
- Add conditional for tests and disable by default on RHEL > 7
|
||||||
|
|
||||||
|
* Wed Aug 22 2018 Colin Walters <walters@verbum.org> - 2018.8-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.8
|
||||||
|
|
||||||
|
* Sun Aug 12 2018 Peter Robinson <pbrobinson@fedoraproject.org> 2018.7-2
|
||||||
|
- Enable grub2 support on ARMv7
|
||||||
|
|
||||||
|
* Fri Jul 20 2018 Colin Walters <walters@verbum.org> - 2018.7-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.7
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.6-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 04 2018 Jonathan Lebon <jonathan@jlebon.com> - 2018.6-4
|
||||||
|
- Backport patch to fix /var mountpoints
|
||||||
|
https://github.com/ostreedev/ostree/issues/1667
|
||||||
|
|
||||||
|
* Thu Jun 21 2018 Colin Walters <walters@redhat.com> - 2018.6-3
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.6
|
||||||
|
|
||||||
|
* Fri May 11 2018 Colin Walters <walters@verbum.org> - 2018.5-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.5
|
||||||
|
|
||||||
|
* Tue Apr 03 2018 Kalev Lember <klember@redhat.com> - 2018.3-2
|
||||||
|
- Backport a patch to avoid writing to parent repo
|
||||||
|
|
||||||
|
* Wed Mar 21 2018 Colin Walters <walters@verbum.org> - 2018.3-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.3
|
||||||
|
|
||||||
|
* Fri Mar 02 2018 Jonathan Lebon <jlebon@redhat.com> - 2018.2-2
|
||||||
|
- Drop ostree-remount systemd service preset, already in fedora-release
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1550799
|
||||||
|
|
||||||
|
* Thu Feb 15 2018 Colin Walters <walters@verbum.org> - 2018.2-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.2
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 15 2018 Colin Walters <walters@verbum.org> - 2018.1-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2018.1
|
||||||
|
|
||||||
|
* Wed Dec 20 2017 Colin Walters <walters@verbum.org> - 2017.15-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2017.15
|
||||||
|
- Drop upstreamed patches; note this build disabled HTTP2 by
|
||||||
|
default for now since we are hitting it with koji. For more
|
||||||
|
information see https://github.com/ostreedev/ostree/issues/1362
|
||||||
|
|
||||||
|
* Mon Dec 18 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.14-2
|
||||||
|
- Backport patch to drop HTTP2
|
||||||
|
|
||||||
|
* Mon Dec 04 2017 Colin Walters <walters@verbum.org> - 2017.14-1
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2017.14
|
||||||
|
- Update description
|
||||||
|
|
||||||
|
* Mon Nov 27 2017 Colin Walters <walters@verbum.org> - 2017.13-4
|
||||||
|
- Backport patch to drop curl low speed checks; requested by flatpak
|
||||||
|
|
||||||
|
* Tue Nov 07 2017 Kalev Lember <klember@redhat.com> - 2017.13-3
|
||||||
|
- Backport a patch to fix a gnome-software crash when installing flatpaks
|
||||||
|
(#1497642)
|
||||||
|
|
||||||
|
* Thu Nov 02 2017 Colin Walters <walters@verbum.org> - 2017.13-2
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2017.13
|
||||||
|
|
||||||
|
* Tue Oct 03 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.12-2
|
||||||
|
- Let tests subpackage own ostree-trivial-httpd
|
||||||
|
|
||||||
|
* Mon Oct 02 2017 Colin Walters <walters@verbum.org> - 2017.12-1
|
||||||
|
- New upstream version
|
||||||
|
- https://github.com/ostreedev/ostree/releases/tag/v2017.12
|
||||||
|
|
||||||
|
* Thu Sep 14 2017 Colin Walters <walters@verbum.org> - 2017.11-1
|
||||||
|
- New upstream version
|
||||||
|
- Add tests subpackage, prep for https://fedoraproject.org/wiki/CI
|
||||||
|
|
||||||
|
* Tue Aug 22 2017 Ville Skyttä <ville.skytta@iki.fi> - 2017.10-3
|
||||||
|
- Own the %%{_libexecdir}/libostree dir
|
||||||
|
|
||||||
|
* Thu Aug 17 2017 Colin Walters <walters@verbum.org> - 2017.10-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Sat Aug 12 2017 Ville Skyttä <ville.skytta@iki.fi> - 2017.9-5
|
||||||
|
- Own the %%{_datadir}/ostree dir
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.9-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 2017.9-3
|
||||||
|
- Rebuild with binutils fix for ppc64le (#1475636)
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Colin Walters <walters@verbum.org> - 2017.9-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.8-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 17 2017 Colin Walters <walters@verbum.org> - 2017.8-3
|
||||||
|
- Switch to libcurl for F26+
|
||||||
|
I think it works well; to recap the arguments below:
|
||||||
|
It has various advantages like HTTP2, plus now that NetworkManager
|
||||||
|
switched we are the last thing left in Fedora Atomic Host depending
|
||||||
|
on libsoup.
|
||||||
|
|
||||||
|
* Thu Jul 06 2017 Colin Walters <walters@verbum.org> - 2017.8-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Mon Jun 19 2017 Colin Walters <walters@verbum.org> - 2017.7-2
|
||||||
|
- Update to new upstream
|
||||||
|
|
||||||
|
* Fri Jun 02 2017 Colin Walters <walters@verbum.org> - 2017.6-4
|
||||||
|
- Fix previous commit to actually work
|
||||||
|
|
||||||
|
* Thu May 18 2017 Colin Walters <walters@verbum.org> - 2017.6-3
|
||||||
|
- Enable curl+openssl on f27+
|
||||||
|
It has various advantages like HTTP2, plus now that NetworkManager
|
||||||
|
switched we are the last thing left in Fedora Atomic Host depending
|
||||||
|
on libsoup.
|
||||||
|
|
||||||
|
* Wed May 17 2017 Colin Walters <walters@verbum.org> - 2017.6-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Apr 19 2017 Colin Walters <walters@verbum.org> - 2017.5-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Apr 12 2017 Colin Walters <walters@verbum.org> - 2017.4-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Fri Mar 10 2017 Colin Walters <walters@verbum.org> - 2017.3-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Fri Mar 03 2017 Colin Walters <walters@redhat.com> - 2017.2-4
|
||||||
|
- Add patch for ppc64le grub2
|
||||||
|
|
||||||
|
* Thu Feb 23 2017 Colin Walters <walters@verbum.org> - 2017.2-3
|
||||||
|
- Backport libmount unref patch
|
||||||
|
|
||||||
|
* Tue Feb 14 2017 Colin Walters <walters@verbum.org> - 2017.2-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Feb 07 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.1-4
|
||||||
|
- Make ostree-grub2 require ostree
|
||||||
|
|
||||||
|
* Tue Feb 07 2017 Colin Walters <walters@verbum.org> - 2017.1-3
|
||||||
|
- Split off ostree-libs. This is the inverse of upstream
|
||||||
|
https://github.com/ostreedev/ostree/pull/659
|
||||||
|
but renaming the package would be hard for low immediate gain.
|
||||||
|
With this at least, flatpak could theoretically depend just on libostree.
|
||||||
|
And similarly for rpm-ostree compose tree (when that gets split out).
|
||||||
|
|
||||||
|
* Mon Jan 23 2017 Colin Walters <walters@verbum.org> - 2017.1-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Jan 18 2017 Colin Walters <walters@verbum.org> - 2016.15-2
|
||||||
|
- Enable libmount for /boot readonly
|
||||||
|
|
||||||
|
* Mon Dec 12 2016 walters@redhat.com - 2016.15-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Sat Dec 10 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2016.14-3
|
||||||
|
- Rebuild for gpgme 1.18
|
||||||
|
|
||||||
|
* Tue Nov 29 2016 Kalev Lember <klember@redhat.com> - 2016.14-2
|
||||||
|
- Backport a patch to remove an accidental print statement
|
||||||
|
|
||||||
|
* Wed Nov 23 2016 walters@redhat.com - 2016.14-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Tue Nov 15 2016 walters@redhat.com - 2016.13-2
|
||||||
|
- New upstream version
|
||||||
|
- Require glib-networking to fix https://pagure.io/pungi-fedora/pull-request/103
|
||||||
|
|
||||||
|
* Sun Oct 23 2016 walters@verbum.org - 2016.12-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Oct 07 2016 walters@redhat.com - 2016.11-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Tue Sep 20 2016 walters@redhat.com - 2016.10-8
|
||||||
|
- Backport another patch for systemd journal
|
||||||
|
Resolves: #1265295
|
||||||
|
|
||||||
|
* Fri Sep 16 2016 walters@verbum.org - 2016.10-6
|
||||||
|
- Set --with-dracut=yesbutnoconf
|
||||||
|
Resolves: #1331369
|
||||||
|
|
||||||
|
* Thu Sep 15 2016 walters@verbum.org - 2016.10-4
|
||||||
|
- Backport patch to fix bug#1265295
|
||||||
|
|
||||||
|
* Mon Sep 12 2016 Kalev Lember <klember@redhat.com> - 2016.10-3
|
||||||
|
- pull: Do allow executing deltas when mirroring into bare{,-user}
|
||||||
|
|
||||||
|
* Fri Sep 09 2016 Kalev Lember <klember@redhat.com> - 2016.10-2
|
||||||
|
- Drop libgsystem dependency
|
||||||
|
|
||||||
|
* Thu Sep 08 2016 walters@redhat.com - 2016.10-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Aug 31 2016 Colin Walters <walters@verbum.org> - 2016.9-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Tue Aug 09 2016 walters@redhat.com - 2016.8-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Tue Aug 09 2016 Colin Walters <walters@verbum.org> - 2016.7-4
|
||||||
|
- Add pending patch to fix date-based pruning
|
||||||
|
|
||||||
|
* Fri Jul 08 2016 walters@redhat.com - 2016.7-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Mon Jun 20 2016 Colin Walters <walters@redhat.com> - 2016.6-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Sun May 8 2016 Peter Robinson <pbrobinson@fedoraproject.org> 2016.5-3
|
||||||
|
- aarch64 only has grub2-efi
|
||||||
|
- Use %%license
|
||||||
|
|
||||||
|
* Fri Apr 15 2016 Colin Walters <walters@redhat.com> - 2016.5-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Mar 23 2016 Colin Walters <walters@redhat.com> - 2016.4-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Fri Feb 26 2016 Colin Walters <walters@redhat.com> - 2016.3-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Tue Feb 23 2016 Colin Walters <walters@redhat.com> - 2016.2-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 12 2016 Colin Walters <walters@redhat.com> - 2016.1-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Fri Dec 04 2015 Colin Walters <walters@redhat.com> - 2015.11-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Sun Nov 22 2015 Colin Walters <walters@redhat.com> - 2015.10-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu Nov 12 2015 Matthew Barnes <mbarnes@redhat.com> - 2015.9-3
|
||||||
|
- Add ostree-tmp-chmod.service to fix /tmp permissions on existing installs.
|
||||||
|
Resolves: #1276775
|
||||||
|
|
||||||
|
* Fri Oct 30 2015 Colin Walters <walters@redhat.com> - 2015.9-2
|
||||||
|
- Add patch to fix permissions of /tmp
|
||||||
|
Resolves: #1276775
|
||||||
|
|
||||||
|
* Wed Sep 23 2015 Colin Walters <walters@redhat.com> - 2015.9-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Aug 26 2015 Colin Walters <walters@redhat.com> - 2015.8-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2015.7-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 02 2015 Colin Walters <walters@redhat.com> - 2015.7-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu May 28 2015 Colin Walters <walters@redhat.com> - 2015.6-4
|
||||||
|
- Add patch to ensure reliable bootloader ordering
|
||||||
|
See: #1225088
|
||||||
|
|
||||||
|
* Thu Apr 30 2015 Colin Walters <walters@redhat.com> - 2015.6-3
|
||||||
|
- Close sysroot fd in finalize to fix Anaconda
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1217578
|
||||||
|
|
||||||
|
* Fri Apr 17 2015 Colin Walters <walters@redhat.com> - 2015.6-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sun Apr 12 2015 Colin Walters <walters@redhat.com> - 2015.5-4
|
||||||
|
- (Really) Handle null epoch as well; this was injected for https://github.com/cgwalters/rpmdistro-gitoverlay
|
||||||
|
|
||||||
|
* Tue Apr 07 2015 Colin Walters <walters@redhat.com> - 2015.5-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Mar 30 2015 Dan Horák <dan[at]danny.cz> - 2015.4-5
|
||||||
|
- ExcludeArch is a build restriction and is global, switching to %%ifnarch
|
||||||
|
|
||||||
|
* Fri Mar 27 2015 Colin Walters <walters@redhat.com> - 2015.4-4
|
||||||
|
- Have grub2 subpackage match ExcludeArch with grub2
|
||||||
|
|
||||||
|
* Fri Mar 27 2015 Colin Walters <walters@redhat.com> - 2015.4-3
|
||||||
|
- Handle null epoch as well; this was injected for https://github.com/cgwalters/rpmdistro-gitoverlay
|
||||||
|
|
||||||
|
* Wed Mar 25 2015 Colin Walters <walters@redhat.com> - 2015.4-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Feb 16 2015 Colin Walters <walters@redhat.com> - 2015.3-3
|
||||||
|
- Require latest libgsystem to ensure people have it
|
||||||
|
|
||||||
|
* Fri Jan 23 2015 Colin Walters <walters@redhat.com> - 2015.3-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Jan 08 2015 Colin Walters <walters@redhat.com> - 2015.2-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sun Jan 04 2015 Colin Walters <walters@redhat.com> - 2014.13-2
|
||||||
|
- Add patch to ensure correct xattrs on modified config files
|
||||||
|
Fixes: #1178208
|
||||||
|
|
||||||
|
* Wed Dec 17 2014 Colin Walters <walters@redhat.com> - 2014.13-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Nov 26 2014 Colin Walters <walters@redhat.com> - 2014.12-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Thu Oct 30 2014 Colin Walters <walters@redhat.com> - 2014.11-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Oct 29 2014 Colin Walters <walters@redhat.com> - 2014.10.1.gedc3b9a-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Oct 24 2014 Colin Walters <walters@redhat.com> - 2014.9-2
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Oct 16 2014 Colin Walters <walters@redhat.com>
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Sep 08 2014 Colin Walters <walters@redhat.com> - 2014.6-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.5-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 2014.5-4
|
||||||
|
- Rebuilt for gobject-introspection 1.41.4
|
||||||
|
|
||||||
|
* Wed Jun 25 2014 Colin Walters <walters@verbum.org>
|
||||||
|
- Rebuild to pick up new libsoup
|
||||||
|
|
||||||
|
* Fri Jun 13 2014 Colin Walters <walters@verbum.org> - 2014.4-2
|
||||||
|
- Include /etc/ostree, even though it is empty
|
||||||
|
|
||||||
|
* Mon Jun 09 2014 Colin Walters <walters@verbum.org> - 2014.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Apr 13 2014 Colin Walters <walters@verbum.org> - 2014.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Mar 31 2014 Colin Walters <walters@verbum.org>
|
||||||
|
- New git snapshot for rpm-ostree
|
||||||
|
|
||||||
|
* Fri Mar 21 2014 Colin Walters <walters@verbum.org> - 2014.3-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Fri Mar 14 2014 Colin Walters <walters@verbum.org> - 2014.2-3
|
||||||
|
- Move trusted.gpg.d to main runtime package, where it should be
|
||||||
|
|
||||||
|
* Fri Mar 07 2014 Colin Walters <walters@verbum.org> - 2014.2-2
|
||||||
|
- Depend on gpgv2
|
||||||
|
- Resolves: #1073813
|
||||||
|
|
||||||
|
* Sat Mar 01 2014 Colin Walters <walters@verbum.org> - 2014.2-1
|
||||||
|
- New upstream release
|
||||||
|
- Depend on libselinux
|
||||||
|
- Explicitly depend on libarchive too, we were actually failing
|
||||||
|
to disable it before
|
||||||
|
|
||||||
|
* Fri Jan 24 2014 Colin Walters <walters@verbum.org> - 2014.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Jan 13 2014 Colin Walters <walters@verbum.org> - 2013.7-2
|
||||||
|
- Add preset file so ostree-remount is enabled by default, since
|
||||||
|
it needs to be.
|
||||||
|
|
||||||
|
* Tue Oct 15 2013 Colin Walters <walters@verbum.org> - 2013.7-1
|
||||||
|
- New upstream release
|
||||||
|
- Now LGPLv2+ only
|
||||||
|
- Enable libarchive since it might be useful for people
|
||||||
|
- Enable new gpgme dependency
|
||||||
|
|
||||||
|
* Thu Sep 12 2013 Colin Walters <walters@verbum.org> - 2013.6-3
|
||||||
|
- Enable introspection
|
||||||
|
|
||||||
|
* Mon Sep 09 2013 Colin Walters <walters@verbum.org> - 2013.6-2
|
||||||
|
- Tweak description
|
||||||
|
|
||||||
|
* Mon Sep 09 2013 Colin Walters <walters@verbum.org> - 2013.6-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sat Aug 25 2013 Colin Walters <walters@verbum.org> - 2013.5-3
|
||||||
|
- And actually while we are here, drop all the embedded dependency
|
||||||
|
goop from this spec file; it may live on in the EPEL branch.
|
||||||
|
|
||||||
|
* Sat Aug 25 2013 Colin Walters <walters@verbum.org> - 2013.5-2
|
||||||
|
- Drop requirement on linux-user-chroot
|
||||||
|
We now require triggers to be processed on the build server
|
||||||
|
by default, so ostree does not runtime-depend on linux-user-chroot.
|
||||||
|
|
||||||
|
* Sat Aug 17 2013 Colin Walters <walters@verbum.org> - 2013.5-1
|
||||||
|
- New upstream release
|
||||||
|
- Add devel package
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 16 2013 Colin Walters <walters@verbum.org> - 2013.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sun Jul 07 2013 Colin Walters <walters@verbum.org> - 2013.3-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Mon Apr 01 2013 Colin Walters <walters@verbum.org> - 2013.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2012.13-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Dec 23 2012 Colin Walters <walters@verbum.org> - 2012.13-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Tue Dec 18 2012 Colin Walters <walters@verbum.org> - 2012.12-2
|
||||||
|
- Explicitly enable grub2 hook; otherwise we pick up whatever
|
||||||
|
the buildroot has, which is not what we want.
|
||||||
|
|
||||||
|
* Mon Nov 19 2012 Colin Walters <walters@verbum.org> - 2012.12-1
|
||||||
|
- Initial import; thanks to Michel Alexandre Salim for review
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=819951
|
||||||
|
|
Loading…
Reference in New Issue
Block a user