From 9026686eeadbdea766101471ec0e15c929c0b28d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 14 May 2020 09:41:37 +0200 Subject: [PATCH] gitlab-ci: accept failure in REQUIRED_PACKAGES script for non-existing qt-devel On CentOS 8, many devel packages are not available. Even after # dnf config-manager --set-enabled PowerTools certain devel packages are missing. Some of these (libndp-devel, mobile-broadband-provider-info-devel, teamd-devel) we build in copr ([1]), but libpsl-devel and qt-devel are still missing. Only install them optionally and allow failure for them not being present. [1] https://copr.fedorainfracloud.org/coprs/nmstate/nm-build-deps/repo/epel-8/nmstate-nm-build-deps-epel-8.repo (cherry picked from commit 1473f00d74e0cc5f96de157354df5a74b792a59d) (cherry picked from commit 4e8840f6e69c41747f54a057cd54300cdb60eff6) --- contrib/fedora/REQUIRED_PACKAGES | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index aa44bcb553..e32ae78524 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -60,7 +60,6 @@ install \ jansson-devel \ libcurl-devel \ libndp-devel \ - libpsl-devel \ libselinux-devel \ libtool \ libuuid-devel \ @@ -74,7 +73,6 @@ install \ ppp-devel \ python3-dbus \ python3-gobject \ - qt-devel \ readline-devel \ rpm-build \ systemd-devel \ @@ -87,7 +85,9 @@ install \ # some packages don't exist in certain distributions. Install them one-by-one, and ignore errors. install_ignore_missing \ - python-gobject-base \ dbus-python \ + libpsl-devel \ pygobject3-base \ + python-gobject-base \ + qt-devel \ #end