From bc0c79faebe1e50d44e76cb4e74ee1c3751ed13b Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 4 May 2020 13:25:43 +0200 Subject: [PATCH] build-from-source: introduce INSTALL_DEPENDENCIES env variable Environments like Copr cannot install the dependencies during the script execution. In order to solve this, this patch introduces "INSTALL_DEPENDENCIES" environment variable. Signed-off-by: Fernando Fernandez Mancera https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/490 --- contrib/rh-bkr/build-from-source.sh | 111 +++++++++++++++------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh index e5c8dc4e52..24e1f1e753 100755 --- a/contrib/rh-bkr/build-from-source.sh +++ b/contrib/rh-bkr/build-from-source.sh @@ -16,6 +16,7 @@ DO_TEST_BUILD="${DO_TEST_BUILD:-yes}" DO_TEST_PACKAGE="${DO_TEST_PACKAGE:-yes}" DO_INSTALL="${DO_INSTALL:-yes}" SUDO="$SUDO" +INSTALL_DEPENDENCIES="${INSTALL_DEPENDENCIES:-yes}" if [ -z "$SUDO" ]; then unset SUDO @@ -26,60 +27,64 @@ if grep -q --quiet Ootpa /etc/redhat-release; then YUM_ARGS+=("--enablerepo=rhel-8-buildroot") fi -$SUDO yum install \ - 'perl(XML::Parser)' \ - 'perl(YAML)' \ - /usr/bin/dbus-launch \ - ModemManager-glib-devel \ - audit-libs-devel \ - automake \ - bluez-libs-devel \ - dbus-devel \ - dbus-glib-devel \ - dbus-python \ - dhclient \ - gettext-devel \ - git \ - glib2-devel \ - gnutls-devel \ - gobject-introspection-devel \ - gtk-doc \ - intltool \ - iptables \ - jansson-devel \ - libasan \ - libcurl-devel \ - libgudev1-devel \ - libndp-devel \ - libnl3-devel \ - libpsl-devel \ - libselinux-devel \ - libsoup-devel \ - libubsan \ - libudev-devel \ - libuuid-devel \ - mobile-broadband-provider-info-devel \ - newt-devel \ - nss-devel \ - pkgconfig \ - polkit-devel \ - ppp-devel \ - pygobject3-base \ - python3 \ - readline-devel \ - rpm-build \ - strace \ - systemd \ - teamd-devel \ - vala-tools \ - valgrind \ - wireless-tools-devel \ - "${YUM_ARGS[@]}" \ - --skip-broken \ - -y +if [[ "$INSTALL_DEPENDENCIES" == yes ]]; then + $SUDO yum install \ + 'perl(XML::Parser)' \ + 'perl(YAML)' \ + /usr/bin/dbus-launch \ + ModemManager-glib-devel \ + audit-libs-devel \ + automake \ + bluez-libs-devel \ + dbus-devel \ + dbus-glib-devel \ + dbus-python \ + dhclient \ + gettext-devel \ + git \ + glib2-devel \ + gnutls-devel \ + gobject-introspection-devel \ + gtk-doc \ + intltool \ + iptables \ + jansson-devel \ + libasan \ + libcurl-devel \ + libgudev1-devel \ + libndp-devel \ + libnl3-devel \ + libpsl-devel \ + libselinux-devel \ + libsoup-devel \ + libubsan \ + libudev-devel \ + libuuid-devel \ + mobile-broadband-provider-info-devel \ + newt-devel \ + nss-devel \ + pkgconfig \ + polkit-devel \ + ppp-devel \ + pygobject3-base \ + python3 \ + readline-devel \ + rpm-build \ + strace \ + systemd \ + teamd-devel \ + vala-tools \ + valgrind \ + wireless-tools-devel \ + "${YUM_ARGS[@]}" \ + --skip-broken \ + -y +fi -# for the tests, let's pre-load some modules: -$SUDO modprobe ip_gre +if [[ "$DO_TEST_BUILD" == yes ]]; then + # for the tests, let's pre-load some modules: + $SUDO modprobe ip_gre +fi if grep -q Maipo /etc/redhat-release; then PYTHON=$(which python2)