From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- ...oid-race-condition-between-test-and-mkdir.patch | 75 ++++++++++++++++++++++ .../recipes-devtools/luaposix/luaposix_33.4.0.bb | 21 ++++++ 2 files changed, 96 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb (limited to 'meta-openembedded/meta-oe/recipes-devtools/luaposix') diff --git a/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch new file mode 100644 index 0000000000..d8a9e3d2b7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix/0001-fix-avoid-race-condition-between-test-and-mkdir.patch @@ -0,0 +1,75 @@ +From 4dfca036c96071bd2a2c80ff84719c6d37858373 Mon Sep 17 00:00:00 2001 +From: Haseeb Ashraf +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 +--- + 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-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb new file mode 100644 index 0000000000..1bee9fe0b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_33.4.0.bb @@ -0,0 +1,21 @@ +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.3" + +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}" -- cgit v1.2.3