From 244e9bb4df559996307bd9769c2e8d8d40984b3c Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 7 May 2024 14:51:08 +0200 Subject: [PATCH] Copy mdns resolution workaround to the emulated platforms too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applies fix from commit 5c6814fb18760f65bab0f8b9cd623ee5c874a58d to the emulated platforms. Fixes: QTBUG-107696 Pick-to: 6.5 Change-Id: I9c282ecf9c29c57cce964ae9962f1857c953cfd8 Reviewed-by: Axel Spoerl Reviewed-by: Mårten Nordheim (cherry picked from commit d25f25f3afa8311bc993d2dd0ced09753092ffd1) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh index 71196158..a764dc7e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh @@ -113,7 +113,7 @@ sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARM64/sysroots/$sysrootARM64/et # Fix mdns to support both docker and network tests # See also https://bugreports.qt.io/browse/QTBUG-106013 -sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' \ +sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] mdns4 dns/' \ $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf \ $yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto.sh index 71196158..a764dc7e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto.sh @@ -113,7 +113,7 @@ sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARM64/sysroots/$sysrootARM64/et # Fix mdns to support both docker and network tests # See also https://bugreports.qt.io/browse/QTBUG-106013 -sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' \ +sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] mdns4 dns/' \ $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf \ $yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf