Re: [oe] [meta-oe][PATCH] lvm2: remove subitted patch

[Markus Volk]

Thanks for the fix

On Thu, May 30 2024 at 10:29:08 PM +02:00:00, Martin Jansa 
 wrote:

This causes:

ERROR: QA Issue: Missing Upstream-Status in patch
TOPDIR/meta-oe/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
Please add according to

. [patch-status]

On Tue, May 28, 2024 at 10:17 AM Markus Volk via
lists.openembedded.org >

wrote:


 devmapper update also updated lvm2. Thus build fails with:
 patching file daemons/lvmdbusd/utils.py
 Hunk #1 FAILED at 778.
 1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py

 - Drop the submitted patch
 - Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper 
and lvm2

 - refresh patches

 Signed-off-by: Markus Volk >

 ---
  .../0001-Avoid-bashisms-in-init-scripts.patch | 17 +-
  .../files/0001-configure.ac-check-egrep.patch | 12 +++
  ...mplement-libc-specific-reopen_stream.patch | 31 
+--

  .../0001-include-libgen.h-for-basename.patch  |  9 ++
  ...tweak-MODPROBE_CMD-for-cross-compile.patch | 11 +++
  .../lvm2/files/0005-do-not-build-manual.patch | 15 -
  ...lvm2-monitor.service-after-tmp.mount.patch |  7 ++---
  .../lvm2/files/reproducible-build.patch   | 15 ++---
  ...ibdevmapper_2.03.24.bb => libdevmapper.bb} |  0
  .../lvm2/{lvm2_2.03.22.bb => lvm2.bb} |  1 -
  meta-oe/recipes-support/lvm2/lvm2.inc |  1 +
  ...findmnt-bin-lsblk-bin-sort-not-found.patch | 11 +++
  ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 
-

  .../lvm2/lvm2/tweak-for-lvmdbusd.patch| 13 +---
  14 files changed, 67 insertions(+), 105 deletions(-)
  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.24.bb => 
libdevmapper.bb} (100%)
  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.22.bb => lvm2.bb} 
(98%)
  delete mode 100644 
meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch


 diff --git 
a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch 
b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch

 index 3c4a3a151..fb58793a1 100644
 --- 
a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
 +++ 
b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch

 @@ -1,7 +1,7 @@
 -From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 
2001
 +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 
2001
  From: Peter Kjellerstedt >

  Date: Mon, 26 Nov 2018 14:53:09 +0800
 -Subject: [PATCH 1/3] Avoid bashisms in init scripts
 +Subject: [PATCH] Avoid bashisms in init scripts

  Upstream-Status: Inappropriate

 @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia 


   5 files changed, 10 insertions(+), 10 deletions(-)

  diff --git a/scripts/blk_availability_init_red_hat.in 
b/scripts/blk_availability_init_red_hat.in

 -index 347c395..b2e9cf9 100644
 +index 347c39574..b2e9cf932 100644
  --- a/scripts/blk_availability_init_red_hat.in
  +++ b/scripts/blk_availability_init_red_hat.in
  @@ -1,4 +1,4 @@
 @@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
 ;;
   esac
  diff --git a/scripts/cmirrord_init_red_hat.in 
b/scripts/cmirrord_init_red_hat.in

 -index c82f8f5..a3a321d 100755
 +index c82f8f547..a3a321d9c 100755
  --- a/scripts/cmirrord_init_red_hat.in
  +++ b/scripts/cmirrord_init_red_hat.in
  @@ -1,4 +1,4 @@
 @@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
   esac

  diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in 
b/scripts/lvm2_lvmpolld_init_red_hat.in

 -index 176ff5d..825f6ad 100644
 +index 176ff5dcb..825f6ad84 100644
  --- a/scripts/lvm2_lvmpolld_init_red_hat.in
  +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
  @@ -1,4 +1,4 @@
 @@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
   esac

  diff --git a/scripts/lvm2_monitoring_init_red_hat.in 
b/scripts/lvm2_monitoring_init_red_hat.in

 -index 95e4125..dff89cd 100644
 +index 95e4125a0..dff89cd38 100644
  --- a/scripts/lvm2_monitoring_init_red_hat.in
  +++ b/scripts/lvm2_monitoring_init_red_hat.in
  @@ -1,4 +1,4 @@
 @@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
   esac

  diff --git a/scripts/lvm2_monitoring_init_rhel4 
b/scripts/lvm2_monitoring_init_rhel4

 -index 8eb06c5..2e8d0f7 100644
 +index 8eb06c509..2e8d0f71e 100644
  --- a/scripts/lvm2_monitoring_init_rhel4
  +++ b/scripts/lvm2_monitoring_init_rhel4
  @@ -1,4 +1,4 @@
 @@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
 ;;
   esac

 ---
 -2.7.4
 -
 diff --git 
a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch 
b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch

 index 474c2f8ac..f4b0f913d 100644
 --- 
a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
 +++ 

Re: [oe] [meta-oe][PATCH] lvm2: remove subitted patch

[Martin Jansa]

This causes:

ERROR: QA Issue: Missing Upstream-Status in patch
TOPDIR/meta-oe/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
Please add according to
https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status
. [patch-status]

On Tue, May 28, 2024 at 10:17 AM Markus Volk via
lists.openembedded.org 
wrote:
>
> devmapper update also updated lvm2. Thus build fails with:
> patching file daemons/lvmdbusd/utils.py
> Hunk #1 FAILED at 778.
> 1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py
>
> - Drop the submitted patch
> - Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2
> - refresh patches
>
> Signed-off-by: Markus Volk 
> ---
>  .../0001-Avoid-bashisms-in-init-scripts.patch | 17 +-
>  .../files/0001-configure.ac-check-egrep.patch | 12 +++
>  ...mplement-libc-specific-reopen_stream.patch | 31 +--
>  .../0001-include-libgen.h-for-basename.patch  |  9 ++
>  ...tweak-MODPROBE_CMD-for-cross-compile.patch | 11 +++
>  .../lvm2/files/0005-do-not-build-manual.patch | 15 -
>  ...lvm2-monitor.service-after-tmp.mount.patch |  7 ++---
>  .../lvm2/files/reproducible-build.patch   | 15 ++---
>  ...ibdevmapper_2.03.24.bb => libdevmapper.bb} |  0
>  .../lvm2/{lvm2_2.03.22.bb => lvm2.bb} |  1 -
>  meta-oe/recipes-support/lvm2/lvm2.inc |  1 +
>  ...findmnt-bin-lsblk-bin-sort-not-found.patch | 11 +++
>  ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 -
>  .../lvm2/lvm2/tweak-for-lvmdbusd.patch| 13 +---
>  14 files changed, 67 insertions(+), 105 deletions(-)
>  rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.24.bb => 
> libdevmapper.bb} (100%)
>  rename meta-oe/recipes-support/lvm2/{lvm2_2.03.22.bb => lvm2.bb} (98%)
>  delete mode 100644 
> meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch
>
> diff --git 
> a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
>  
> b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
> index 3c4a3a151..fb58793a1 100644
> --- 
> a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
> +++ 
> b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
> @@ -1,7 +1,7 @@
> -From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
> +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
>  From: Peter Kjellerstedt 
>  Date: Mon, 26 Nov 2018 14:53:09 +0800
> -Subject: [PATCH 1/3] Avoid bashisms in init scripts
> +Subject: [PATCH] Avoid bashisms in init scripts
>
>  Upstream-Status: Inappropriate
>
> @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia 
>   5 files changed, 10 insertions(+), 10 deletions(-)
>
>  diff --git a/scripts/blk_availability_init_red_hat.in 
> b/scripts/blk_availability_init_red_hat.in
> -index 347c395..b2e9cf9 100644
> +index 347c39574..b2e9cf932 100644
>  --- a/scripts/blk_availability_init_red_hat.in
>  +++ b/scripts/blk_availability_init_red_hat.in
>  @@ -1,4 +1,4 @@
> @@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
> ;;
>   esac
>  diff --git a/scripts/cmirrord_init_red_hat.in 
> b/scripts/cmirrord_init_red_hat.in
> -index c82f8f5..a3a321d 100755
> +index c82f8f547..a3a321d9c 100755
>  --- a/scripts/cmirrord_init_red_hat.in
>  +++ b/scripts/cmirrord_init_red_hat.in
>  @@ -1,4 +1,4 @@
> @@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
>   esac
>
>  diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in 
> b/scripts/lvm2_lvmpolld_init_red_hat.in
> -index 176ff5d..825f6ad 100644
> +index 176ff5dcb..825f6ad84 100644
>  --- a/scripts/lvm2_lvmpolld_init_red_hat.in
>  +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
>  @@ -1,4 +1,4 @@
> @@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
>   esac
>
>  diff --git a/scripts/lvm2_monitoring_init_red_hat.in 
> b/scripts/lvm2_monitoring_init_red_hat.in
> -index 95e4125..dff89cd 100644
> +index 95e4125a0..dff89cd38 100644
>  --- a/scripts/lvm2_monitoring_init_red_hat.in
>  +++ b/scripts/lvm2_monitoring_init_red_hat.in
>  @@ -1,4 +1,4 @@
> @@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
>   esac
>
>  diff --git a/scripts/lvm2_monitoring_init_rhel4 
> b/scripts/lvm2_monitoring_init_rhel4
> -index 8eb06c5..2e8d0f7 100644
> +index 8eb06c509..2e8d0f71e 100644
>  --- a/scripts/lvm2_monitoring_init_rhel4
>  +++ b/scripts/lvm2_monitoring_init_rhel4
>  @@ -1,4 +1,4 @@
> @@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
> ;;
>   esac
>
> ---
> -2.7.4
> -
> diff --git 
> a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch 
> b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
> index 474c2f8ac..f4b0f913d 100644
> --- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
> +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
> @@ -1,4 +1,7 @@
> -configure.ac: check egrep
> +From 

[oe] [meta-oe][PATCH] lvm2: remove subitted patch

[Markus Volk]

devmapper update also updated lvm2. Thus build fails with:
patching file daemons/lvmdbusd/utils.py
Hunk #1 FAILED at 778.
1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py

- Drop the submitted patch
- Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2
- refresh patches

Signed-off-by: Markus Volk 
---
 .../0001-Avoid-bashisms-in-init-scripts.patch | 17 +-
 .../files/0001-configure.ac-check-egrep.patch | 12 +++
 ...mplement-libc-specific-reopen_stream.patch | 31 +--
 .../0001-include-libgen.h-for-basename.patch  |  9 ++
 ...tweak-MODPROBE_CMD-for-cross-compile.patch | 11 +++
 .../lvm2/files/0005-do-not-build-manual.patch | 15 -
 ...lvm2-monitor.service-after-tmp.mount.patch |  7 ++---
 .../lvm2/files/reproducible-build.patch   | 15 ++---
 ...ibdevmapper_2.03.24.bb => libdevmapper.bb} |  0
 .../lvm2/{lvm2_2.03.22.bb => lvm2.bb} |  1 -
 meta-oe/recipes-support/lvm2/lvm2.inc |  1 +
 ...findmnt-bin-lsblk-bin-sort-not-found.patch | 11 +++
 ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 -
 .../lvm2/lvm2/tweak-for-lvmdbusd.patch| 13 +---
 14 files changed, 67 insertions(+), 105 deletions(-)
 rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.24.bb => 
libdevmapper.bb} (100%)
 rename meta-oe/recipes-support/lvm2/{lvm2_2.03.22.bb => lvm2.bb} (98%)
 delete mode 100644 
meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch

diff --git 
a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch 
b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
index 3c4a3a151..fb58793a1 100644
--- 
a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
+++ 
b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
@@ -1,7 +1,7 @@
-From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001
+From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt 
 Date: Mon, 26 Nov 2018 14:53:09 +0800
-Subject: [PATCH 1/3] Avoid bashisms in init scripts
+Subject: [PATCH] Avoid bashisms in init scripts
 
 Upstream-Status: Inappropriate
 
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia 
  5 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/scripts/blk_availability_init_red_hat.in 
b/scripts/blk_availability_init_red_hat.in
-index 347c395..b2e9cf9 100644
+index 347c39574..b2e9cf932 100644
 --- a/scripts/blk_availability_init_red_hat.in
 +++ b/scripts/blk_availability_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644
;;
  esac
 diff --git a/scripts/cmirrord_init_red_hat.in 
b/scripts/cmirrord_init_red_hat.in
-index c82f8f5..a3a321d 100755
+index c82f8f547..a3a321d9c 100755
 --- a/scripts/cmirrord_init_red_hat.in
 +++ b/scripts/cmirrord_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755
  esac
  
 diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in 
b/scripts/lvm2_lvmpolld_init_red_hat.in
-index 176ff5d..825f6ad 100644
+index 176ff5dcb..825f6ad84 100644
 --- a/scripts/lvm2_lvmpolld_init_red_hat.in
 +++ b/scripts/lvm2_lvmpolld_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644
  esac
  
 diff --git a/scripts/lvm2_monitoring_init_red_hat.in 
b/scripts/lvm2_monitoring_init_red_hat.in
-index 95e4125..dff89cd 100644
+index 95e4125a0..dff89cd38 100644
 --- a/scripts/lvm2_monitoring_init_red_hat.in
 +++ b/scripts/lvm2_monitoring_init_red_hat.in
 @@ -1,4 +1,4 @@
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644
  esac
  
 diff --git a/scripts/lvm2_monitoring_init_rhel4 
b/scripts/lvm2_monitoring_init_rhel4
-index 8eb06c5..2e8d0f7 100644
+index 8eb06c509..2e8d0f71e 100644
 --- a/scripts/lvm2_monitoring_init_rhel4
 +++ b/scripts/lvm2_monitoring_init_rhel4
 @@ -1,4 +1,4 @@
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644
;;
  esac
  
--- 
-2.7.4
-
diff --git 
a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch 
b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
index 474c2f8ac..f4b0f913d 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
@@ -1,4 +1,7 @@
-configure.ac: check egrep
+From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001
+From: Kai Kang 
+Date: Wed, 6 Dec 2023 10:24:46 +0800
+Subject: [PATCH] configure.ac: check egrep
 
 The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
 from configure.ac, then it fails to substitute '@EGREP@':
@@ -17,10 +20,10 @@ Signed-off-by: Kai Kang 
  1 file changed, 1 insertion(+)
 
 diff --git a/configure.ac b/configure.ac
-index 2e52498f9..d9462e22c 100644
+index c2dbf3c9f..d9e7964c3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -78,6 +78,7 @@ AC_PROG_LN_S
+@@ -88,6 +88,7 @@ AC_PROG_EGREP