Re: [oe] [meta-oe][PATCH] kselftest: Add a recipe on kernel selftest
Hi Raj, Even if enable ptest, the error can't be reproduced. In fact, the recipe doesn't inherit ptest, it just compiles programs and output them, which will be used by other oe modules(oe-selftest or ptest), to a custom directory. I know that you are busy with your job. And my request will add your workload , which is not my intention. But it is really hard for me to reproduce your error.~_~ So I sincerely hope that could I get your whole environment, including your metadata and other files? I think docker would be an easy way. Could you help me again? If I get your image, I think I will be confident to fix the error. --Hongzhi On 2018年07月20日 00:21, Khem Raj wrote: can you try with ptest enabled in DISTRO_FEATURES On Wed, Jul 18, 2018 at 12:57 AM Hongzhi, Song wrote: Hi Raj, I have try my best to reproduce your error, but I failed. Could you help me to do the build in docker and share the dock image with us. Or maybe you have a better method. Thanks, Hongzhi On 2018年07月10日 12:11, Khem Raj wrote: This is failing to build here | DEBUG: Executing shell function do_compile | NOTE: make -j 16 CROSS_COMPILE=x86_64-bec-linux- ARCH=x86 CC=x86_64-bec-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot AR=x86_64-bec-linux-ar LD=x86_64-bec-linux-ld --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot DESTDIR=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/image -C /mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf | make: Entering directory '/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf' | Makefile:19: *** recipe commences before first target. Stop. | make: Leaving directory '/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf' | ERROR: oe_runmake failed On Sat, Jul 7, 2018 at 11:05 PM Hongzhi.Song wrote: The recipe builds the framework for kernel-selftest. Now, it just contains two sets of testcase, bpf and vm. We are appending others to the recipe. It needs some features which will be written into relevant recipe. But now, you should add them to conf/local.conf manually. KERNEL_FEATURES_append += "features/bpf/bpf.scc" Signed-off-by: Dengke Du Signed-off-by: Hongzhi.Song --- .../recipes-kernel/kselftest/kernel-selftest.bb| 94 ++ 1 file changed, 94 insertions(+) create mode 100644 meta-oe/recipes-kernel/kselftest/kernel-selftest.bb diff --git a/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb new file mode 100644 index 000..6f20bd3 --- /dev/null +++ b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb @@ -0,0 +1,94 @@ +SUMMARY = "Kernel selftest for Linux" +DESCRIPTION = "Kernel selftest for Linux" +LICENSE = "GPLv2" + +# for bpf and vm +DEPENDS = " \ +elfutils \ +libcap \ +libcap-ng \ +fuse \ +util-linux \ +rsync-native \ +" +# for vm +RDEPENDS_${PN} += "libgcc \ + bash \ +" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit linux-kernel-base kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +S = "${WORKDIR}/${BP}" + +# now we just test bpf and vm +# we will append other kernel selftest in the future +TEST_LIST = "bpf \ + vm \ +" + +EXTRA_OEMAKE = '\ +CROSS_COMPILE=${TARGET_PREFIX} \ +ARCH=${ARCH} \ +CC="${CC}" \ +AR="${AR}" \ +LD="${LD}" \ +' + +EXTRA_OEMAKE += "\ +'DESTDIR=${D}' \ +" + +KERNEL_SELFTEST_SRC ?= "Makefile \ +include \ +tools \ +scripts \ +arch \ +" + +do_compile() { +for i in ${TEST_LIST} +do +oe_runmake -C ${S}/tools/testing/selftests/${i} +done +} + +do_install() { +for i in ${TEST_LIST} +do +oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/opt/kselftest/${i} install +done + +chown root:root -R ${D}/opt/kselftest +} + +do_configure() { +: +} + +do_configure[prefuncs] += "copy_kselftest_source_from_kernel remove_clang_related" +python copy_kselftest_source_from_kernel() { +sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() +src_dir = d.getVar("STAGING_KERNEL_DIR") +dest_dir = d.getVar("S") +bb.utils.mkdirhier(dest_dir) +for s in sources: +src = oe.path.join(src_dir, s) +dest = oe.path.join(dest_dir, s) +if os.path.isdir(src): +oe.path.copytree(src, dest) +else: +bb.utils.copyfile(src, dest) +} + +remove_clang_related() { + sed
[oe] [meta-oe][PATCH] liblockfile: Upgrade to 1.14
From: Mingli Yu * Licence-Update: - Copyright years are updated from 2011 to 2016 - The text as below "On Debian GNU/Linux systems, the complete text of the GNU Lesser General \ Public License can be found in `/usr/share/common-licenses/LGPL-2'. You can \ also find a copy on the GNU website at http://www.gnu.org"; updated to "The complete LGPL-2 license is included in the licenses/ directory." * Compared to liblockfile_1.09.orig.tar.gz unpack to ${WORKDIR}/${BPN}-${PV}, liblockfile_1.14.orig.tar.gz unpack to ${WORKDIR}/${BPN} now. Add S = "${WORKDIR}/${BPN}" to fix the gap * Remove two backported patch - install.patch - ldflags.patch * Use DESTDIR instead of the previous ROOT and add patch 0001-Makefile.in-add-DESTDIR.patch to fix below issue: | install -d -m 755 -g root -p /usr/include | install -d -m 755 -g root -p /usr/lib | install -d -m 755 -g root -p /usr/bin | install -m 755 nfslock.so.0.1 /usr/lib | install -d -m 755 -g root -p /usr/share/man/man1 | install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied | Makefile:78: recipe for target 'install_nfslib' failed | make: *** [install_nfslib] Error 1 | make: *** Waiting for unfinished jobs | install -d -m 755 -g root -p /usr/share/man/man3 | install -m 644 lockfile.h maillock.h /usr/include | install: cannot create regular file '/usr/include/lockfile.h': Permission denied | install: cannot create regular file '/usr/include/maillock.h': Permission denied | Makefile:64: recipe for target 'install_common' failed | make: *** [install_common] Error 1 * Rework patch: - Rework liblockfile-fix-nfslib-and-soname.patch to 0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch as the previous patch partly in upstream - liblockfile-fix-install-so-to-man-dir.patch Signed-off-by: Mingli Yu --- .../liblockfile-1.09/install.patch| 48 .../liblockfile-1.09/ldflags.patch| 21 --- .../0001-Makefile.in-add-DESTDIR.patch| 54 ++ ...install-nfslock.so-and-nfslock.so.0.patch} | 57 ++- .../configure.patch | 0 ...iblockfile-fix-install-so-to-man-dir.patch | 35 ...iblockfile_1.09.bb => liblockfile_1.14.bb} | 26 + 7 files changed, 109 insertions(+), 132 deletions(-) delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch => liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch} (13%) rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/configure.patch (100%) rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/liblockfile-fix-install-so-to-man-dir.patch (17%) rename meta-oe/recipes-extended/liblockfile/{liblockfile_1.09.bb => liblockfile_1.14.bb} (44%) diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted file mode 100644 index a9319ff1e..0 --- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir= @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ --install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ --install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ install -d $(ROOT)$(bindir) -+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) -+ install -d $(ROOT)$(mandir)/man1
Re: [oe] [meta-oe][PATCH] liblockfile: Upgrade to 1.14
Please ignore this patch. Thanks, On 2018年07月20日 10:45, mingli...@windriver.com wrote: From: Mingli Yu * Licence-Update: - Copyright years are updated from 2011 to 2016 - The text as below "On Debian GNU/Linux systems, the complete text of the GNU Lesser General \ Public License can be found in `/usr/share/common-licenses/LGPL-2'. You can \ also find a copy on the GNU website at http://www.gnu.org"; updated to "The complete LGPL-2 license is included in the licenses/ directory." * Compared to liblockfile_1.09.orig.tar.gz unpack to ${WORKDIR}/${BPN}-${PV}, liblockfile_1.14.orig.tar.gz unpack to ${WORKDIR}/${BPN} now. Add S = "${WORKDIR}/${BPN}" to fix the gap * Remove two backported patch - install.patch - ldflags.patch * Use DESTDIR instead of the previous ROOT and add patch 0001-Makefile.in-add-DESTDIR.patch to fix below issue: | install -d -m 755 -g root -p /usr/include | install -d -m 755 -g root -p /usr/lib | install -d -m 755 -g root -p /usr/bin | install -m 755 nfslock.so.0.1 /usr/lib | install -d -m 755 -g root -p /usr/share/man/man1 | install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied | Makefile:78: recipe for target 'install_nfslib' failed | make: *** [install_nfslib] Error 1 | make: *** Waiting for unfinished jobs | install -d -m 755 -g root -p /usr/share/man/man3 | install -m 644 lockfile.h maillock.h /usr/include | install: cannot create regular file '/usr/include/lockfile.h': Permission denied | install: cannot create regular file '/usr/include/maillock.h': Permission denied | Makefile:64: recipe for target 'install_common' failed | make: *** [install_common] Error 1 * Rework patch: - Rework liblockfile-fix-nfslib-and-soname.patch to 0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch as the previous patch partly in upstream - liblockfile-fix-install-so-to-man-dir.patch Signed-off-by: Mingli Yu --- .../liblockfile-1.09/install.patch| 48 - .../liblockfile-1.09/ldflags.patch| 21 ...iblockfile-fix-install-so-to-man-dir.patch | 20 --- .../liblockfile-fix-nfslib-and-soname.patch | 54 --- .../0001-Makefile.in-add-DESTDIR.patch| 54 +++ ...-install-nfslock.so-and-nfslock.so.0.patch | 31 +++ .../configure.patch | 0 ...iblockfile-fix-install-so-to-man-dir.patch | 33 .../liblockfile/liblockfile_1.09.bb | 35 .../liblockfile/liblockfile_1.14.bb | 37 + 10 files changed, 155 insertions(+), 178 deletions(-) delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/configure.patch (100%) create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted file mode 100644 index a9319ff1e..0 --- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir= @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; f
[oe] [meta-oe][PATCH] liblockfile: Upgrade to 1.14
From: Mingli Yu * Licence-Update: - Copyright years are updated from 2011 to 2016 - The text as below "On Debian GNU/Linux systems, the complete text of the GNU Lesser General \ Public License can be found in `/usr/share/common-licenses/LGPL-2'. You can \ also find a copy on the GNU website at http://www.gnu.org"; updated to "The complete LGPL-2 license is included in the licenses/ directory." * Compared to liblockfile_1.09.orig.tar.gz unpack to ${WORKDIR}/${BPN}-${PV}, liblockfile_1.14.orig.tar.gz unpack to ${WORKDIR}/${BPN} now. Add S = "${WORKDIR}/${BPN}" to fix the gap * Remove two backported patch - install.patch - ldflags.patch * Use DESTDIR instead of the previous ROOT and add patch 0001-Makefile.in-add-DESTDIR.patch to fix below issue: | install -d -m 755 -g root -p /usr/include | install -d -m 755 -g root -p /usr/lib | install -d -m 755 -g root -p /usr/bin | install -m 755 nfslock.so.0.1 /usr/lib | install -d -m 755 -g root -p /usr/share/man/man1 | install: cannot create regular file '/usr/lib/nfslock.so.0.1': Permission denied | Makefile:78: recipe for target 'install_nfslib' failed | make: *** [install_nfslib] Error 1 | make: *** Waiting for unfinished jobs | install -d -m 755 -g root -p /usr/share/man/man3 | install -m 644 lockfile.h maillock.h /usr/include | install: cannot create regular file '/usr/include/lockfile.h': Permission denied | install: cannot create regular file '/usr/include/maillock.h': Permission denied | Makefile:64: recipe for target 'install_common' failed | make: *** [install_common] Error 1 * Rework patch: - Rework liblockfile-fix-nfslib-and-soname.patch to 0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch as the previous patch partly in upstream - liblockfile-fix-install-so-to-man-dir.patch Signed-off-by: Mingli Yu --- .../liblockfile-1.09/install.patch| 48 - .../liblockfile-1.09/ldflags.patch| 21 ...iblockfile-fix-install-so-to-man-dir.patch | 20 --- .../liblockfile-fix-nfslib-and-soname.patch | 54 --- .../0001-Makefile.in-add-DESTDIR.patch| 54 +++ ...-install-nfslock.so-and-nfslock.so.0.patch | 31 +++ .../configure.patch | 0 ...iblockfile-fix-install-so-to-man-dir.patch | 33 .../liblockfile/liblockfile_1.09.bb | 35 .../liblockfile/liblockfile_1.14.bb | 37 + 10 files changed, 155 insertions(+), 178 deletions(-) delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-add-DESTDIR.patch create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch rename meta-oe/recipes-extended/liblockfile/{liblockfile-1.09 => liblockfile}/configure.patch (100%) create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/liblockfile-fix-install-so-to-man-dir.patch delete mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted file mode 100644 index a9319ff1e..0 --- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir= @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(included
[oe] [meta-networking][PATCH] ctdb: Has been integrated into samba. So, there is no need to maitain this recipe anymore.
Signed-off-by: Lei Maohui --- .../01-support-cross-compile-for-linux-os.patch| 24 - .../ctdb/02-link-rep_snprintf-for-ltdbtool.patch | 17 --- ...rvice-ensure-the-PID-directory-is-created.patch | 25 -- meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb | 57 -- 4 files changed, 123 deletions(-) delete mode 100644 meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch delete mode 100644 meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch delete mode 100644 meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch delete mode 100644 meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb diff --git a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch b/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch deleted file mode 100644 index c9195b4..000 --- a/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch +++ /dev/null @@ -1,24 +0,0 @@ -support cross-compile for linux-os. - -Signed-off-by: Bian Naimeng - -diff -Nurp ctdb-2.5.1.orig/configure ctdb-2.5.1/configure ctdb-2.5.1.orig/configure 2015-05-07 16:24:28.545000238 +0900 -+++ ctdb-2.5.1/configure 2015-05-07 16:28:20.894000244 +0900 -@@ -10692,10 +10692,16 @@ if test x"$libreplace_cv_HAVE_GETADDRINF - # see bug 5910, use our replacements if we detect - # a broken system. - if test "$cross_compiling" = yes; then : -+ case "$target_os" in -+ *linux*) -+ ;; -+ *) - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run test program while cross compiling - See \`config.log' for more details" "$LINENO" 5; } -+ ;; -+ esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch deleted file mode 100644 index 1294fe4..000 --- a/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch +++ /dev/null @@ -1,17 +0,0 @@ -link rep_snprintf from lib/replace/snprintf.o for ltdbtool - -Signed-off-by: Bian Naimeng - -Index: ctdb-2.5.6/Makefile.in -=== ctdb-2.5.6.orig/Makefile.in -+++ ctdb-2.5.6/Makefile.in -@@ -176,7 +176,7 @@ bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb. - @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ tools/ctdb.o tools/ctdb_vacuum.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) - --bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) -+bin/ltdbtool: tools/ltdbtool.o $(TDB_OBJ) lib/replace/snprintf.o - @echo Linking $@ - $(WRAPPER) $(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS) - diff --git a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch b/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch deleted file mode 100644 index a7e987b..000 --- a/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f02ff7383f1cc0c118732352ccbae476c7b3b3ba Mon Sep 17 00:00:00 2001 -From: Mark Asselstine -Date: Tue, 17 Nov 2015 16:17:00 -0500 -Subject: [PATCH] service: ensure the PID directory is created - -Signed-off-by: Mark Asselstine - config/ctdb.service | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config/ctdb.service b/config/ctdb.service -index ea37c30..8537105 100644 a/config/ctdb.service -+++ b/config/ctdb.service -@@ -5,6 +5,7 @@ After=network.target - [Service] - Type=forking - LimitCORE=infinity -+RuntimeDirectory=/run/ctdb - PIDFile=/run/ctdb/ctdbd.pid - ExecStart=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid start - ExecStop=/usr/sbin/ctdbd_wrapper /run/ctdb/ctdbd.pid stop --- -2.1.4 - diff --git a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb deleted file mode 100644 index df1a19e..000 --- a/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "CTDB is a cluster implementation of the TDB database \ -used by Samba and other projects to store temporary data. If an \ -application is already using TDB for temporary data it is very easy \ -to convert that application to be cluster aware and use CTDB instead." -HOMEPAGE = "https://ctdb.samba.org/"; -LICENSE = "GPL-2.0+ & LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBAS
Re: [oe] [PATCH][meta-oe] protobuf: upgrade 3.5.1 -> 3.6.0.1
On Wed, Jul 18, 2018 at 11:13 PM wrote: > > From: Changqing Li > > License-Update: copyright year updated and clean some useless content > > Signed-off-by: Changqing Li > --- > .../0001-protobuf-fix-configure-error.patch| 33 > ++ > .../{protobuf_3.5.1.bb => protobuf_3.6.0.1.bb} | 14 ++--- my host has gcc8 and it failed to build native version NOTE: Running task 13158 of 33598 (virtual:native:/mnt/a/oe/sources/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb:do_compile) |^ |vector > options; | ^ | ../git/protoc-c/c_generator.cc:108:29: error: expected primary-expression before ‘>’ token |vector > options; | ^ | ../git/protoc-c/c_generator.cc:108:31: error: expected primary-expression before ‘>’ token |vector > options; |^ | ../git/protoc-c/c_generator.cc:108:33: error: ‘options’ was not declared in this scope |vector > options; | ^~~ | ../git/protoc-c/c_generator.cc:152:5: error: ‘scoped_ptr’ was not declared in this scope | scoped_ptr output( | ^~ | ../git/protoc-c/c_generator.cc:152:5: note: suggested alternative: ‘sched_param’ | scoped_ptr output( | ^~ | sched_param | ../git/protoc-c/c_generator.cc:152:40: error: expected primary-expression before ‘>’ token | scoped_ptr output( | ^ | ../git/protoc-c/c_generator.cc:152:42: error: ‘output’ was not declared in this scope | scoped_ptr output( | ^~ | ../git/protoc-c/c_generator.cc:152:42: note: suggested alternative: ‘getpt’ | scoped_ptr output( | ^~ | getpt | ../git/protoc-c/c_generator.cc:160:5: error: ‘scoped_ptr’ was not declared in this scope | scoped_ptr output( | ^~ | ../git/protoc-c/c_generator.cc:160:5: note: suggested alternative: ‘sched_param’ | scoped_ptr output( | ^~ | sched_param | ../git/protoc-c/c_generator.cc:160:40: error: expected primary-expression before ‘>’ token | scoped_ptr output( | ^ | ../git/protoc-c/c_generator.cc:160:42: error: ‘output’ was not declared in this scope | scoped_ptr output( | ^~ | ../git/protoc-c/c_generator.cc:160:42: note: suggested alternative: ‘getpt’ | scoped_ptr output( | ^~ | getpt | make: *** [Makefile:1497: protoc-c/protoc_gen_c-c_primitive_field.o] Error 1 | make: *** [Makefile:1441: protoc-c/protoc_gen_c-c_generator.o] Error 1 | ERROR: oe_runmake failed > 2 files changed, 43 insertions(+), 4 deletions(-) > create mode 100644 > meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch > rename meta-oe/recipes-devtools/protobuf/{protobuf_3.5.1.bb => > protobuf_3.6.0.1.bb} (86%) > > diff --git > a/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch > > b/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch > new file mode 100644 > index 000..a2f7a4b > --- /dev/null > +++ > b/meta-oe/recipes-devtools/protobuf/protobuf/0001-protobuf-fix-configure-error.patch > @@ -0,0 +1,33 @@ > +From 52959e8e01e39139d18f752e97283e45b4b7a426 Mon Sep 17 00:00:00 2001 > +From: Changqing Li > +Date: Wed, 18 Jul 2018 17:52:34 +0800 > +Subject: [PATCH] protobuf: fix configure error > + > +fix below error: > +gnu-configize: 'configure.ac' or 'configure.in' is required > + > +third_party/googletest is git submodule of protobuf. Above error > +caused by missing submodule googletest. > + > +Upstream-Status: Inappropriate [oe-specific] > + > +Signed-off-by: Changqing Li > +--- > + configure.ac | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index aec10cf..7fbe57d 100644 > +--- a/configure.ac > b/configure.ac > +@@ -214,7 +214,6 @@ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) > + # too. > + export CFLAGS > + export CXXFLAGS > +-AC_CONFIG_SUBDIRS([third_party/googletest]) > + > + AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile > conformance/Makefile protobuf.pc protobuf-lite.pc]) > + AC_OUTPUT > +-- > +2.7.4 > + > diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb > similarity index 86% > rename from meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > rename to meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb > index 8cef391..5850744 100644 > --- a/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb > +++ b/meta-oe/recipes-devtools/protobuf/protobuf_3.6.0.1.bb > @@ -5,18 +5,19 @@ all of its internal RPC protocols a
Re: [oe] [meta-oe][PATCH] kselftest: Add a recipe on kernel selftest
can you try with ptest enabled in DISTRO_FEATURES On Wed, Jul 18, 2018 at 12:57 AM Hongzhi, Song wrote: > > Hi Raj, > > I have try my best to reproduce your error, but I failed. > > Could you help me to do the build in docker and share the dock image > with us. Or maybe you have a better method. > > > Thanks, > > Hongzhi > > > On 2018年07月10日 12:11, Khem Raj wrote: > > This is failing to build here > > > > | DEBUG: Executing shell function do_compile > > | NOTE: make -j 16 CROSS_COMPILE=x86_64-bec-linux- ARCH=x86 > > CC=x86_64-bec-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 > > -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat > > -Wformat-security -Werror=format-security > > --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot > > AR=x86_64-bec-linux-ar LD=x86_64-bec-linux-ld > > --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot > > > > DESTDIR=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/image > > -C > > /mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf > > | make: Entering directory > > '/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf' > > | Makefile:19: *** recipe commences before first target. Stop. > > | make: Leaving directory > > '/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf' > > | ERROR: oe_runmake failed > > On Sat, Jul 7, 2018 at 11:05 PM Hongzhi.Song > > wrote: > >> The recipe builds the framework for kernel-selftest. Now, it just > >> contains two sets of testcase, bpf and vm. We are appending others > >> to the recipe. > >> > >> It needs some features which will be written into relevant recipe. > >> But now, you should add them to conf/local.conf manually. > >> KERNEL_FEATURES_append += "features/bpf/bpf.scc" > >> > >> Signed-off-by: Dengke Du > >> Signed-off-by: Hongzhi.Song > >> --- > >> .../recipes-kernel/kselftest/kernel-selftest.bb| 94 > >> ++ > >> 1 file changed, 94 insertions(+) > >> create mode 100644 meta-oe/recipes-kernel/kselftest/kernel-selftest.bb > >> > >> diff --git a/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb > >> b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb > >> new file mode 100644 > >> index 000..6f20bd3 > >> --- /dev/null > >> +++ b/meta-oe/recipes-kernel/kselftest/kernel-selftest.bb > >> @@ -0,0 +1,94 @@ > >> +SUMMARY = "Kernel selftest for Linux" > >> +DESCRIPTION = "Kernel selftest for Linux" > >> +LICENSE = "GPLv2" > >> + > >> +# for bpf and vm > >> +DEPENDS = " \ > >> +elfutils \ > >> +libcap \ > >> +libcap-ng \ > >> +fuse \ > >> +util-linux \ > >> +rsync-native \ > >> +" > >> +# for vm > >> +RDEPENDS_${PN} += "libgcc \ > >> + bash \ > >> +" > >> + > >> +do_configure[depends] += "virtual/kernel:do_shared_workdir" > >> + > >> +inherit linux-kernel-base kernel-arch > >> + > >> +do_populate_lic[depends] += "virtual/kernel:do_patch" > >> + > >> +S = "${WORKDIR}/${BP}" > >> + > >> +# now we just test bpf and vm > >> +# we will append other kernel selftest in the future > >> +TEST_LIST = "bpf \ > >> + vm \ > >> +" > >> + > >> +EXTRA_OEMAKE = '\ > >> +CROSS_COMPILE=${TARGET_PREFIX} \ > >> +ARCH=${ARCH} \ > >> +CC="${CC}" \ > >> +AR="${AR}" \ > >> +LD="${LD}" \ > >> +' > >> + > >> +EXTRA_OEMAKE += "\ > >> +'DESTDIR=${D}' \ > >> +" > >> + > >> +KERNEL_SELFTEST_SRC ?= "Makefile \ > >> +include \ > >> +tools \ > >> +scripts \ > >> +arch \ > >> +" > >> + > >> +do_compile() { > >> +for i in ${TEST_LIST} > >> +do > >> +oe_runmake -C ${S}/tools/testing/selftests/${i} > >> +done > >> +} > >> + > >> +do_install() { > >> +for i in ${TEST_LIST} > >> +do > >> +oe_runmake -C ${S}/tools/testing/selftests/${i} > >> INSTALL_PATH=${D}/opt/kselftest/${i} install > >> +done > >> + > >> +chown root:root -R ${D}/opt/kselftest > >> +} > >> + > >> +do_configure() { > >> +: > >> +} > >> + > >> +do_configure[prefuncs] += "copy_kselftest_source_from_kernel > >> remove_clang_related" > >> +python copy_kselftest_source_from_kernel() { > >> +sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() > >> +src_dir = d.getVar("STAGING_KERNEL_DIR") > >> +dest_dir = d.getVar("S") > >> +bb.utils.mkdirhier(dest_dir) > >> +for s in sources: > >> +src = oe.path.join(src_dir, s) > >> +dest = oe.path.join(dest_dir, s) > >> +if os.path.isdir(src): > >> +oe.path.copytree(src, dest) > >> +else: > >> +bb.utils.copyfile(src, dest) > >> +} > >> + > >> +remove_clang_related() { > >> + sed -i -e '/test_pkt_access/d' -e '/test
Re: [oe] [meta-networking][PATCH] Fix confilct error in do_rootfs.
On Thu, Jul 19, 2018 at 2:00 AM Lei, Maohui wrote: > > ping > can you rebase on latest master and resend ? > > -Original Message- > > From: Lei, Maohui > > Sent: Monday, May 28, 2018 2:34 AM > > To: openembedded-devel@lists.openembedded.org > > Cc: Lei, Maohui > > Subject: [oe] [meta-networking][PATCH] Fix confilct error in do_rootfs. > > > > Error: Transaction check error: > > file /usr/bin/mailq conflicts between attempted installs of esmtp-1.2- > > r0.x86_64 and postfix-3.2.2-r0.x86_64 > > file /usr/bin/newaliases conflicts between attempted installs of > > esmtp-1.2- > > r0.x86_64 and postfix-3.2.2-r0.x86_64 > > > > Signed-off-by: Lei Maohui > > --- > > meta-networking/recipes-daemons/postfix/postfix.inc | 7 --- > > meta-networking/recipes-support/esmtp/esmtp_1.2.bb | 6 +++--- > > 2 files changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta- > > networking/recipes-daemons/postfix/postfix.inc > > index 09447d5..a5e8618 100644 > > --- a/meta-networking/recipes-daemons/postfix/postfix.inc > > +++ b/meta-networking/recipes-daemons/postfix/postfix.inc > > @@ -219,9 +219,10 @@ do_install_append_class-target() { > > sed -i 's:-fdebug-prefix-map[^ ]*::g; s:-- > > sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out > > } > > > > -ALTERNATIVE_${PN} = "sendmail" > > -ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" > > -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" > > +ALTERNATIVE_${PN} += "mailq newaliases" > > +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" > > +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" > > + > > ALTERNATIVE_PRIORITY = "120" > > > > ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" > > diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta- > > networking/recipes-support/esmtp/esmtp_1.2.bb > > index 2da73e7..9fb817b 100644 > > --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb > > +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb > > @@ -18,10 +18,10 @@ EXTRA_OECONF = > > "--with-libesmtp=${STAGING_EXECPREFIXDIR}" > > > > inherit autotools update-alternatives > > > > -ALTERNATIVE_${PN} = "sendmail" > > +ALTERNATIVE_${PN} += "mailq newaliases" > > +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" > > +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" > > > > -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" > > -ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" > > ALTERNATIVE_PRIORITY = "10" > > > > ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" > > -- > > 1.9.1 > > > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH] libiio: fix build of python bindins
In the actual form, the python bindings are never built since the recipe does not depend on python, thus he cmake script does not detect python and does not build the bindings. Add a summy PACKAGECONFIG for the python bindings to make it simpler to disable. Signed-off-by: Neil Armstrong --- meta-oe/recipes-support/libiio/libiio_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb index ba380ed..fa6f4c2 100644 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-oe/recipes-support/libiio/libiio_git.bb @@ -24,10 +24,11 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ " -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND" +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS" PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[PYTHON_BINDINGS] = ",,python" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] libnice: Upgrade to 0.1.14
Sorry, forgot to label this v2. Slight change to the commit message - GStreamer 1.14 instead of 1.14.0, since WebRTC is an introduction to 1.14.x overall. On 2018-07-19 11:49, Carlos Rafael Giani wrote: This is the minimum version needed by the new GStreamer 1.14 WebRTC support (not to be confused with the WebRTC DSP support). New packageconfigs were added to make the GStreamer 0.10 and 1.0 support configurable. Signed-off-by: Carlos Rafael Giani --- .../{libnice_0.1.13.bb => libnice_0.1.14.bb} | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) rename meta-oe/recipes-support/farsight/{libnice_0.1.13.bb => libnice_0.1.14.bb} (55%) diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb b/meta-oe/recipes-support/farsight/libnice_0.1.14.bb similarity index 55% rename from meta-oe/recipes-support/farsight/libnice_0.1.13.bb rename to meta-oe/recipes-support/farsight/libnice_0.1.14.bb index 48c8221a3..775257f93 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.1.14.bb @@ -2,8 +2,8 @@ SUMMARY = "Interactive Connectivity Establishment library" DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." HOMEPAGE = "http://nice.freedesktop.org/wiki/"; SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"; -SRC_URI[md5sum] = "3226faeaf48a9150ada00da2e2865959" -SRC_URI[sha256sum] = "61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1" +SRC_URI[md5sum] = "c9b9b74b8ae1b3890e4bd93f1b70e8ff" +SRC_URI[sha256sum] = "be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c" LICENSE = "LGPLv2.1 & MPLv1.1" LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ @@ -11,17 +11,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ " -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +DEPENDS = "glib-2.0 gnutls" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "gstreamer1.0" PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" +PACKAGECONFIG[gstreamer0.10] = "--with-gstreamer-0.10,--without-gstreamer-0.10,gstreamer gst-plugins-base" +PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" inherit autotools pkgconfig gtk-doc gobject-introspection -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug ${libdir}/gstreamer-1.0/.debug" do_configure_prepend() { mkdir ${S}/m4 || true -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libnice: Upgrade to 0.1.14
This is the minimum version needed by the new GStreamer 1.14 WebRTC support (not to be confused with the WebRTC DSP support). New packageconfigs were added to make the GStreamer 0.10 and 1.0 support configurable. Signed-off-by: Carlos Rafael Giani --- .../{libnice_0.1.13.bb => libnice_0.1.14.bb} | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) rename meta-oe/recipes-support/farsight/{libnice_0.1.13.bb => libnice_0.1.14.bb} (55%) diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb b/meta-oe/recipes-support/farsight/libnice_0.1.14.bb similarity index 55% rename from meta-oe/recipes-support/farsight/libnice_0.1.13.bb rename to meta-oe/recipes-support/farsight/libnice_0.1.14.bb index 48c8221a3..775257f93 100644 --- a/meta-oe/recipes-support/farsight/libnice_0.1.13.bb +++ b/meta-oe/recipes-support/farsight/libnice_0.1.14.bb @@ -2,8 +2,8 @@ SUMMARY = "Interactive Connectivity Establishment library" DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." HOMEPAGE = "http://nice.freedesktop.org/wiki/"; SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"; -SRC_URI[md5sum] = "3226faeaf48a9150ada00da2e2865959" -SRC_URI[sha256sum] = "61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1" +SRC_URI[md5sum] = "c9b9b74b8ae1b3890e4bd93f1b70e8ff" +SRC_URI[sha256sum] = "be120ba95d4490436f0da077ffa8f767bf727b82decf2bf499e39becc027809c" LICENSE = "LGPLv2.1 & MPLv1.1" LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ @@ -11,17 +11,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ " -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" +DEPENDS = "glib-2.0 gnutls" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "gstreamer1.0" PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" +PACKAGECONFIG[gstreamer0.10] = "--with-gstreamer-0.10,--without-gstreamer-0.10,gstreamer gst-plugins-base" +PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" inherit autotools pkgconfig gtk-doc gobject-introspection -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug ${libdir}/gstreamer-1.0/.debug" do_configure_prepend() { mkdir ${S}/m4 || true -- 2.17.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] samba: Delete remain of LSB.
Signed-off-by: Lei Maohui --- meta-networking/recipes-connectivity/samba/samba_4.7.8.bb | 4 1 file changed, 4 deletions(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb index 593ff57..fc1a2e0 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.8.bb @@ -48,9 +48,6 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" -LSB = "" -LSB_linuxstdbase = "lsb" - INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." @@ -70,7 +67,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} acl ad-dc cups gnutls ldap mitkrb5 \ " -RDEPENDS_${PN}-base += "${LSB}" RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] Fix confilct error in do_rootfs.
ping > -Original Message- > From: Lei, Maohui > Sent: Monday, May 28, 2018 2:34 AM > To: openembedded-devel@lists.openembedded.org > Cc: Lei, Maohui > Subject: [oe] [meta-networking][PATCH] Fix confilct error in do_rootfs. > > Error: Transaction check error: > file /usr/bin/mailq conflicts between attempted installs of esmtp-1.2- > r0.x86_64 and postfix-3.2.2-r0.x86_64 > file /usr/bin/newaliases conflicts between attempted installs of esmtp-1.2- > r0.x86_64 and postfix-3.2.2-r0.x86_64 > > Signed-off-by: Lei Maohui > --- > meta-networking/recipes-daemons/postfix/postfix.inc | 7 --- > meta-networking/recipes-support/esmtp/esmtp_1.2.bb | 6 +++--- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta- > networking/recipes-daemons/postfix/postfix.inc > index 09447d5..a5e8618 100644 > --- a/meta-networking/recipes-daemons/postfix/postfix.inc > +++ b/meta-networking/recipes-daemons/postfix/postfix.inc > @@ -219,9 +219,10 @@ do_install_append_class-target() { > sed -i 's:-fdebug-prefix-map[^ ]*::g; s:-- > sysroot=${STAGING_DIR_TARGET}::g' ${D}/etc/postfix/makedefs.out > } > > -ALTERNATIVE_${PN} = "sendmail" > -ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" > -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" > +ALTERNATIVE_${PN} += "mailq newaliases" > +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" > +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" > + > ALTERNATIVE_PRIORITY = "120" > > ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" > diff --git a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta- > networking/recipes-support/esmtp/esmtp_1.2.bb > index 2da73e7..9fb817b 100644 > --- a/meta-networking/recipes-support/esmtp/esmtp_1.2.bb > +++ b/meta-networking/recipes-support/esmtp/esmtp_1.2.bb > @@ -18,10 +18,10 @@ EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" > > inherit autotools update-alternatives > > -ALTERNATIVE_${PN} = "sendmail" > +ALTERNATIVE_${PN} += "mailq newaliases" > +ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" > +ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" > > -ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" > -ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" > ALTERNATIVE_PRIORITY = "10" > > ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" > -- > 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] python-pyzmq, python3-pyzmq: update to 17.1.0
Also the package is licensed under both BSD and LGPL-3.0. This the license checksum was updated to reflect this. Signed-off-by: Pascal Bach --- .../{python-pyzmq_14.7.0.bb => python-pyzmq.inc} | 17 +++- .../python/python-pyzmq/club-rpath-out.patch | 31 +++--- .../recipes-devtools/python/python-pyzmq_17.1.0.bb | 2 ++ .../python/python3-pyzmq_17.1.0.bb | 2 ++ 4 files changed, 23 insertions(+), 29 deletions(-) rename meta-python/recipes-devtools/python/{python-pyzmq_14.7.0.bb => python-pyzmq.inc} (58%) create mode 100644 meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb diff --git a/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb b/meta-python/recipes-devtools/python/python-pyzmq.inc similarity index 58% rename from meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb rename to meta-python/recipes-devtools/python/python-pyzmq.inc index b5baf82df..2447c2f34 100644 --- a/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb +++ b/meta-python/recipes-devtools/python/python-pyzmq.inc @@ -1,16 +1,19 @@ SUMMARY = "Pyzmq provides Zero message queue access for the Python language" HOMEPAGE = "http://zeromq.org/bindings:python"; -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e" +LICENSE = "BSD & LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ +file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" DEPENDS = "zeromq" -SRC_URI = "file://club-rpath-out.patch" -SRC_URI[md5sum] = "87e3abb33af5794db5ae85c667bbf324" -SRC_URI[sha256sum] = "77994f80360488e7153e64e5959dc5471531d1648e3a4bff14a714d074a38cc2" +FILESEXTRAPATHS_prepend := "${THISDIR}/python-pyzmq:" -inherit pypi setuptools pkgconfig +SRC_URI += "file://club-rpath-out.patch" +SRC_URI[md5sum] = "aecdfc328193fbd81f6dc23228319943" +SRC_URI[sha256sum] = "2199f753a230e26aec5238b0518b036780708a4c887d4944519681a920b9dee4" -RDEPENDS_${PN} += "python-multiprocessing" +inherit pypi pkgconfig + +RDEPENDS_${PN} += "${PYTHON_PN}-multiprocessing" FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" diff --git a/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch index 2dc3b73f9..936f16585 100644 --- a/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch +++ b/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch @@ -1,26 +1,13 @@ diff --git a/setup.py b/setup.py -index 62df445..1fdbdeb 100755 +index d243eaa..98099bc 100755 --- a/setup.py +++ b/setup.py -@@ -213,12 +213,6 @@ def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): - pass - # unused rpath args for OS X: - # settings['extra_link_args'] = ['-Wl,-rpath','-Wl,$ORIGIN/..'] --else: --settings['runtime_library_dirs'] += ['$ORIGIN/..'] --elif sys.platform != 'darwin': --settings['runtime_library_dirs'] += [ --os.path.abspath(x) for x in settings['library_dirs'] --] - - return settings +@@ -192,8 +192,6 @@ def _add_rpath(settings, path): + """ + if sys.platform == 'darwin': + settings['extra_link_args'].extend(['-Wl,-rpath','-Wl,%s' % path]) +-else: +-settings['runtime_library_dirs'].append(path) -@@ -592,8 +586,6 @@ class Configure(build_ext): - pass - # unused rpath args for OS X: - # settings['extra_link_args'] = ['-Wl,-rpath','-Wl,$ORIGIN/../zmq'] --else: --settings['runtime_library_dirs'] = [ os.path.abspath(pjoin('.', 'zmq')) ] - - line() - info("Configure: Autodetecting ZMQ settings...") + def settings_from_prefix(prefix=None, bundle_libzmq_dylib=False): + """load appropriate library/include settings from ZMQ prefix""" diff --git a/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb b/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb new file mode 100644 index 0..b690106bb --- /dev/null +++ b/meta-python/recipes-devtools/python/python-pyzmq_17.1.0.bb @@ -0,0 +1,2 @@ +require python-pyzmq.inc +inherit setuptools diff --git a/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb b/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb new file mode 100644 index 0..050f53af1 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyzmq_17.1.0.bb @@ -0,0 +1,2 @@ +require python-pyzmq.inc +inherit setuptools3 -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] cppzmq: use cmake to install the package
This way also the required cmake configs are installed so other packages can find it. It seems also cleaner to use the upstream mechanism than to have our own install script. Signed-off-by: Pascal Bach --- meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 4920bce8c..9aff59c6c 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -11,10 +11,7 @@ SRC_URI = "git://github.com/zeromq/cppzmq.git" S = "${WORKDIR}/git" -do_install () { -install -d ${D}/usr/include -install -m 0755 ${S}/zmq.hpp ${D}/usr/include/ -} +inherit cmake PACKAGES = "${PN}-dev" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel