| Message ID | 1650524435-13155-1-git-send-email-zhengrq.fnst@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | sysvinit: upgrade 3.02 -> 3.03 | expand |
Hi zhengruoqin, Il giorno Thu, 21 Apr 2022 15:00:35 +0800 "zhengruoqin" <zhengrq.fnst@fujitsu.com> ha scritto: > 0001-Fixed-compile-error-on-GNU-Hurd.patch > removed since it's included in 3.03. > > Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Thank you for sending an update version of your patch, but I'm afraid it does not apply, and this is for a weird reason, see below. > diff --git > a/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch > b/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch > deleted file mode 100644 index d278a32ec7..0000000000 --- > a/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch > +++ /dev/null @@ -1,28 +0,0 @@ > -From d595594506e6fd2247f7984c276f822ea626434c Mon Sep 17 00:00:00 > -From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> The patch currently in the repo has a different name here: From: Wang Mingyu <wangmy@fujitsu.com> > -Date: Thu, 7 Apr 2022 11:57:19 +0900 > -Subject: [PATCH] Fixed compile error on GNU Hurd > - > -Fixed compile error on GNU Hurd due to missing MAX_PATH definition. > - > -Upstream-Status: Backport > [https://github.com/slicer69/sysvinit/commit/14d8d25269016b26965b428a855dd084cc88994d] > - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Same here. Did you apply any mangling to the patch before sending? Please resend without any mangling and I'll be glad to take your patch for testing. Best regards.
diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch b/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch deleted file mode 100644 index d278a32ec7..0000000000 --- a/meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d595594506e6fd2247f7984c276f822ea626434c Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> -Date: Thu, 7 Apr 2022 11:57:19 +0900 -Subject: [PATCH] Fixed compile error on GNU Hurd - -Fixed compile error on GNU Hurd due to missing MAX_PATH definition. - -Upstream-Status: Backport [https://github.com/slicer69/sysvinit/commit/14d8d25269016b26965b428a855dd084cc88994d] - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> ---- - src/bootlogd.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/bootlogd.h b/src/bootlogd.h -index b47bc9d..ba17f0c 100644 ---- a/src/bootlogd.h -+++ b/src/bootlogd.h -@@ -10,3 +10,6 @@ - #define FALSE 0 - #endif - -+#ifndef PATH_MAX -+#define PATH_MAX 2048 -+#endif --- -2.25.1 - diff --git a/meta/recipes-core/sysvinit/sysvinit_3.02.bb b/meta/recipes-core/sysvinit/sysvinit_3.03.bb similarity index 96% rename from meta/recipes-core/sysvinit/sysvinit_3.02.bb rename to meta/recipes-core/sysvinit/sysvinit_3.03.bb index cfe9d0b597..f6547f237a 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.02.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.03.bb @@ -20,9 +20,8 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://rcS \ file://bootlogd.init \ file://01_bootlogd \ - file://0001-Fixed-compile-error-on-GNU-Hurd.patch \ " -SRC_URI[sha256sum] = "4ca03ffdbefb5a99a60b94a021693686c2b498a08ff8aa4e859821fa7c39a792" +SRC_URI[sha256sum] = "a80418c80828558da9e29208ebbe22d91903d047fd5babdd3cd0eb1fea32d6f0" S = "${WORKDIR}/sysvinit-${PV}"
0001-Fixed-compile-error-on-GNU-Hurd.patch removed since it's included in 3.03. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> --- ...0001-Fixed-compile-error-on-GNU-Hurd.patch | 28 ------------------- .../{sysvinit_3.02.bb => sysvinit_3.03.bb} | 3 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta/recipes-core/sysvinit/sysvinit/0001-Fixed-compile-error-on-GNU-Hurd.patch rename meta/recipes-core/sysvinit/{sysvinit_3.02.bb => sysvinit_3.03.bb} (96%)