summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-22 13:20:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-24 12:26:35 +0100
commit7929e06936c0d139192e80b91cae350c1b8aac4b (patch)
tree81f75928cbe13d1f7fcb757f20e34bc54f15f6e4
parentc942230eee405d35b99d85a3e9d8b00ce11d2222 (diff)
downloadpoky-7929e06936c0d139192e80b91cae350c1b8aac4b.tar.gz
musl: Bring in patches post 1.20 release
There have been regressions found in 1.20 release, this is cumulative update to bring these changes and drops the local patches which have been upstreamed in this delta https://git.musl-libc.org/cgit/musl/log/?qt=range&q=0fa1e638e87cf257e9f96b4019b2076afd674a19..c50985d5c8e316c5c464f352e79eeebfed1121a9 License-Update: Dropped BSD Prng implementation https://git.musl-libc.org/cgit/musl/commit/COPYRIGHT?id=c50985d5c8e316c5c464f352e79eeebfed1121a9 (From OE-Core rev: 0e1f892ed34d4c84f2a9164f10efad94f9282c49) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/musl/musl.inc2
-rw-r--r--meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch29
-rw-r--r--meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch76
-rw-r--r--meta/recipes-core/musl/musl_git.bb4
4 files changed, 2 insertions, 109 deletions
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index ba9b1a046c..319709b3cb 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -9,7 +9,7 @@ standards-conformance and safety."
9HOMEPAGE = "http://www.musl-libc.org/" 9HOMEPAGE = "http://www.musl-libc.org/"
10LICENSE = "MIT" 10LICENSE = "MIT"
11SECTION = "libs" 11SECTION = "libs"
12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2b9032093c4765e49ae85ddeba29afff" 12LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8a4bb28f771c817fe57d3a7c4240e3aa"
13 13
14PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 14PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
15 15
diff --git a/meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch b/meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch
deleted file mode 100644
index b1217723a3..0000000000
--- a/meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From e2e723cfe96ce6ed6558ed7e8fbb44b2283297da Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Sep 2018 06:57:28 -0700
4Subject: [PATCH] Define MAX_HANDLE_SZ
5
6MAX_HANDLE_SZ is described in name_to_handle_at() to contain maximum
7expected size for a file handle
8
9Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2018/09/13/16]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 include/fcntl.h | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/include/fcntl.h b/include/fcntl.h
16index 5c3defcb..6a8b6d49 100644
17--- a/include/fcntl.h
18+++ b/include/fcntl.h
19@@ -166,6 +166,7 @@ struct f_owner_ex {
20 };
21 #define FALLOC_FL_KEEP_SIZE 1
22 #define FALLOC_FL_PUNCH_HOLE 2
23+#define MAX_HANDLE_SZ 128
24 #define SYNC_FILE_RANGE_WAIT_BEFORE 1
25 #define SYNC_FILE_RANGE_WRITE 2
26 #define SYNC_FILE_RANGE_WAIT_AFTER 4
27--
282.19.0
29
diff --git a/meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch b/meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch
deleted file mode 100644
index 4738e1efd8..0000000000
--- a/meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1From ef3ef607693a9513d5ab94a1de67dd2f1f97d8ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Sep 2018 16:08:40 -0700
4Subject: [PATCH] wireup linux/name_to_handle_at and name_to_handle_at syscalls
5
6Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2018/09/13/4]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 include/fcntl.h | 7 +++++++
10 src/linux/name_to_handle_at.c | 11 +++++++++++
11 src/linux/open_by_handle_at.c | 10 ++++++++++
12 3 files changed, 28 insertions(+)
13 create mode 100644 src/linux/name_to_handle_at.c
14 create mode 100644 src/linux/open_by_handle_at.c
15
16diff --git a/include/fcntl.h b/include/fcntl.h
17index 6d8edcd1..5c3defcb 100644
18--- a/include/fcntl.h
19+++ b/include/fcntl.h
20@@ -155,6 +155,11 @@ int lockf(int, int, off_t);
21 #define F_OWNER_PID 1
22 #define F_OWNER_PGRP 2
23 #define F_OWNER_GID 2
24+struct file_handle {
25+ unsigned int handle_bytes;
26+ int handle_type;
27+ unsigned char f_handle[];
28+};
29 struct f_owner_ex {
30 int type;
31 pid_t pid;
32@@ -170,6 +175,8 @@ struct f_owner_ex {
33 #define SPLICE_F_GIFT 8
34 int fallocate(int, int, off_t, off_t);
35 #define fallocate64 fallocate
36+int name_to_handle_at(int, const char *, struct file_handle *, int *, int);
37+int open_by_handle_at(int, struct file_handle *, int);
38 ssize_t readahead(int, off_t, size_t);
39 int sync_file_range(int, off_t, off_t, unsigned);
40 ssize_t vmsplice(int, const struct iovec *, size_t, unsigned);
41diff --git a/src/linux/name_to_handle_at.c b/src/linux/name_to_handle_at.c
42new file mode 100644
43index 00000000..bb6f8007
44--- /dev/null
45+++ b/src/linux/name_to_handle_at.c
46@@ -0,0 +1,11 @@
47+#define _GNU_SOURCE
48+#include <fcntl.h>
49+#include "syscall.h"
50+
51+int name_to_handle_at(int dirfd, const char *pathname,
52+ struct file_handle *handle,
53+ int *mount_id, int flags)
54+{
55+ return syscall(SYS_name_to_handle_at, dirfd,
56+ pathname, handle, mount_id, flags);
57+}
58diff --git a/src/linux/open_by_handle_at.c b/src/linux/open_by_handle_at.c
59new file mode 100644
60index 00000000..9bc93f14
61--- /dev/null
62+++ b/src/linux/open_by_handle_at.c
63@@ -0,0 +1,10 @@
64+#define _GNU_SOURCE
65+#include <fcntl.h>
66+#include "syscall.h"
67+
68+int open_by_handle_at(int mount_fd, struct file_handle *handle,
69+ int flags)
70+{
71+ return syscall(SYS_open_by_handle_at, mount_fd,
72+ handle, flags);
73+}
74--
752.19.0
76
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index f0556533b5..0d8f8eb2a4 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,7 +4,7 @@
4require musl.inc 4require musl.inc
5inherit linuxloader 5inherit linuxloader
6 6
7SRCREV = "0fa1e638e87cf257e9f96b4019b2076afd674a19" 7SRCREV = "c50985d5c8e316c5c464f352e79eeebfed1121a9"
8 8
9PV = "1.1.20+git${SRCPV}" 9PV = "1.1.20+git${SRCPV}"
10 10
@@ -12,8 +12,6 @@ PV = "1.1.20+git${SRCPV}"
12 12
13SRC_URI = "git://git.musl-libc.org/musl \ 13SRC_URI = "git://git.musl-libc.org/musl \
14 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ 14 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
15 file://0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch \
16 file://0001-Define-MAX_HANDLE_SZ.patch \
17 " 15 "
18 16
19S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"