| Message ID | 20200506131130.410171-2-nolange79@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] package/fakeroot: bump version to 1.24 | expand |
On Wed, 6 May 2020 15:11:29 +0200 Norbert Lange <nolange79@gmail.com> wrote: > Signed-off-by: Norbert Lange <nolange79@gmail.com> > --- > ...02-Select-TCP-when-lack-of-SYSV-IPC.patch} | 0 > ...nicate-check-return-status-of-msgrcv.patch | 46 ------------------- > package/fakeroot/fakeroot.hash | 6 +-- > package/fakeroot/fakeroot.mk | 6 +-- > 4 files changed, 5 insertions(+), 53 deletions(-) > rename package/fakeroot/{0003-Select-TCP-when-lack-of-SYSV-IPC.patch => 0002-Select-TCP-when-lack-of-SYSV-IPC.patch} (100%) > delete mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch What happened to 0002-communicate-check-return-status-of-msgrcv.patch ? It is removed by your patch. Why? Also, your PATCH 1/2 is a version bump, but PATCH 2/2 is a bug fix. Since Buildroot 2020.05-rc1 has now been released, we normally don't merge version bumps in master. Could you clarify if the fchownat/fchmodat issue happens with the current version of fakeroot in Buildroot (1.20) ? Or only with the updated version 1.24 ? Can it be fixed with fakeroot 1.20 ? Thanks, Thomas
Am Sa., 9. Mai 2020 um 18:50 Uhr schrieb Thomas Petazzoni <thomas.petazzoni@bootlin.com>: > > On Wed, 6 May 2020 15:11:29 +0200 > Norbert Lange <nolange79@gmail.com> wrote: > > > Signed-off-by: Norbert Lange <nolange79@gmail.com> > > --- > > ...02-Select-TCP-when-lack-of-SYSV-IPC.patch} | 0 > > ...nicate-check-return-status-of-msgrcv.patch | 46 ------------------- > > package/fakeroot/fakeroot.hash | 6 +-- > > package/fakeroot/fakeroot.mk | 6 +-- > > 4 files changed, 5 insertions(+), 53 deletions(-) > > rename package/fakeroot/{0003-Select-TCP-when-lack-of-SYSV-IPC.patch => 0002-Select-TCP-when-lack-of-SYSV-IPC.patch} (100%) > > delete mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch > > What happened to 0002-communicate-check-return-status-of-msgrcv.patch ? > It is removed by your patch. Why? Cause its included in that version > > Also, your PATCH 1/2 is a version bump, but PATCH 2/2 is a bug fix. > Since Buildroot 2020.05-rc1 has now been released, we normally don't > merge version bumps in master. > > Could you clarify if the fchownat/fchmodat issue happens with the > current version of fakeroot in Buildroot (1.20) ? Or only with the > updated version 1.24 ? Can it be fixed with fakeroot 1.20 ? issue exist with both, could certainly be fixed in 1.20 separately, I just don't take much interest in fixing ~ 4 year versions by default. Norbert
On Sat, 9 May 2020 23:29:22 +0200 Norbert Lange <nolange79@gmail.com> wrote: > > What happened to 0002-communicate-check-return-status-of-msgrcv.patch ? > > It is removed by your patch. Why? > > Cause its included in that version OK. > > Could you clarify if the fchownat/fchmodat issue happens with the > > current version of fakeroot in Buildroot (1.20) ? Or only with the > > updated version 1.24 ? Can it be fixed with fakeroot 1.20 ? > > issue exist with both, could certainly be fixed in 1.20 separately, > I just don't take much interest in fixing ~ 4 year versions by default. In the general case, I agree. But here we have already tagged -rc1, and we try to not merge version bumps so close to the release. And in the context of Buildroot, fakeroot is used by *everybody*, so any regression can cause issues to a significant number of users. So I'd prefer to see the problem fixed for 1.20, so that we can apply the fix on master, and then have the version bump to 1.24 in next. Thanks! Thomas
diff --git a/package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch b/package/fakeroot/0002-Select-TCP-when-lack-of-SYSV-IPC.patch similarity index 100% rename from package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch rename to package/fakeroot/0002-Select-TCP-when-lack-of-SYSV-IPC.patch diff --git a/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch b/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch deleted file mode 100644 index 4e81b49122..0000000000 --- a/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a853f21633693f9eefc4949660253a5328d2d2f3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <yann.morin.1998@free.fr> -Date: Sun, 13 Aug 2017 23:21:54 +0200 -Subject: [PATCH] communicate: check return status of msgrcv() - -msgrcv can return with -1 to indicate an error condition. -One such error is to have been interrupted by a signal. - -Being interrupted by a signal is very rare in this code, except in a -very special condition: a highly-parallel (1000 jobs!) mksquashfs on -a filesystem with extended attributes, where we see errors like (those -are mksquashfs errors): - llistxattr for titi/603/883 failed in read_attrs, because Unknown - error 1716527536 - -See: https://bugs.busybox.net/show_bug.cgi?id=10141 - -In this case, we just have to retry the call to msgrcv(). - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> ---- - communicate.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/communicate.c b/communicate.c -index 293f404..787bb63 100644 ---- a/communicate.c -+++ b/communicate.c -@@ -553,10 +553,13 @@ void send_get_fakem(struct fake_msg *buf) - l=msgrcv(msg_get, - (struct my_msgbuf*)buf, - sizeof(*buf)-sizeof(buf->mtype),0,0); -- while((buf->serial!=serial)||buf->pid!=pid); -+ while(((l==-1)&&(errno==EINTR))||(buf->serial!=serial)||buf->pid!=pid); - - semaphore_down(); - -+ if(l==-1) -+ buf->xattr.flags_rc=errno; -+ - /* - (nah, may be wrong, due to allignment) - --- -2.11.0 - diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index d1d959df6f..633bda0cb9 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,6 +1,4 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 -# Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 +# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.24-1.dsc +sha256 2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed fakeroot_1.24.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 1be99071bf..39a6906182 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot +FAKEROOT_VERSION = 1.24 +FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz +FAKEROOT_SITE = http://deb.debian.org/debian/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off
Signed-off-by: Norbert Lange <nolange79@gmail.com> --- ...02-Select-TCP-when-lack-of-SYSV-IPC.patch} | 0 ...nicate-check-return-status-of-msgrcv.patch | 46 ------------------- package/fakeroot/fakeroot.hash | 6 +-- package/fakeroot/fakeroot.mk | 6 +-- 4 files changed, 5 insertions(+), 53 deletions(-) rename package/fakeroot/{0003-Select-TCP-when-lack-of-SYSV-IPC.patch => 0002-Select-TCP-when-lack-of-SYSV-IPC.patch} (100%) delete mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch