summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2020-09-15 19:31:35 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-09-22 09:35:48 +0200
commit8d4d48cf5dc8e8abfaa9ca127f0d070e758ac300 (patch)
tree5815076fb33a00e8c258915426adcfb8ae7d3e2c /patches
parent54fa98f4da93ae96b5bb113693164364a9f1581d (diff)
downloadptxdist-8d4d48cf5dc8e8abfaa9ca127f0d070e758ac300.tar.gz
ptxdist-8d4d48cf5dc8e8abfaa9ca127f0d070e758ac300.tar.xz
weston: version bump 8.0.0 -> 9.0.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Message-Id: <20200915173135.24420-1-p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch33
-rw-r--r--patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch60
-rw-r--r--patches/weston-8.0.0/series5
3 files changed, 0 insertions, 98 deletions
diff --git a/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch b/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
deleted file mode 100644
index 1486121e7..000000000
--- a/patches/weston-8.0.0/0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: James Hilliard <james.hilliard1@gmail.com>
-Date: Sat, 1 Feb 2020 20:02:29 -0700
-Subject: [PATCH] unconditionally include sys/mman.h in os-compatibility.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’?
- map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0);
- ^~~~~~~~~
- LOCK_READ
-
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
----
- shared/os-compatibility.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
-index 5e1ce4793cec..041c929f83e5 100644
---- a/shared/os-compatibility.c
-+++ b/shared/os-compatibility.c
-@@ -34,10 +34,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <libweston/zalloc.h>
--
--#ifdef HAVE_MEMFD_CREATE
- #include <sys/mman.h>
--#endif
-
- #include "os-compatibility.h"
-
diff --git a/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch b/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
deleted file mode 100644
index 82d25b00d..000000000
--- a/patches/weston-8.0.0/0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Sebastian Wick <sebastian@sebastianwick.net>
-Date: Wed, 5 Feb 2020 10:27:23 +0100
-Subject: [PATCH] shared: guard all the seal logic behind HAVE_MEMFD_CREATE
-
-The initial version of os_ro_anonymous_file missed two guards around the
-seal logic which leads to a compilation error on older systems.
-
-Also make the check for a read-only file symmetric in
-os_ro_anonymous_file_get_fd and os_ro_anonymous_file_put_fd.
-
-Signed-off-by: Sebastian Wick <sebastian@sebastianwick.net>
----
- shared/os-compatibility.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
-index 041c929f83e5..2e12b7cc3626 100644
---- a/shared/os-compatibility.c
-+++ b/shared/os-compatibility.c
-@@ -340,6 +340,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- void *src, *dst;
- int seals, fd;
-
-+#ifdef HAVE_MEMFD_CREATE
- seals = fcntl(file->fd, F_GET_SEALS);
-
- /* file was sealed for read-only and we don't have to support MAP_SHARED
-@@ -348,6 +349,7 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- if (seals != -1 && mapmode == RO_ANONYMOUS_FILE_MAPMODE_PRIVATE &&
- (seals & READONLY_SEALS) == READONLY_SEALS)
- return file->fd;
-+#endif
-
- /* for all other cases we create a new anonymous file that can be mapped
- * with MAP_SHARED and copy the contents to it and return that instead
-@@ -388,17 +390,18 @@ os_ro_anonymous_file_get_fd(struct ro_anonymous_file *file,
- int
- os_ro_anonymous_file_put_fd(int fd)
- {
-+#ifdef HAVE_MEMFD_CREATE
- int seals = fcntl(fd, F_GET_SEALS);
- if (seals == -1 && errno != EINVAL)
- return -1;
-
-- /* If the fd cannot be sealed seals is -1 at this point
-- * or the file can be sealed but has not been sealed for writing.
-- * In both cases we created a new anonymous file that we have to
-- * close.
-+ /* The only case in which we do NOT have to close the file is when the file
-+ * was sealed for read-only
- */
-- if (seals == -1 || !(seals & F_SEAL_WRITE))
-- close(fd);
-+ if (seals != -1 && (seals & READONLY_SEALS) == READONLY_SEALS)
-+ return 0;
-+#endif
-
-+ close(fd);
- return 0;
- }
diff --git a/patches/weston-8.0.0/series b/patches/weston-8.0.0/series
deleted file mode 100644
index ed045c3f9..000000000
--- a/patches/weston-8.0.0/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-unconditionally-include-sys-mman.h-in-os-compatibili.patch
-0002-shared-guard-all-the-seal-logic-behind-HAVE_MEMFD_CR.patch
-# bb3fbf767cc2393f046e3c397089bedb - git-ptx-patches magic