PR#42: [f32] Sync from current master - rpms/rpm-ostree

rpms / rpm-ostree

#42 [f32] Sync from current master

Merged 3 years ago by lucab. Opened 3 years ago by lucab.

rpms/ lucab/rpm-ostree ups/f32/2020.7-1 into f32

Merge branch 'master' into ups/f32/2020.7-1

Luca BRUNO • 3 years ago

ce5a078

new upstream release 2020.7

Luca BRUNO • 3 years ago

5943026

Fix invalid use of volatile caught by gcc-11

Jeff Law • 3 years ago

bbd2d17

https://github.com/coreos/rpm-ostree/releases/tag/v2020.6

Colin Walters • 3 years ago

83534d6

add gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch

Peter Robinson • 3 years ago

d1f19b1

sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)

Peter Robinson • 3 years ago

8c131cd

.gitignore

file modified

		`@@ -91,3 +91,5 @@`
		`/rpm-ostree-2020.4.tar.xz`
		`/rpm-ostree-2020.4.15.g8b0bcd7b.tar.xz`
		`/rpm-ostree-2020.5.tar.xz`
		`+ /rpm-ostree-2020.6.tar.xz`
		`+ /rpm-ostree-2020.7.tar.xz`

rpm-ostree-gcc11.patch

file added

+13

		`@@ -0,0 +1,13 @@`
		`+ diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c`
		`+ index 7b160e4..af48122 100644`
		`+ --- a/src/daemon/rpmostree-sysroot-upgrader.c`
		`+ +++ b/src/daemon/rpmostree-sysroot-upgrader.c`
		`+ @@ -1712,7 +1712,7 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self,`
		`+ GType`
		`+ rpmostree_sysroot_upgrader_flags_get_type (void)`
		`+ {`
		`+ - static volatile gsize g_define_type_id__volatile = 0;`
		`+ + static gsize g_define_type_id__volatile = 0;`
		`+`
		`+ if (g_once_init_enter (&g_define_type_id__volatile))`
		`+ {`

rpm-ostree.spec

file modified

+19 -6

		`@@ -3,14 +3,14 @@`

		`Summary: Hybrid image/package system`
		`Name: rpm-ostree`
		`- Version: 2020.5`
		`+ Version: 2020.7`
		`Release: 1%{?dist}`
		`- #VCS: https://github.com/cgwalters/rpm-ostree`
		`+ License: LGPLv2+`
		`+ URL: https://github.com/coreos/rpm-ostree`
		`# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"`
		`# in the upstream git. If rust is enabled, it contains vendored sources.`
		`- Source0: rpm-ostree-%{version}.tar.xz`
		`- License: LGPLv2+`
		`- URL: https://github.com/projectatomic/rpm-ostree`
		`+ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz`
		`+ Patch0: %{name}-gcc11.patch`

		`ExclusiveArch: %{rust_arches}`

		`@@ -194,6 +194,19 @@`

		`%files devel -f files.devel`
		`%changelog`
		`+ * Mon Nov 02 2020 Luca BRUNO <lucab@lucabruno.net> - 2020.7-1`
		`+ - New upstream version`
		`+ https://github.com/coreos/rpm-ostree/releases/tag/v2020.7`
		`+`
		`+ * Mon Nov 02 2020 Jeff Law <law@redhat.com> - 2020.6-2`
		`+ - Fix invalid use of volatile caught by gcc-11`
		`+`
		`+ * Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters@verbum.org> - 2020.6-1`
		`+ - https://github.com/coreos/rpm-ostree/releases/tag/v2020.6`
		`+`
		`+ * Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.5-2`
		`+ - sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)`
		`+`
		`* Tue Sep 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.5-1`
		`- New upstream version`
		`https://github.com/coreos/rpm-ostree/releases/tag/v2020.5`
		`@@ -216,7 +229,7 @@`
		`* Tue Jun 30 2020 Jeff Law <aw@redhat.com> - 2020.3-2`
		`- Disable LTO`

		`- * Wed Feb 05 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1`
		`+ * Fri Jun 19 2020 Jonathan Lebon <jonathan@jlebon.com> - 2020.3-1`
		`- New upstream version`
		`https://github.com/coreos/rpm-ostree/releases/tag/v2020.3`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (rpm-ostree-2020.5.tar.xz) = a7b2fabec124983c7eded63650adeff9a5c328b91f261c66582a2b4ba0bb9ed5b766b5ee773bbaeedaa797aba4975645f90e880de601950dc0dd53a2723c1987`
		`+ SHA512 (rpm-ostree-2020.7.tar.xz) = e8056f58d396b906642624bb55f48e618e95193a026761cccd0d33bb56524ddec5012f7b922f51504c5c2e0cb2757b758636cb8aebeace5aae3d24dc864f16f2`

lucab commented 3 years ago

ce5a078 Merge branch 'master' into ups/f32/2020.7-1
5943026 new upstream release 2020.7
bbd2d17 Fix invalid use of volatile caught by gcc-11
83534d6 https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
d1f19b1 add gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch
8c131cd sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)