Skip to contentSkip to conversation

musl: Bring in patches post 1.20 release

PATCH New Khem Raj 1 participant 1 message Sep 22, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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

---
 meta/recipes-core/musl/musl.inc               |  2 +-
 .../musl/musl/0001-Define-MAX_HANDLE_SZ.patch | 29 -------
 ...e_to_handle_at-and-name_to_handle_at.patch | 76 -------------------
 meta/recipes-core/musl/musl_git.bb            |  4 +-
 4 files changed, 2 insertions(+), 109 deletions(-)
 delete mode 100644 meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch
 delete mode 100644 meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch
meta/recipes-core/musl/musl.inc +1 -1
index ba9b1a046c..319709b3cb 100644
@@ -9,7 +9,7 @@ standards-conformance and safety."
 HOMEPAGE = "http://www.musl-libc.org/"
 LICENSE = "MIT"
 SECTION = "libs"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2b9032093c4765e49ae85ddeba29afff"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8a4bb28f771c817fe57d3a7c4240e3aa"
 
 PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
 
meta/recipes-core/musl/musl/0001-Define-MAX_HANDLE_SZ.patch deleted +0 -29
deleted file mode 100644
index b1217723a3..0000000000
@@ -1,29 +0,0 @@
-From e2e723cfe96ce6ed6558ed7e8fbb44b2283297da Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 13 Sep 2018 06:57:28 -0700
-Subject: [PATCH] Define MAX_HANDLE_SZ
-
-MAX_HANDLE_SZ is described in name_to_handle_at() to contain maximum
-expected size for a file handle
-
-Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2018/09/13/16]
-Signed-off-by: Khem Raj <[email protected]>
----
- include/fcntl.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/fcntl.h b/include/fcntl.h
-index 5c3defcb..6a8b6d49 100644
---- a/include/fcntl.h
-+++ b/include/fcntl.h
-@@ -166,6 +166,7 @@ struct f_owner_ex {
- };
- #define FALLOC_FL_KEEP_SIZE 1
- #define FALLOC_FL_PUNCH_HOLE 2
-+#define MAX_HANDLE_SZ 128
- #define SYNC_FILE_RANGE_WAIT_BEFORE 1
- #define SYNC_FILE_RANGE_WRITE 2
- #define SYNC_FILE_RANGE_WAIT_AFTER 4
--- 
-2.19.0
-
meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch deleted +0 -76

76 lines not on this page · raw message

meta/recipes-core/musl/musl_git.bb +1 -3
index f0556533b5..0d8f8eb2a4 100644
@@ -4,7 +4,7 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "0fa1e638e87cf257e9f96b4019b2076afd674a19"
+SRCREV = "c50985d5c8e316c5c464f352e79eeebfed1121a9"
 
 PV = "1.1.20+git${SRCPV}"
 
@@ -12,8 +12,6 @@ PV = "1.1.20+git${SRCPV}"
 
 SRC_URI = "git://git.musl-libc.org/musl \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
-           file://0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch \
-           file://0001-Define-MAX_HANDLE_SZ.patch \
           "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.19.0