openembedded-devel.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
* [meta-networking][PATCH 1/3] kronosnet: Correct path to poll.h
@ 2021-10-13  4:56 Khem Raj
  2021-10-13  4:56 ` [meta-oe][PATCH 2/3] luaposix: Upgrade to 35.1 Khem Raj
  2021-10-13  4:56 ` [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama Khem Raj
  0 siblings, 2 replies; 4+ messages in thread
From: Khem Raj @ 2021-10-13  4:56 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ests-Correct-include-path-for-poll.h.patch | 29 +++++++++++++++++++
 .../kronosnet/kronosnet_1.22.bb               |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch

diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
new file mode 100644
index 0000000000..0d261fd4ef
--- /dev/null
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet/0001-libknet-tests-Correct-include-path-for-poll.h.patch
@@ -0,0 +1,29 @@
+From cae68083fda5d4ca832ff3cc8a533454df2efe23 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 Oct 2021 20:35:53 -0700
+Subject: [PATCH] libknet/tests: Correct include path for poll.h
+
+Fixes
+/usr/include/sys/poll.h:1:2: error: redirec
+ting incorrect #include <sys/poll.h> to <poll.h> [-Werror,-W#warnings]
+| #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
+
+Upstream-Status: Submitted [https://github.com/kronosnet/kronosnet/pull/363]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libknet/tests/test-common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libknet/tests/test-common.c b/libknet/tests/test-common.c
+index 86b76b0..8f8b6ca 100644
+--- a/libknet/tests/test-common.c
++++ b/libknet/tests/test-common.c
+@@ -20,7 +20,7 @@
+ #include <pthread.h>
+ #include <dirent.h>
+ #include <sys/select.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "libknet.h"
+ #include "test-common.h"
diff --git a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb b/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb
index 3d49a2365a..28d740cb41 100644
--- a/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb
+++ b/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb
@@ -12,7 +12,9 @@ SECTION = "libs"
 DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd"
 
 SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23"
-SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1"
+SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \
+           file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \
+           "
 
 UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases"
 
-- 
2.33.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/3] luaposix: Upgrade to 35.1
  2021-10-13  4:56 [meta-networking][PATCH 1/3] kronosnet: Correct path to poll.h Khem Raj
@ 2021-10-13  4:56 ` Khem Raj
  2021-10-13  4:56 ` [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama Khem Raj
  1 sibling, 0 replies; 4+ messages in thread
From: Khem Raj @ 2021-10-13  4:56 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj

automake has been dropped therefore switch to using luke build system
Drop automake specific patch which is no longer needed
Use lua 5.4 since thats whats provided in oe-core

License-Update: File renamed to LICENSE and copyright year changed to
2021

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ace-condition-between-test-and-mkdir.patch | 75 -------------------
 .../luaposix/luaposix_33.4.0.bb               | 21 ------
 .../luaposix/luaposix_35.1.bb                 | 27 +++++++
 3 files changed, 27 insertions(+), 96 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch
 delete mode 100644 meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb
 create mode 100644 meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb

diff --git a/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch b/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch
deleted file mode 100644
index d8a9e3d2b7..0000000000
--- a/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4dfca036c96071bd2a2c80ff84719c6d37858373 Mon Sep 17 00:00:00 2001
-From: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
-Date: Fri, 17 Apr 2020 14:36:50 +0500
-Subject: [PATCH 1/1] fix: avoid race condition between test and mkdir
-
-when building in parallel the race condition, when the directory
-is tested for existence and it is created, can break the build
-
-Signed-off-by: Haseeb Ashraf <Haseeb_Ashraf@mentor.com>
----
- Makefile.in            | 6 +++---
- build-aux/rockspecs.mk | 2 +-
- local.mk               | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 9b51ef3..4722525 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1637,7 +1637,7 @@ distclean-tags:
- 
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
--	test -d "$(distdir)" || mkdir "$(distdir)"
-+	$(MKDIR_P) "$(distdir)"
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- 	list='$(DISTFILES)'; \
-@@ -1975,7 +1975,7 @@ clean-local:
- 	rm -f $(posix_submodules)
- 
- $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
--	test -d $(builddir)/doc || mkdir $(builddir)/doc
-+	$(MKDIR_P) $(builddir)/doc
- @HAVE_LDOC_TRUE@	$(LDOC) -c build-aux/config.ld -d $(abs_srcdir)/doc .
- @HAVE_LDOC_FALSE@	$(MKDIR_P) doc
- @HAVE_LDOC_FALSE@	touch doc/index.html doc/ldoc.css
-@@ -1983,7 +1983,7 @@ $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
- doc: $(allhtml)
- 
- $(luarocks_config): Makefile.am
--	@test -d build-aux || mkdir build-aux
-+	@$(MKDIR_P) build-aux
- 	$(AM_V_GEN){						\
- 	  $(set_LUA_BINDIR);					\
- 	  echo 'rocks_trees = { "$(abs_srcdir)/luarocks" }';	\
-diff --git a/build-aux/rockspecs.mk b/build-aux/rockspecs.mk
-index ebd1dbf..c8fbdbc 100644
---- a/build-aux/rockspecs.mk
-+++ b/build-aux/rockspecs.mk
-@@ -62,7 +62,7 @@ LUA_INCDIR = `cd $$LUA_BINDIR/../include && pwd`
- LUA_LIBDIR = `cd $$LUA_BINDIR/../lib && pwd`
- 
- $(luarocks_config): Makefile.am
--	@test -d build-aux || mkdir build-aux
-+	@$(MKDIR_P) build-aux
- 	$(AM_V_GEN){						\
- 	  $(set_LUA_BINDIR);					\
- 	  echo 'rocks_trees = { "$(abs_srcdir)/luarocks" }';	\
-diff --git a/local.mk b/local.mk
-index d391ef7..80b22ce 100644
---- a/local.mk
-+++ b/local.mk
-@@ -255,7 +255,7 @@ dist_examples_DATA +=				\
- allhtml = $(dist_doc_DATA) $(dist_examples_DATA) $(dist_modules_DATA) $(dist_classes_DATA)
- 
- $(allhtml): $(EXTRA_ext_posix_posix_la_SOURCES) $(ext_posix_posix_la_SOURCES)
--	test -d $(builddir)/doc || mkdir $(builddir)/doc
-+	$(MKDIR_P) $(builddir)/doc
- if HAVE_LDOC
- 	$(LDOC) -c build-aux/config.ld -d $(abs_srcdir)/doc .
- else
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb b/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb
deleted file mode 100644
index 9a66d8fb28..0000000000
--- a/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "luaposix is a POSIX binding for Lua."
-LICENSE = "MIT"
-HOMEPAGE = "https://github.com/luaposix/luaposix"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7dd2aad04bb7ca212e69127ba8d58f9f"
-
-DEPENDS += "lua-native lua"
-
-SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release \
-           file://0001-fix-avoid-race-condition-between-test-and-mkdir.patch \
-"
-SRCREV = "8e4902ed81c922ed8f76a7ed85be1eaa3fd7e66d"
-S = "${WORKDIR}/git"
-LUA_VERSION = "5.4"
-
-inherit autotools pkgconfig
-
-do_install() {
-    oe_runmake 'DESTDIR=${D}' 'luadir=${datadir}/lua/${LUA_VERSION}' 'luaexecdir=${libdir}/lua/${LUA_VERSION}' install
-}
-
-FILES:${PN} = "${datadir}/lua/${LUA_VERSION} ${libdir}/lua/${LUA_VERSION}"
diff --git a/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb b/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb
new file mode 100644
index 0000000000..5c7d4c9199
--- /dev/null
+++ b/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "luaposix is a POSIX binding for Lua."
+LICENSE = "MIT"
+HOMEPAGE = "https://github.com/luaposix/luaposix"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f81069e00c0cad249f20efe958276db1"
+
+DEPENDS += "lua-native lua"
+
+SRC_URI = "git://github.com/luaposix/luaposix.git;branch=release-v${PV} \
+"
+SRCREV = "14043c5086ae738823a5dfbc9170d9e14193fbef"
+S = "${WORKDIR}/git"
+LUA_VERSION = "5.4"
+
+B = "${S}"
+
+inherit pkgconfig
+
+do_compile() {
+  ${S}/build-aux/luke
+}
+
+do_install() {
+    ${S}/build-aux/luke PREFIX=${D}${prefix} install
+}
+
+FILES:${PN} = "${datadir}/lua/${LUA_VERSION} \
+               ${libdir}/lua/${LUA_VERSION}"
-- 
2.33.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama
  2021-10-13  4:56 [meta-networking][PATCH 1/3] kronosnet: Correct path to poll.h Khem Raj
  2021-10-13  4:56 ` [meta-oe][PATCH 2/3] luaposix: Upgrade to 35.1 Khem Raj
@ 2021-10-13  4:56 ` Khem Raj
  2021-10-13  5:40   ` [oe] " Nandor Han
  1 sibling, 1 reply; 4+ messages in thread
From: Khem Raj @ 2021-10-13  4:56 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj

Fixes
| src/xutils.c:29:10: fatal error: 'X11/extensions/Xinerama.h' file not found
| #include <X11/extensions/Xinerama.h>
|          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
| 1 error generated.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
index ce2f51fc68..a5b6d8410c 100644
--- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
+++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \
                     file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504"
 
-DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11"
+DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11 libxinerama"
 
 PV .= "+git${SRCPV}"
 
-- 
2.33.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [oe] [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama
  2021-10-13  4:56 ` [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama Khem Raj
@ 2021-10-13  5:40   ` Nandor Han
  0 siblings, 0 replies; 4+ messages in thread
From: Nandor Han @ 2021-10-13  5:40 UTC (permalink / raw)
  To: raj.khem, openembedded-devel

Hi,

On 10/13/21 7:56 AM, Khem Raj via lists.openembedded.org wrote:
> Fixes
> | src/xutils.c:29:10: fatal error: 'X11/extensions/Xinerama.h' file not found
> | #include <X11/extensions/Xinerama.h>
> |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> | 1 error generated.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>   meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
> index ce2f51fc68..a5b6d8410c 100644
> --- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
> +++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
> @@ -4,7 +4,7 @@ LICENSE = "GPLv3"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \
>                       file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504"
>   
> -DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11"
> +DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11 libxinerama"

nitpick: shouldn't this be alphabetically arranged?

<snip>
-- 
Regards,
    Nandor


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-13  5:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-13  4:56 [meta-networking][PATCH 1/3] kronosnet: Correct path to poll.h Khem Raj
2021-10-13  4:56 ` [meta-oe][PATCH 2/3] luaposix: Upgrade to 35.1 Khem Raj
2021-10-13  4:56 ` [meta-gnome][PATCH 3/3] devilspie: Add missing dependency on libxinerama Khem Raj
2021-10-13  5:40   ` [oe] " Nandor Han

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).