From: Wang Mingyu <wan...@fujitsu.com> Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- .../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(-)
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch index 7ce8405..b32ed6e 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-Fix-build-with-glibc-2.28.patch @@ -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 <cheese...@fedoraproject.org> Signed-off-by: Mingli Yu <mingli...@windriver.com> diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch index 2df4ed8..9504d0a 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0003-vendor-common-o2cb.ocf-add-new-conf-file.patch @@ -3,7 +3,7 @@ From: Li xin <lixin.f...@cn.fujitsu.com> 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 <lixin.f...@cn.fujitsu.com> --- diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch index 7347786..16abb21 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/no-redhat.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/vendor/common/o2cb.init.sh +++ b/vendor/common/o2cb.init.sh @@ -18,7 +18,7 @@ diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch index f8ab313..2a79b4a 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-tools-1.8.5-format-fortify.patch @@ -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 -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- 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/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
