From patchwork Tue Jul 14 09:52:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 235519 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3583762ilg; Tue, 14 Jul 2020 02:55:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjAqYiRPkzm4JtG1Af2Mt8GZTQmdBpTxSYOmUg46OjnfIx4c2MME/eK0eA30V2IMA82QWZ X-Received: by 2002:a25:be11:: with SMTP id h17mr6448532ybk.179.1594720518092; Tue, 14 Jul 2020 02:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594720518; cv=none; d=google.com; s=arc-20160816; b=xogNsU+4aE+2roAykij4m5U70FQNJcJ8fQtBlZCE5AduKNMW+z5a/Wr8SFwhVfpGc+ THnD07FcsiZt5cSxm1uEnuJxAt32yquCp0Ci0Zrwn6ivrxHxLjN+rR06PHPZ81743nSq lgoPYSoUdg2SPjH7dekxR4ynBTgtVNOgkpjOb2U3/54Lb8D5C5bpQTRUduM5OHzcf4F2 XoZAD8Y9WgKEV+ljQejf3aEOABw9SrzzkMZqeYjFLSXkYv1IxbOp6BmVdwmht6c64gUy splaHsAEts9mkOqTC2T682H5eQjtIhqcfFFI8bHk4aRg7Kyln16n7tL11CFPp6mBcm7R yu5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BBfEE2/nVgeVfVJMVyVYNC/Z05o6uaGLDngf+bqz22g=; b=iyUSjgROoZM00Fuyl1AtXm1eb/ZKFefri3LSqD5vLHdj4uraypx4XoL0F8O8oW1lJJ sjZtg+wzj9KFV4efaIC12eD969WGjUJc2FKuKi/03yIkb8qGyXnrQHswYP6SUvbTEEWM p/CkPoqnZzB4TCsreszS9ZJAvEfXPCH/wckYoUEga7Bt9N+U3+wMNrhWJ4QjpEjEUgWw z0OU+fZmLwzXQjyXDkgJ50wsj0gT7tiV5sxBz1suWjBAbm9JQVBRphKnRY3z7Tz+XeEE VYC8NRGAG1yuqnz6cq6/KwQbZMla7xH6fCa/LXVgs8yTkg2t65LoBLGngjS4Fs66gMdU N1FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nDCxifch; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f6si9203684ybi.333.2020.07.14.02.55.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Jul 2020 02:55:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nDCxifch; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvHef-0006ZI-GY for patch@linaro.org; Tue, 14 Jul 2020 05:55:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvHcO-0003NT-DE for qemu-devel@nongnu.org; Tue, 14 Jul 2020 05:52:56 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvHcM-0003wq-EY for qemu-devel@nongnu.org; Tue, 14 Jul 2020 05:52:56 -0400 Received: by mail-wm1-x335.google.com with SMTP id o8so4139097wmh.4 for ; Tue, 14 Jul 2020 02:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BBfEE2/nVgeVfVJMVyVYNC/Z05o6uaGLDngf+bqz22g=; b=nDCxifchzh+MNerjmbmpwLmCRdVTHZjsUT/DO0kuD9Kf7UYae+7weRTeYzFIPtT5Zj lrMngcRaRtZdFXsqzV9vRTP6MUZDv0GYAMqcPJMqD0rYQWipLdsynFuzYC/yOf4Pznyl fUcuplsuRC6IH3trOAqa6ovBTTvcYNZiKfegXt3FV8sqX2Wklt09ooBO3hKGY7dIC/qD SxPq3pUvKB3YCkXkj/ohxYfoD+KY1OAsEJX1EZl23tsnjqi3aZNncoqkC1tpl+y+9yxJ kxVXegauHU1bHDJXUFvqWaSXdzvsO0nzItcnVaBoxMFMyCsKUIG9vlnWdC6XJun+zybR t0vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BBfEE2/nVgeVfVJMVyVYNC/Z05o6uaGLDngf+bqz22g=; b=tG4MhjDS7haohY4UNVLDj/+tlLqml/Qh2GppZLg9s07Vffqx/ims+D90Q7tVHMW3Sr hMViAvWpLjbEX+PbgGslEybUQDyHuIVdRQ4QIXmghfp5hLRkvXLeN9HyoSDqFF+qYLwK n5jxyNLMVolep+9d+o/+M6dDPgytoggSKvSnCShS18YJ1q6L1o9lvZYhAE4WOaP0PCi9 jC0uAf5++n6tH94XN2Z6IVKYlv5hqZNk8xMSC6F5RTvqx+OXA+QCBCDT0APdjhd6i2UB FNvoRMfLrKyRqIrmQoNAX+YiuUooYr1SOgxry9G94yj9Vk1Pomwxw99NWWa4wTPbd7j0 eBfw== X-Gm-Message-State: AOAM5339Cnv895QRPFzlQxxBo2Q/KHgbwWZX9I1wzq6S3+nG8/Aj0fZR AWZqFQ3HnQ+3eZoUZEmgWPCS0g== X-Received: by 2002:a1c:96ce:: with SMTP id y197mr3394116wmd.86.1594720373167; Tue, 14 Jul 2020 02:52:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f9sm28163988wru.47.2020.07.14.02.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2020 02:52:48 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 90D5F1FF8F; Tue, 14 Jul 2020 10:52:47 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image Date: Tue, 14 Jul 2020 10:52:41 +0100 Message-Id: <20200714095247.19573-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200714095247.19573-1-alex.bennee@linaro.org> References: <20200714095247.19573-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The libssh problem only exists in Ubuntu 18.04 - we can enable it in 20.04 again. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200713185237.9419-1-thuth@redhat.com> Message-Id: <20200713200415.26214-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index f7aac840bf..8d10934a2a 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -65,9 +65,6 @@ RUN apt-get update && \ RUN dpkg -l $PACKAGES | sort > /packages.txt ENV FEATURES clang tsan pyyaml sdl2 -# https://bugs.launchpad.net/qemu/+bug/1838763 -ENV QEMU_CONFIGURE_OPTS --disable-libssh - # Apply patch https://reviews.llvm.org/D75820 # This is required for TSan in clang-10 to compile with QEMU. RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h