Skip to contentSkip to conversation

pseudo: drop syncfs probe patch

PATCH In review [email protected] 2 participants 3 messages Dec 9, 2023 – Dec 10, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pseudo: drop syncfs probe patch

From: Alexandre Belloni <[email protected]>

The patch is now upstream and SRCREV has already been bumped

---
 .../pseudo/files/syncfs-probe.patch           | 44 -------------------
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta/recipes-devtools/pseudo/files/syncfs-probe.patch
meta/recipes-devtools/pseudo/files/syncfs-probe.patch deleted +0 -44
deleted file mode 100644
index 23f01673e3c2..000000000000
@@ -1,44 +0,0 @@
-From e38b1fec2eb4a5dcefafdab7f1a240966f3632f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eil=C3=ADs=20=27pidge=27=20N=C3=AD=20Fhlannag=C3=A1in?=
- <[email protected]>
-Date: Wed, 6 Dec 2023 13:00:29 +0000
-Subject: [PATCH] subports: Add _GNU_SOURCE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[YOCTO #15074]
-
-The syncfs probe in ports/unix/subports was failing if the compiler does not 
-support implicit function declarations. syncfs is protected and requires 
-_GNU_SOURCE, so the answer here is to pull it in.
-
-Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <[email protected]>
-
----
-Upstream-Status: Pending
-
- ports/unix/subports | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ports/unix/subports b/ports/unix/subports
-index e41b036..bd5a2f6 100755
---- a/ports/unix/subports
-+++ b/ports/unix/subports
-@@ -1,11 +1,13 @@
- #!/bin/sh
- cat > dummy.c <<EOF
-+#define _GNU_SOURCE
- #include <unistd.h>
- int main(void) {
- 	syncfs(0);
- 	return 0;
- }
- EOF
-+
- if ${CC} -o dummy dummy.c > /dev/null 2>&1; then
- 	echo "unix/syncfs"
- fi
--- 
-2.34.1
-
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -1
index 31b2d5fad20d..699cab11c668 100644
@@ -2,7 +2,6 @@ require pseudo.inc
 
 SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
            file://0001-configure-Prune-PIE-flags.patch \
-           file://syncfs-probe.patch \
            file://glibc238.patch \
            file://fallback-passwd \
            file://fallback-group \
Signature · 1 line
2.43.0
#1 lore raw
Quoted 66 lines · Alexandre Belloni via lists.openembedded.org

From: Alexandre Belloni <[email protected]>

The patch is now upstream and SRCREV has already been bumped

---
 .../pseudo/files/syncfs-probe.patch           | 44 -------------------
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta/recipes-devtools/pseudo/files/syncfs-probe.patch
meta/recipes-devtools/pseudo/files/syncfs-probe.patch deleted +0 -44
deleted file mode 100644
index 23f01673e3c2..000000000000
@@ -1,44 +0,0 @@
-From e38b1fec2eb4a5dcefafdab7f1a240966f3632f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eil=C3=ADs=20=27pidge=27=20N=C3=AD=20Fhlannag=C3=A1in?=
- <[email protected]>
-Date: Wed, 6 Dec 2023 13:00:29 +0000
-Subject: [PATCH] subports: Add _GNU_SOURCE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[YOCTO #15074]
-
-The syncfs probe in ports/unix/subports was failing if the compiler does not 
-support implicit function declarations. syncfs is protected and requires 
-_GNU_SOURCE, so the answer here is to pull it in.
-
-Signed-off-by: Eilís 'pidge' Ní Fhlannagáin <[email protected]>
-
----
-Upstream-Status: Pending
-
- ports/unix/subports | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ports/unix/subports b/ports/unix/subports
-index e41b036..bd5a2f6 100755
---- a/ports/unix/subports
-+++ b/ports/unix/subports
-@@ -1,11 +1,13 @@
- #!/bin/sh
- cat > dummy.c <<EOF
-+#define _GNU_SOURCE
- #include <unistd.h>
- int main(void) {
- 	syncfs(0);
- 	return 0;
- }
- EOF
-+
- if ${CC} -o dummy dummy.c > /dev/null 2>&1; then
- 	echo "unix/syncfs"
- fi
--- 
-2.34.1
-
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -0
index 31b2d5fad20d..699cab11c668 100644

meta/recipes-devtools/pseudo/pseudo_git.bb require pseudo.inc · line 7

Quoted 7 lines
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -1
@@ -2,7 +2,6 @@ require pseudo.inc
 
 SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
            file://0001-configure-Prune-PIE-flags.patch \
-           file://syncfs-probe.patch \
            file://glibc238.patch \
            file://fallback-passwd \
            file://fallback-group \

I think this issue is only in your branch?

Cheers,

Richard

#2 lore raw
Quoted 69 lines · Richard Purdie
Quoted 67 lines · Alexandre Belloni via lists.openembedded.org

From: Alexandre Belloni <[email protected]>

The patch is now upstream and SRCREV has already been bumped

---
 .../pseudo/files/syncfs-probe.patch           | 44 -------------------
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 meta/recipes-devtools/pseudo/files/syncfs-probe.patch
meta/recipes-devtools/pseudo/files/syncfs-probe.patch deleted +0 -44
deleted file mode 100644
index 23f01673e3c2..000000000000
@@ -1,44 +0,0 @@
-From e38b1fec2eb4a5dcefafdab7f1a240966f3632f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eil=C3=ADs=20=27pidge=27=20N=C3=AD=20Fhlannag=C3=A1in?=
- <[email protected]>
-Date: Wed, 6 Dec 2023 13:00:29 +0000
-Subject: [PATCH] subports: Add _GNU_SOURCE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-[YOCTO #15074]
-
-The syncfs probe in ports/unix/subports was failing if the compiler does not 
-support implicit function declarations. syncfs is protected and requires 
-_GNU_SOURCE, so the answer here is to pull it in.
-
-Signed-off-by: Eil�s 'pidge' N� Fhlannag�in <[email protected]>
-
----
-Upstream-Status: Pending
-
- ports/unix/subports | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ports/unix/subports b/ports/unix/subports
-index e41b036..bd5a2f6 100755
---- a/ports/unix/subports
-+++ b/ports/unix/subports
-@@ -1,11 +1,13 @@
- #!/bin/sh
- cat > dummy.c <<EOF
-+#define _GNU_SOURCE
- #include <unistd.h>
- int main(void) {
- 	syncfs(0);
- 	return 0;
- }
- EOF
-+
- if ${CC} -o dummy dummy.c > /dev/null 2>&1; then
- 	echo "unix/syncfs"
- fi
--- 
-2.34.1
-
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -0
index 31b2d5fad20d..699cab11c668 100644
@@ -2,7 +2,6 @@ require pseudo.inc
 
Quoted 9 lines

meta/recipes-devtools/pseudo/pseudo_git.bb require pseudo.inc · line 7

Quoted 6 lines
meta/recipes-devtools/pseudo/pseudo_git.bb +0 -1
 SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
            file://0001-configure-Prune-PIE-flags.patch \
-           file://syncfs-probe.patch \
            file://glibc238.patch \
            file://fallback-passwd \
            file://fallback-group \

I think this issue is only in your branch?

Yes, because I was still carrying the other patch, I realized after sending

Quoted 4 lines

Cheers,

Richard

Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com