Re: [OE-core] KERNEL_IMAGETYPES and Image.gz
On 2017/06/03 4:18, nicolas.deche...@linaro.org (Nicolas Dechesne) wrote: Le ven. 2 juin 2017 ? 20:32, Kunihiko Hayashi < hayashi.kunih...@socionext.com> a ?crit : On 2017/06/03 1:24, nicolas.deche...@linaro.org (Nicolas Dechesne) wrote: On Fri, Jun 2, 2017 at 6:16 PM, Kunihiko Hayashiwrote: I already suggested the patch to solve this issue. https://patchwork.openembedded.org/patch/138596/ Although I've not received any comments on this yet, could you try to apply it? thanks for sending this out. Well, unfortunately, I think your patch is doing something wrong. As discussed earlier on that thread, we should be using kernel Makefile to generate the target as much as possible. The linux build system can generate vmlinux, Image and Image.gz, but not vmlinux.gz. So we should compress only vmlinux 'outside' of the linux build system, and for Image.gz we shouldn't do that in OE. In other words, Image.gz should be included in typeformake. Your patch does not do that, and that is something which is taken care by mine. Surely we should use Image.gz generated by kernel build system and my patch doesn't do that. I also think that OE should compress only images that the kernel build system doesn't generate. Sorry my patch won't help. No problem. Can you please review and tes this one then, and provide feedback? Yes. I'll try your suggestion and put feedback after the patch mail. Best Regards, Kunihiko Hayashi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][PATCH 1/1] tcf-agent: correct CFLAGS
On Fri, Jun 2, 2017 at 4:07 PM, Joe Slaterwrote: > Modify CFLAGS for several cases which will not compile otherwise. > Do not use the form CFLAGS_x_append because it will replace, not > append to CFLAGS for override x. actually the reason is that override and _append are exchanged. I see the issue too here. I sent a patch just to fix the space issue but this patch is better with one exception. please call the new variable with call uppercase. > > Signed-off-by: Joe Slater > --- > meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 17 + > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb > b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb > index 1dad825..5558a59 100644 > --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb > +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb > @@ -35,17 +35,18 @@ MAKE_OS = "`echo ${TARGET_OS} | sed > s,^linux.*,GNU/Linux,`" > > EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" > > -# These features don't compile on mips and libc-musl > -CFLAGS_mips_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ > --DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ > --DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" > -CFLAGS_mips64_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ > --DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ > --DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" > -CFLAGS_append_libc-musl = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ > +lcl_stop_services = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ > -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ > -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" > > + > +# These features don't compile for several cases. > +# > +CFLAGS_append_mips = " ${lcl_stop_services}" > +CFLAGS_append_mips64 = " ${lcl_stop_services}" > +CFLAGS_append_libc-musl = " ${lcl_stop_services}" > +CFLAGS_append_powerpc64 = " ${lcl_stop_services}" > + > do_install() { > oe_runmake install INSTALLROOT=${D} > install -d ${D}${sysconfdir}/init.d/ > -- > 2.7.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/1] tcf-agent: correct CFLAGS
Modify CFLAGS for several cases which will not compile otherwise. Do not use the form CFLAGS_x_append because it will replace, not append to CFLAGS for override x. Signed-off-by: Joe Slater--- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 1dad825..5558a59 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -35,17 +35,18 @@ MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" -# These features don't compile on mips and libc-musl -CFLAGS_mips_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ --DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ --DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_mips64_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ --DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ --DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_append_libc-musl = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +lcl_stop_services = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" + +# These features don't compile for several cases. +# +CFLAGS_append_mips = " ${lcl_stop_services}" +CFLAGS_append_mips64 = " ${lcl_stop_services}" +CFLAGS_append_libc-musl = " ${lcl_stop_services}" +CFLAGS_append_powerpc64 = " ${lcl_stop_services}" + do_install() { oe_runmake install INSTALLROOT=${D} install -d ${D}${sysconfdir}/init.d/ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Multi-threaded RPM support
I did get a laugh when this showed up in my mail client screen as: "Multi-threaded RP" :) Seriously, I am looking forward to trying and hopefully merging this, should make for some nice speedups. Cheers, RP -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] Multi-threaded RPM support
Alex, I get this when bitbake core-image-minimal http://errors.yoctoproject.org/Errors/Build/38347/ HEAD is at http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=akanavin/parallel-rpm On Thu, 2017-06-01 at 20:37 +0300, Alexander Kanavin wrote: > On 06/01/2017 08:13 PM, Mark Hatle wrote: > >>> perl > >>> before: 1m19s 63M > >>> after: 55s 42M > >>> > >>> python3 > >>> before: 40s 38M > >>> after: 28s 24M > >> > >> it is interesting to see that perl and python does not benefit 'much'. > >> buildstats should give us a better picture per recipe. > > > > This may be due to how we process rpmdeps within OpenEmbedded.. but I'm not > > sure. I'd have expected a bigger time difference with large packages (lots > > of > > sub packages) like perl and python3. > > The numbers include the overhead of starting bitbake (some 10 seconds). > Subtract that (from both 'before' and 'after') and then it's more > impressive :) I tested via > > time bitbake -f -c do_package_write_rpm perl > > Alex > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/15] libidn: Fix hardened build with musl
Armin Please backport this patch to pyro as well. On Sun, May 21, 2017 at 10:00 PM, Khem Rajwrote: > Re-introduce the patch that was deemed to be not needed > but it infact is still needed with musl > > Signed-off-by: Khem Raj > --- > .../libidn/0001-idn-format-security-warnings.patch | 181 > + > meta/recipes-extended/libidn/libidn_1.33.bb| 1 + > 2 files changed, 182 insertions(+) > create mode 100644 > meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch > > diff --git > a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch > b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch > new file mode 100644 > index 00..5adc7d9fd9 > --- /dev/null > +++ > b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch > @@ -0,0 +1,181 @@ > +From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= > +Date: Tue, 28 Jun 2016 12:43:31 +0100 > +Subject: [PATCH] idn: fix printf() format security warnings > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +| ../../libidn-1.32/src/idn.c: In function 'main': > +| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and > no format arguments [-Werror=format-security] > +|error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be > specified")); > +|^ > +| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and > no format arguments [-Werror=format-security] > +| fprintf (stderr, _("Type each input string on a line by itself, " > +| ^~~ > +| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and > no format arguments [-Werror=format-security] > +| error (EXIT_FAILURE, errno, _("input error")); > +| ^ > +| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > +| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > +| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > +| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UCS-4 to UTF-8")); > +| ^ > +| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UCS-4 to UTF-8")); > +| ^ > +| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UCS-4 to UTF-8")); > +| ^ > +| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > +| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > +| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and > no format arguments [-Werror=format-security] > +| error (EXIT_FAILURE, 0, _("could not do NFKC normalization")); > +| ^ > +| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and > no format arguments [-Werror=format-security] > +| _("could not convert from UTF-8 to UCS-4")); > +| ^ > + > +Signed-off-by: André Draszik > +--- > +Upstream-Status: Pending > + > + src/idn.c | 27 ++- > + 1 file changed, 14 insertions(+), 13 deletions(-) > + > +diff --git a/src/idn.c b/src/idn.c > +index be1c7d1..68e4291 100644 > +--- a/src/idn.c > b/src/idn.c > +@@ -170,7 +170,7 @@ main (int argc, char *argv[]) > + (args_info.idna_to_unicode_given ? 1 : 0) + > + (args_info.nfkc_given ? 1 : 0) != 1) > + { > +- error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be > specified")); > ++ error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be > specified")); > + usage (EXIT_FAILURE); > + } > + > +@@ -185,7 +185,7 @@ main (int argc, char *argv[]) > + if (!args_info.quiet_given > + && args_info.inputs_num == 0 > + && isatty (fileno (stdin))) > +-fprintf (stderr, _("Type each input string on a line by itself, " > ++fprintf (stderr, "%s", _("Type each input string on a line by itself, " > +
[OE-core] [PATCH] oeqa/core: Improve grammar in README and loader comments
Signed-off-by: Randy MacLeod--- meta/lib/oeqa/core/README| 37 ++--- meta/lib/oeqa/core/loader.py | 8 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/meta/lib/oeqa/core/README b/meta/lib/oeqa/core/README index f67dff7..d4fcda4 100644 --- a/meta/lib/oeqa/core/README +++ b/meta/lib/oeqa/core/README @@ -2,34 +2,34 @@ == Introduction == -This is the new (version 2) OEQA framework. Base clases are located inside the -'oeqa/core' folder and subsequent components needs to extend from these. +This is version 2 of the OEQA framework. Base clases are located in the +'oeqa/core' directory and subsequent components must extend from these. -The main design consideration was to implement the needed functionality -on top of Python unittest framework. To archive the latter, the following -modules are present: +The main design consideration was to implement the needed functionality on +top of the Python unittest framework. To achieve this goal, the following +modules are used: * oeqa/core/runner.py: Provides OETestResult and OETestRunner base - classes extending the unittest ones. This class has the support for - export results to different formats currently RAW and XML. + classes extending the unittest class. These classes support exporting + results to different formats; currently RAW and XML support exist. -* oeqa/core/loader.py: Provides OETestLoader extending unittest ones, - also implements unified way for decorator support and for filtering test - cases. +* oeqa/core/loader.py: Provides OETestLoader extending the unittest class. + It also features a unified implementation of decorator support and + filtering test cases. * oeqa/core/case.py: Provides OETestCase base class extending unittest.TestCase and provides access to the Test data (td), Test context and Logger functionality. -* oeqa/core/decorator: Provides OETestDecorator a new class to implement +* oeqa/core/decorator: Provides OETestDecorator, a new class to implement decorators for Test cases. -* oeqa/core/context: Provides OETestContext a high-level API for +* oeqa/core/context: Provides OETestContext, a high-level API for loadTests and runTests of certain Test component and OETestContextExecutor a base class to enable oe-test to discover/use the Test component. -In the other hand, a new 'oe-test' runner is located under 'scripts', allowing scans for components +Also, a new 'oe-test' runner is located under 'scripts', allowing scans for components that supports OETestContextExecutor (see below). == Terminology == @@ -39,15 +39,14 @@ that supports OETestContextExecutor (see below). * Test data: Data associated with the Test component. Currently we use bitbake datastore as a Test data input. -* Test context: A context of what tests needs to be run and how to do it, additionally provides - access to the Test data and could have custom methods, attrs. +* Test context: A context of what tests needs to be run and how to do it; this additionally + provides access to the Test data and could have custom methods and/or attrs. == oe-test == -The new tool oe-test (located at scripts) has the ability to scan the code base for test -components and provide a unified way to run test cases. Internally it scans folders inside -oeqa module in order to find specific classes that -implements a test component. +The new tool, oe-test, has the ability to scan the code base for test components and provide +a unified way to run test cases. Internally it scans folders inside oeqa module in order to find +specific classes that implement a test component. == Usage == diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py index bffb2da..51bfd9d 100644 --- a/meta/lib/oeqa/core/loader.py +++ b/meta/lib/oeqa/core/loader.py @@ -14,11 +14,11 @@ from oeqa.core.decorator import decoratorClasses, OETestDecorator, \ def _make_failed_test(classname, methodname, exception, suiteClass): """ -When loading tests unittest framework stores the exception in a new -class created for be displayed into run(). +When loading tests, the unittest framework stores any exceptions and +displays them only when the 'run' method is called. -For our purposes will be better to raise the exception in loading -step instead of wait to run the test suite. +For our purposes, it is better to raise the exceptions in the loading +step rather than waiting to run the test suite. """ raise exception unittest.loader._make_failed_test = _make_failed_test -- 2.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org
[OE-core] [PATCH] go: Upgrade to 1.8.3
Add a comment to fix build musl<->glibc switch while using same TMPDIR Signed-off-by: Khem Raj--- meta/recipes-devtools/go/go-1.8.inc | 8 meta/recipes-devtools/go/go-cross.inc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/go/go-1.8.inc b/meta/recipes-devtools/go/go-1.8.inc index 5c376a2eb6..3690f310bd 100644 --- a/meta/recipes-devtools/go/go-1.8.inc +++ b/meta/recipes-devtools/go/go-1.8.inc @@ -1,8 +1,8 @@ require go-common.inc -GOMINOR = "" +GOMINOR = "3" GO_BASEVERSION = "1.8" -PV .= "${GOMINOR}" +PV .= ".${GOMINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707" @@ -15,5 +15,5 @@ SRC_URI += "\ file://split-host-and-target-build.patch \ file://gotooldir.patch \ " -SRC_URI[md5sum] = "7743960c968760437b6e39093cfe6f67" -SRC_URI[sha256sum] = "406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596" +SRC_URI[md5sum] = "64e9380e07bba907e26a00cf5fcbe77e" +SRC_URI[sha256sum] = "5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6" diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 93206a5d05..71e461123c 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc @@ -6,7 +6,8 @@ PN = "go-cross-${TARGET_ARCH}" # Ignore how TARGET_ARCH is computed. TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" - +# Ignore target os libc for cross compiler +#TARGET_OS[vardepexclude] = "LIBCEXTENSION" FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:" GOROOT_FINAL = "${libdir}/go" -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KERNEL_IMAGETYPES and Image.gz
Le ven. 2 juin 2017 à 20:32, Kunihiko Hayashi < hayashi.kunih...@socionext.com> a écrit : > > On 2017/06/03 1:24, nicolas.deche...@linaro.org (Nicolas Dechesne) wrote: > > On Fri, Jun 2, 2017 at 6:16 PM, Kunihiko Hayashi > >wrote: > >> I already suggested the patch to solve this issue. > >> > >> https://patchwork.openembedded.org/patch/138596/ > >> > >> Although I've not received any comments on this yet, could you try to > apply > >> it? > > > > thanks for sending this out. Well, unfortunately, I think your patch > > is doing something wrong. > > > > As discussed earlier on that thread, we should be using kernel > > Makefile to generate the target as much as possible. The linux build > > system can generate vmlinux, Image and Image.gz, but not vmlinux.gz. > > So we should compress only vmlinux 'outside' of the linux build > > system, and for Image.gz we shouldn't do that in OE. In other words, > > Image.gz should be included in typeformake. Your patch does not do > > that, and that is something which is taken care by mine. > > Surely we should use Image.gz generated by kernel build system and my patch > doesn't do that. I also think that OE should compress only images that the > kernel build system doesn't generate. > Sorry my patch won't help. No problem. Can you please review and tes this one then, and provide feedback? Thanks! > > Best Regards, > Kunihiko Hayashi > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] cmake: Upgrade to 3.8.2
There was a set of changes, those are: - CMake now requires librhash for build and as there is no other users in OE-Core we make it use its internal copy instead; - Copyright.txt checksum has change due new contrubutors and 2017 year additions; - Patch avoid-gcc-warnings-with-Wstrict-prototypes.patch was removed as it is not need anymore; - Patch 0001-KWIML-tests-Remove-format-security-from-flags.patch was removed as it is included in this release. Signed-off-by: Otavio Salvador--- Changes in v2: - Update to 3.8.2 (Khem) ...cmake-native_3.7.2.bb => cmake-native_3.8.2.bb} | 1 + meta/recipes-devtools/cmake/cmake.inc | 8 ++--- ...L-tests-Remove-format-security-from-flags.patch | 33 - ...void-gcc-warnings-with-Wstrict-prototypes.patch | 42 -- .../cmake/{cmake_3.7.2.bb => cmake_3.8.2.bb} | 1 + 5 files changed, 5 insertions(+), 80 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.7.2.bb => cmake-native_3.8.2.bb} (94%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch delete mode 100644 meta/recipes-devtools/cmake/cmake/avoid-gcc-warnings-with-Wstrict-prototypes.patch rename meta/recipes-devtools/cmake/{cmake_3.7.2.bb => cmake_3.8.2.bb} (97%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.7.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb similarity index 94% rename from meta/recipes-devtools/cmake/cmake-native_3.7.2.bb rename to meta/recipes-devtools/cmake/cmake-native_3.8.2.bb index 7ad4345efe..e55e8b1cf6 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.7.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb @@ -18,6 +18,7 @@ CMAKE_EXTRACONF = "\ -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ +-DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ -DHAVE_SYS_ACL_H=0 \ " diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 6c8b36d18d..dbd34f542c 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/; BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php; SECTION = "console/utils" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \ file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" @@ -14,12 +14,10 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ file://qt4-fail-silent.patch \ - file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \ - file://0001-KWIML-tests-Remove-format-security-from-flags.patch \ " -SRC_URI[md5sum] = "79bd7e65cd81ea3aa2619484ad6ff25a" -SRC_URI[sha256sum] = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0" +SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419" +SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch b/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch deleted file mode 100644 index 190133ba5c..00 --- a/meta/recipes-devtools/cmake/cmake/0001-KWIML-tests-Remove-format-security-from-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0941395b146804abcd87004589ff6e7a2953412d Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 16 Mar 2017 14:39:04 +0200 -Subject: [PATCH] KWIML tests: Remove format-security from flags - -For the tests where "format" is removed from flags, "format-security" -should be removed as well. Otherwise building cmake with -"-Wformat -Wformat-security" fails: - -| cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] - -Upstream-Status: Backport [part of commit f77420cfc9] -Signed-off-by: Jussi Kukkonen - Utilities/KWIML/test/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Utilities/KWIML/test/CMakeLists.txt b/Utilities/KWIML/test/CMakeLists.txt -index 4f6f37b..1bf93bb 100644 a/Utilities/KWIML/test/CMakeLists.txt -+++ b/Utilities/KWIML/test/CMakeLists.txt -@@ -10,7 +10,7 @@ endif() - # Suppress printf/scanf format warnings; we test if the sizes match. - foreach(lang C CXX) - if(KWIML_LANGUAGE_${lang} AND
Re: [OE-core] [PATCH 1/2] package_rpm.bbclass: use multithreaded xz compression
On Fri, Jun 2, 2017 at 4:40 AM, Alexander Kanavinwrote: > On 06/01/2017 10:02 PM, Andre McCurdy wrote: >>> >>> RPM's default is single-threaded gz; the change greatly helps with >>> both buildtimes (when there is a small number of large-sized packages) >>> and disk space taken by resulting rpms. >> >> Do you have any test results for that? Obviously build times will be >> longer when building with a single CPU since xz compression needs more >> CPU than gzip, but I'm curious how many CPUs are required before the >> multiple threads win over and build times actually get shorter. 4? 8? > > Yes; it's in the cover letter. Yes, I only saw that after sending my reply. I shouldn't read emails in reverse order... sorry about that. The cover letter benchmarks didn't mention the 22 CPU cores though, so it's good to have that clarified. Seeing some results from a 4 or 8 core machine would be interesting too. >> One other concern with parallel xz compression is memory usage. Single >> threaded xz needs more memory than gzip and running multiple xz >> compression threads together will push the memory usage up again. >> Maybe not an issue if the peak is still acceptable, but something to >> be aware of (I've given up trying to build in 4GB, but hopefully 8GB >> build machines still have some life left in them...).> > > I haven't seen anything resembling low-memory or OOM in my testing, even > when running 44 rpm instances at the same time, each with their own several > threads, each thread handling a package, and compression for the package > again being done in a multi-threaded way. But then I have 22 cores and 32G > RAM here. > > So do try the patches please, and report the findings, YMMV. > > Alex > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KERNEL_IMAGETYPES and Image.gz
On 2017/06/03 1:24, nicolas.deche...@linaro.org (Nicolas Dechesne) wrote: On Fri, Jun 2, 2017 at 6:16 PM, Kunihiko Hayashiwrote: I already suggested the patch to solve this issue. https://patchwork.openembedded.org/patch/138596/ Although I've not received any comments on this yet, could you try to apply it? thanks for sending this out. Well, unfortunately, I think your patch is doing something wrong. As discussed earlier on that thread, we should be using kernel Makefile to generate the target as much as possible. The linux build system can generate vmlinux, Image and Image.gz, but not vmlinux.gz. So we should compress only vmlinux 'outside' of the linux build system, and for Image.gz we shouldn't do that in OE. In other words, Image.gz should be included in typeformake. Your patch does not do that, and that is something which is taken care by mine. Surely we should use Image.gz generated by kernel build system and my patch doesn't do that. I also think that OE should compress only images that the kernel build system doesn't generate. Sorry my patch won't help. Best Regards, Kunihiko Hayashi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for #11283: wic rm
== Series Details == Series: #11283: wic rm Revision: 1 URL : https://patchwork.openembedded.org/series/7046/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at bafb7e221d) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] wic: implement removing directories
Added support for removing directories using mdeltree utility to Disk.del method [YOCTO #11283] Signed-off-by: Ed Bartosh--- scripts/lib/wic/engine.py | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 6fc8bb7..2c899dd 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -239,6 +239,7 @@ class Disk: self._mdir = None self._mcopy = None self._mdel = None +self._mdeltree = None self._partimages = {} # find parted @@ -290,6 +291,10 @@ class Disk: def mdel(self): return self._prop("mdel") +@property +def mdeltree(self): +return self._prop("mdeltree") + def _get_part_image(self, pnum): if pnum not in self.partitions: raise WicError("Partition %s is not in the image") @@ -325,10 +330,19 @@ class Disk: def remove(self, pnum, path): """Remove files/dirs from the partition.""" -cmd = "{} -i {} ::{}".format(self.mdel, - self._get_part_image(pnum), - path) -exec_cmd(cmd) +partimg = self._get_part_image(pnum) +cmd = "{} -i {} ::{}".format(self.mdel, partimg, path) +try: +exec_cmd(cmd) +except WicError as err: +if "not found" in str(err) or "non empty" in str(err): +# mdel outputs 'File ... not found' or 'directory .. non empty" +# try to use mdeltree as path could be a directory +cmd = "{} -i {} ::{}".format(self.mdeltree, + partimg, path) +exec_cmd(cmd) +else: +raise err self._put_part_image(pnum) def wic_ls(args, native_sysroot): -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] selftest: add test_wic_rm test case
Added test case for "wic rm" functionality. - remove file from vfat partition - remove directory from vfat partition Signed-off-by: Ed Bartosh--- meta/lib/oeqa/selftest/wic.py | 28 1 file changed, 28 insertions(+) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index 3a611c1..b137fd1 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -889,3 +889,31 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r self.assertEqual(0, result.status) self.assertEqual(8, len(result.output.split('\n'))) self.assertTrue(os.path.basename(testdir) in result.output) + +def test_wic_rm(self): +"""Test removing files and directories from the the wic image.""" +self.assertEqual(0, runCmd("wic create mkefidisk " + "--image-name=core-image-minimal " + "-D -o %s" % self.resultdir).status) +images = glob(self.resultdir + "mkefidisk-*.direct") +self.assertEqual(1, len(images)) + +sysroot = get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools') + +# list directory content of the first partition +result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot)) +self.assertEqual(0, result.status) +self.assertEqual(8, len(result.output.split('\n'))) + +# remove file +result = runCmd("wic rm %s:1/bzimage -n %s" % (images[0], sysroot)) +self.assertEqual(0, result.status) + +# remove directory +result = runCmd("wic rm %s:1/efi -n %s" % (images[0], sysroot)) +self.assertEqual(0, result.status) + +# check if they're removed +result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot)) +self.assertEqual(0, result.status) +self.assertEqual(6, len(result.output.split('\n'))) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] wic: add 'wic rm' command
Added empty 'wic rm' command that does nothing. The functionality will be added by the next commits. [YOCTO #11283] Signed-off-by: Ed Bartosh--- scripts/lib/wic/engine.py | 7 +++ scripts/wic | 14 ++ 2 files changed, 21 insertions(+) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index a48c4ad..9a8055c 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -340,6 +340,13 @@ def wic_cp(args, native_sysroot): disk = Disk(args.dest.image, native_sysroot) disk.copy(args.src, args.dest.part, args.dest.path) +def wic_rm(args, native_sysroot): +""" +Remove files or directories from the vfat partition of +partitioned image. +""" +pass + def find_canned(scripts_path, file_name): """ Find a file either by its path or by name in the canned files dir. diff --git a/scripts/wic b/scripts/wic index fc192ec..da14f47 100755 --- a/scripts/wic +++ b/scripts/wic @@ -248,6 +248,13 @@ def wic_cp_subcommand(args, usage_str): """ engine.wic_cp(args, args.native_sysroot) +def wic_rm_subcommand(args, usage_str): +""" +Command-line handling for removing files/dirs from images. +The real work is done by engine.wic_rm() +""" +engine.wic_rm(args, args.native_sysroot) + def wic_help_subcommand(args, usage_str): """ Command-line handling for help subcommand to keep the current @@ -286,6 +293,9 @@ helptopics = { "cp":[wic_help_topic_subcommand, wic_help_topic_usage, hlp.wic_cp_help], +"rm":[wic_help_topic_subcommand, + wic_help_topic_usage, + hlp.wic_rm_help], "list": [wic_help_topic_subcommand, wic_help_topic_usage, hlp.wic_list_help] @@ -409,6 +419,10 @@ subcommands = { hlp.wic_cp_usage, hlp.wic_cp_help, wic_init_parser_cp], +"rm":[wic_rm_subcommand, + hlp.wic_rm_usage, + hlp.wic_rm_help, + wic_init_parser_rm], "help": [wic_help_subcommand, wic_help_topic_usage, hlp.wic_help_help, -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] wic: add help and usage content for 'wic rm'
Added wic_rm_help and wic_rm_usage variables to help.py. These variables contain help content that will be used in 'wic rm help' and 'wic rm --help' output. Signed-off-by: Ed Bartosh--- scripts/lib/wic/help.py | 59 - 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index e93ac4b..23d943c 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -395,7 +395,7 @@ DESCRIPTION The second form of the command copies file or directory to the specified directory on the vfat partition: $ wic cp test tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1/efi/ - $ wic ls tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1/eti/ + $ wic ls tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1/efi/ Volume in drive : is boot Volume Serial Number is DB4C-FD4C Directory for ::/efi @@ -411,6 +411,63 @@ DESCRIPTION containing the tools(parted and mtools) to use. """ +wic_rm_usage = """ + + Remove files or directories from the vfat partitions + + usage: wic rm : [--native-sysroot ] + + This command removes files or directories from the vfat partitions of partitioned + image. + + See 'wic help rm' for more detailed instructions. + +""" + +wic_rm_help = """ + +NAME +wic rm - remove files or directories from the vfat partitions + +SYNOPSIS +wic rm : +wic rm : --native-sysroot + +DESCRIPTION +This command removes files or directories from the vfat partition of the +wic image: + +$ wic ls ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1 +Volume in drive : is boot + Volume Serial Number is 11D0-DE21 +Directory for ::/ + +libcom32 c32186500 2017-06-02 15:15 +libutil c32 24148 2017-06-02 15:15 +syslinux cfg 209 2017-06-02 15:15 +vesamenu c32 27104 2017-06-02 15:15 +vmlinuz6926384 2017-06-02 15:15 +5 files 7 164 345 bytes + 16 582 656 bytes free + +$ wic rm ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1/libutil.c32 + +$ wic ls ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1 +Volume in drive : is boot + Volume Serial Number is 11D0-DE21 +Directory for ::/ + +libcom32 c32186500 2017-06-02 15:15 +syslinux cfg 209 2017-06-02 15:15 +vesamenu c32 27104 2017-06-02 15:15 +vmlinuz6926384 2017-06-02 15:15 +4 files 7 140 197 bytes + 16 607 232 bytes free + +The -n option is used to specify the path to the native sysroot +containing the tools(parted and mtools) to use. +""" + wic_plugins_help = """ NAME -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] wic: implement removing files
Added implementation of Disk.del method and wic_r function that removes files from the vfat partition using mdel utility. [YOCTO #11283] Signed-off-by: Ed Bartosh--- scripts/lib/wic/engine.py | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 9a8055c..6fc8bb7 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -238,6 +238,7 @@ class Disk: self._partitions = None self._mdir = None self._mcopy = None +self._mdel = None self._partimages = {} # find parted @@ -285,6 +286,10 @@ class Disk: def mcopy(self): return self._prop("mcopy") +@property +def mdel(self): +return self._prop("mdel") + def _get_part_image(self, pnum): if pnum not in self.partitions: raise WicError("Partition %s is not in the image") @@ -318,6 +323,14 @@ class Disk: exec_cmd(cmd) self._put_part_image(pnum) +def remove(self, pnum, path): +"""Remove files/dirs from the partition.""" +cmd = "{} -i {} ::{}".format(self.mdel, + self._get_part_image(pnum), + path) +exec_cmd(cmd) +self._put_part_image(pnum) + def wic_ls(args, native_sysroot): """List contents of partitioned image or vfat partition.""" disk = Disk(args.path.image, native_sysroot) @@ -345,7 +358,8 @@ def wic_rm(args, native_sysroot): Remove files or directories from the vfat partition of partitioned image. """ -pass +disk = Disk(args.path.image, native_sysroot) +disk.remove(args.path.part, args.path.path) def find_canned(scripts_path, file_name): """ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] wic: add wic_init_parser_rm
Add parser for 'wic rm' subcommand. Signed-off-by: Ed Bartosh--- scripts/wic | 6 ++ 1 file changed, 6 insertions(+) diff --git a/scripts/wic b/scripts/wic index 5e81fad..fc192ec 100755 --- a/scripts/wic +++ b/scripts/wic @@ -379,6 +379,12 @@ def wic_init_parser_cp(subparser): subparser.add_argument("-n", "--native-sysroot", help="path to the native sysroot containing the tools") +def wic_init_parser_rm(subparser): +subparser.add_argument("path", type=imgpathtype, +help="path: :") +subparser.add_argument("-n", "--native-sysroot", +help="path to the native sysroot containing the tools") + def wic_init_parser_help(subparser): helpparsers = subparser.add_subparsers(dest='help_topic', help=hlp.wic_usage) for helptopic in helptopics: -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] #11283: wic rm
Hi, This is an implementation of new wic subcommand 'wic rm'. It removes files or directories from vfat partitions: $ wic ls ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1 Volume in drive : is boot Volume Serial Number is 11D0-DE21 Directory for ::/ libcom32 c32186500 2017-06-02 15:15 libutil c32 24148 2017-06-02 15:15 syslinux cfg 209 2017-06-02 15:15 vesamenu c32 27104 2017-06-02 15:15 vmlinuz6926384 2017-06-02 15:15 5 files 7 164 345 bytes 16 582 656 bytes free $ wic rm ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1/libutil.c32 $ wic ls ./tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.wic:1 Volume in drive : is boot Volume Serial Number is 11D0-DE21 Directory for ::/ libcom32 c32186500 2017-06-02 15:15 syslinux cfg 209 2017-06-02 15:15 vesamenu c32 27104 2017-06-02 15:15 vmlinuz6926384 2017-06-02 15:15 4 files 7 140 197 bytes 16 607 232 bytes free The patchset also contains test case for 'wic rm' functionality. The following changes since commit 4cf2ac543ee3646332e8dac847d23429b492494c: image_types_wic: schedule prepare_wic_build correctly (2017-06-02 11:21:49 +0300) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (6): wic: add wic_init_parser_rm wic: add help and usage content for 'wic rm' wic: add 'wic rm' command wic: implement removing files wic: implement removing directories selftest: add test_wic_rm test case meta/lib/oeqa/selftest/wic.py | 28 scripts/lib/wic/engine.py | 35 + scripts/lib/wic/help.py | 59 ++- scripts/wic | 20 +++ 4 files changed, 141 insertions(+), 1 deletion(-) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/3] Two new devtool plugins: export and import
From: Leonardo SandovalThese two plugins can be used to share the devtool workspace between users. Changes from v1 (mostly suggested by Paul E.) Export: * metatada file created and included on tar, containing workspace data (to be consume by the import plugin) * tar archive contains a timestamp, making effectively unique for ever export * Exclude or include recipes are validated against current workspace * change on parameter naming, following the tar command args Import: * the tar archive to be imported must be given from the commmand line * Before importing, bbappends must have its corresponding recipe * EXTERNALSRC correctly modified reflecting imported workspace The following changes since commit ef506f58da3a95fba2696df749b2b81f9c118847: cve-check-tool: backport a patch to make CVE checking work (2017-05-18 14:01:48 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lsandov1/devtool-import-export http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lsandov1/devtool-import-export Leonardo Sandoval (3): export: new plugin to export the devtool workspace ftools: new function to replace strings inside a text file import: new plugin to import the devtool workspace meta/lib/oeqa/utils/ftools.py | 22 +++ scripts/lib/devtool/export.py | 120 ++ scripts/lib/devtool/import.py | 130 ++ 3 files changed, 272 insertions(+) create mode 100644 scripts/lib/devtool/export.py create mode 100644 scripts/lib/devtool/import.py -- 2.12.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/3] ftools: new function to replace strings inside a text file
From: Leonardo SandovalSigned-off-by: Leonardo Sandoval --- meta/lib/oeqa/utils/ftools.py | 22 ++ 1 file changed, 22 insertions(+) diff --git a/meta/lib/oeqa/utils/ftools.py b/meta/lib/oeqa/utils/ftools.py index a7233d4ca6..8bf2547d68 100644 --- a/meta/lib/oeqa/utils/ftools.py +++ b/meta/lib/oeqa/utils/ftools.py @@ -44,3 +44,25 @@ def remove_from_file(path, data): except ValueError: pass write_file(path, "\n".join(contents)) + +def replace_from_file(path, old, new): +# In case old is None, return immediately +if old is None: +return +try: +rdata = read_file(path) +except IOError as e: +# if file does not exit, just quit, otherwise raise an exception +if e.errno == errno.ENOENT: +return +else: +raise + +old_contents = rdata.splitlines() +new_contents = [] +for old_content in old_contents: +try: +new_contents.append(old_content.replace(old, new)) +except ValueError: +pass +write_file(path, "\n".join(new_contents)) -- 2.12.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/3] import: new plugin to import the devtool workspace
From: Leonardo SandovalTakes a tar archive created by 'devtool export' and export it (untar) to workspace. By default, the whole tar archive is imported, thus there is no way to limit what is imported. https://bugzilla.yoctoproject.org/show_bug.cgi?id=10510 [YOCTO #10510] Signed-off-by: Leonardo Sandoval --- scripts/lib/devtool/import.py | 130 ++ 1 file changed, 130 insertions(+) create mode 100644 scripts/lib/devtool/import.py diff --git a/scripts/lib/devtool/import.py b/scripts/lib/devtool/import.py new file mode 100644 index 00..5b85571669 --- /dev/null +++ b/scripts/lib/devtool/import.py @@ -0,0 +1,130 @@ +# Development tool - import command plugin +# +# Copyright (C) 2014-2017 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +"""Devtool import plugin""" + +import os +import tarfile +import logging +import re +from devtool import standard, setup_tinfoil +from devtool import export + +import oeqa.utils.ftools as ftools +import json + +logger = logging.getLogger('devtool') + +def devimport(args, config, basepath, workspace): +"""Entry point for the devtool 'import' subcommand""" + +def get_pn(name): +dirpath, recipe = os.path.split(name) +pn = "" +for sep in "_ .".split(): +if sep in recipe: +pn = recipe.split(sep)[0] +break +return pn + +# match exported workspace folders +prog = re.compile('recipes|appends|sources') + +if not os.path.exists(args.file): +logger.error('Tar archive %s does not exist. Export your workspace using "devtool export"') +return 1 + +# get current recipes +current_recipes = [] +try: +tinfoil = setup_tinfoil(config_only=False, basepath=basepath) +current_recipes = [recipe[1] for recipe in tinfoil.cooker.recipecaches[''].pkg_fn.items()] +finally: +tinfoil.shutdown() + +imported = [] +with tarfile.open(args.file) as tar: + +# get exported metadata so values containing paths can be automatically replaced it +export_workspace_path = export_workspace = None +try: +metadata = tar.getmember(export.metadata) +tar.extract(metadata) +with open(metadata.name) as fdm: +export_workspace_path, export_workspace = json.load(fdm) +os.unlink(metadata.name) +except KeyError as ke: +logger.warn('The export metadata file created by "devtool export" was not found') +logger.warn('Manual editing is needed to correct paths on imported recipes/appends') + +members = [member for member in tar.getmembers() if member.name != export.metadata] +for member in members: +# make sure imported bbappend has its corresponding recipe (bb) +if member.name.startswith('appends'): +bbappend = get_pn(member.name) +if bbappend: +if bbappend not in current_recipes: +# check that the recipe is not in the tar archive being imported +if bbappend not in export_workspace: +logger.warn('No recipe to append %s, skipping' % bbappend) +continue +else: +logger.warn('bbappend name %s could not be detected' % member.name) +continue + +# extract file from tar +path = os.path.join(config.workspace_path, member.name) +if os.path.exists(path): +if args.overwrite: +try: +tar.extract(member, path=config.workspace_path) +except PermissionError as pe: +logger.warn(pe) +else: +logger.warn('File already present. Use --overwrite/-o to overwrite it: %s' % member.name) +else: +tar.extract(member, path=config.workspace_path) + +if member.name.startswith('appends'): +recipe = get_pn(member.name) + +# Update EXTERNARLSRC +if export_workspace_path: +# appends created by 'devtool
[OE-core] [PATCH v2 1/3] export: new plugin to export the devtool workspace
From: Leonardo SandovalBy default, exports the whole workspace (all recipes) including the source code. User can also limit what is exported with --included/--excluded flags. As a result of this operation, a tar archive containing only workspace metadata and its corresponding source code is created, which can be properly imported with 'devtool import'. https://bugzilla.yoctoproject.org/show_bug.cgi?id=10510 [YOCTO #10510] Signed-off-by: Leonardo Sandoval --- scripts/lib/devtool/export.py | 120 ++ 1 file changed, 120 insertions(+) create mode 100644 scripts/lib/devtool/export.py diff --git a/scripts/lib/devtool/export.py b/scripts/lib/devtool/export.py new file mode 100644 index 00..64ac85162b --- /dev/null +++ b/scripts/lib/devtool/export.py @@ -0,0 +1,120 @@ +# Development tool - export command plugin +# +# Copyright (C) 2014-2017 Intel Corporation +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +"""Devtool export plugin""" + +import os +import argparse +import tarfile +import logging +import datetime +import json + +logger = logging.getLogger('devtool') + +# output files +default_arcname_prefix = "workspace-export" +default_arcname_link = default_arcname_prefix + '.tar' +metadata = '.export_metadata' + +def export(args, config, basepath, workspace): +"""Entry point for the devtool 'export' subcommand""" + +def add_metadata(tar): +"""Archive the workspace object""" +# finally store the workspace metadata +with open(metadata, 'w') as fd: +fd.write(json.dumps((config.workspace_path, workspace))) +tar.add(metadata) +os.unlink(metadata) + +def add_recipe(tar, recipe, data): +"""Archive recipe with proper arcname""" +# Create a map of name/arcnames +arcnames = [] +for key, name in data.items(): +if name: +if key == 'srctree': +# all sources, no matter where are located, goes into the sources directory +arcname = 'sources/%s' % recipe +else: +arcname = name.replace(config.workspace_path, '') +arcnames.append((name, arcname)) + +for name, arcname in arcnames: +tar.add(name, arcname=arcname) + + +# Make sure workspace is non-empty and possible listed include/excluded recipes are in workspace +if not workspace: +logger.info('Workspace has not recipes, nothing to export') +return 0 +else: +for param, recipes in {'include':args.include,'exclude':args.exclude}.items(): +for recipe in recipes: +if recipe not in workspace: +logger.error('Recipe (%s) on %s argument not in the current workspace' % (recipe, param)) +return 1 + +name = args.file + +default_name = "%s-%s.tar" % (default_arcname_prefix, datetime.datetime.now().strftime('%Y%m%d%H%M%S')) +if not name: +name = default_name +else: +# if name is a directory, append the default name +if os.path.isdir(name): +name = os.path.join(name, default_name) + +if os.path.exists(name) and not args.overwrite: +logger.error('Tar archive %s exists. Use --overwrite/-o to overwrite it') +return 1 + +# if all workspace is excluded, quit +if not len(set(workspace.keys()).difference(set(args.exclude))): +logger.warn('All recipes in workspace excluded, no tar archive created') +return 0 + +exported = [] +with tarfile.open(name, 'w') as tar: +if args.include: +for recipe in args.include: +add_recipe(tar, recipe, workspace[recipe]) +exported.append(recipe) +else: +for recipe, data in workspace.items(): +if recipe not in args.exclude: +add_recipe(tar, recipe, data) +exported.append(recipe) + +add_metadata(tar) + +logger.info('Tar archive created at %s with the following recipes: %s' % (name, ' '.join(exported))) +return 0 + +def register_commands(subparsers, context): +"""Register devtool export subcommands""" +parser = subparsers.add_parser('export', +
Re: [OE-core] KERNEL_IMAGETYPES and Image.gz
On 2017/05/30 6:13, nicolas.deche...@linaro.org (Nicolas Dechesne) wrote: > hi, > > i am trying to set KERNEL_IMAGETYPES="Image.gz" in my machine conf > file. But it doesn't work. I am seeing this error during > kernel_do_compile(): > > run.do_compile.30019: cannot open Image: No such file > > In fact the code snippet that tries to compress the Image file into > Image.gz expects the Image file to be in ${B}, but when compiling > kernel Image is actually in ${B}/arch/arm64/boot: > > $ find tmp-rpb-glibc/work/dragonboard_410c-linaro-linux/linux-linaro-qcomlt/ > -name Image > tmp-rpb-glibc/work/dragonboard_410c-linaro-linux/linux-linaro-qcomlt/4.9-r0/build/arch/arm64/boot/Image > > The piece of code in question is in kernel.bbclass: > > gzip -9c < "${typeformake}" > "${KERNEL_OUTPUT_DIR}/${type}" > It really sounds to me like something obvious is missing, i doubt I > would be the first one to try Image.gz.. I already suggested the patch to solve this issue. https://patchwork.openembedded.org/patch/138596/ Although I've not received any comments on this yet, could you try to apply it? > > Any thoughts? > > thanks > nico > Best Regards, Kunihiko Hayashi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KERNEL_IMAGETYPES and Image.gz
On Fri, Jun 2, 2017 at 6:16 PM, Kunihiko Hayashiwrote: > I already suggested the patch to solve this issue. > > https://patchwork.openembedded.org/patch/138596/ > > Although I've not received any comments on this yet, could you try to apply > it? thanks for sending this out. Well, unfortunately, I think your patch is doing something wrong. As discussed earlier on that thread, we should be using kernel Makefile to generate the target as much as possible. The linux build system can generate vmlinux, Image and Image.gz, but not vmlinux.gz. So we should compress only vmlinux 'outside' of the linux build system, and for Image.gz we shouldn't do that in OE. In other words, Image.gz should be included in typeformake. Your patch does not do that, and that is something which is taken care by mine. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/runtime/context.py: Add support to specify port in target_ip
Signed-off-by: Aníbal Limón--- meta/lib/oeqa/runtime/context.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index c4cd76c..0294003 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -92,6 +92,12 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): def getTarget(target_type, logger, target_ip, server_ip, **kwargs): target = None +if target_ip: +target_ip_port = target_ip.split(':') +if len(target_ip_port) == 2: +target_ip = target_ip_port[0] +kwargs['port'] = target_ip_port[1] + if target_type == 'simpleremote': target = OESSHTarget(logger, target_ip, server_ip, **kwargs) elif target_type == 'qemu': -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] distutils-base.bbclass: Do not use -pie with hardening
Fix build when PIE is turned on. It tries to build .so file using -pie and -shared flags together because its doing compile and link in same step CFLAGS and LDFLAGS are combined and does not work, ending in errors e.g. | /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/python-pygpgme/0.3-r0/recipe-sysroot/usr/l ib/Scrt1.o: In function `_start_c': | /usr/src/debug/musl/1.1.16+gitAUTOINC+179766aa2e-r0/git/crt/crt1.c:17: undefined reference to `main' | collect2: error: ld returned 1 exit status This error while cryptic is due to the fact that we are building a shared library but also pass -pie flag to the link step after specify LDHSARED ( which is -shared linker flags ) we can not use -pie when doing shared libs. This is true for all the python modules inheriting setup tools Disable the pie flags thusly for all modules using setuptools since this setting is done in setuptools makefiles which are then used during module compiles Signed-off-by: Khem Raj--- v1 -> v2 - Move change to distutils-base V2 -> v3 - Fix a missing end quote meta/classes/distutils-base.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass index 9f398d7051..d6137c4e42 100644 --- a/meta/classes/distutils-base.bbclass +++ b/meta/classes/distutils-base.bbclass @@ -2,3 +2,5 @@ DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') = RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base pythonnative + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmware: add support for mt7601u WiFi chip
Mediatek MT7601U is a common 802.11 g/n WiFi USB chip Signed-off-by: Tim Orling--- meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12 1 file changed, 12 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 0ef1e28..4558daf 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -223,6 +223,7 @@ do_install() { PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ + ${PN}-mt7601u-license ${PN}-mt7601u \ ${PN}-radeon-license ${PN}-radeon \ ${PN}-marvell-license ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \ ${PN}-ti-connectivity-license ${PN}-wl12xx ${PN}-wl18xx \ @@ -324,6 +325,17 @@ FILES_${PN}-ralink = " \ RDEPENDS_${PN}-ralink += "${PN}-ralink-license" +# For mediatek MT7601U +LICENSE_${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware" +LICENSE_${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" + +FILES_${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" +FILES_${PN}-mt7601u = " \ + ${nonarch_base_libdir}/firmware/mt7601u.bin \ +" + +RDEPENDS_${PN}-mt7601u += "${PN}-mt7601u-license" + # For radeon LICENSE_${PN}-radeon = "Firmware-radeon" LICENSE_${PN}-radeon-license = "Firmware-radeon" -- 2.9.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initscripts: Populate volatile from existing file
In some cases, it may be useful to populate a volatile file from an existing one, e.g. a file in a read-only rootfs that may be edited in a read-write destination. To provide this behavior, creation of volatile files has been updated to copy a file which has been given in the field. If set to none, the current behavior is preserved. Signed-off-by: David Vincent--- .../initscripts/initscripts-1.0/populate-volatile.sh | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index 22a71ecaae..35316ec2ba 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh @@ -25,8 +25,18 @@ COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." create_file() { + EXEC="" + [ -z "$2" ] && { + EXEC=" + touch \"$1\"; + " + } || { + EXEC=" + cp \"$2\" \"$1\"; + " + } EXEC=" - touch \"$1\"; + ${EXEC} chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " @@ -187,7 +197,9 @@ apply_cfgfile() { case "${TTYPE}" in "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." - create_file "${TNAME}" + TSOURCE="$TLTARGET" + [ "${TSOURCE}" = "none" ] && TSOURCE="" + create_file "${TNAME}" "${TSOURCE}" & ;; "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." mk_dir "${TNAME}" -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake: Upgrade to 3.8.1
On Wed, May 31, 2017 at 9:58 PM, Khem Rajwrote: > On Wed, May 31, 2017 at 5:31 PM, Otavio Salvador > wrote: >> There was a set of changes, those are: >> >> - CMake now requires librhash for build and as there is no other >>users in OE-Core we make it use its internal copy instead; >> >> - Copyright.txt checksum has change due new contrubutors and 2017 >>year additions; >> >> - Patch avoid-gcc-warnings-with-Wstrict-prototypes.patch was removed >>as it is not need anymore; >> >> - Patch 0001-KWIML-tests-Remove-format-security-from-flags.patch was >>removed as it is included in this release. >> > > Can we get to 3.8.2 instead while you are at it ? Sure. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/41] Consolidated Pull
Another Friday, another consolidated pull. The wic changes that were previously in here have been deferred as there were mysterious dependency problems that I can't replicate. Ross The following changes since commit 35ecff3cf077bd22cf7d0a6145732cdcc34f15dc: bitbake: fetch/git: add support for removing arbitrary revs for shallow (2017-06-02 13:36:57 +0100) are available in the git repository at: ssh://g...@git.yoctoproject.org/poky-contrib ross/mut for you to fetch changes up to 6ec5f58acad63baba744ab1bd5901ff8256c6bfc: dropbear: upgrade 2016.74 -> 2017.75 (2017-06-02 15:10:29 +0100) Choong YinThong (1): start_getty: Over added SERIAL_CONSOLE cause error in userspace log Daniel Lublin (2): devtool: deploy-target: Don't use find -exec devtool: deploy-target: Let script continue even if rm fails Dengke Du (2): json-glib: upgrade 1.2.2 -> 1.2.8 dropbear: upgrade 2016.74 -> 2017.75 Ed Bartosh (1): isoimage-isohybrid: don't use TRANSLATED_TARGET_ARCH Gan, Yau Wai (1): insane.bbclass: fix override handling in RDEPENDS QA Jonathan Liu (1): bitbake.conf: Add sdl-config to HOSTTOOLS if using host SDL Joshua Watt (1): archiver: Escape recipe name in regex Jussi Kukkonen (18): glib-2.0: Upgrade 2.50.3 -> 2.52.2 libsoup-2.4: Upgrade 2.56.0 -> 2.58.1 atk: Upgrade 2.22 -> 2.24 atk-spi2-core: Upgrade 2.24.0 -> 2.24.1 at-spi2-atk: Upgrade 2.24.0 -> 2.24.1 adwaita-icon-theme: Upgrade 3.22.0 -> 3.24.0 libepoxy: Upgrade 1.4.1 -> 1.4.2 librsvg: Upgrade 2.40.16 -> 2.40.17 gtk+3: Upgrade 3.22.8 -> 3.22.15 gnome-themes-standard: Upgrade 3.22.2 -> 3.22.3 vte: Upgrade 0.46.1 -> 0.48.3 libevdev: Upgrade 1.5.6 -> 1.5.7 clutter-1.0: Upgrade 1.26.0 -> 1.26.2 clutter-gst-3.0: Upgrade 3.0.22 -> 3.0.24 xf86-input-libinput: Upgrade 0.24.0 -> 0.25.1 xserver-xorg: Upgrade 1.19.1 -> 1.19.3 xkbcomp: Upgrade 1.3.1 -> 1.4.0 xkeyboard-config: Upgrade 2.20 -> 2.21 Khem Raj (3): nfs-utils: Fix build error due to missing stdint.h> include glibc: Configure with extra hardening options libatomic-ops: Upgrade to 7.6.0 Leonardo Sandoval (1): maintainers: update maintainers in several python modules, cronie and swig Marek Vasut (2): u-boot: Update to 2017.05 release u-boot: Fix build with OpenSSL 1.1.x Maxin B. John (3): sqlite3: upgrade 3.18.0 -> 3.19.2 libtasn1: upgrade 4.10 -> 4.12 pkgconfig: upgrade 0.29.1 -> 0.29.2 Mikko Rapeli (1): scripts: Fix return value checks from subprocess.call()'s Nicolas Dechesne (1): mesa: upgrade to 17.1.1 Ola x Nilsson (1): devtool: Compare abspath of both B and S Paul Eggleton (1): classes/buildhistory: make a single commit per build Ross Burton (1): kconfig-frontends: fix another build race meta-poky/conf/distro/include/maintainers.inc | 32 ++--- meta/classes/archiver.bbclass | 4 +- meta/classes/buildhistory.bbclass | 12 +- meta/classes/image_types_wic.bbclass | 2 +- meta/classes/insane.bbclass| 2 +- meta/conf/bitbake.conf | 3 + .../0001-rsa-Fix-build-with-OpenSSL-1.1.x.patch| 158 + ...ols-kwbimage-fix-build-with-OpenSSL-1.1.x.patch | 101 + meta/recipes-bsp/u-boot/files/default-gcc.patch| 39 - ...ommon_2017.01.inc => u-boot-common_2017.05.inc} | 8 +- ...utils_2017.01.bb => u-boot-fw-utils_2017.05.bb} | 2 - ...kimage_2017.01.bb => u-boot-mkimage_2017.05.bb} | 2 - .../{u-boot_2017.01.bb => u-boot_2017.05.bb} | 0 ...nclude-stdint.h-for-UINT16_MAX-definition.patch | 27 .../nfs-utils/nfs-utils_2.1.1.bb | 1 + .../dropbear/support-out-of-tree-builds.patch | 43 -- meta/recipes-core/dropbear/dropbear_2016.74.bb | 7 - meta/recipes-core/dropbear/dropbear_2017.75.bb | 5 + .../glib-2.0/glib-2.0/fix-conflicting-rand.patch | 35 - .../glib-2.0/glib-2.0/glib-gettextize-dir.patch| 24 .../{glib-2.0_2.50.3.bb => glib-2.0_2.52.2.bb} | 8 +- meta/recipes-core/glib-2.0/glib.inc| 1 + meta/recipes-core/glibc/glibc_2.25.bb | 4 + .../sysvinit/sysvinit-inittab/start_getty | 38 - .../kconfig-frontends/files/missing-mkdir.patch| 4 + ...e-Move-warning-pragma-outside-of-function.patch | 39 - meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 5 +- .../0001-Don-t-use-AC_CANONICAL_HOST.patch | 29 ...heme_3.22.0.bb => adwaita-icon-theme_3.24.0.bb} | 5 +- ...d_3.22.2.bb => gnome-themes-standard_3.22.3.bb} | 4 +- .../gtk+/{gtk+3_3.22.8.bb => gtk+3_3.22.15.bb} | 4 +- ..._3.22.8.bb => gtk-icon-utils-native_3.22.15.bb} | 4 +- .../{json-glib_1.2.2.bb =>
[OE-core] [PATCH V2] distutils-base.bbclass: Do not use -pie with hardening
Fix build when PIE is turned on. It tries to build .so file using -pie and -shared flags together because its doing compile and link in same step CFLAGS and LDFLAGS are combined and does not work, ending in errors e.g. | /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/python-pygpgme/0.3-r0/recipe-sysroot/usr/l ib/Scrt1.o: In function `_start_c': | /usr/src/debug/musl/1.1.16+gitAUTOINC+179766aa2e-r0/git/crt/crt1.c:17: undefined reference to `main' | collect2: error: ld returned 1 exit status This error while cryptic is due to the fact that we are building a shared library but also pass -pie flag to the link step after specify LDHSARED ( which is -shared linker flags ) we can not use -pie when doing shared libs. This is true for all the python modules inheriting setup tools Disable the pie flags thusly for all modules using setuptools since this setting is done in setuptools makefiles which are then used during module compiles Signed-off-by: Khem Raj--- v1 -> v2: - Move the change to distutils-base to include both python2 and 3 meta/classes/distutils-base.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/distutils-base.bbclass b/meta/classes/distutils-base.bbclass index 9f398d7051..3adbd5c643 100644 --- a/meta/classes/distutils-base.bbclass +++ b/meta/classes/distutils-base.bbclass @@ -2,3 +2,5 @@ DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES') = RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base pythonnative + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS} -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] rpm: run binary package generation via thread pools
On 06/01/2017 07:02 PM, Alexander Kanavin wrote: On 06/01/2017 06:15 PM, Alexander Kanavin wrote: This greatly reduces build times when there is a large amount of small rpm packages to produce. The patches are rather invasive, and so will be submitted upstream. And now the pull request is open: https://github.com/rpm-software-management/rpm/pull/226 https://github.com/rpm-software-management/rpm/issues/211 So the upstream's reaction to the pull request is that they're not against this, but they want the multiprocessing to be done with openmp (and not nss/nspr), given that they now actually support openssl as an alternative to nss, and don't want any hard dependencies on netscape stuff. I'll spend some time studying that. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] package_rpm.bbclass: use multithreaded xz compression
On 06/01/2017 10:02 PM, Andre McCurdy wrote: RPM's default is single-threaded gz; the change greatly helps with both buildtimes (when there is a small number of large-sized packages) and disk space taken by resulting rpms. Do you have any test results for that? Obviously build times will be longer when building with a single CPU since xz compression needs more CPU than gzip, but I'm curious how many CPUs are required before the multiple threads win over and build times actually get shorter. 4? 8? Yes; it's in the cover letter. One other concern with parallel xz compression is memory usage. Single threaded xz needs more memory than gzip and running multiple xz compression threads together will push the memory usage up again. Maybe not an issue if the peak is still acceptable, but something to be aware of (I've given up trying to build in 4GB, but hopefully 8GB build machines still have some life left in them...). I haven't seen anything resembling low-memory or OOM in my testing, even when running 44 rpm instances at the same time, each with their own several threads, each thread handling a package, and compression for the package again being done in a multi-threaded way. But then I have 22 cores and 32G RAM here. So do try the patches please, and report the findings, YMMV. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cairo: Upgrade 1.14.8 -> 1.15.4
On 2 June 2017 at 07:30, Fan Xinwrote: > 1. Upgrade cairo from 1.14.8 to 1.15.4 > "Subject: cairo snapshot 1.15.4 now available" The recipe inherits upstream-version-is-even because odd minor versions are development snapshots. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/9] gstreamer1.0-plugins-ugly: upgrade to version 1.12.0
Note that this might be because of a change I did in gstreamer1.0-vaapi.inc. Previously, the PACKAGECONFIG line contained "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}". I replaced that with a PACKAGECONFIG_GL variable that can be overridden by distros and/or BSP layers, just like how PACKAGECONFIG_GL works in gstreamer1.0-plugins-bad.inc . On 2017-06-01 17:32, Burton, Ross wrote: On 16 May 2017 at 12:26, Carlos Rafael Giani> wrote: * libmad plugin was removed in 1.12.0, since mad is GPLed, unmaintained, and both gst-libav & the mpg123 plugin are fully functional alternatives Something in this series is causing other plugins to change their dependencies and I'm not sure if it's intentional or not. For example, this happens when upgrading base/good/bad: packages/corei7-64-poky-linux/gstreamer1.0-vaapi/gstreamer1.0-vaapi: RDEPENDS: removed all items "libwayland-egl (['>= 17.1.1']) libgles2-mesa (['>= 17.1.1'])" I've not dug into this to see if that is expected or not. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sed: Upgrade 4.2.2 -> 4.4
On Fri, 2017-06-02 at 17:15 +0900, Fan Xin wrote: > 1. Upgrade sed from 4.2.2 to 4.4 > > 2. Update the SRC_URI > The format of archive file is changed from .tar.gz to .tar.xz > > 3. Rename the folder from sed-4.2.2 to sed > No need to update the folder name when version upgrade > > 4. Delete unncessary patch file due to the applied file is not exist. > sed-add-ptest.patch That patch touches three files. Could you explain more about why this patch is no longer required as I don't quite understand what you mean here? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sed: Upgrade 4.2.2 -> 4.4
On 2017年06月02日 16:15, Fan Xin wrote: 1. Upgrade sed from 4.2.2 to 4.4 2. Update the SRC_URI The format of archive file is changed from .tar.gz to .tar.xz 3. Rename the folder from sed-4.2.2 to sed No need to update the folder name when version upgrade 4. Delete unncessary patch file due to the applied file is not exist. sed-add-ptest.patch So you should add another patch to add the tests. 5. Update licence checksum due to date change, not license change Signed-off-by: Fan Xin--- .../sed/sed-4.2.2/sed-add-ptest.patch | 66 -- ...need_charset_alias-when-building-for-musl.patch | 0 .../sed/{sed-4.2.2 => sed}/run-ptest | 0 .../sed/{sed_4.2.2.bb => sed_4.4.bb} | 11 ++-- 4 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%) rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/run-ptest (100%) rename meta/recipes-extended/sed/{sed_4.2.2.bb => sed_4.4.bb} (76%) diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch deleted file mode 100644 index 0293900..000 --- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch +++ /dev/null @@ -1,66 +0,0 @@ -sed: add ptest - -ptest needs buildtest-TESTS and runtest-TESTS targets. -serial-tests is required to generate those targets. - -And fix following error after add serial-tests. - -[snip] -help2man: can't get `--help' info from ../sed/sed -make[2]: *** [sed.1] Error 2 -[snip] - -Upstream-Status: Inappropriate - -Signed-off-by: Chong Lu - configure.ac |2 +- - doc/Makefile.am |2 +- - testsuite/Makefile.am |6 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9d33ec9..4f0c532 100644 a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux) - AC_CONFIG_SRCDIR([sed/sed.c]) - AM_CONFIG_HEADER(config.h:config_h.in) - AC_PREREQ(2.60) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([serial-tests]) - - SED_FEATURE_VERSION=4.2.2 - AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", -diff --git a/doc/Makefile.am b/doc/Makefile.am -index af6975c..6fd8c9a 100644 a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -25,7 +25,7 @@ $(srcdir)/s-texi: sed-in.texi $(srcdir)/groupify.sed - fi - echo stamp > $(srcdir)/s-texi - --sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x -+_sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x - $(HELP2MAN) --name "stream editor for filtering and transforming text" \ - -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) - -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index d80e72c..b05f01e 100644 a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -99,5 +99,11 @@ EXTRA_DIST = \ - # automake makes `check' depend on $(TESTS). Declare - # dummy targets for $(TESTS) so that make does not complain. - -+install-ptest: -+ cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - ) -+ for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done -+ sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile -+ for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done -+ - .PHONY: $(SEDTESTS) - $(SEDTESTS): --- -1.7.9.5 - diff --git a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch rename to meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch diff --git a/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/meta/recipes-extended/sed/sed/run-ptest similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/run-ptest rename to meta/recipes-extended/sed/sed/run-ptest diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.4.bb similarity index 76% rename from meta/recipes-extended/sed/sed_4.2.2.bb rename to meta/recipes-extended/sed/sed_4.4.bb index 5aa7d8a..cb559e0 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.4.bb @@ -1,18 +1,17 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/; LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ -
[OE-core] [PATCH] sed: Upgrade 4.2.2 -> 4.4
1. Upgrade sed from 4.2.2 to 4.4 2. Update the SRC_URI The format of archive file is changed from .tar.gz to .tar.xz 3. Rename the folder from sed-4.2.2 to sed No need to update the folder name when version upgrade 4. Delete unncessary patch file due to the applied file is not exist. sed-add-ptest.patch 5. Update licence checksum due to date change, not license change Signed-off-by: Fan Xin--- .../sed/sed-4.2.2/sed-add-ptest.patch | 66 -- ...need_charset_alias-when-building-for-musl.patch | 0 .../sed/{sed-4.2.2 => sed}/run-ptest | 0 .../sed/{sed_4.2.2.bb => sed_4.4.bb} | 11 ++-- 4 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%) rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/run-ptest (100%) rename meta/recipes-extended/sed/{sed_4.2.2.bb => sed_4.4.bb} (76%) diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch deleted file mode 100644 index 0293900..000 --- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch +++ /dev/null @@ -1,66 +0,0 @@ -sed: add ptest - -ptest needs buildtest-TESTS and runtest-TESTS targets. -serial-tests is required to generate those targets. - -And fix following error after add serial-tests. - -[snip] -help2man: can't get `--help' info from ../sed/sed -make[2]: *** [sed.1] Error 2 -[snip] - -Upstream-Status: Inappropriate - -Signed-off-by: Chong Lu - configure.ac |2 +- - doc/Makefile.am |2 +- - testsuite/Makefile.am |6 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9d33ec9..4f0c532 100644 a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux) - AC_CONFIG_SRCDIR([sed/sed.c]) - AM_CONFIG_HEADER(config.h:config_h.in) - AC_PREREQ(2.60) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([serial-tests]) - - SED_FEATURE_VERSION=4.2.2 - AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", -diff --git a/doc/Makefile.am b/doc/Makefile.am -index af6975c..6fd8c9a 100644 a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -25,7 +25,7 @@ $(srcdir)/s-texi: sed-in.texi $(srcdir)/groupify.sed - fi - echo stamp > $(srcdir)/s-texi - --sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x -+_sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x - $(HELP2MAN) --name "stream editor for filtering and transforming text" \ - -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) - -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index d80e72c..b05f01e 100644 a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -99,5 +99,11 @@ EXTRA_DIST = \ - # automake makes `check' depend on $(TESTS). Declare - # dummy targets for $(TESTS) so that make does not complain. - -+install-ptest: -+ cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - ) -+ for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done -+ sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile -+ for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done -+ - .PHONY: $(SEDTESTS) - $(SEDTESTS): --- -1.7.9.5 - diff --git a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch rename to meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch diff --git a/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/meta/recipes-extended/sed/sed/run-ptest similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/run-ptest rename to meta/recipes-extended/sed/sed/run-ptest diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.4.bb similarity index 76% rename from meta/recipes-extended/sed/sed_4.2.2.bb rename to meta/recipes-extended/sed/sed_4.4.bb index 5aa7d8a..cb559e0 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.4.bb @@ -1,18 +1,17 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/; LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f" +LIC_FILES_CHKSUM =
[OE-core] [PATCH v3] kernel.bbclass: fix KERNEL_IMAGETYPE(S) for Image.gz
KERNEL_IMAGETYPES lists all the kernel images that we want to build. in cb17b6c2a7 (kernel.bbclass: support kernel image type of vmlinux.gz), some logic was added to support vmlinux.gz which is not a target built by kernel makefiles (only vmlinux). It is clear that the goal of this logic is only to support vmlinux.gz and not others compressed format (such as Image.gz) which are valid target for kernel makefiles. For Image.gz we should rely on the kernel makefiles and not do the compression in kernel class. This patch updates the logic used to filter out non supported kernel target from KERNEL_IMAGETYPES, and make vmlinux.gz a 'special case', instead of *.gz. If more special cases are needed in the future, we could add them in a similar way. This patch should be a no-op for anyone using vmlinux or vmlinux.gz, and on top of that it is fixing the build for Image.gz which was not working until now. Signed-off-by: Nicolas Dechesne--- meta/classes/kernel.bbclass | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7a134d5c29..7670c7107a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -32,7 +32,6 @@ KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION') KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}" python __anonymous () { -import re # Merge KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE into KERNEL_IMAGETYPES type = d.getVar('KERNEL_IMAGETYPE') or "" @@ -44,7 +43,10 @@ python __anonymous () { types = (alttype + ' ' + types).strip() d.setVar('KERNEL_IMAGETYPES', types) -typeformake = re.sub(r'\.gz', '', types) +# some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz +# typeformake lists only valid kernel make targets, and post processing can be done after the kernel +# is built (such as using gzip to compress vmlinux) +typeformake = types.replace('vmlinux.gz', 'vmlinux') d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) for type in types.split(): @@ -268,14 +270,12 @@ kernel_do_compile() { fi for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do oe_runmake ${typeformake} CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd - for type in ${KERNEL_IMAGETYPES} ; do - if test "${typeformake}.gz" = "${type}"; then - mkdir -p "${KERNEL_OUTPUT_DIR}" - gzip -9c < "${typeformake}" > "${KERNEL_OUTPUT_DIR}/${type}" - break; - fi - done done + # vmlinux.gz is not built by kernel + if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then + mkdir -p "${KERNEL_OUTPUT_DIR}" + gzip -9c < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz" + fi } do_compile_kernelmodules() { -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lzip: Upgrade 1.18 -> 1.19
Signed-off-by: Fan Xin--- meta/recipes-extended/lzip/{lzip_1.18.bb => lzip_1.19.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/lzip/{lzip_1.18.bb => lzip_1.19.bb} (88%) diff --git a/meta/recipes-extended/lzip/lzip_1.18.bb b/meta/recipes-extended/lzip/lzip_1.19.bb similarity index 88% rename from meta/recipes-extended/lzip/lzip_1.18.bb rename to meta/recipes-extended/lzip/lzip_1.19.bb index c1dc8ce..099b364 100644 --- a/meta/recipes-extended/lzip/lzip_1.18.bb +++ b/meta/recipes-extended/lzip/lzip_1.19.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \ SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" -SRC_URI[md5sum] = "3838567460ce4a10143de4bccc64fe1c" -SRC_URI[sha256sum] = "47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd" +SRC_URI[md5sum] = "4dd8790d7528440d034fc713a8680bd3" +SRC_URI[sha256sum] = "ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9" CONFIGUREOPTS = "\ '--srcdir=${S}' \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cups: Upgrade 2.2.2 -> 2.2.3
Signed-off-by: Fan Xin--- meta/recipes-extended/cups/{cups_2.2.2.bb => cups_2.2.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/cups/{cups_2.2.2.bb => cups_2.2.3.bb} (40%) diff --git a/meta/recipes-extended/cups/cups_2.2.2.bb b/meta/recipes-extended/cups/cups_2.2.3.bb similarity index 40% rename from meta/recipes-extended/cups/cups_2.2.2.bb rename to meta/recipes-extended/cups/cups_2.2.3.bb index 5174c30..204d14d 100644 --- a/meta/recipes-extended/cups/cups_2.2.2.bb +++ b/meta/recipes-extended/cups/cups_2.2.3.bb @@ -2,5 +2,5 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f212b4338db0da8cb892e94bf2949460" -SRC_URI[md5sum] = "036f6bda6202ae3e280ac00c710b5ca4" -SRC_URI[sha256sum] = "f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6" +SRC_URI[md5sum] = "006a8156680a516e43c59034e31df8bf" +SRC_URI[sha256sum] = "66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: Upgrade 1.14.8 -> 1.15.4
1. Upgrade cairo from 1.14.8 to 1.15.4 2. Update the SRC_URI according to the release note https://www.cairographics.org/news/cairo-1.15.4/ 3. Fix the -dev package contains non-symlink .so error. Signed-off-by: Fan Xin--- meta/recipes-graphics/cairo/{cairo_1.14.8.bb => cairo_1.15.4.bb} | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) rename meta/recipes-graphics/cairo/{cairo_1.14.8.bb => cairo_1.15.4.bb} (86%) diff --git a/meta/recipes-graphics/cairo/cairo_1.14.8.bb b/meta/recipes-graphics/cairo/cairo_1.15.4.bb similarity index 86% rename from meta/recipes-graphics/cairo/cairo_1.14.8.bb rename to meta/recipes-graphics/cairo/cairo_1.15.4.bb index 5a3c74f..f48effa 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.8.bb +++ b/meta/recipes-graphics/cairo/cairo_1.15.4.bb @@ -2,10 +2,10 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz; +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.xz; -SRC_URI[md5sum] = "4ef0db2eacb271c74f8a3fd87822aa98" -SRC_URI[sha256sum] = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20" +SRC_URI[md5sum] = "891ddce3c1c73df791efafd627240cdc" +SRC_URI[sha256sum] = "deddf31e196e826e7790bbbf7d0f4b3fd15df243aa48511b349f1791b96be291" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" @@ -32,7 +32,7 @@ FILES_${PN} = "${libdir}/libcairo.so.*" FILES_${PN}-dev += "${libdir}/cairo/*.so" FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" +FILES_${PN}-perf-utils = "${bindir}/cairo-trace ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so" do_install_append () { rm -rf ${D}${bindir}/cairo-sphinx @@ -41,3 +41,4 @@ do_install_append () { rm -rf ${D}${libdir}/cairo/.debug/cairo-fdr* rm -rf ${D}${libdir}/cairo/.debug/cairo-sphinx* } + -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] tcf-agent: Add missing leading space to CFLAGS appends
Its a typo, that we see when building with musl Signed-off-by: Khem Raj--- meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb index 1dad825fda..de627e09e8 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb @@ -36,13 +36,13 @@ MAKE_OS = "`echo ${TARGET_OS} | sed s,^linux.*,GNU/Linux,`" EXTRA_OEMAKE = "MACHINE=${MAKE_ARCH} OPSYS=${MAKE_OS} 'CC=${CC}' 'AR=${AR}'" # These features don't compile on mips and libc-musl -CFLAGS_mips_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +CFLAGS_mips_append = " -DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_mips64_append = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +CFLAGS_mips64_append = " -DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -CFLAGS_append_libc-musl = "-DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ +CFLAGS_append_libc-musl = " -DSERVICE_RunControl=0 -DSERVICE_Breakpoints=0 \ -DSERVICE_Memory=0 -DSERVICE_Registers=0 -DSERVICE_MemoryMap=0 \ -DSERVICE_StackTrace=0 -DSERVICE_Expressions=0" -- 2.13.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core