fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 11:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-from-source: also (re)install noarch packages

Browse source 
Fix installing also noarch packages. I think they were omitted wrongly
before, and installing them now might break existing assumptions during
CI (like, which packages are installed and which not).

But since the script anyway didn't ensure which RPMs are installed
prevoiusly, it was very likely that packages like NetworkManager-config-server
was already installed. CI needs to always anticipate that such packages
may be installed and act accordingly. Usually, this just means to
explicitly overwrite the configuration snippets provided by these
packages.
This commit is contained in:
Thomas Haller 2018-11-13 11:21:25 +01:00
parent a2a9352d03
commit e6bcd8770b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/rh-bkr/build-from-source.sh
View file

@ -150,11 +150,11 @@ if [[ "$DO_TEST_PACKAGE" == yes || "$DO_INSTALL" == yes ]]; then
fi
if [[ "$DO_INSTALL" == yes ]]; then
pushd "./contrib/fedora/rpm/latest/RPMS/$ARCH/"
for p in $(ls -1 ./*.rpm | sed 's#.*\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#'); do
pushd "./contrib/fedora/rpm/latest/RPMS/"
for p in $(ls -1 ./{$ARCH,noarch}/*.rpm | sed -n 's#^\./[^/]\+/\(NetworkManager.*\)-1\.[0-9]\+\..*#\1#p'); do
$SUDO rpm -e --nodeps $p || true
done
$SUDO yum install -y ./*.rpm
$SUDO yum install -y ./{$ARCH,noarch}/*.rpm
popd
# ensure that the expected NM is installed.