diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 981689dc55..240078b89e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,11 +60,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-ee13da0f38c7' - CENTOS_TAG: 'tag-5d3b59c9dd4b' - DEBIAN_TAG: 'tag-b274cbc4bddd' - FEDORA_TAG: 'tag-5d3b59c9dd4b' - UBUNTU_TAG: 'tag-b274cbc4bddd' + ALPINE_TAG: 'tag-759073a4a7c5' + CENTOS_TAG: 'tag-0d2843d78314' + DEBIAN_TAG: 'tag-529c288644bc' + FEDORA_TAG: 'tag-0d2843d78314' + UBUNTU_TAG: 'tag-529c288644bc' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' diff --git a/contrib/alpine/REQUIRED_PACKAGES b/contrib/alpine/REQUIRED_PACKAGES index f05147eb79..358214fd0f 100755 --- a/contrib/alpine/REQUIRED_PACKAGES +++ b/contrib/alpine/REQUIRED_PACKAGES @@ -7,7 +7,6 @@ apk update apk add \ 'alpine-sdk' \ 'autoconf' \ - 'automake' \ 'bash' \ 'clang' \ 'curl-dev' \ @@ -31,7 +30,6 @@ apk add \ 'libteam-dev' \ 'libtool' \ 'linux-headers' \ - 'make' \ 'meson' \ 'mobile-broadband-provider-info' \ 'modemmanager-dev' \ diff --git a/contrib/debian/REQUIRED_PACKAGES b/contrib/debian/REQUIRED_PACKAGES index 1c7186d7a4..fa73b21add 100755 --- a/contrib/debian/REQUIRED_PACKAGES +++ b/contrib/debian/REQUIRED_PACKAGES @@ -32,9 +32,6 @@ install_ignore_missing() { install \ \ - autoconf \ - automake \ - autopoint \ clang \ dbus \ dbus-x11 \ @@ -67,7 +64,6 @@ install \ libtool \ libudev-dev \ locales \ - make \ meson \ mobile-broadband-provider-info \ pkg-config \ diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 38ca90267f..adffcd9eeb 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -69,7 +69,6 @@ install \ libselinux-devel \ libtool \ libuuid-devel \ - make \ meson \ mobile-broadband-provider-info-devel \ newt-devel \ diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 369d5015fb..d0f9c45f4e 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -250,7 +250,6 @@ Conflicts: NetworkManager-initscripts-ifcfg-rh <= 1:1.47.5-3 Conflicts: NetworkManager-dispatcher-routing-rules <= 1:1.47.5-3 %endif -BuildRequires: make BuildRequires: gcc BuildRequires: libtool BuildRequires: pkgconfig