From 7e581a0303e501827766292211ae193ca321fb6f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 26 May 2021 22:14:06 +0200 Subject: [PATCH] Revert "contrib: no longer install libuuid as build dependency" Ups, we actually still require libuuid. Actually, we only need to to build the example script `examples/C/glib/add-connection-gdbus.c`. The proper solution would be to make this an optional dependency. So far this was not yet done. Also, libuuid is really an ubiquitous dependency on Linux, so it's not really a problem to have this build dependency, even if it's just to build the examples. This reverts commit c0a3947ff9571b0b36b3c1acc358ea7d8599afa9. --- .gitlab-ci.yml | 8 ++++---- contrib/debian/REQUIRED_PACKAGES | 1 + contrib/fedora/REQUIRED_PACKAGES | 1 + contrib/fedora/rpm/NetworkManager.spec | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2249b8b57..411a937279 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,10 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-01-28.0-2010ca4a2530' - UBUNTU_TAG: '2021-01-28.0-93aff6dd74af' - DEBIAN_TAG: '2021-01-28.0-93aff6dd74af' - CENTOS_TAG: '2021-01-28.0-2010ca4a2530' + FEDORA_TAG: '2021-01-28.0-9831d9f49e57' + UBUNTU_TAG: '2021-01-28.0-b88d09982586' + DEBIAN_TAG: '2021-01-28.0-b88d09982586' + CENTOS_TAG: '2021-01-28.0-9831d9f49e57' ALPINE_TAG: '2021-01-28.0-3913bcd6d86c' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES index 4029dee661..65807d0d4b 100755 --- a/contrib/debian/REQUIRED_PACKAGES +++ b/contrib/debian/REQUIRED_PACKAGES @@ -73,6 +73,7 @@ install \ python3-pip \ python3-setuptools \ udev \ + uuid-dev \ valgrind \ \ #end diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index a847a38e1c..ee2622de8d 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -65,6 +65,7 @@ install \ libndp-devel \ libselinux-devel \ libtool \ + libuuid-devel \ make \ meson \ mobile-broadband-provider-info-devel \ diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 999739abaf..78fc552aa1 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -254,6 +254,7 @@ BuildRequires: audit-libs-devel BuildRequires: gtk-doc %endif BuildRequires: libudev-devel +BuildRequires: libuuid-devel BuildRequires: /usr/bin/valac BuildRequires: libxslt %if %{with bluetooth}