[PATCH] pseudo: drop syncfs probe patch

[PATCH] pseudo: drop syncfs probe patch

[alexandre.belloni]

From: Alexandre Belloni <alexandre.belloni@bootlin.com>

The patch is now upstream and SRCREV has already been bumped

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 .../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

diff --git a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch b/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
deleted file mode 100644
index 23f01673e3c2..000000000000
--- a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
+++ /dev/null
@@ -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?=
- <pidge@baylibre.com>
-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 <pidge@baylibre.com>
-
----
-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
-
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 31b2d5fad20d..699cab11c668 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -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 \
-- 
2.43.0

Re: [OE-core] [PATCH] pseudo: drop syncfs probe patch

[Richard Purdie]

On Sun, 2023-12-10 at 00:27 +0100, Alexandre Belloni via
lists.openembedded.org wrote:
> From: Alexandre Belloni <alexandre.belloni@bootlin.com>
> 
> The patch is now upstream and SRCREV has already been bumped
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
>  .../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
> 
> diff --git a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch b/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
> deleted file mode 100644
> index 23f01673e3c2..000000000000
> --- a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
> +++ /dev/null
> @@ -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?=
> - <pidge@baylibre.com>
> -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 <pidge@baylibre.com>
> -
> ----
> -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
> -
> diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
> index 31b2d5fad20d..699cab11c668 100644
> --- a/meta/recipes-devtools/pseudo/pseudo_git.bb
> +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
> @@ -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

Re: [OE-core] [PATCH] pseudo: drop syncfs probe patch

[Alexandre Belloni]

On 10/12/2023 13:19:48+0000, Richard Purdie wrote:
> On Sun, 2023-12-10 at 00:27 +0100, Alexandre Belloni via
> lists.openembedded.org wrote:
> > From: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > 
> > The patch is now upstream and SRCREV has already been bumped
> > 
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > ---
> >  .../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
> > 
> > diff --git a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch b/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
> > deleted file mode 100644
> > index 23f01673e3c2..000000000000
> > --- a/meta/recipes-devtools/pseudo/files/syncfs-probe.patch
> > +++ /dev/null
> > @@ -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?=
> > - <pidge@baylibre.com>
> > -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 <pidge@baylibre.com>
> > -
> > ----
> > -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
> > -
> > diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
> > index 31b2d5fad20d..699cab11c668 100644
> > --- a/meta/recipes-devtools/pseudo/pseudo_git.bb
> > +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
> > @@ -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?
> 

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

> Cheers,
> 
> Richard
> 

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