<div dir="ltr">Boom.<div><br></div><div>packages/corei7-64-poky-linux/psmisc: PACKAGES: removed "psmisc-locale", added "psmisc-locale-uk psmisc-locale-sv psmisc-locale-el psmisc-locale-ro psmisc-locale-da psmisc-locale-hr psmisc-locale-cs psmisc-locale-eo psmisc-locale-id psmisc-locale-sr psmisc-locale-it psmisc-locale-pt-br psmisc-locale-eu psmisc-locale-fi psmisc-locale-ca psmisc-locale-fr psmisc-locale-zh-tw psmisc-locale-pt psmisc-locale-de psmisc-locale-nl psmisc-locale-zh-cn psmisc-locale-bg psmisc-locale-vi psmisc-locale-nb psmisc-locale-hu psmisc-locale-pl psmisc-locale-ja psmisc-locale-ru"<br></div><div><br></div><div>Upstream has a custom autogen.sh which invokes po/update-potfiles as they don't ship a po/POTFILES.in (which is silly). Without that file gettext doesn't believe po/ is a gettext directory and won't generate po/Makefile.</div><div><br></div><div>We also disable autopoint by default in autotools.bbclass so that needs to be re-enabled (I've a long-standing branch to fix that but need to finish it off).</div><div><br></div><div>This fixes the build:</div><div><br></div><div><div>EXTRA_AUTORECONF=""</div><div>do_configure_prepend() {<br></div><div> ( cd ${S} && po/update-potfiles )</div><div>}</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 17 November 2017 at 00:25, Burton, Ross <span dir="ltr"><<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm not sure that disabling translations entirely is a suitable fix for upstreams makefile being broken (or our recipe breaking)...<div><br></div><div>Did you look at the upstream repo to see if they've a fix, or how complicated the fix would be?</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>Ross</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On 14 November 2017 at 14:57, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.<wbr>intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Switch to gitlab, as that's where development now happens.<br>
Drop two upstreamed patches, add two patches to avoid newly<br>
introduced build errors.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel<wbr>.com</a>><br>
---<br>
...001-Typo-in-fuser-makes-M-<wbr>on-all-the-time.patch | 46 ----------------------<br>
.../files/0002-Include-<wbr>limits.h-for-PATH_MAX.patch | 29 --------------<br>
...-create-src-directory-befo<wbr>re-attempting-t.patch | 30 ++++++++++++++<br>
...efile.am-do-not-recurse-in<wbr>to-po-directory.patch | 30 ++++++++++++++<br>
meta/recipes-extended/psmisc/<a href="http://psmisc_22.21.bb" rel="noreferrer" target="_blank"><wbr>psmisc_22.21.bb</a> | 12 ------<br>
meta/recipes-extended/psmisc/<a href="http://psmisc_23.0.bb" rel="noreferrer" target="_blank"><wbr>psmisc_23.0.bb</a> | 11 ++++++<br>
6 files changed, 71 insertions(+), 87 deletions(-)<br>
delete mode 100644 meta/recipes-extended/psmisc/f<wbr>iles/0001-Typo-in-fuser-makes-<wbr>M-on-all-the-time.patch<br>
delete mode 100644 meta/recipes-extended/psmisc/f<wbr>iles/0002-Include-limits.h-for<wbr>-PATH_MAX.patch<br>
create mode 100644 meta/recipes-extended/psmisc/p<wbr>smisc/0001-Makefile.am-create-<wbr>src-directory-before-attemptin<wbr>g-t.patch<br>
create mode 100644 meta/recipes-extended/psmisc/p<wbr>smisc/0001-Makefile.am-do-not-<wbr>recurse-into-po-directory.patc<wbr>h<br>
delete mode 100644 meta/recipes-extended/psmisc/<a href="http://psmisc_22.21.bb" rel="noreferrer" target="_blank">p<wbr>smisc_22.21.bb</a><br>
create mode 100644 meta/recipes-extended/psmisc/<a href="http://psmisc_23.0.bb" rel="noreferrer" target="_blank">p<wbr>smisc_23.0.bb</a><br>
<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/files/0001-Typo-in-fuser-<wbr>makes-M-on-all-the-time.patch b/meta/recipes-extended/psmisc<wbr>/files/0001-Typo-in-fuser-<wbr>makes-M-on-all-the-time.patch<br>
deleted file mode 100644<br>
index e57d60f6a34..00000000000<br>
--- a/meta/recipes-extended/psmisc<wbr>/files/0001-Typo-in-fuser-<wbr>makes-M-on-all-the-time.patch<br>
+++ /dev/null<br>
@@ -1,46 +0,0 @@<br>
-From 3638cc55b4d08851faba46635d737b<wbr>24d016665b Mon Sep 17 00:00:00 2001<br>
-From: Brad Jorsch <<a href="mailto:anomie@users.sourceforge.net" target="_blank">anomie@users.sourceforge.net</a>><br>
-Date: Fri, 28 Feb 2014 21:55:02 +1100<br>
-Subject: [PATCH] Typo in fuser makes -M on all the time<br>
-<br>
-Brad found that fuser had the -M option on all the time.<br>
-A simple but significant typo caused this, thanks the the patch.<br>
-<br>
-Bug-Debian: <a href="http://bugs.debian.org/740275" rel="noreferrer" target="_blank">http://bugs.debian.org/740275</a><br>
-<br>
-Upstream-Status: Backport<br>
-<br>
-Signed-off-by: Craig Small <<a href="mailto:csmall@enc.com.au" target="_blank">csmall@enc.com.au</a>><br>
----<br>
- ChangeLog | 4 ++++<br>
- src/fuser.c | 2 +-<br>
- 2 files changed, 5 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/ChangeLog b/ChangeLog<br>
-index fd1cccf..e5f784c 100644<br>
---- a/ChangeLog<br>
-+++ b/ChangeLog<br>
-@@ -1,3 +1,7 @@<br>
-+Changes in 22.22<br>
-+================<br>
-+ * Fixed typo in fuser which has -M on Debian #740275<br>
-+<br>
- Changes in 22.21<br>
- ================<br>
- * Missing comma in fuser(1) added Debian #702391<br>
-diff --git a/src/fuser.c b/src/fuser.c<br>
-index b485f65..389b302 100644<br>
---- a/src/fuser.c<br>
-+++ b/src/fuser.c<br>
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])<br>
- usage(_("No process specification given"));<br>
-<br>
- /* Check if -M flag was used and if so check mounts */<br>
-- if (opts * OPT_ISMOUNTPOINT) {<br>
-+ if (opts & OPT_ISMOUNTPOINT) {<br>
- check_mountpoints(&mounts, &names_head, &names_tail);<br>
- }<br>
-<br>
---<br>
-1.8.4.2<br>
-<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/files/0002-Include-limits.h-<wbr>for-PATH_MAX.patch b/meta/recipes-extended/psmisc<wbr>/files/0002-Include-limits.h-<wbr>for-PATH_MAX.patch<br>
deleted file mode 100644<br>
index c8afcac8a8b..00000000000<br>
--- a/meta/recipes-extended/psmisc<wbr>/files/0002-Include-limits.h-<wbr>for-PATH_MAX.patch<br>
+++ /dev/null<br>
@@ -1,29 +0,0 @@<br>
-From aa66afecd8ba9cc4139f25ab15ec31<wbr>5173413a7d Mon Sep 17 00:00:00 2001<br>
-From: Paul Barker <<a href="mailto:paul@paulbarker.me.uk" target="_blank">paul@paulbarker.me.uk</a>><br>
-Date: Wed, 20 Aug 2014 10:31:37 +0000<br>
-Subject: [PATCH] Include <limits.h> for PATH_MAX<br>
-<br>
-When building against musl libc, PATH_MAX is defined in <limits.h>.<br>
-<br>
-Signed-off-by: Paul Barker <<a href="mailto:paul@paulbarker.me.uk" target="_blank">paul@paulbarker.me.uk</a>><br>
-<br>
-Upstream-Status: Accepted (Should be in next release after 22.21)<br>
----<br>
- src/pstree.c | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/src/pstree.c b/src/pstree.c<br>
-index 071e6c4..0d28260 100644<br>
---- a/src/pstree.c<br>
-+++ b/src/pstree.c<br>
-@@ -41,6 +41,7 @@<br>
- #include <sys/types.h><br>
- #include <sys/stat.h><br>
- #include <sys/ioctl.h><br>
-+#include <limits.h><br>
-<br>
- #include "i18n.h"<br>
- #include "comm.h"<br>
---<br>
-2.0.4<br>
-<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-<wbr>create-src-directory-before-<wbr>attempting-t.patch b/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-<wbr>create-src-directory-before-<wbr>attempting-t.patch<br>
new file mode 100644<br>
index 00000000000..4d44495fd3f<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-<wbr>create-src-directory-before-<wbr>attempting-t.patch<br>
@@ -0,0 +1,30 @@<br>
+From 285877b7761d74736aca2687ed9bef<wbr>2f78b82c33 Mon Sep 17 00:00:00 2001<br>
+From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
+Date: Thu, 2 Nov 2017 16:21:22 +0200<br>
+Subject: [PATCH] Makefile.am: create src directory before attempting to write<br>
+ there<br>
+<br>
+Otherwise out of tree builds will fail.<br>
+<br>
+Upstream-Status: Pending<br>
+Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
+---<br>
+ Makefile.am | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/Makefile.am b/Makefile.am<br>
+index 9f61ab4..b4ced7f 100644<br>
+--- a/Makefile.am<br>
++++ b/Makefile.am<br>
+@@ -79,7 +79,7 @@ EXTRA_DIST = src/signames.c README.md<br>
+ CLEANFILES = src/signames.h<br>
+<br>
+ src/signames.h: src/signames.c Makefile<br>
+- export LC_ALL=C ; \<br>
++ export LC_ALL=C ; mkdir -p src ; \<br>
+ @CPP@ -dM $< |\<br>
+ tr -s '\t ' ' ' | sort -n -k 3 | sed \<br>
+ 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \<br>
+--<br>
+2.14.2<br>
+<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-do-<wbr>not-recurse-into-po-directory.<wbr>patch b/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-do-<wbr>not-recurse-into-po-directory.<wbr>patch<br>
new file mode 100644<br>
index 00000000000..72f993a1702<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/psmisc<wbr>/psmisc/0001-Makefile.am-do-<wbr>not-recurse-into-po-directory.<wbr>patch<br>
@@ -0,0 +1,30 @@<br>
+From bbd69f375a0eaeba3bfa17008f8ff4<wbr>1e836c1688 Mon Sep 17 00:00:00 2001<br>
+From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
+Date: Thu, 2 Nov 2017 16:39:59 +0200<br>
+Subject: [PATCH] Makefile.am: do not recurse into po directory<br>
+<br>
+Some broken autoconf logic results in a missing Makefile - let's<br>
+just skip the directory with translations, as users of psmisc are unlikely<br>
+to need those anyway.<br>
+<br>
+Upstream-Status: Inappropriate [oe-core specific]<br>
+Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
+---<br>
+ Makefile.am | 1 -<br>
+ 1 file changed, 1 deletion(-)<br>
+<br>
+diff --git a/Makefile.am b/Makefile.am<br>
+index b4ced7f..0d343a6 100644<br>
+--- a/Makefile.am<br>
++++ b/Makefile.am<br>
+@@ -11,7 +11,6 @@ ACLOCAL_AMFLAGS = -I m4<br>
+<br>
+ SUBDIRS = \<br>
+ doc \<br>
+- po \<br>
+ icons \<br>
+ testsuite<br>
+<br>
+--<br>
+2.14.2<br>
+<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_22.21.bb" rel="noreferrer" target="_blank">psmisc_22.21.bb</a> b/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_22.21.bb" rel="noreferrer" target="_blank">psmisc_22.21.bb</a><br>
deleted file mode 100644<br>
index 1c6473ebf43..00000000000<br>
--- a/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_22.21.bb" rel="noreferrer" target="_blank">psmisc_22.21.bb</a><br>
+++ /dev/null<br>
@@ -1,12 +0,0 @@<br>
-require psmisc.inc<br>
-LICENSE = "GPLv2"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0<wbr>215e8d672dc4c32c317bb3"<br>
-<br>
-SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f<wbr>1bf"<br>
-SRC_URI[sha256sum] = "97323cad619210845b696d7d722c3<wbr>83852b2acb5c49b5b0852c4f29c77a<wbr>8145a"<br>
-<br>
-SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/<wbr>psmisc-${PV}.tar.gz \<br>
- file://0001-Typo-in-fuser-mak<wbr>es-M-on-all-the-time.patch \<br>
- file://0002-Include-limits.h-<wbr>for-PATH_MAX.patch \<br>
- file://0001-Use-UINTPTR_MAX-i<wbr>nstead-of-__WORDSIZE.patch \<br>
- "<br>
diff --git a/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_23.0.bb" rel="noreferrer" target="_blank">psmisc_23.0.bb</a> b/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_23.0.bb" rel="noreferrer" target="_blank">psmisc_23.0.bb</a><br>
new file mode 100644<br>
index 00000000000..e036ae25508<br>
--- /dev/null<br>
+++ b/meta/recipes-extended/psmisc<wbr>/<a href="http://psmisc_23.0.bb" rel="noreferrer" target="_blank">psmisc_23.0.bb</a><br>
@@ -0,0 +1,11 @@<br>
+require psmisc.inc<br>
+LICENSE = "GPLv2"<br>
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0<wbr>215e8d672dc4c32c317bb3"<br>
+<br>
+SRC_URI = "git://<a href="http://gitlab.com/psmisc/psmisc.git;protocol=https" rel="noreferrer" target="_blank">gitlab.com/psmisc/psmis<wbr>c.git;protocol=https</a> \<br>
+ file://0001-Use-UINTPTR_MAX-i<wbr>nstead-of-__WORDSIZE.patch \<br>
+ file://0001-Makefile.am-create<wbr>-src-directory-before-attempti<wbr>ng-t.patch \<br>
+ file://0001-Makefile.am-do-no<wbr><a href="http://t-recurse-into-po-directory.pa">t-recurse-into-po-directory.pa</a><wbr>tch \<br>
+ "<br>
+SRCREV = "67b1da268f4c0ce6859980e3dfcfa<wbr>ec5b2448e80"<br>
+S = "${WORKDIR}/git"<br>
<span class="m_-3080677120899070445HOEnZb"><font color="#888888">--<br>
2.15.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>
</div></div></blockquote></div><br></div>