Skip to contentSkip to conversation

package/xen: bump version to 4.14.0

PATCH New Alistair Francis 2 participants 2 messages Aug 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/xen: bump version to 4.14.0

Bump the Xen package to the latest release. We can also remove a patch to change the CFLAGS as it is no longer required.

---
 ...e-linux-limits.h-for-XATTR_SIZE_MAX.patch} |  0
 ...x-build-with-CFLAGS-from-environment.patch | 36 -------------------
 package/xen/xen.hash                          |  2 +-
 package/xen/xen.mk                            |  2 +-
 4 files changed, 2 insertions(+), 38 deletions(-)
 rename package/xen/{0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch => 0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch} (100%)
 delete mode 100644 package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch renamed from package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch +0 -0
similarity index 100%
rename from package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
rename to package/xen/0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch deleted +0 -36
deleted file mode 100644
index fb316739b4..0000000000
@@ -1,36 +0,0 @@
-From 8aea14bbd20b04b8fffaf35138ebdcbd39e433a3 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-Date: Sat, 29 Oct 2016 16:35:26 +0200
-Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment
-
-When CFLAGS are passed from the environment, the first-level make
-invocation will append -D__OBJECT_FILE__ to it, then call a second
-make invocation, that will have those new CFLAGS in its environment,
-but will also append -D__OBJECT_FILE__ to those.
-
-Then, the compiler fails because __OBEJECT_FILE__ is defined twice.
-
-Just undefine it before defining it again, as a *workaround* to this
-issue.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
- xen/Rules.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xen/Rules.mk b/xen/Rules.mk
-index 3090ea7828..d535bf9e2f 100644
---- a/xen/Rules.mk
-+++ b/xen/Rules.mk
-@@ -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.22.0
-
package/xen/xen.hash +1 -1
index ab5f9d9083..e9b18eb962 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  b97ce363e55b12c992063f4466c43cba0a6386ceb7a747b4dc670311f337ef01  xen-4.13.1.tar.gz
+sha256  06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035  xen-4.14.0.tar.gz
 sha256  36b91794c6d4a678137c70c41e384c03b552c7efba82c0d73e6be842e41ab3d3  COPYING
package/xen/xen.mk +1 -1
index 15742b5127..a30e80e5e7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XEN_VERSION = 4.13.1
+XEN_VERSION = 4.14.0
 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
 XEN_LICENSE = GPL-2.0
 XEN_LICENSE_FILES = COPYING
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/xen: bump version to 4.14.0

Quoted 4 lines · On Sat, 15 Aug 2020 19:53:07 -0700 Alistair Francis <[email protected]>…

Bump the Xen package to the latest release. We can also remove a patch to change the CFLAGS as it is no longer required.

Quoted 8 lines
---
 ...e-linux-limits.h-for-XATTR_SIZE_MAX.patch} |  0
 ...x-build-with-CFLAGS-from-environment.patch | 36 -------------------
 package/xen/xen.hash                          |  2 +-
 package/xen/xen.mk                            |  2 +-
 4 files changed, 2 insertions(+), 38 deletions(-)
 rename package/xen/{0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch => 0001-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch} (100%)
 delete mode 100644 package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch

You had forgotten to update the hash of the license file, which had changed. I've done that, and applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com