Skip to contentSkip to conversation

cluster-glue: fix Upstream-Status

PATCH In review [email protected] 2 participants 3 messages Jul 16, 2024 – Jul 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 cluster-glue: fix Upstream-Status

From: Wang Mingyu <[email protected]>

---
 .../cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch     | 2 +-
 .../cluster-glue/0001-ribcl.py.in-Warning-Fix.patch             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch +1 -1
index dd762b8..9a760b0 100644
@@ -12,7 +12,7 @@ Subject: [PATCH] don't compile doc and Error Fix
 |       http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ha_logd.xml
 | make[2]: *** [hb_report.8] Error 127
 
-Upstream-Status: pending
+Upstream-Status: Pending
 
 Signed-off-by: Li Xin <[email protected]>
 ---
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-ribcl.py.in-Warning-Fix.patch +1 -1
index 31010d4..b7e9578 100644
@@ -12,7 +12,7 @@ Allow the build to specify a path for the python instead of reusing
 the PYTHON variable which can lead to inconsistencies if we are cross
 compiling.
 
-Upstream-Status: pending
+Upstream-Status: Pending
 
 Signed-off-by: Li Xin <[email protected]>
 ---
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 ocfs2-tools: fix Upstream-Status

From: Wang Mingyu <[email protected]>

---
 .../ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch            | 2 +-
 .../0003-vendor-common-o2cb.ocf-add-new-conf-file.patch         | 2 +-
 .../recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch         | 2 ++
 .../ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch          | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch +1 -1
index 7ce8405..b32ed6e 100644
@@ -16,7 +16,7 @@ In file included from o2cb_abi.c:52:
   loff_t d_off; /* Offset of structure in the file */
   ^~~~~~
 
-Upstream-Status: Backport[https://github.com/cheese/ocfs2-tools/commit/fa150e35931123fc630125ebef1901ffb30d421f]
+Upstream-Status: Backport [https://github.com/cheese/ocfs2-tools/commit/fa150e35931123fc630125ebef1901ffb30d421f]
 
 Signed-off-by: Robin Lee <[email protected]>
 Signed-off-by: Mingli Yu <[email protected]>
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch +1 -1
index 2df4ed8..9504d0a 100644
@@ -3,7 +3,7 @@ From: Li xin <[email protected]>
 Date: Fri, 12 Dec 2014 16:15:28 +0900
 Subject: [PATCH 3/3] vendor/common/o2cb.ocf: add new conf file
 
-Upstream-Status: pending
+Upstream-Status: Pending
 
 Signed-off-by: Li Xin <[email protected]>
 ---
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch +2 -0
index 7347786..16abb21 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 --- a/vendor/common/o2cb.init.sh
 +++ b/vendor/common/o2cb.init.sh
 @@ -18,7 +18,7 @@
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch +2 -0
index f8ab313..2a79b4a 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/tunefs.ocfs2/op_query.c b/tunefs.ocfs2/op_query.c
 index 295c185b..40394d15 100644
 --- a/tunefs.ocfs2/op_query.c
Signature · 1 line
2.34.1
#2 lore raw

Re: [yocto] [meta-cgl] [PATCH 2/2] ocfs2-tools: fix Upstream-Status

Merged.

Quoted 65 lines · wangmy via lists.yoctoproject.org

From: Wang Mingyu <[email protected]>

---
  .../ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch            | 2 +-
  .../0003-vendor-common-o2cb.ocf-add-new-conf-file.patch         | 2 +-
  .../recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch         | 2 ++
  .../ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch          | 2 ++
  4 files changed, 6 insertions(+), 2 deletions(-)
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch +1 -1
index 7ce8405..b32ed6e 100644
@@ -16,7 +16,7 @@ In file included from o2cb_abi.c:52:
    loff_t d_off; /* Offset of structure in the file */
    ^~~~~~
 
-Upstream-Status: Backport[https://github.com/cheese/ocfs2-tools/commit/fa150e35931123fc630125ebef1901ffb30d421f]
+Upstream-Status: Backport [https://github.com/cheese/ocfs2-tools/commit/fa150e35931123fc630125ebef1901ffb30d421f]
 
  Signed-off-by: Robin Lee <[email protected]>
  Signed-off-by: Mingli Yu <[email protected]>
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch +1 -1
index 2df4ed8..9504d0a 100644
@@ -3,7 +3,7 @@ From: Li xin <[email protected]>
  Date: Fri, 12 Dec 2014 16:15:28 +0900
  Subject: [PATCH 3/3] vendor/common/o2cb.ocf: add new conf file
 
-Upstream-Status: pending
+Upstream-Status: Pending
 
  Signed-off-by: Li Xin <[email protected]>
  ---
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch +2 -0
index 7347786..16abb21 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
  --- a/vendor/common/o2cb.init.sh
  +++ b/vendor/common/o2cb.init.sh
  @@ -18,7 +18,7 @@
meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch +2 -1
index f8ab313..2a79b4a 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
  diff --git a/tunefs.ocfs2/op_query.c b/tunefs.ocfs2/op_query.c
  index 295c185b..40394d15 100644
  --- a/tunefs.ocfs2/op_query.c
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#63506): https://lists.yoctoproject.org/g/yocto/message/63506
Mute This Topic: https://lists.yoctoproject.org/mt/107246250/2167262
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
Jeremy Puhlman
[email protected]