diff options
author | Thomas Haller <thaller@redhat.com> | 2018-10-19 16:34:06 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-10-22 13:19:15 +0200 |
commit | a487d34fc4b4636496045c0f83306b37f01ec89b (patch) | |
tree | e4630d8184225d2423c3c76971ecca3011a48068 | |
parent | e0b168d6a84141408c48126fb4f358df1222870c (diff) | |
download | NetworkManager-a487d34fc4b4636496045c0f83306b37f01ec89b.tar.gz |
contrib: make "contrib/fedora/REQUIRED_PACKAGES" executable script
It will be called by .gitlab-ci.yml to install the packages.
-rwxr-xr-x[-rw-r--r--] | contrib/fedora/REQUIRED_PACKAGES | 23 | ||||
-rw-r--r-- | contrib/fedora/rpm/README | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 2efe95ce95..4a0ee4452d 100644..100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -1,3 +1,5 @@ +#!/bin/bash + # A list of packages useful/needed to build and develop # NetworkManager on Fedora and RHEL. # @@ -8,7 +10,16 @@ # Not all of these packages are strictly speaking necessary. # This is a generous list of related packages. -yum install \ +install() { + if [ "$NM_INSTALL" != "" ]; then + $NM_INSTALL "$@" + else + sudo "$(which dnf &>/dev/null && echo dnf || echo yum)" install -y "$@" + fi +} + +install \ + \ ModemManager-devel \ ModemManager-glib-devel \ audit-libs-devel \ @@ -21,6 +32,7 @@ yum install \ dbus-python \ dbus-x11 \ dhclient \ + gcc-c++ \ gettext-devel \ git \ gnutls-devel \ @@ -35,11 +47,15 @@ yum install \ libselinux-devel \ libtool \ libuuid-devel \ + make \ + meson \ newt-devel \ nss-devel \ polkit-devel \ ppp-devel \ pygobject3-base \ + python3-dbus \ + qt-devel \ readline-devel \ rpm-build \ systemd-devel \ @@ -47,5 +63,6 @@ yum install \ vala-devel \ vala-tools \ valgrind \ - wireless-tools-devel - + wireless-tools-devel \ + \ + #end diff --git a/contrib/fedora/rpm/README b/contrib/fedora/rpm/README index 8cc9c6f0a0..7982a1ef5b 100644 --- a/contrib/fedora/rpm/README +++ b/contrib/fedora/rpm/README @@ -7,7 +7,7 @@ git clone https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git cd NetworkManager git checkout $WHATEVER -sudo sh ./contrib/fedora/REQUIRED_PACKAGES +./contrib/fedora/REQUIRED_PACKAGES # |