From patchwork Sat Aug 10 10:18:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1145177 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=alistair23.me Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=alistair23.me header.i=@alistair23.me header.b="Z3k7b4EH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="IW0Q3qgp"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 465TYC0PR6z9sN6 for ; Sun, 11 Aug 2019 03:26:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8AE6085F57; Sat, 10 Aug 2019 17:26:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Cyex4qbs3WiV; Sat, 10 Aug 2019 17:26:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 03A5B85232; Sat, 10 Aug 2019 17:26:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E227F1BF5A7 for ; Sat, 10 Aug 2019 17:26:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DE57985CD0 for ; Sat, 10 Aug 2019 17:26:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q1QPS9QkHopt for ; Sat, 10 Aug 2019 17:26:17 +0000 (UTC) X-Greylist: delayed 00:07:36 by SQLgrey-1.7.6 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by whitealder.osuosl.org (Postfix) with ESMTPS id DCE63838F6 for ; Sat, 10 Aug 2019 17:26:16 +0000 (UTC) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 2DA3F21240; Sat, 10 Aug 2019 13:18:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sat, 10 Aug 2019 13:18:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=Kp+wOW2HIJD493Ek7sJAQydLXs /JBnbdwg5eJ4RVB/I=; b=Z3k7b4EH5NEoeARDEOut7eRvYIZhqSvPYjhANTJTPR 1JEs3dKSRe+5VKv0gbyzk28ggLSPfwH9dzpGTGXBhzPKWoyJoTUyIdbEI0XTQ5Fp 60zYVDaLEP4Xb+5082QmcdeO1x9V3oajqUd3Hwju4fFApNq2SgmMCjWWNjKj7jkJ tMtwoPoaQKrrHvfRIgBXsLNQX2OFmBLXXBAEcwRnRofMs8k3uP+WfmzsXjqI1WM6 KBhjf4b2YQ3PxC0urYR04PajA3GnP81LrRjN2b+hTrKjXCy12iKSDoEHq/uXLqeC 8ivD1md4/4OBXdtZNXiqnAQbLflWBAKM+VPjMq6gWTtg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=Kp+wOW2HIJD493Ek7 sJAQydLXs/JBnbdwg5eJ4RVB/I=; b=IW0Q3qgpjzRGkXt1Tn/TjdVKY0xBQRxHe Hrxt2C8Fj7KJOfu0YQwHYWUTz5cn+7xe5rbFBQOg8aMOTOfqzEV2tegN7IjviMS/ EWDdby5bXjO1ga5Rstt4FifreKPfVQaOdANWk3yHg/X2cecBVl6ZQZdCnwnBJ69a moYu/uc9ojjoEyFoQNbddRD9YC3zZmXIUsP+VwLE8H2W06uZXiucC74Ihv6qUYWJ InqkKI0D0eqOwCcQGmveg26IYFOkoSUZe1AYUNEOF2DF2RD/3K2ayJiGLfkRafkK WEEOVBuyYx4vCu7BXEBEwNw0cPEPneo8uALPBeQgphzPbzIK8FJlQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudduledgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeetlhhishhtrghirhcuhfhrrghntghishcuoegrlhhishhtrghi rhesrghlihhsthgrihhrvdefrdhmvgeqnecuffhomhgrihhnpeigvghnphhrohhjvggtth drohhrghdpghhithhhuhgsrdgtohhmnecukfhppeejfedrleefrdekgedrvddtkeenucfr rghrrghmpehmrghilhhfrhhomheprghlihhsthgrihhrsegrlhhishhtrghirhdvfedrmh gvnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from alistair-xps-14z.alistair23.me (c-73-93-84-208.hsd1.ca.comcast.net [73.93.84.208]) by mail.messagingengine.com (Postfix) with ESMTPA id 6E4D48005A; Sat, 10 Aug 2019 13:18:38 -0400 (EDT) From: Alistair Francis To: buildroot@busybox.net Date: Sat, 10 Aug 2019 03:18:31 -0700 Message-Id: <20190810101831.8170-1-alistair@alistair23.me> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/xen: bump to version 4.12.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Alistair Francis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Alistair Francis --- ...x-build-with-CFLAGS-from-environment.patch | 14 ++-- ...rm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch | 37 --------- ...-32-bit-gcc-8-1-non-debug-build-work.patch | 79 ------------------- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 5 files changed, 9 insertions(+), 125 deletions(-) delete mode 100644 package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch delete mode 100644 package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch diff --git a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch index 0d4e581af6..fb316739b4 100644 --- a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch @@ -1,4 +1,4 @@ -From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 +From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 29 Oct 2016 16:35:26 +0200 Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment @@ -19,18 +19,18 @@ Signed-off-by: "Yann E. MORIN" 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Rules.mk b/xen/Rules.mk -index a9fda71..09ccbfa 100644 +index 3090ea7828..d535bf9e2f 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk -@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o - CFLAGS += -nostdinc -fno-builtin -fno-common - CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +@@ -61,7 +61,7 @@ CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith + $(call cc-option-add,CFLAGS,CC,-Wvla) + CFLAGS += -pipe -D__XEN__ -include $(BASEDIR)/include/xen/config.h + CFLAGS-$(CONFIG_DEBUG_INFO) += -g -CFLAGS += '-D__OBJECT_FILE__="$@"' +CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' ifneq ($(clang),y) # Clang doesn't understand this command line argument, and doesn't appear to -- -2.7.4 +2.22.0 diff --git a/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch b/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch deleted file mode 100644 index db2bbe8363..0000000000 --- a/package/xen/0003-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c8993743d611ed23ebded3168ac3ac6ff3e5d2fa Mon Sep 17 00:00:00 2001 -From: Christopher Clark -Date: Thu, 16 Aug 2018 13:22:41 -0700 -Subject: [PATCH] libxl/arm: Fix build on arm64 + acpi w/ gcc 8.2 - -Add zero-padding to #defined ACPI table strings that are copied. -Provides sufficient characters to satisfy the length required to -fully populate the destination and prevent array-bounds warnings. -Add BUILD_BUG_ON sizeof checks for compile-time length checking. - -Signed-off-by: Christopher Clark -Reviewed-by: Stefano Stabellini -Acked-by: Wei Liu ---- - tools/libxl/libxl_arm_acpi.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c -index 636f724039..eeca1def06 100644 ---- a/tools/libxl/libxl_arm_acpi.c -+++ b/tools/libxl/libxl_arm_acpi.c -@@ -48,9 +48,9 @@ extern const unsigned char dsdt_anycpu_arm[]; - _hidden - extern const int dsdt_anycpu_arm_len; - --#define ACPI_OEM_ID "Xen" --#define ACPI_OEM_TABLE_ID "ARM" --#define ACPI_ASL_COMPILER_ID "XL" -+#define ACPI_OEM_ID "Xen\0\0" -+#define ACPI_OEM_TABLE_ID "ARM\0\0\0\0" -+#define ACPI_ASL_COMPILER_ID "XL\0" - - enum { - RSDP, --- -2.17.1 - diff --git a/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch b/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch deleted file mode 100644 index 9c51c554cd..0000000000 --- a/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8 Mon Sep 17 00:00:00 2001 -From: Wei Liu -Date: Thu, 26 Jul 2018 15:58:54 +0100 -Subject: [PATCH] xenpmd: make 32 bit gcc 8.1 non-debug build work - -32 bit gcc 8.1 non-debug build yields: - -xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=] - snprintf(val, 3, "%02x", - ^~~~ -xenpmd.c:354:22: note: directive argument in the range [40, 2147483778] - snprintf(val, 3, "%02x", - ^~~~~~ -xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3 - snprintf(val, 3, "%02x", - ^~~~~~~~~~~~~~~~~~~~~~~~ - (unsigned int)(9*4 + - ~~~~~~~~~~~~~~~~~~~~ - strlen(info->model_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->serial_number) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->battery_type) + - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - strlen(info->oem_info) + 4)); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -All info->* used in calculation are 32 bytes long, and the parsing -code makes sure they are null-terminated, so the end result of the -expression won't exceed 255, which should be able to be fit into 3 -bytes in hexadecimal format. - -Add an assertion to make gcc happy. - -Signed-off-by: Wei Liu -Acked-by: Ian Jackson -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/xen-project/xen/commit/e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8] ---- - tools/xenpmd/xenpmd.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c -index 56412a9a81c..1c801caa712 100644 ---- a/tools/xenpmd/xenpmd.c -+++ b/tools/xenpmd/xenpmd.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - /* #define RUN_STANDALONE */ - #define RUN_IN_SIMULATE_MODE -@@ -345,18 +346,17 @@ void write_ulong_lsb_first(char *temp_val, unsigned long val) - void write_battery_info_to_xenstore(struct battery_info *info) - { - char val[1024], string_info[256]; -+ unsigned int len; - - xs_mkdir(xs, XBT_NULL, "/pm"); - - memset(val, 0, 1024); - memset(string_info, 0, 256); - /* write 9 dwords (so 9*4) + length of 4 strings + 4 null terminators */ -- snprintf(val, 3, "%02x", -- (unsigned int)(9*4 + -- strlen(info->model_number) + -- strlen(info->serial_number) + -- strlen(info->battery_type) + -- strlen(info->oem_info) + 4)); -+ len = 9 * 4 + strlen(info->model_number) + strlen(info->serial_number) + -+ strlen(info->battery_type) + strlen(info->oem_info) + 4; -+ assert(len < 255); -+ snprintf(val, 3, "%02x", len); - write_ulong_lsb_first(val+2, info->present); - write_ulong_lsb_first(val+10, info->design_capacity); - write_ulong_lsb_first(val+18, info->last_full_capacity); diff --git a/package/xen/xen.hash b/package/xen/xen.hash index d4232f592e..a15bc7d852 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3f9217f5a7cc240a06f3a03db8c29605d69a64d98330c426611ba5c2ee08b5d8 xen-4.11.2.tar.gz +sha256 5450a85497b84167df1d229b3ab98fb24ef4d6b0510dce522798c13c1b090159 xen-4.12.1.tar.gz sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index bd8a39f639..b0dc2dfe4c 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.11.2 +XEN_VERSION = 4.12.1 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING