folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nicogbg/fix dev build break (#1696) 

* fix libstoragemgmt build break

* fix rpm-ostree build break

Co-authored-by: nicolas guibourge <nicolasg@microsoft.com>
This commit is contained in:
nicolas guibourge 2021-11-30 08:58:06 -08:00 committed by GitHub
parent 1ca5aaa039
commit a2d6a97fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPECS/libstoragemgmt/libstoragemgmt.spec
View File

@ -1,7 +1,7 @@
Summary: Storage array management library
Name: libstoragemgmt
Version: 1.8.4
Release: 8%{?dist}
Release: 9%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -198,6 +198,7 @@ plugin selection for locally managed storage.
%autosetup -p1
%build
export CFLAGS="-Wno-format-extra-args -Wno-format"
./autogen.sh
%configure --with-python3 --disable-static
%make_build
@ -526,6 +527,9 @@ fi
%{_mandir}/man1/local_lsmplugin.1*
%changelog
* Mon Nov 29 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.4-9
- Fix build issue due to gcc 11.2 and CFLAGS
* Tue Jun 29 2021 Thomas Crain <thcrain@microsoft.com> - 1.8.4-8
- Use libconfig-devel at build-time instead of libconfig
- Remove %%bcond_with test line

24
SPECS/rpm-ostree/rpm-ostree-gcc-11-2.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ru rpm-ostree-2020.4-orig/libdnf/tests/hawkey/test_query.cpp rpm-ostree-2020.4/libdnf/tests/hawkey/test_query.cpp
--- rpm-ostree-2020.4-orig/libdnf/tests/hawkey/test_query.cpp 2020-07-24 03:29:34.000000000 -0700
+++ rpm-ostree-2020.4/libdnf/tests/hawkey/test_query.cpp 2021-11-29 17:21:02.648380257 -0800
@@ -306,7 +306,7 @@
hy_query_filter(q, HY_PKG_NAME, HY_EQ, "jay");
pset = hy_query_run_set(q);
hy_query_free(q);
- fail_unless(dnf_packageset_count(pset), 2);
+ fail_unless(dnf_packageset_count(pset) == 2);
// use hy_query_filter_package_in():
q = hy_query_create(test_globals.sack);
diff -ru rpm-ostree-2020.4-orig/libdnf/tests/hawkey/test_sack.cpp rpm-ostree-2020.4/libdnf/tests/hawkey/test_sack.cpp
--- rpm-ostree-2020.4-orig/libdnf/tests/hawkey/test_sack.cpp 2020-07-24 03:29:34.000000000 -0700
+++ rpm-ostree-2020.4/libdnf/tests/hawkey/test_sack.cpp 2021-11-29 17:48:37.769337883 -0800
@@ -83,7 +83,7 @@
const char ** arches = dnf_sack_list_arches(sack);
/* noarch, x86_64, athlon, i686, i586, i486, i386 */
- fail_unless(g_strv_length((gchar**)arches), 7);
+ fail_unless(g_strv_length((gchar**)arches) == 7);
if (strcmp(arches[2], "athlon") == 0) {
// Fedora, Mageia

6
SPECS/rpm-ostree/rpm-ostree.spec
View File

@ -1,7 +1,7 @@
Summary: Commit RPMs to an OSTree repository
Name: rpm-ostree
Version: 2020.4
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -9,6 +9,7 @@ URL: https://github.com/coreos/rpm-ostree
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
Patch0: rpm-ostree-libdnf-build.patch
Patch1: rpm-ostree-disable-selinux.patch
Patch2: rpm-ostree-gcc-11-2.patch
BuildRequires: attr-devel
BuildRequires: autoconf
BuildRequires: autogen
@ -151,6 +152,9 @@ make check
%{_datadir}/gir-1.0/*-1.0.gir
%changelog
* Mon Nov 29 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 2020.4-3
- Fix build issue due to gcc 11.2
* Wed Oct 20 2021 Thomas Crain <thcrain@microsoft.com> - 2020.4-2
- Remove unused gobject-introspection-python requirement
- Explicity specify python3-gobject-introspection requirement