From nobody Sun Apr 28 03:56:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1614285056; cv=none; d=zohomail.com; s=zohoarc; b=MaIrPJZERejzxVE/ym67WVwYM6zE5InJ4eHUFdIfja4OOsJhYAppfu0QQQMrjF9a/y3gzv10HNbsmMSxf3IxDW3J2W81x49195nb+asRGv199yueRNKvY+EyND6n+Ob+S6V4/6n61jQH6U7S9bbQFw5Zkf/8bZfDJszglpSTG8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614285056; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yy04LInPnWZMpaNC6KAKSgj6jNvwFL9ELDpPIBxXM/0=; b=Dx8G5aXFpeqCzSv2p+scBEu/7jmMgQAlHJVP8sU7FjrXgecDCxhtUzfZVcQnwlzzkv/pXbMWMgbtDxojOije7PPgZqBtlsk0Ved/m+w15D1C1rCTLm3RBBYOmLD2/3lRVOh/MBI/QuaRGul4055bGTiY+Xrf71sHq6zOej0bIYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614285056809448.4887795217853; Thu, 25 Feb 2021 12:30:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.89958.170031 (Exim 4.92) (envelope-from ) id 1lFNHV-000831-Rw; Thu, 25 Feb 2021 20:30:41 +0000 Received: by outflank-mailman (output) from mailman id 89958.170031; Thu, 25 Feb 2021 20:30:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHV-00082s-OL; Thu, 25 Feb 2021 20:30:41 +0000 Received: by outflank-mailman (input) for mailman id 89958; Thu, 25 Feb 2021 20:30:41 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHU-00080O-Tx for xen-devel@lists.xenproject.org; Thu, 25 Feb 2021 20:30:40 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9d24a89a-4b02-493c-a854-65cedcced3a9; Thu, 25 Feb 2021 20:30:40 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9d24a89a-4b02-493c-a854-65cedcced3a9 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614285040; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7Qx8jBmkmdqJqWBNokGVben/Nln8ENewcLj1gGF0TLI=; b=QJWJwq84XWvyi8LiEMczFTRwHVnfkI6IDTMrrEPE1BG259+wdpbO6FFm WJLKYlW5Eu0eg69bXUPzbWENDPVT6xkuHzbdSpCgdfnQnMhgo1/AeCDeb gbgLfp3e1pfoBV8whPXy4PRSD97aHIQusIa64eolWzl5z1lFjRqEtnQyN Y=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ttoJ9fpxkvZkkT8zQSkgPq1z9X8fNuC4qsaA13gavWAV1C+SqixUoeWTy69UYPRzf7lbpxcn9j 22ImvXfA584+weNvU48sAnHwpULZPO9BQCuwmPub1OGLXD8rWQ1K7D+k/L6ei4Fg64l0/rJZ/c gpTjUcYYDnljBMRDSURiqb2agUnL7YeSusaR5mj7sUl1/rVI0XF/8b1PVgazsg7MLOYNJUv39y eTIp66EMAzq05LSz9bGkMpH5+x+7FtdizfgCpUoh+rKXzLbxb8bTAq2yMv4NE9ksgUzg95QGB9 8N8= X-SBRS: 5.2 X-MesageID: 38422276 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,207,1610427600"; d="scan'208";a="38422276" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Ian Jackson Subject: [PATCH 1/3] tools/hvmloader: Drop machelf include as well Date: Thu, 25 Feb 2021 20:30:07 +0000 Message-ID: <20210225203010.11378-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210225203010.11378-1-andrew.cooper3@citrix.com> References: <20210225203010.11378-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) The logic behind switching to elfstructs applies to sun builds as well. Fixes: 81b2b328a2 ("hvmloader: use Xen private header for elf structs") Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Ian Jackson --- tools/firmware/hvmloader/32bitbios_support.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/= hvmloader/32bitbios_support.c index e726946a7b..6f28fb6bde 100644 --- a/tools/firmware/hvmloader/32bitbios_support.c +++ b/tools/firmware/hvmloader/32bitbios_support.c @@ -22,9 +22,6 @@ =20 #include #include -#ifdef __sun__ -#include -#endif =20 #include "util.h" #include "config.h" --=20 2.11.0 From nobody Sun Apr 28 03:56:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1614285056; cv=none; d=zohomail.com; s=zohoarc; b=m4mlBI22iVFRkMSQx/7U4YCwVd/z4WQnSrUaF+LPJ9wcuqtj2BTkdGwc4V6iYGrRmVK98pCW/OEQWIRD5Y+IvaHnU7jWJHkuom7YNfjeAh/gLXu7NJVQu9gZR7oKeXmVvAAcVXo6gKiwdg7tTpMuzovOqTCZo5zn+ic3E3XAgKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614285056; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XVvLwI4fTV/qj6K8J/F7lRFhjgDOEc4g4ITsFeffWwo=; b=AhRQr0cu5+s2h3khEyWqzgclm2kYi+ztmd8A4bhTyBRTMDr8AoVFbfDw33/Ec24Fk992mwxyUQCqDhHn16GgAvOv9ex3VfCkLxAgZMsI6REyq/fFeCYZl0jRrwBtBlpzis0L+grLFwGbh2PviknhWIQcs8+6LmhI0eyIeNHg20g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16142850565441019.0046536372917; Thu, 25 Feb 2021 12:30:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.89957.170019 (Exim 4.92) (envelope-from ) id 1lFNHU-00080q-JU; Thu, 25 Feb 2021 20:30:40 +0000 Received: by outflank-mailman (output) from mailman id 89957.170019; Thu, 25 Feb 2021 20:30:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHU-00080i-Fv; Thu, 25 Feb 2021 20:30:40 +0000 Received: by outflank-mailman (input) for mailman id 89957; Thu, 25 Feb 2021 20:30:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHT-00080O-Tw for xen-devel@lists.xenproject.org; Thu, 25 Feb 2021 20:30:39 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b336a773-bd63-4dcb-99ea-ee13014eb19f; Thu, 25 Feb 2021 20:30:38 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b336a773-bd63-4dcb-99ea-ee13014eb19f DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614285038; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8hVN7Jd1M433kecw5Oj1hJjCQjf9Moi2LnCMo4tdjc8=; b=PnHBjyDuSIgH/mNyiTj8N5Dn61ciBVwhrAhRGtNCpEV9kp5uneIVr743 FhBlvDLimJ9wWT7Y2P0+YuIe0J/aVo+w3uP3arhMdsab1GIeomss/5ECO XTwqEgol8x4ky/fbI2UMuG/J0Peu1GZt8WFkTC4XVmgMNaLTqyykS2/eX s=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: ie/i33Gei64ljV6YdDzbwAvj2LHGW1RD5fqq8cdzwZCw3SJMDR/sr0A65QKgKfL1KiYvRTaAma wWm1R6HZw5QFP1YaRMbFw+ae+L32Ztf4C0rFbN4hbO9ozDESgcg6FmYPZXvzqo51j3WMYzq4hl Jn/o/1bxZGEE9SPrJn+3/7G5ut7OMKeBJoCjZldZTwtJEY5L3a0YWM1j1Hc+2iq/wBgDq5d4Mj S6hwVnQNFvEaOgU5LNG0tAxf/H3A7Zb5sr0kbWdj5v7MepBt6s9FrlANNYrhCNLyOBW1uVEa02 acs= X-SBRS: 5.2 X-MesageID: 38050464 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,207,1610427600"; d="scan'208";a="38050464" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Ian Jackson Subject: [PATCH 2/3] tools/firmware: Build firmware as -ffreestanding Date: Thu, 25 Feb 2021 20:30:08 +0000 Message-ID: <20210225203010.11378-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210225203010.11378-1-andrew.cooper3@citrix.com> References: <20210225203010.11378-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) firmware should always have been -ffreestanding, as it doesn't execute in t= he host environment. inttypes.h isn't a freestanding header, but the 32bitbios_support.c only wa= nts the stdint.h types so switch to the more appropriate include. This removes the build time dependency on a 32bit libc just to compile the hvmloader and friends. Update README and the TravisCI configuration. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Ian Jackson For 4.15. Build tested in Travis (Ubuntu) and XenServer (CentOS) - no chan= ge in the compiled HVMLoader binary. I'm currently rebuilding the containers locally to check Arch, Debian and OpenSUSE, but don't anticipate any proble= ms. This does not resolve the build issue on Alpine. Exactly what to do there = is still TBC, but Roger has opened a bug with Apline concerning their GCC packaging. --- .travis.yml | 1 - README | 3 --- tools/firmware/Rules.mk | 2 +- tools/firmware/hvmloader/32bitbios_support.c | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15ca9e9047..2362475f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,6 @@ addons: - acpica-tools - bin86 - bcc - - libc6-dev-i386 - libnl-3-dev - ocaml-nox - libfindlib-ocaml-dev diff --git a/README b/README index 33cdf6b826..5167bb1708 100644 --- a/README +++ b/README @@ -62,9 +62,6 @@ provided by your OS distributor: * GNU bison and GNU flex * GNU gettext * ACPI ASL compiler (iasl) - * Libc multiarch package (e.g. libc6-dev-i386 / glibc-devel.i686). - Required when building on a 64-bit platform to build - 32-bit components which are enabled on a default build. =20 In addition to the above there are a number of optional build prerequisites. Omitting these will cause the related features to be diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk index 26bbddccd4..93abcabc67 100644 --- a/tools/firmware/Rules.mk +++ b/tools/firmware/Rules.mk @@ -16,4 +16,4 @@ CFLAGS +=3D -Werror $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) =20 # Extra CFLAGS suitable for an embedded type of environment. -CFLAGS +=3D -fno-builtin -msoft-float +CFLAGS +=3D -fno-builtin -msoft-float -ffreestanding diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/= hvmloader/32bitbios_support.c index 6f28fb6bde..cee3804888 100644 --- a/tools/firmware/hvmloader/32bitbios_support.c +++ b/tools/firmware/hvmloader/32bitbios_support.c @@ -20,7 +20,7 @@ * this program; If not, see . */ =20 -#include +#include #include =20 #include "util.h" --=20 2.11.0 From nobody Sun Apr 28 03:56:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1614285051; cv=none; d=zohomail.com; s=zohoarc; b=At0MOA+cPlHWhdRQnHOdiMLpRZFr4wRGQjTDpgM6ts1Up+E66zdI9TE2WCWBTNpnnNwN44v0eFTSYlGd5Aj3CWta+5YzO9cZkKgLjAe73CMkmZ02akRZd2oYhASM+rfXEBgrbqW1FExCzsHeUsS16fTlvvj7aaKPm14TrioD2qQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614285051; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+aQp+ZLzhpwJW2VxrDeTdVJkBGcvRvDXAfYAnyuUjcg=; b=JVmngU2rX0hWOlfq5jiLCdxXvROQS1+Eq3nOHhMeAdMQqoTXZ+EH83x9wW5v40meCtxsvDXVPfTz9DVJ3OpFoFSCXOxS60dPdifNEk9cKulE8bUPFVCj59kM38zUCKTyS5slLgmrtK6Fq/ylAVTZLAOOuNsLY4HC+JljLmzvJzY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1614285051834368.00249058261727; Thu, 25 Feb 2021 12:30:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.89955.169994 (Exim 4.92) (envelope-from ) id 1lFNHL-0007vP-U8; Thu, 25 Feb 2021 20:30:31 +0000 Received: by outflank-mailman (output) from mailman id 89955.169994; Thu, 25 Feb 2021 20:30:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHL-0007vI-Qs; Thu, 25 Feb 2021 20:30:31 +0000 Received: by outflank-mailman (input) for mailman id 89955; Thu, 25 Feb 2021 20:30:30 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lFNHK-0007vD-M8 for xen-devel@lists.xenproject.org; Thu, 25 Feb 2021 20:30:30 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id df6720d4-3744-49de-b4d1-09441e620fab; Thu, 25 Feb 2021 20:30:29 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: df6720d4-3744-49de-b4d1-09441e620fab DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614285029; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=2KPiebheJyKHjlqvLctYPjbzkFONFknSVoRbxujFVEE=; b=WtKRWOZOQE3NpbUysrR8U9Mf1hy6RIIFO86Ps8M8/8/I10xx+Hj7rtpO Sgm9N7e4PfB0ZdXphI0XKBB1tWWNMiOlox/8rdue6NMjhq7bPDHw/0zaW mN4CmGzMocBLNQ60FnkhL6RDZOMI6hD+2r+YThHFdUHRUdSHbvcPvXGPT Y=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: NePu1J4P/KYBJYnQPEvgTTrX62mpxFDZpqQPpwPq53wThMHrfGNYe9GkQgSnUt+MlZwPmZ2jnZ T1nwU86VaQccohBP6vqE1pswVZiisDvvug2bX6Rz8q2YqT/XyLfkQIxEG+7K44fU5QQ1rmhYQX WAHDpNi1OEeyjRkdxSi2+toy+Kwfku6D9OJi8NDP66+QhL/lCgVz6Gwn+5b4mrFWmu6s1IumCa zs1/5Kj146QGEVTx8aUN7XpL5kHniPgoM+CLZE0A7/4S8cO/YE2krv+9tQdRI62n55/153s6Hb Q/8= X-SBRS: 5.2 X-MesageID: 37980454 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,207,1610427600"; d="scan'208";a="37980454" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Doug Goldstein , Wei Liu , Ian Jackson Subject: [PATCH 3/3] automation: Annotate that a 32bit libc is no longer a dependency Date: Thu, 25 Feb 2021 20:30:09 +0000 Message-ID: <20210225203010.11378-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210225203010.11378-1-andrew.cooper3@citrix.com> References: <20210225203010.11378-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-ZohoMail-DKIM: pass (identity @citrix.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We can't drop the 32bit libc from the existing containers, because they are used on older Xen branches as well. However, we can avoid the dependency being propagated into newer conainers derived from our dockerfiles. No functional change. Signed-off-by: Andrew Cooper --- CC: Doug Goldstein CC: Wei Liu CC: Ian Jackson For 4.15. Documentation changes only --- automation/build/archlinux/current.dockerfile | 1 + automation/build/centos/7.2.dockerfile | 1 + automation/build/centos/7.dockerfile | 1 + automation/build/debian/jessie.dockerfile | 1 + automation/build/debian/stretch.dockerfile | 1 + automation/build/debian/unstable.dockerfile | 1 + automation/build/fedora/29.dockerfile | 1 + automation/build/suse/opensuse-leap.dockerfile | 1 + automation/build/suse/opensuse-tumbleweed.dockerfile | 1 + automation/build/ubuntu/bionic.dockerfile | 1 + automation/build/ubuntu/focal.dockerfile | 1 + automation/build/ubuntu/trusty.dockerfile | 1 + automation/build/ubuntu/xenial.dockerfile | 1 + 13 files changed, 13 insertions(+) diff --git a/automation/build/archlinux/current.dockerfile b/automation/bui= ld/archlinux/current.dockerfile index d8fbebaf79..d46fc9d9ca 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -20,6 +20,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprog= ressbar --needed \ iasl \ inetutils \ iproute \ + # lib32-glibc for Xen < 4.15 lib32-glibc \ libaio \ libcacard \ diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/cent= os/7.2.dockerfile index c2f46b694c..af672a0be1 100644 --- a/automation/build/centos/7.2.dockerfile +++ b/automation/build/centos/7.2.dockerfile @@ -34,6 +34,7 @@ RUN rpm --rebuilddb && \ yajl-devel \ pixman-devel \ glibc-devel \ + # glibc-devel.i686 for Xen < 4.15 glibc-devel.i686 \ make \ binutils \ diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos= /7.dockerfile index e37d9d743a..5f83c97d0c 100644 --- a/automation/build/centos/7.dockerfile +++ b/automation/build/centos/7.dockerfile @@ -32,6 +32,7 @@ RUN yum -y install \ yajl-devel \ pixman-devel \ glibc-devel \ + # glibc-devel.i686 for Xen < 4.15 glibc-devel.i686 \ make \ binutils \ diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/d= ebian/jessie.dockerfile index 1232b9e204..808d6272e4 100644 --- a/automation/build/debian/jessie.dockerfile +++ b/automation/build/debian/jessie.dockerfile @@ -31,6 +31,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/= debian/stretch.dockerfile index 32742f7f39..e3bace1f87 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/debian/unstable.dockerfile b/automation/build= /debian/unstable.dockerfile index aeb4f3448b..9a10ee08d6 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/unstable.dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedor= a/29.dockerfile index 6a4e5b0413..5482952523 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -25,6 +25,7 @@ RUN dnf -y install \ yajl-devel \ pixman-devel \ glibc-devel \ + # glibc-devel.i686 for Xen < 4.15 glibc-devel.i686 \ make \ binutils \ diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/bu= ild/suse/opensuse-leap.dockerfile index c60c13c943..685dd5d7fd 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -26,6 +26,7 @@ RUN zypper install -y --no-recommends \ git \ glib2-devel \ glibc-devel \ + # glibc-devel-32bit for Xen < 4.15 glibc-devel-32bit \ gzip \ hostname \ diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automat= ion/build/suse/opensuse-tumbleweed.dockerfile index 084cce0921..061173e751 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -26,6 +26,7 @@ RUN zypper install -y --no-recommends \ git \ glib2-devel \ glibc-devel \ + # glibc-devel-32bit for Xen < 4.15 glibc-devel-32bit \ gzip \ hostname \ diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/u= buntu/bionic.dockerfile index 712b2e4722..408063698c 100644 --- a/automation/build/ubuntu/bionic.dockerfile +++ b/automation/build/ubuntu/bionic.dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ub= untu/focal.dockerfile index c1c1f8d58f..90b4001a6a 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -31,6 +31,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/u= buntu/trusty.dockerfile index 397a28061d..fd377d948f 100644 --- a/automation/build/ubuntu/trusty.dockerfile +++ b/automation/build/ubuntu/trusty.dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/u= buntu/xenial.dockerfile index ce0e84fa2f..57a71eb8c6 100644 --- a/automation/build/ubuntu/xenial.dockerfile +++ b/automation/build/ubuntu/xenial.dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ ocaml-nox \ --=20 2.11.0