musl: Update to master tip
PATCH 1/3 musl: Update to master tip
--- meta/recipes-core/musl/musl_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/musl/musl_git.bb +4 -2
@@ -4,9 +4,11 @@ require musl.inc inherit linuxloader -SRCREV = "21a172dd36cae7a08492fd3a7500d7bf0daee13e" +SRCREV = "de7dc1318f493184b20f7661bc12b1829b957b67" -PV = "1.1.20+git${SRCPV}" +BASEVER = "1.1.20" + +PV = "${BASEVER}+git${SRCPV}" # mirror is at git://github.com/kraj/musl.git
Signature · 1 line
2.20.1
PATCH 2/3 linux-libc-headers: Remove spurious x.mbox file
--- meta/recipes-kernel/linux-libc-headers/x.mbox | 174 ------------------ 1 file changed, 174 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/x.mbox
meta/recipes-kernel/linux-libc-headers/x.mbox deleted +0 -174
@@ -1,174 +0,0 @@ -From [email protected] Tue Dec 25 20:46:09 2018 -Delivered-To: [email protected] -Received: by 2002:a2e:4c3:0:0:0:0:0 with SMTP id a64-v6csp5312962ljf; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -X-Google-Smtp-Source: ALg8bN5+ydksOT9csVRJHxYDz7K6mUppK0qIlnMBsbGWz9Sq8Fdlk64bzsaJk68T9XGeIzgSwxS9 -X-Received: by 2002:a63:295:: with SMTP id 143mr16751743pgc.362.1545788769434; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -ARC-Seal: i=1; a=rsa-sha256; t=1545788769; cv=none; - d=google.com; s=arc-20160816; - b=jG9fBrPvXAw8K+BjylRwE9cyo1dGTSQIXWYQAsxDXBL4sJKb/9HQ7t9CARYj48ptNC - PyU9C1SF8FBe8jel1WM2zKHYxcoKShkfNv92t9jrw7thhkeRGtOPIfoQXt1ma6+1MLGa - hdinQ5eBKdQt2AouG0A8huAMuHJfxYB9XpD5771sN0XD51Ecc8oYTYOEPmzg21EYg9EC - /8A+bodbKwBlIjg6x/O1ucx7W6fV5iyeyaOsJbzbPZeTdC3FqGycgSfErAkyoEJjYwAP - /k5PPo4vm6SU3PHJOV7a2cLbWfG6bS5K6/cxzdpXQKTGheKZOc6FFE3ptZfAwkFbVxfX - Siww== -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=errors-to:sender:content-transfer-encoding:mime-version - :list-subscribe:list-help:list-post:list-archive:list-unsubscribe - :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; - bh=L66KCbYgtwDc95aWv7eY3oTToexeHY5x8MVGyHJ/gPM=; - b=rrE3b6NDRkazf03I4sTmeHnGX/emKFRWJSUcjyKS2hmAS83KcWTj/WfkinO4w4TeuB - S7hPfsAA+DsVLI8Qz0Y2FpZp8dyCeDTDkJtPqZdlDhErV2b3weNNFqbiY4fjIlREkYO/ - OIg0TgyyPGu4Ekur2dkYbdGmxIGtNsdIEQwv/zROwASqQiK/jpz7M156pGCbKYiSZz1g - k3Bwrg+ON72xwBpMoN/x/9Ep7UXl3dvKAkgxUgPaBnPuwDW3HV+y4a3AYyiBoXRRILvm - NDuAEwBRysljjsAeD1fxvwtKosRKuNfQpKDwibdgcsHjywPZKykADwYvp3Yc9bdOUwry - A8FA== -ARC-Authentication-Results: i=1; mx.google.com; - spf=pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) [email protected] -Return-Path: <[email protected]> -Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) - by mx.google.com with ESMTP id j35si31697173pgl.223.2018.12.25.17.46.08; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -Received-SPF: pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; -Authentication-Results: mx.google.com; - spf=pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) [email protected] -Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) - by mail.openembedded.org (Postfix) with ESMTP id 564896BEF4; - Wed, 26 Dec 2018 01:45:54 +0000 (UTC) -X-Original-To: [email protected] -Delivered-To: [email protected] -Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) - by mail.openembedded.org (Postfix) with ESMTP id 812D86B79B - for <[email protected]>; - Wed, 26 Dec 2018 01:45:45 +0000 (UTC) -Received: from ala-blade48.wrs.com (ala-blade48.wrs.com [147.11.105.68]) - by mail.windriver.com (8.15.2/8.15.1) with SMTP id wBQ1ji3b015924; - Tue, 25 Dec 2018 17:45:44 -0800 (PST) -Received: by ala-blade48.wrs.com (sSMTP sendmail emulation); - Tue, 25 Dec 2018 17:45:44 -0800 -From: He Zhe <[email protected]> -To: [email protected] -Date: Tue, 25 Dec 2018 17:45:44 -0800 -Message-Id: <[email protected]> -X-Mailer: git-send-email 2.11.0 -Cc: [email protected] -Subject: [OE-core] [PATCH] linux-libc-headers: Fix build failure with fixed - input and output files instead of pipe -X-BeenThere: [email protected] -X-Mailman-Version: 2.1.12 -Precedence: list -List-Id: Patches and discussions about the oe-core layer - <openembedded-core.lists.openembedded.org> -List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>, - <mailto:[email protected]?subject=unsubscribe> -List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/> -List-Post: <mailto:[email protected]> -List-Help: <mailto:[email protected]?subject=help> -List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>, - <mailto:[email protected]?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: [email protected] -Errors-To: [email protected] -Status: RO -X-Status: A -Content-Length: 4076 -Lines: 94 - -This is an amendment for -2322dc4 "linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe" -which moves just the temporary input file from /tmp to build directory. But the -build directory may not in the same file system with the output file, -/dev/null, either and thus make it possible to trigger that bug, 67f846b, in -binutil v2.31. - -This patch puts both the input and output files into build directory for good. - -Signed-off-by: He Zhe <[email protected]> ---- - ...fixed-input-and-output-files-instead-of-.patch} | 22 ++++++++++------------ - .../linux-libc-headers/linux-libc-headers_4.18.bb | 2 +- - 2 files changed, 11 insertions(+), 13 deletions(-) - rename meta/recipes-kernel/linux-libc-headers/linux-libc-headers/{0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch => 0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch} (83%) - -diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -similarity index 83% -rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch -rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -index 0d8fa80939..9ba1c076e8 100644 ---- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch -+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -@@ -1,7 +1,7 @@ --From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 -+From 694eba7bb974f6b8bd308804cb24350150108b2b Mon Sep 17 00:00:00 2001 - From: He Zhe <[email protected]> - Date: Wed, 21 Nov 2018 15:12:43 +0800 --Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for -+Subject: [PATCH] scripts: Use fixed input and output files instead of pipe for - here-doc - - There was a bug of "as" in binutils that when it checks if the input file and -@@ -40,31 +40,29 @@ Upstream-Status: Inappropriate [A work around for binutils v2.31] - - Signed-off-by: He Zhe <[email protected]> - --- -- scripts/gcc-goto.sh | 7 ++++++- -- 1 file changed, 6 insertions(+), 1 deletion(-) -+ scripts/gcc-goto.sh | 5 ++++- -+ 1 file changed, 4 insertions(+), 1 deletion(-) - - diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh --index 083c526..0aaf1b4 100755 -+index 083c526..8dfac55 100755 - --- a/scripts/gcc-goto.sh - +++ b/scripts/gcc-goto.sh --@@ -3,7 +3,9 @@ -+@@ -3,7 +3,7 @@ - # Test for gcc 'asm goto' support - # Copyright (C) 2010, Jason Baron <[email protected]> - - -cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" --+TMPFILE=`mktemp -p .` --+ --+cat << "END" > ${TMPFILE} -++cat << "END" > ./input - int main(void) - { - #if defined(__arm__) || defined(__aarch64__) --@@ -20,3 +22,6 @@ entry: -+@@ -20,3 +20,6 @@ entry: - return 0; - } - END - + --+$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" --+rm ${TMPFILE} -++$@ -x c ./input -c -o ./output && echo "y" -++rm ./input ./output - -- - 2.7.4 - -diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -index 00420aa6f7..229a0027d7 100644 ---- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -@@ -10,7 +10,7 @@ SRC_URI_append_libc-musl = "\ - " - - SRC_URI_append = "\ -- file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ -+ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ - " - - SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" --- -2.11.0 - --- -_______________________________________________ -Openembedded-core mailing list [email protected] -http://lists.openembedded.org/mailman/listinfo/openembedded-core -
Signature · 1 line
2.20.1
Re: [PATCH 2/3] linux-libc-headers: Remove spurious x.mbox file
oops! Thanks Khem!
Bruce
Quoted 196 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>Cc Bruce Ashfield <[email protected]>--- meta/recipes-kernel/linux-libc-headers/x.mbox | 174 ------------------ 1 file changed, 174 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/x.mboxmeta/recipes-kernel/linux-libc-headers/x.mbox deleted +0
-175@@ -1,174 +0,0 @@ -From [email protected] Tue Dec 25 20:46:09 2018 -Delivered-To: [email protected] -Received: by 2002:a2e:4c3:0:0:0:0:0 with SMTP id a64-v6csp5312962ljf; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -X-Google-Smtp-Source: ALg8bN5+ydksOT9csVRJHxYDz7K6mUppK0qIlnMBsbGWz9Sq8Fdlk64bzsaJk68T9XGeIzgSwxS9 -X-Received: by 2002:a63:295:: with SMTP id 143mr16751743pgc.362.1545788769434; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -ARC-Seal: i=1; a=rsa-sha256; t=1545788769; cv=none; - d=google.com; s=arc-20160816; - b=jG9fBrPvXAw8K+BjylRwE9cyo1dGTSQIXWYQAsxDXBL4sJKb/9HQ7t9CARYj48ptNC - PyU9C1SF8FBe8jel1WM2zKHYxcoKShkfNv92t9jrw7thhkeRGtOPIfoQXt1ma6+1MLGa - hdinQ5eBKdQt2AouG0A8huAMuHJfxYB9XpD5771sN0XD51Ecc8oYTYOEPmzg21EYg9EC - /8A+bodbKwBlIjg6x/O1ucx7W6fV5iyeyaOsJbzbPZeTdC3FqGycgSfErAkyoEJjYwAP - /k5PPo4vm6SU3PHJOV7a2cLbWfG6bS5K6/cxzdpXQKTGheKZOc6FFE3ptZfAwkFbVxfX - Siww== -ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; - h=errors-to:sender:content-transfer-encoding:mime-version - :list-subscribe:list-help:list-post:list-archive:list-unsubscribe - :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; - bh=L66KCbYgtwDc95aWv7eY3oTToexeHY5x8MVGyHJ/gPM=; - b=rrE3b6NDRkazf03I4sTmeHnGX/emKFRWJSUcjyKS2hmAS83KcWTj/WfkinO4w4TeuB - S7hPfsAA+DsVLI8Qz0Y2FpZp8dyCeDTDkJtPqZdlDhErV2b3weNNFqbiY4fjIlREkYO/ - OIg0TgyyPGu4Ekur2dkYbdGmxIGtNsdIEQwv/zROwASqQiK/jpz7M156pGCbKYiSZz1g - k3Bwrg+ON72xwBpMoN/x/9Ep7UXl3dvKAkgxUgPaBnPuwDW3HV+y4a3AYyiBoXRRILvm - NDuAEwBRysljjsAeD1fxvwtKosRKuNfQpKDwibdgcsHjywPZKykADwYvp3Yc9bdOUwry - A8FA== -ARC-Authentication-Results: i=1; mx.google.com; - spf=pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) [email protected] -Return-Path: <[email protected]> -Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) - by mx.google.com with ESMTP id j35si31697173pgl.223.2018.12.25.17.46.08; - Tue, 25 Dec 2018 17:46:09 -0800 (PST) -Received-SPF: pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; -Authentication-Results: mx.google.com; - spf=pass (google.com: best guess record for domain of [email protected] designates 140.211.169.62 as permitted sender) [email protected] -Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) - by mail.openembedded.org (Postfix) with ESMTP id 564896BEF4; - Wed, 26 Dec 2018 01:45:54 +0000 (UTC) -X-Original-To: [email protected] -Delivered-To: [email protected] -Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) - by mail.openembedded.org (Postfix) with ESMTP id 812D86B79B - for <[email protected]>; - Wed, 26 Dec 2018 01:45:45 +0000 (UTC) -Received: from ala-blade48.wrs.com (ala-blade48.wrs.com [147.11.105.68]) - by mail.windriver.com (8.15.2/8.15.1) with SMTP id wBQ1ji3b015924; - Tue, 25 Dec 2018 17:45:44 -0800 (PST) -Received: by ala-blade48.wrs.com (sSMTP sendmail emulation); - Tue, 25 Dec 2018 17:45:44 -0800 -From: He Zhe <[email protected]> -To: [email protected] -Date: Tue, 25 Dec 2018 17:45:44 -0800 -Message-Id: <[email protected]> -X-Mailer: git-send-email 2.11.0 -Cc: [email protected] -Subject: [OE-core] [PATCH] linux-libc-headers: Fix build failure with fixed - input and output files instead of pipe -X-BeenThere: [email protected] -X-Mailman-Version: 2.1.12 -Precedence: list -List-Id: Patches and discussions about the oe-core layer - <openembedded-core.lists.openembedded.org> -List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>, - <mailto:[email protected]?subject=unsubscribe> -List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/> -List-Post: <mailto:[email protected]> -List-Help: <mailto:[email protected]?subject=help> -List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>, - <mailto:[email protected]?subject=subscribe> -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: [email protected] -Errors-To: [email protected] -Status: RO -X-Status: A -Content-Length: 4076 -Lines: 94 - -This is an amendment for -2322dc4 "linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe" -which moves just the temporary input file from /tmp to build directory. But the -build directory may not in the same file system with the output file, -/dev/null, either and thus make it possible to trigger that bug, 67f846b, in -binutil v2.31. - -This patch puts both the input and output files into build directory for good. - -Signed-off-by: He Zhe <[email protected]> ---- - ...fixed-input-and-output-files-instead-of-.patch} | 22 ++++++++++------------ - .../linux-libc-headers/linux-libc-headers_4.18.bb | 2 +- - 2 files changed, 11 insertions(+), 13 deletions(-) - rename meta/recipes-kernel/linux-libc-headers/linux-libc-headers/{0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch => 0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch} (83%) - -diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -similarity index 83% -rename from meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch -rename to meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -index 0d8fa80939..9ba1c076e8 100644 ---- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch -+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch -@@ -1,7 +1,7 @@ --From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 -+From 694eba7bb974f6b8bd308804cb24350150108b2b Mon Sep 17 00:00:00 2001 - From: He Zhe <[email protected]> - Date: Wed, 21 Nov 2018 15:12:43 +0800 --Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for -+Subject: [PATCH] scripts: Use fixed input and output files instead of pipe for - here-doc - - There was a bug of "as" in binutils that when it checks if the input file and -@@ -40,31 +40,29 @@ Upstream-Status: Inappropriate [A work around for binutils v2.31] - - Signed-off-by: He Zhe <[email protected]> - --- -- scripts/gcc-goto.sh | 7 ++++++- -- 1 file changed, 6 insertions(+), 1 deletion(-) -+ scripts/gcc-goto.sh | 5 ++++- -+ 1 file changed, 4 insertions(+), 1 deletion(-) - - diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh --index 083c526..0aaf1b4 100755 -+index 083c526..8dfac55 100755 - --- a/scripts/gcc-goto.sh - +++ b/scripts/gcc-goto.sh --@@ -3,7 +3,9 @@ -+@@ -3,7 +3,7 @@ - # Test for gcc 'asm goto' support - # Copyright (C) 2010, Jason Baron <[email protected]> - - -cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" --+TMPFILE=`mktemp -p .` --+ --+cat << "END" > ${TMPFILE} -++cat << "END" > ./input - int main(void) - { - #if defined(__arm__) || defined(__aarch64__) --@@ -20,3 +22,6 @@ entry: -+@@ -20,3 +20,6 @@ entry: - return 0; - } - END - + --+$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" --+rm ${TMPFILE} -++$@ -x c ./input -c -o ./output && echo "y" -++rm ./input ./output - -- - 2.7.4 - -diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -index 00420aa6f7..229a0027d7 100644 ---- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb -@@ -10,7 +10,7 @@ SRC_URI_append_libc-musl = "\ - " - - SRC_URI_append = "\ -- file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ -+ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ - " - - SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" --- -2.11.0 - --- -_______________________________________________ -Openembedded-core mailing list [email protected] -http://lists.openembedded.org/mailman/listinfo/openembedded-core - --2.20.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
PATCH 3/3 linux-libc-headers_4.19.bb: Backport patch to fix clockid_t in UAPI
In reply to Khem Raj--- ...kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 +++++++++++++++++++ .../linux-libc-headers_4.19.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch new file +49 -0
@@ -0,0 +1,49 @@ +From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001 +From: Davide Caratti <[email protected]> +Date: Mon, 17 Dec 2018 11:26:38 +0100 +Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Herton reports the following error when building a userspace program that +includes net_stamp.h: + + In file included from foo.c:2: + /usr/include/linux/net_tstamp.h:158:2: error: unknown type name + ‘clockid_t’ + clockid_t clockid; /* reference clockid */ + ^~~~~~~~~ + +Fix it by using __kernel_clockid_t in place of clockid_t. + +Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.") +Cc: Timothy Redaelli <[email protected]> +Reported-by: Herton R. Krzesinski <[email protected]> +Signed-off-by: Davide Caratti <[email protected]> +Tested-by: Paolo Abeni <[email protected]> +Signed-off-by: David S. Miller <[email protected]> +--- +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5] + + include/uapi/linux/net_tstamp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h +index 97ff3c17ec4d..e5b39721c6e4 100644 +--- a/include/uapi/linux/net_tstamp.h ++++ b/include/uapi/linux/net_tstamp.h +@@ -155,8 +155,8 @@ enum txtime_flags { + }; + + struct sock_txtime { +- clockid_t clockid; /* reference clockid */ +- __u32 flags; /* as defined by enum txtime_flags */ ++ __kernel_clockid_t clockid;/* reference clockid */ ++ __u32 flags; /* as defined by enum txtime_flags */ + }; + + #endif /* _NET_TIMESTAMPING_H */ +-- +2.20.1 +
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb +1 -0
@@ -10,6 +10,7 @@ SRC_URI_append_libc-musl = "\ " SRC_URI_append = "\ + file://0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch \ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ file://0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch \
Signature · 1 line
2.20.1
Re: [PATCH 3/3] linux-libc-headers_4.19.bb: Backport patch to fix clockid_t in UAPI
Looks good to me.
Bruce
Quoted 84 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>Cc Bruce Ashfield <[email protected]>--- ...kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 +++++++++++++++++++ .../linux-libc-headers_4.19.bb | 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patchmeta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch new file +49
-0@@ -0,0 +1,49 @@ +From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001 +From: Davide Caratti <[email protected]> +Date: Mon, 17 Dec 2018 11:26:38 +0100 +Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Herton reports the following error when building a userspace program that +includes net_stamp.h: + + In file included from foo.c:2: + /usr/include/linux/net_tstamp.h:158:2: error: unknown type name + ‘clockid_t’ + clockid_t clockid; /* reference clockid */ + ^~~~~~~~~ + +Fix it by using __kernel_clockid_t in place of clockid_t. + +Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.") +Cc: Timothy Redaelli <[email protected]> +Reported-by: Herton R. Krzesinski <[email protected]> +Signed-off-by: Davide Caratti <[email protected]> +Tested-by: Paolo Abeni <[email protected]> +Signed-off-by: David S. Miller <[email protected]> +--- +Upstream-Status: Backport [https://github.com/torvalds/linux/commit/e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5] + + include/uapi/linux/net_tstamp.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h +index 97ff3c17ec4d..e5b39721c6e4 100644 +--- a/include/uapi/linux/net_tstamp.h ++++ b/include/uapi/linux/net_tstamp.h +@@ -155,8 +155,8 @@ enum txtime_flags { + }; + + struct sock_txtime { +- clockid_t clockid; /* reference clockid */ +- __u32 flags; /* as defined by enum txtime_flags */ ++ __kernel_clockid_t clockid;/* reference clockid */ ++ __u32 flags; /* as defined by enum txtime_flags */ + }; + + #endif /* _NET_TIMESTAMPING_H */ +-- +2.20.1 +meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb +1
-1@@ -10,6 +10,7 @@ SRC_URI_append_libc-musl = "\ " SRC_URI_append = "\ + file://0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch \ file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ file://0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch \ --2.20.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
✗ patchtest: failure for "musl: Update to master tip..." and 2 more
In reply to Khem Raj== Series Details ==
Series: "musl: Update to master tip..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/15570/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 65c419b8c4)
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe