From b48980223a350b76c3f54f7f92b6331232b58b8c Mon Sep 17 00:00:00 2001
From: fanglinxu <fanglinxu@huawei.com>
Date: Mon, 18 Jul 2022 21:26:48 +0800
Subject: [PATCH 1/2] yocto: fixup compile err in psmisc recipe

change to use a default po/update-potfiles when these is no
po/update-potfiles.

Signed-off-by: fanglinxu <fanglinxu@huawei.com>
---
 meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend b/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend
index f3ee77e3381..01c3ddb282e 100644
--- a/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend
+++ b/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend
@@ -10,10 +10,11 @@ SRC_URI += " \
 
 S = "${WORKDIR}/${BPN}-${PV}"
 
-do_configure_openeuler() {
+do_configure_prepend() {
     # cannot run po/update-potfiles in new version
-    autotools_do_configure
+    if [ ! -f ${S}/po/update-potfiles ]; then
+        touch ${S}/po/update-potfiles
+        chmod +x ${S}/po/update-potfiles
+    fi
 }
 
-deltask do_configure
-addtask configure_openeuler before do_compile after do_patch do_unpack
-- 
Gitee


From 3c2ea02cb77e65eafa1553d3aa258b7ac1251f9c Mon Sep 17 00:00:00 2001
From: fanglinxu <fanglinxu@huawei.com>
Date: Mon, 18 Jul 2022 21:30:01 +0800
Subject: [PATCH 2/2] yocto: refactor procps recipe

refactor procps:
 * apply openeuler source package and patches
 * add not conflicting patches from poky
 * add default po/update-potfiles to avoid configure err

Signed-off-by: fanglinxu <fanglinxu@huawei.com>
---
 .../recipes-extended/procps/procps_%.bbappend | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 meta-openeuler/recipes-extended/procps/procps_%.bbappend

diff --git a/meta-openeuler/recipes-extended/procps/procps_%.bbappend b/meta-openeuler/recipes-extended/procps/procps_%.bbappend
new file mode 100644
index 00000000000..6cdd4ce6a30
--- /dev/null
+++ b/meta-openeuler/recipes-extended/procps/procps_%.bbappend
@@ -0,0 +1,32 @@
+#main bbfile: yocto-poky/meta/recipes-extended/procps/procps_3.3.17.bb
+
+#version in openEuler
+PV = "3.3.17"
+
+S = "${WORKDIR}/${BPN}-${PV}"
+
+# files, patches can't be applied in openeuler or conflict with openeuler
+SRC_URI_remove = " \
+            git://gitlab.com/procps-ng/procps.git;protocol=https \
+            "
+# files, patches that come from openeuler
+SRC_URI += " \
+        file://procps-ng/procps-ng-${PV}.tar.xz \
+        file://procps-ng/0001-top-fix-two-potential-alternate-display-mode-abends.patch \
+        file://procps-ng/0002-top-In-the-bye_bye-function-replace-fputs-with-the-w.patch \
+        file://procps-ng/0003-add-options-M-and-N-for-top.patch \
+        file://procps-ng/0004-top-exit-with-error-when-pid-overflow.patch \
+        file://procps-ng/0005-fix-a-fix-for-the-bye_bye-function.patch \
+        "
+
+do_configure_prepend() {
+    # cannot run po/update-potfiles in new version
+    if [ ! -f ${S}/po/update-potfiles ]; then
+        touch ${S}/po/update-potfiles
+        chmod +x ${S}/po/update-potfiles
+    fi
+}
+
+SRC_URI[tarball.md5sum] = "d60613e88c2f442ebd462b5a75313d56"
+SRC_URI[tarball.sha256sum] = "4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4"
+
-- 
Gitee