[oe] [meta-oe][PATCH 7/7] breakpad: Fix build with musl/mips
Signed-off-by: Khem Raj--- .../breakpad/breakpad/mcontext.patch | 77 ++ .../breakpad/breakpad/mips_asm_sgidefs.patch | 9 ++- meta-oe/recipes-devtools/breakpad/breakpad_git.bb | 3 + 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch new file mode 100644 index 0..42e073b94 --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch @@ -0,0 +1,77 @@ +map the mcontext_t structure for musl + +Upstream-Status: Inappropriate[need to consider Android] + +Signed-off-by: Khem Raj +Index: git/src/client/linux/dump_writer_common/thread_info.cc +=== +--- git.orig/src/client/linux/dump_writer_common/thread_info.cc git/src/client/linux/dump_writer_common/thread_info.cc +@@ -229,7 +229,6 @@ void ThreadInfo::FillCPUContext(RawConte + } + + #elif defined(__mips__) +- + uintptr_t ThreadInfo::GetInstructionPointer() const { + return mcontext.pc; + } +@@ -263,8 +262,11 @@ void ThreadInfo::FillCPUContext(RawConte + out->cause = 0; // Not stored in mcontext + + for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) ++#ifdef __GLIBC__ + out->float_save.regs[i] = mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs; +- ++#else ++out->float_save.regs[i] = mcontext.fpregs[i]; ++#endif + out->float_save.fpcsr = mcontext.fpc_csr; + #if _MIPS_SIM == _ABIO32 + out->float_save.fir = mcontext.fpc_eir; +Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc +=== +--- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc git/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -247,8 +247,11 @@ void UContextReader::FillCPUContext(RawC + out->cause = 0; // Not reported in signal context. + + for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) ++#ifdef __GLIBC__ + out->float_save.regs[i] = uc->uc_mcontext.fpregs.fp_r.fp_dregs[i]; +- ++#else ++out->float_save.regs[i] = uc->uc_mcontext.fpregs[i]; ++#endif + out->float_save.fpcsr = uc->uc_mcontext.fpc_csr; + #if _MIPS_SIM == _ABIO32 + out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused. +Index: git/src/client/linux/minidump_writer/linux_core_dumper.cc +=== +--- git.orig/src/client/linux/minidump_writer/linux_core_dumper.cc git/src/client/linux/minidump_writer/linux_core_dumper.cc +@@ -196,7 +196,7 @@ bool LinuxCoreDumper::EnumerateThreads() + info.tgid = status->pr_pgrp; + info.ppid = status->pr_ppid; + #if defined(__mips__) +-#if defined(__ANDROID__) ++#if defined(__ANDROID__) || !defined(__GLIBC__) + for (int i = EF_R0; i <= EF_R31; i++) + info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; + #else // __ANDROID__ +Index: git/src/tools/linux/md2core/minidump-2-core.cc +=== +--- git.orig/src/tools/linux/md2core/minidump-2-core.cc git/src/tools/linux/md2core/minidump-2-core.cc +@@ -516,8 +516,12 @@ ParseThreadRegisters(CrashedProcess::Thr + thread->mcontext.lo3 = rawregs->lo[2]; + + for (int i = 0; i < MD_FLOATINGSAVEAREA_MIPS_FPR_COUNT; ++i) { ++#ifdef __GLIBC__ + thread->mcontext.fpregs.fp_r.fp_fregs[i]._fp_fregs = + rawregs->float_save.regs[i]; ++#else ++thread->mcontext.fpregs[i] = rawregs->float_save.regs[i]; ++#endif + } + + thread->mcontext.fpc_csr = rawregs->float_save.fpcsr; diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch index 678f63d74..19bb56044 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch +++ b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch @@ -2,7 +2,7 @@ Index: lss/linux_syscall_support.h === --- lss.orig/linux_syscall_support.h +++ lss/linux_syscall_support.h -@@ -118,15 +118,7 @@ extern "C" { +@@ -118,21 +118,13 @@ extern "C" { #include #ifdef __mips__ @@ -18,3 +18,10 @@ Index: lss/linux_syscall_support.h #endif #endif + /* The Android NDK's #defines these macros as aliases + * to their non-64 counterparts. To avoid naming conflict, remove them. */ +-#ifdef __ANDROID__ ++#if defined(__ANDROID__) || (defined(__linux__) && !defined(__glibc__)) + /* These are restored by the corresponding #pragma pop_macro near +* the end of this file. */ + # pragma push_macro("stat64") diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 1ddd6b565..a17759eb4 100644
[oe] [meta-oe][PATCH V3 6/7] leveldb: Fix parallel build
Add build parallelism, since we do not use oe_runmake Signed-off-by: Khem Raj--- Changes in V3: Fix parallel build .../leveldb/0001-Makefile-Fix-parallel-build.patch | 35 ++ meta-oe/recipes-extended/leveldb/leveldb_git.bb| 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch new file mode 100644 index 0..5068654e2 --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch @@ -0,0 +1,35 @@ +From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Sep 2017 17:47:02 -0700 +Subject: [PATCH] Makefile: Fix parallel build + +Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is +creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o + +Fixes error like + +| mkdir out-static +| mkdir out-shared/db +| Assembler messages: +| Fatal error: can't create out-shared/db/db_bench.o: No such file or directory + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: git/Makefile +=== +--- git.orig/Makefile git/Makefile +@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/wri + $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) + $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) + +-$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) ++$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) + $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) + + .PHONY: run-shared diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb index dfe4b459a..8fec89c6f 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb @@ -10,6 +10,7 @@ PV = "1.20+git${SRCPV}" SRC_URI = "git://github.com/google/${BPN}.git \ file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ file://0002-makefile-build-SHARED_MEMENVLIB.patch \ + file://0001-Makefile-Fix-parallel-build.patch \ " S = "${WORKDIR}/git" @@ -19,7 +20,7 @@ inherit utils do_compile() { # do not use oe_runmake. oe_runmake pass to make compilation arguments and override # leveldb makefile variable CFLAGS and broke leveldb build. -CFLAGS="${CFLAGS}" make || die +CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die } do_install() { -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 4/7] toybox: Upgrade to 0.7.4
enable parallel build Signed-off-by: Khem Raj--- .../recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb} | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) rename meta-oe/recipes-core/toybox/{toybox_0.7.3.bb => toybox_0.7.4.bb} (87%) diff --git a/meta-oe/recipes-core/toybox/toybox_0.7.3.bb b/meta-oe/recipes-core/toybox/toybox_0.7.4.bb similarity index 87% rename from meta-oe/recipes-core/toybox/toybox_0.7.3.bb rename to meta-oe/recipes-core/toybox/toybox_0.7.4.bb index 0cd44ff64..76a7af459 100644 --- a/meta-oe/recipes-core/toybox/toybox_0.7.3.bb +++ b/meta-oe/recipes-core/toybox/toybox_0.7.4.bb @@ -2,12 +2,10 @@ SUMMARY = "Toybox combines common utilities together into a single executable." HOMEPAGE = "http://www.landley.net/toybox/; DEPENDS = "attr" -SRC_URI = " \ -http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ +SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ " - -SRC_URI[md5sum] = "6fa2a001402cb067ba541e0d8948da50" -SRC_URI[sha256sum] = "e6469b508224e0d2e4564dda05c4bb47aef5c28bf29d6c983bcdc6e3a0cd29d6" +SRC_URI[md5sum] = "55ea59a31c7da9510c8fabe70f4bc561" +SRC_URI[sha256sum] = "49d74ca897501e5c981516719870fe08581726f5c018abe35ef52c6f0de113e7" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" @@ -16,7 +14,7 @@ SECTION = "base" TOYBOX_BIN = "generated/unstripped/toybox" -EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' +EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC}" CPUS=${@oe.utils.cpu_count()}' do_configure() { oe_runmake defconfig -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-gnome][PATCH 3/7] network-manager-applet: Disable gobject-introspection on musl
It segfaults qemu Signed-off-by: Khem Raj--- .../network-manager-applet/network-manager-applet_1.4.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb index 8cec305ef..14b336a1e 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.4.4.bb @@ -17,6 +17,8 @@ SRC_URI[archive.sha256sum] = "693846eeae0986e79eb1cedfbc499f132f27a9976ef189a0f1 PACKAGECONFIG[modemmanager] = "--with-wwan,--without-wwan,modemmanager" PACKAGECONFIG ??= "" +GI_DATA_ENABLED_libc-musl = "False" + do_configure_append() { # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror for i in $(find ${B} -name "Makefile") ; do -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/7] openl2tp: Fix build with musl/libtirpc
Signed-off-by: Khem Raj--- ...api.c-include-rpc-clnt.h-for-resultproc_t.patch | 31 ++ .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch new file mode 100644 index 0..a11a97ebd --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch @@ -0,0 +1,31 @@ +From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Sep 2017 13:05:03 -0700 +Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' + +Fixes + +| /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + l2tp_api.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/l2tp_api.c b/l2tp_api.c +index f0946fd..f77881c 100644 +--- a/l2tp_api.c b/l2tp_api.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + //#include + +-- +2.14.1 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 0395199e7..bbde8a337 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -36,6 +36,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ SRC_URI_append_libc-musl = "\ file://0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch \ file://0002-user-ipv6-structures.patch \ + file://0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch \ " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 5/7] nbench-byte: Update SRC_URI to fossies.org
Current SRC_URI responds with 404 Fix WARNING: nbench-byte-2.2.3-r0 do_fetch: Failed to fetch URL http://www.tux.org/~mayer/linux/nbench-byte-2.2.3.tar.gz, attempting MIRRORS if available Signed-off-by: Khem Raj--- meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb index 56272d985..da2cb4b32 100644 --- a/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +++ b/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb @@ -1,3 +1,4 @@ +SUMMARY = "A CPU benchmark utility" DESCRIPTION = "BYTE Magazine's native benchmarks (also called BYTEmark) \ designed to expose the capabilities of a system's CPU, FPU, \ and memory system." @@ -6,7 +7,7 @@ LICENSE = "nbench-byte" LIC_FILES_CHKSUM = "file://README;beginline=57;endline=66;md5=020ef579f8fa5746b7e307a54707834f" SECTION = "console/utils" -SRC_URI = "http://www.tux.org/~mayer/linux/${BP}.tar.gz \ +SRC_URI = "https://fossies.org/linux/misc/${BP}.tar.gz \ file://nbench_32bits.patch \ file://Makefile-add-more-dependencies-to-pointer.h.patch" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/7] yp-tools: Ignore cpp warnings as errors
-Wno-error=\#Warnings is too clang'ish, gcc doesnt like it use an option that common for both compilers Signed-off-by: Khem Raj--- meta-networking/recipes-support/nis/yp-tools_4.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb index a3f0a7698..9ac973812 100644 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.2.bb @@ -33,7 +33,7 @@ CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" EXTRA_OECONF = " \ --disable-rpath --disable-domainname \ " -CFLAGS_append_libc-musl = " -Wno-error=\#warnings" +CFLAGS_append_libc-musl = " -Wno-error=cpp" FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH V2 2/5] leveldb: Fix build with clang
On Wed, Sep 13, 2017 at 2:33 AM, Martin Jansawrote: > I'm keeping this one in master-next for a bit longer because in some builds > I've seen some issues which might be caused by enabled parallelism. > > The log doesn't show much, the only error is: > > Assembler messages: > Fatal error: can't create out-shared/db/db_bench.o: No such file or > directory > mkdir out-shared/db > > So I've removed the parallelism part from this change and re-running the > builds. I have reproduced this issue. I have a potential fix. I will send a v3 tonight > > On Thu, Sep 7, 2017 at 5:57 AM, Khem Raj wrote: >> >> Add build parallelism, since we do not use oe_runmake >> >> Signed-off-by: Khem Raj >> Signed-off-by: Martin Jansa >> --- >> ...uild_detect_platform-Check-for-__SSE4_2__.patch | 36 >> ++ >> .../0002-makefile-build-SHARED_MEMENVLIB.patch | 43 >> ++ >> meta-oe/recipes-extended/leveldb/leveldb_git.bb| 6 ++- >> 3 files changed, 83 insertions(+), 2 deletions(-) >> create mode 100644 >> meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch >> create mode 100644 >> meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch >> >> diff --git >> a/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch >> b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch >> new file mode 100644 >> index 0..bbabf688d >> --- /dev/null >> +++ >> b/meta-oe/recipes-extended/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch >> @@ -0,0 +1,36 @@ >> +From 5fd0918df2bb30e8f3edb2ee895d178edbf26f40 Mon Sep 17 00:00:00 2001 >> +From: Khem Raj >> +Date: Mon, 4 Sep 2017 22:38:03 -0700 >> +Subject: [PATCH 1/2] build_detect_platform: Check for __SSE4_2__ >> + >> +just using -msse4.2 is not enough, especially with clang >> +where it may accept -msse4.2 even during cross compiling >> +for say arm, however the difference is that builtin defines >> +wont be defined. >> + >> +Signed-off-by: Khem Raj >> +--- >> +Upstream-Status: Pending >> + >> + build_detect_platform | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +Index: git/build_detect_platform >> +=== >> +--- git.orig/build_detect_platform >> git/build_detect_platform >> +@@ -230,13 +230,12 @@ EOF >> + rm -f $CXXOUTPUT 2>/dev/null >> + >> + # Test if gcc SSE 4.2 is supported >> +-$CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null <> ++$CXX $CXXFLAGS -Werror -x c++ - -o $CXXOUTPUT -msse4.2 -dD -E >> 2>/dev/null | fgrep __SSE4_2__ $CXXOUTPUT 2>/dev/null <> + int main() {} >> + EOF >> + if [ "$?" = 0 ]; then >> + PLATFORM_SSEFLAGS="-msse4.2" >> + fi >> +- >> + rm -f $CXXOUTPUT 2>/dev/null >> + fi >> + >> diff --git >> a/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch >> b/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch >> new file mode 100644 >> index 0..fc708b23a >> --- /dev/null >> +++ >> b/meta-oe/recipes-extended/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch >> @@ -0,0 +1,43 @@ >> +From 1ed8cec1fcf666904bb3ebd29fc85e235b72d122 Mon Sep 17 00:00:00 2001 >> +From: Khem Raj >> +Date: Mon, 4 Sep 2017 22:40:49 -0700 >> +Subject: [PATCH 2/2] makefile: build SHARED_MEMENVLIB >> + >> +Signed-off-by: Khem Raj >> +--- >> +Upstream-Status: Pending >> + >> + Makefile | 6 +++--- >> + 1 file changed, 3 insertions(+), 3 deletions(-) >> + >> +diff --git a/Makefile b/Makefile >> +index f7cc7d7..cb42278 100644 >> +--- a/Makefile >> b/Makefile >> +@@ -126,12 +126,12 @@ SHARED_VERSION_MINOR = 20 >> + SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT) >> + SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR) >> + SHARED_LIB3 = >> $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) >> +-SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) >> $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) >> ++SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) >> $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) >> $(SHARED_MEMENVLIB) >> + $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3) >> + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1) >> + $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3) >> + ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2) >> +-SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a >> ++SHARED_MEMENVLIB = >> $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR) >> + endif >> + >> + $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) >> +@@ -294,7 +294,7 @@ endif >> +
Re: [oe] chromium detected as stripped
On Wed, Sep 20, 2017 at 1:43 PM, Trevor Woernerwrote: > When I compile chromium61 with pyro, I get a strange error. Every time the > python wrapper (gcc_link_wrapper.py) is called for a native compile (g++), I > get: ... > This happens with both qemux86-64 and raspberrypi3. Unfortunately those log > files are 18M and 19M each, so I won't be attaching them. Why can't my build > find 'ld'? That seems quite strange. Probably some kind of ld vs gold issue? > I'm not using gold anywhere and have not enabled it, are you using gold? Turns out, I had to install binutils-gold on my host for this to work. Which suggests a hiccup in the build. Maybe the build needs to tweak the python wrapper? (As if using ninja and gn weren't enough, the build also wants to use a wrapper to call the compiler?!) This still leaves the problem with my builds against master. I tried downgrading the compiler to 6%, but that causes a build issue in mesa, so the build can't even get close to chromium to see if that compile can succeed with gcc-6 instead of the default gcc-7. The regular procedure is to add things to master, then backport them to various branches if appropriate. If we can't get master to work, there won't be anything to backport. In any case meta-browser currently doesn't have a pyro branch. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/1] lvm2: disable thin provisioning support if GPLv3 incompatible
On Thu, Sep 21, 2017 at 7:16 AM, Khem Rajwrote: > On Wed, Sep 20, 2017 at 11:47 PM, wrote: >> From: Kai Kang >> >> Disable thin provisioning support for lvm2 if it is set GPLv3 >> incompatible. >> >> Signed-off-by: Kai Kang >> --- >> meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc >> b/meta-oe/recipes-support/lvm2/lvm2.inc >> index ab8db9cba..9791554a9 100644 >> --- a/meta-oe/recipes-support/lvm2/lvm2.inc >> +++ b/meta-oe/recipes-support/lvm2/lvm2.inc >> @@ -23,7 +23,7 @@ inherit autotools-brokensep pkgconfig systemd >> LVM2_PACKAGECONFIG = "dmeventd lvmetad" >> LVM2_PACKAGECONFIG_append_class-target = " \ >> ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ >> -thin-provisioning-tools \ >> +${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', >> 'thin-provisioning-tools', d)} \ >> udev \ >> " > there are other strings like GPL-3.0, as well as other types of GPL 3 > derivative licenses, I wonder if this will work for all Perhaps something like: ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} would work more reliably? > ___ > 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
Re: [oe] [meta-qt5][PATCH] qt5: add missing commercial license
(Sorry for duplicate emails. I thought those were not delivered.) I agree on clearing up complex logical expressions of licenses. But I think it's another topic because it would need wider updates including the other packages unrelated to commercial license fix. What about discussing about it on new thread after this patch? Regards, Kwangsub > -Original Message- > From: Christian Gagneraud [mailto:chg...@gmail.com] > Sent: Thursday, September 21, 2017 7:00 PM > To: Kwangsub Kim> Cc: openembedded-devel@lists.openembedded.org > Subject: Re: [oe] [meta-qt5][PATCH] qt5: add missing commercial license > > On 21 September 2017 at 14:40, Kwangsub Kim wrote: > [...] > > diff --git a/recipes-qt/qt5/qtserialport_git.bb > > b/recipes-qt/qt5/qtserialport_git.bb > > index 056e237..23f03ce 100644 > > --- a/recipes-qt/qt5/qtserialport_git.bb > > +++ b/recipes-qt/qt5/qtserialport_git.bb > > @@ -3,7 +3,7 @@ require qt5-git.inc > > > > # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different > > than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & > > (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" > > +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL- > Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" > > Explicit brackets would be nice to disambiguate & and | precedence. > > are we talking, eg: > > (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1) | LGPL-3.0 > > or > > GFDL-1.3 & (BSD & (LGPL-2.1 & (The-Qt-Company-Qt-LGPL-Exception-1.1 | > LGPL-3.0)) | The-Qt-Company-Commercial) > > whatever the answer is, more explicit bracketing would make it more > obvious to tedious readers, but maybe at the expense of readability (if > that makes sense). > > I don't know which part of the code is in charge of evaluating these > expressions, is it eg.: > http://en.cppreference.com/w/cpp/language/operator_precedence, > https://docs.python.org/3/reference/expressions.html#operator-precedence, > or bitbake own sauce > > I think licensing is important to get right, clear and reliable. > > Chris -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] luajit: create developer symlinks
On Thu, Sep 21, 2017 at 5:01 AM, Pascal Bachwrote: > LuaJIT tries to call ldconfig during installation which doesn't work. Presumably this stopped working recently (since host tools now need to be whitelisted and ldconfig is not included in HOSTTOOLS)? If so, maybe mention that in the commit message. > This causes the .so and .so.2 symlinks to no be created. > > By setting "LDCONFIG= :" the call will be skipped the same as on Darwin > > Signed-off-by: Pascal Bach > --- > meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb > b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb > index d7477ed..1e06e34 100644 > --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb > +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb > @@ -52,6 +52,7 @@ EXTRA_OEMAKE = "\ > \ > 'PREFIX=${prefix}' \ > 'MULTILIB=${baselib}' \ > +'LDCONFIG= :' \ > " > > do_compile () { > -- > 2.1.4 > > -- > ___ > 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
Re: [oe] [PATCH 1/1] lvm2: disable thin provisioning support if GPLv3 incompatible
On Wed, Sep 20, 2017 at 11:47 PM,wrote: > From: Kai Kang > > Disable thin provisioning support for lvm2 if it is set GPLv3 > incompatible. > > Signed-off-by: Kai Kang > --- > meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc > b/meta-oe/recipes-support/lvm2/lvm2.inc > index ab8db9cba..9791554a9 100644 > --- a/meta-oe/recipes-support/lvm2/lvm2.inc > +++ b/meta-oe/recipes-support/lvm2/lvm2.inc > @@ -23,7 +23,7 @@ inherit autotools-brokensep pkgconfig systemd > LVM2_PACKAGECONFIG = "dmeventd lvmetad" > LVM2_PACKAGECONFIG_append_class-target = " \ > ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ > -thin-provisioning-tools \ > +${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', > 'thin-provisioning-tools', d)} \ > udev \ > " there are other strings like GPL-3.0, as well as other types of GPL 3 derivative licenses, I wonder if this will work for all -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [morty][PATCH 1/2] lftp: change SRC_URI source
On 09/21/2017 02:59 AM, Martin Jansa wrote: > From: Oleksandr Kravchuk> > Changed SRC_URI source to official web-site, which keeps tarballs with > old releases. > > Cherry-picked from master, but without the upgrade to 4.7.5. Both in stagging. Thanks, Armin > > commit a2e075ba656a89da58ca4f849c2f08ec6d50a96f > Author: Oleksandr Kravchuk > Date: Mon Jan 9 15:34:07 2017 +0100 > > lftp: update to 4.7.5 and change SRC_URI source > > Updated lftp to version 4.7.5 and changed SRC_URI source to official > web-site, which keeps tarballs with old releases. > > Signed-off-by: Oleksandr Kravchuk > Signed-off-by: Martin Jansa > Signed-off-by: Joe MacDonald > Signed-off-by: Martin Jansa > --- > meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb > b/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb > index 287821194..d62453745 100644 > --- a/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb > +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb > @@ -6,7 +6,7 @@ SECTION = "console/network" > LICENSE = "GPLv3" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > -SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \ > +SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.gz \ > file://fix-gcc-6-conflicts-signbit.patch \ >" > SRC_URI[md5sum] = "8eb1fe5f113126b60f172643c7f6c2e6" -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] luajit: create developer symlinks
LuaJIT tries to call ldconfig during installation which doesn't work. This causes the .so and .so.2 symlinks to no be created. By setting "LDCONFIG= :" the call will be skipped the same as on Darwin Signed-off-by: Pascal Bach--- meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb index d7477ed..1e06e34 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb @@ -52,6 +52,7 @@ EXTRA_OEMAKE = "\ \ 'PREFIX=${prefix}' \ 'MULTILIB=${baselib}' \ +'LDCONFIG= :' \ " do_compile () { -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add missing commercial license
Signed-off-by: Kwangsub Kim--- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c354db4..0cb75a6 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-2.0" +LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 25cd72b..f46cbc2 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-3.0" +LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d3447ef..26881f0 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 471cfee..3737e10 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 19f895e..0aebbd3 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e123f0d..4b2924b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \ diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d3a83a7..0b30043 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)" +LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 056e237..23f03ce 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,7 +3,7 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: add missing commercial license
On 21 September 2017 at 14:40, Kwangsub Kimwrote: [...] > diff --git a/recipes-qt/qt5/qtserialport_git.bb > b/recipes-qt/qt5/qtserialport_git.bb > index 056e237..23f03ce 100644 > --- a/recipes-qt/qt5/qtserialport_git.bb > +++ b/recipes-qt/qt5/qtserialport_git.bb > @@ -3,7 +3,7 @@ require qt5-git.inc > > # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what > # other qt* components use :/ > -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 > | LGPL-3.0)" > +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 > | LGPL-3.0) | The-Qt-Company-Commercial" Explicit brackets would be nice to disambiguate & and | precedence. are we talking, eg: (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1) | LGPL-3.0 or GFDL-1.3 & (BSD & (LGPL-2.1 & (The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)) | The-Qt-Company-Commercial) whatever the answer is, more explicit bracketing would make it more obvious to tedious readers, but maybe at the expense of readability (if that makes sense). I don't know which part of the code is in charge of evaluating these expressions, is it eg.: http://en.cppreference.com/w/cpp/language/operator_precedence, https://docs.python.org/3/reference/expressions.html#operator-precedence, or bitbake own sauce I think licensing is important to get right, clear and reliable. Chris -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] please merge morty-next to morty
Hi Armin, merged. I've resent 2 more changes which were pending for morty. I've also refreshed pyro-next based on your last request. Regards, On Wed, Sep 20, 2017 at 6:14 AM, akuster808wrote: > Hello Martin, > > If there are no outstanding issues with what is in next, can you please > merge it to morty? > > Yes, I have not addressed the vlc package issue. > > > Kind regards, > > Armin > > > > -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [morty][PATCH 2/2] opensaf: fix QA Issue
From: "dengke...@windriver.com"Move the do_sysvinit_install contents to do_install_append. Signed-off-by: Dengke Du Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb index da9c10520..6ceb225e9 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb @@ -53,6 +53,11 @@ do_install_append() { install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system + +if [ ! -d "${D}${sysconfdir}/init.d" ]; then +install -d ${D}${sysconfdir}/init.d +install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ +fi } FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" @@ -62,12 +67,3 @@ INSANE_SKIP_${PN} = "dev-so" RDEPENDS_${PN} += "bash python" -do_sysvinit_install() { -if [ ! -d "${D}${sysconfdir}/init.d" ]; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ -fi -} - -addtask sysvinit_install after do_install before do_package - -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [morty][PATCH 1/2] lftp: change SRC_URI source
From: Oleksandr KravchukChanged SRC_URI source to official web-site, which keeps tarballs with old releases. Cherry-picked from master, but without the upgrade to 4.7.5. commit a2e075ba656a89da58ca4f849c2f08ec6d50a96f Author: Oleksandr Kravchuk Date: Mon Jan 9 15:34:07 2017 +0100 lftp: update to 4.7.5 and change SRC_URI source Updated lftp to version 4.7.5 and changed SRC_URI source to official web-site, which keeps tarballs with old releases. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald Signed-off-by: Martin Jansa --- meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb b/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb index 287821194..d62453745 100644 --- a/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb +++ b/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb @@ -6,7 +6,7 @@ SECTION = "console/network" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \ +SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.gz \ file://fix-gcc-6-conflicts-signbit.patch \ " SRC_URI[md5sum] = "8eb1fe5f113126b60f172643c7f6c2e6" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add missing commercial license
Signed-off-by: Kwangsub Kim--- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c354db4..0cb75a6 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-2.0" +LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 25cd72b..f46cbc2 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-3.0" +LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d3447ef..26881f0 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 471cfee..3737e10 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 19f895e..0aebbd3 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e123f0d..4b2924b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \ diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d3a83a7..0b30043 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)" +LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 056e237..23f03ce 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,7 +3,7 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add missing commercial license
Signed-off-by: Kwangsub Kim--- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index c354db4..0cb75a6 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-2.0" +LICENSE = "LGPL-3.0 | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 25cd72b..f46cbc2 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-3.0" +LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d3447ef..26881f0 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 471cfee..3737e10 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 19f895e..0aebbd3 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e123f0d..4b2924b 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" +LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \ diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index d3a83a7..0b30043 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+)" +LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 056e237..23f03ce 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,7 +3,7 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] cpupower: add a new recipe
cpupower is a tool to show and set processor power related values. In addition, it allows to run in-kernel selftests intel_pstate test. The recipe is based on the initial work from Roy Li: https://patchwork.openembedded.org/patch/118911/ Signed-off-by: Fathi Boudra --- meta-oe/recipes-kernel/cpupower/cpupower.bb | 36 + 1 file changed, 36 insertions(+) create mode 100644 meta-oe/recipes-kernel/cpupower/cpupower.bb diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-oe/recipes-kernel/cpupower/cpupower.bb new file mode 100644 index 0..c963c8ef9 --- /dev/null +++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb @@ -0,0 +1,36 @@ +SUMMARY = "Shows and sets processor power related values" +DESCRIPTION = "cpupower is a collection of tools to examine and tune power \ +saving related features of your processor." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" +DEPENDS = "pciutils" +PROVIDES = "virtual/cpupower" + +inherit kernelsrc kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +EXTRA_OEMAKE = "-C ${S}/tools/power/cpupower O=${B} CROSS=${TARGET_PREFIX} CC="${CC}" LD="${LD}" AR=${AR} ARCH=${ARCH}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +do_compile() { +oe_runmake +} + +do_install() { +oe_runmake DESTDIR=${D} install +# Do not ship headers +rm -rf ${D}${includedir} +chown -R root:root ${D} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RDEPENDS_${PN} = "bash" + +python do_package_prepend() { +d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0]) +} + +B = "${WORKDIR}/${BPN}-${PV}" -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] lvm2: fix start lvm2-monitor.service failed
While systemd based, start lvm2-monitor.service failed. ... |Sep 21 05:37:34 qemux86-64 lvm[389]: /var/lock: stat failed: No such file or directory |Sep 21 05:37:34 qemux86-64 systemd[1]: lvm2-monitor.service: Main process exited, code=exited, status=5/NOTINSTALLED ... The failure of lvm2-monitor.service caused reboot hung when disk partion is lvm thin provision. While starting lvm2-monitor.service, it reqires the existence of locking dir "/var/lock" which is a symlink to "../run/lock" in oe-core, and "/run" is created in "/etc/fstab" which have to be be after the start of lvm2-monitor.service. So tweak the locking dir to "/tmp/lock" and make sure the dir existence (after tmp.mount). Signed-off-by: Hongxu Jia--- ...tart-lvm2-monitor.service-after-tmp.mount.patch | 32 ++ meta-oe/recipes-support/lvm2/files/lvm.conf| 2 +- meta-oe/recipes-support/lvm2/lvm2.inc | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch new file mode 100644 index 000..0e68d62 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -0,0 +1,32 @@ +From 24a2c47fd01dde1710f1fa66f5c30ce7010c5956 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Thu, 21 Sep 2017 15:28:10 +0800 +Subject: [PATCH] start lvm2-monitor.service after tmp.mount + +The lvm2-monitor.service reqires the existence of locking_dir +("/tmp/lock/lvm"), and unit tmp.mount is to mount /tmp. +So start lvm2-monitor.service after tmp.mount + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in +index 22238b7..93b2bee 100644 +--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in +@@ -2,7 +2,7 @@ + Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling + Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) + Requires=dm-event.socket lvm2-lvmetad.socket +-After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service ++After=dm-event.socket dm-event.service lvm2-lvmetad.socket lvm2-activation.service lvm2-lvmetad.service tmp.mount + Before=local-fs-pre.target + DefaultDependencies=no + Conflicts=shutdown.target +-- +1.8.3.1 + diff --git a/meta-oe/recipes-support/lvm2/files/lvm.conf b/meta-oe/recipes-support/lvm2/files/lvm.conf index 9e3b5fe..c2bb85d 100644 --- a/meta-oe/recipes-support/lvm2/files/lvm.conf +++ b/meta-oe/recipes-support/lvm2/files/lvm.conf @@ -214,7 +214,7 @@ global { # Local non-LV directory that holds file-based locks while commands are # in progress. A directory like /tmp that may get wiped on reboot is OK. -locking_dir = "/var/lock/lvm" +locking_dir = "/tmp/lock/lvm" # Other entries can go here to allow you to load shared libraries # e.g. if support for LVM1 metadata was compiled as a shared library use diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index ab8db9c..f0859ef 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,6 +15,7 @@ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ + file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ " S = "${WORKDIR}/LVM2.${PV}" -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/1] lvm2: disable thin provisioning support if GPLv3 incompatible
From: Kai KangDisable thin provisioning support for lvm2 if it is set GPLv3 incompatible. Signed-off-by: Kai Kang --- meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index ab8db9cba..9791554a9 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -23,7 +23,7 @@ inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd lvmetad" LVM2_PACKAGECONFIG_append_class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ -thin-provisioning-tools \ +${@bb.utils.contains('INCOMPATIBLE_LICENSE', 'GPLv3', '', 'thin-provisioning-tools', d)} \ udev \ " -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 0/1] lvm2: disable thin provisioning support if GPLv3 incompatible
From: Kai KangTest steps: 1 add layer meta-gplv2 to conf/bblayers.conf 2 echo INCOMPATIBLE_LICENSE += \"GPLv3 LGPLv3 GPLv3+ LGPLv3+ AGPL-3.0\" >> conf/local.conf 3 bitbake lvm2 Without the patch, lvm2 fails with: ERROR: Nothing RPROVIDES 'thin-provisioning-tools' (but /buildarea2/kkang/Yocto/repo/meta-openembedded/meta-oe /recipes-support/lvm2/lvm2_2.02.171.bb, /buildarea2/kkang/Yocto/repo/meta-openembedded/meta-oe/recipes-support /lvm2/libdevmapper_2.02.171.bb RDEPENDS on or otherwise requires it) thin-provisioning-tools was skipped: it has an incompatible license: GPLv3 NOTE: Runtime target 'thin-provisioning-tools' is unbuildable, removing... Missing or unbuildable dependency chain was: ['thin-provisioning-tools'] ERROR: Required build target 'lvm2' has no buildable providers. Missing or unbuildable dependency chain was: ['lvm2', 'thin-provisioning-tools'] Kai Kang (1): lvm2: disable thin provisioning support if GPLv3 incompatible meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] byacc: Add HOMEPAGE info into recipe file.
copy byacc from meta to meta-oe. Signed-off-by: Huang Qiyu--- meta-oe/recipes-extended/byacc/byacc.inc | 23 +++ .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 161 + .../recipes-extended/byacc/byacc/byacc-open.patch | 25 meta-oe/recipes-extended/byacc/byacc_20170201.bb | 12 ++ 4 files changed, 221 insertions(+) create mode 100644 meta-oe/recipes-extended/byacc/byacc.inc create mode 100644 meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch create mode 100644 meta-oe/recipes-extended/byacc/byacc/byacc-open.patch create mode 100644 meta-oe/recipes-extended/byacc/byacc_20170201.bb diff --git a/meta-oe/recipes-extended/byacc/byacc.inc b/meta-oe/recipes-extended/byacc/byacc.inc new file mode 100644 index 000..9bdafd2 --- /dev/null +++ b/meta-oe/recipes-extended/byacc/byacc.inc @@ -0,0 +1,23 @@ +SUMMARY = "Berkeley LALR Yacc parser generator" +HOMEPAGE = "http://invisible-island.net/byacc/; +DESCRIPTION = "A parser generator utility that reads a grammar specification from a file and generates an LR(1) \ +parser for it. The parsers consist of a set of LALR(1) parsing tables and a driver routine written in the C \ +programming language." +SECTION = "devel" +LICENSE = "PD" + +SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz \ + file://byacc-open.patch \ + file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch" + +EXTRA_OECONF += "--program-transform-name='s,^,b,'" + +BBCLASSEXTEND = "native" + +inherit autotools + +do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} diff --git a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch new file mode 100644 index 000..7cd2510 --- /dev/null +++ b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -0,0 +1,161 @@ +Subject: byacc: do not reorder $CC and $CFLAGS + +byacc tries to process $CC and decide which part should belong to CC and which +part should below to CFLAGS and then do reordering. It doesn't make much sense +for OE. And it doesn't do its work correctly. Some options are dropped. + +Delete all these stuff so that we could have all options we need. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi +--- + aclocal.m4 | 1 - + configure | 119 - + 2 files changed, 120 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 917a848..62ef241 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -1021,7 +1021,6 @@ CF_GCC_VERSION + CF_ACVERSION_CHECK(2.52, + [AC_PROG_CC_STDC], + [CF_ANSI_CC_REQD]) +-CF_CC_ENV_FLAGS + ])dnl + dnl --- + dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 +diff --git a/configure b/configure +index 9707e50..4f0497c 100755 +--- a/configure b/configure +@@ -1946,125 +1946,6 @@ esac + # This should have been defined by AC_PROG_CC + : ${CC:=cc} + +-echo "$as_me:1949: checking \$CC variable" >&5 +-echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 +-case "$CC" in +-(*[\ \]-*) +- echo "$as_me:1953: result: broken" >&5 +-echo "${ECHO_T}broken" >&6 +- { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +-echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} +- # humor him... +- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` +- CC=`echo "$CC " | sed -e 's/[ ]-[^].*$//' -e 's/[ ]*$//'` +- for cf_arg in $cf_flags +- do +- case "x$cf_arg" in +- (x-[IUDfgOW]*) +- +-cf_fix_cppflags=no +-cf_new_cflags= +-cf_new_cppflags= +-cf_new_extra_cppflags= +- +-for cf_add_cflags in $cf_flags +-do +-case $cf_fix_cppflags in +-(no) +- case $cf_add_cflags in +- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) +- case $cf_add_cflags in +- (-D*) +- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +- +- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=yes +- +- if test $cf_fix_cppflags = yes ; then +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- continue +- elif test "${cf_tst_cflags}" = "\"'" ; then +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +-
[oe] [meta-oe][PATCH] dfu-util: Add HOMEPAGE info into recipe file.
Signed-off-by: Huang Qiyu--- meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb index 01bca22..76e1552 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb @@ -1,4 +1,5 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" +HOMEPAGE = "http://dfu-util.sourceforge.net; SECTION = "devel" AUTHOR = "Harald Welte " LICENSE = "GPLv2" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel