[OE-core] [PATCH] strace: upgrade 5.5 -> 5.6
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} (92%)
diff --git a/meta/recipes-devtools/strace/strace_5.5.bb
b/meta/recipes-devtools/strace/strace_5.6.bb
similarity index 92%
rename from meta/recipes-devtools/strace/strace_5.5.bb
rename to meta/recipes-devtools/strace/strace_5.6.bb
index ae552da028..5015e87b22 100644
--- a/meta/recipes-devtools/strace/strace_5.5.bb
+++ b/meta/recipes-devtools/strace/strace_5.6.bb
@@ -15,8 +15,8 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
file://uintptr_t.patch \
file://0001-strace-fix-reproducibilty-issues.patch \
"
-SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
-SRC_URI[sha256sum] =
"9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
+SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
+SRC_URI[sha256sum] =
"189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"
inherit autotools ptest
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138617):
https://lists.openembedded.org/g/openembedded-core/message/138617
Mute This Topic: https://lists.openembedded.org/mt/74413658/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] gtest and gmock not added to SDK
On Fri, May 22, 2020 at 3:50 PM Tom Hochstein wrote: > On Fri, May 22, 2020 at 03:33 PM, Andre McCurdy wrote: > On Fri, May 22, 2020 at 5:48 PM Tom Hochstein wrote: > > The gtest and gmock packages provided by googletest are not added to the SDK > by default. I assume it is because the googletest main package is empty? > > Are you including googletest in the image used to create the SDK or > gmock and gtest? > > It looks like gmock and gtest are only mentioned in the googletest > recipe as PROVIDES, so they are aliases for build time dependencies > only. For run time dependencies you should use googletest. > > Right, I should have mentioned that. I have a DEPENDS on gtest for a package > in my image. To fix the SDK, I added an RDEPENDS on googletest from the same > package. What you have done is probably the best solution. You could alternatively add googletest to the image. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138616): https://lists.openembedded.org/g/openembedded-core/message/138616 Mute This Topic: https://lists.openembedded.org/mt/74408257/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] gtest and gmock not added to SDK
On Fri, May 22, 2020 at 03:33 PM, Andre McCurdy wrote:
>
> On Fri, May 22, 2020 at 2:29 PM Otavio Salvador
> wrote:
>
>> On Fri, May 22, 2020 at 5:48 PM Tom Hochstein
>> wrote:
>>
>>> The gtest and gmock packages provided by googletest are not added to the
>>> SDK by default. I assume it is because the googletest main package is
>>> empty?
>>
>>
>
> Are you including googletest in the image used to create the SDK or
> gmock and gtest?
>
> It looks like gmock and gtest are only mentioned in the googletest
> recipe as PROVIDES, so they are aliases for build time dependencies
> only. For run time dependencies you should use googletest.
Right, I should have mentioned that. I have a DEPENDS on gtest for a package in
my image. To fix the SDK, I added an RDEPENDS on googletest from the same
package.
>
>
>
>>
>>> I added an RDEPENDS_${PN} from the dependent package to fix it. Is there a
>>> better solution?
>>
>> You can change the packages to have their `-dev` to rdepends on
>> `gtest/gmock-dev` for example.
>>
>> --
>> Otavio Salvador O.S. Systems
>> http://www.ossystems.com.br http://code.ossystems.com.br
>> Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138615):
https://lists.openembedded.org/g/openembedded-core/message/138615
Mute This Topic: https://lists.openembedded.org/mt/74408257/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] oeqa/concurrencytest: don't delete build directory for failed tests
Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/utils/concurrencytest.py | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index fac59f765a..01c39830f9 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -77,14 +77,17 @@ class ProxyTestResult: # a very basic TestResult proxy, in order to modify add* calls def __init__(self, target): self.result = target +self.failed_tests = 0 def _addResult(self, method, test, *args, exception = False, **kwargs): return method(test, *args, **kwargs) def addError(self, test, err = None, **kwargs): +self.failed_tests += 1 self._addResult(self.result.addError, test, err, exception = True, **kwargs) def addFailure(self, test, err = None, **kwargs): +self.failed_tests += 1 self._addResult(self.result.addFailure, test, err, exception = True, **kwargs) def addSuccess(self, test, **kwargs): @@ -96,6 +99,9 @@ class ProxyTestResult: def addUnexpectedSuccess(self, test, **kwargs): self._addResult(self.result.addUnexpectedSuccess, test, **kwargs) +def wasSuccessful(self): +return self.failed_tests == 0 + def __getattr__(self, attr): return getattr(self.result, attr) @@ -287,10 +293,10 @@ def fork_for_tests(concurrency_num, suite): # as per default in parent code subunit_client.buffer = True subunit_result = AutoTimingTestResultDecorator(subunit_client) - process_suite.run(ExtraResultsEncoderTestResult(subunit_result)) +unittest_result = process_suite.run(ExtraResultsEncoderTestResult(subunit_result)) if ourpid != os.getpid(): os._exit(0) -if newbuilddir: +if newbuilddir and unittest_result.wasSuccessful(): removebuilddir(newbuilddir) except: # Don't do anything with process children -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138614): https://lists.openembedded.org/g/openembedded-core/message/138614 Mute This Topic: https://lists.openembedded.org/mt/74410261/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] gtest and gmock not added to SDK
On Fri, May 22, 2020 at 2:29 PM Otavio Salvador
wrote:
>
> On Fri, May 22, 2020 at 5:48 PM Tom Hochstein wrote:
> > The gtest and gmock packages provided by googletest are not added to the
> > SDK by default. I assume it is because the googletest main package is empty?
Are you including googletest in the image used to create the SDK or
gmock and gtest?
It looks like gmock and gtest are only mentioned in the googletest
recipe as PROVIDES, so they are aliases for build time dependencies
only. For run time dependencies you should use googletest.
> > I added an RDEPENDS_${PN} from the dependent package to fix it. Is there a
> > better solution?
>
> You can change the packages to have their `-dev` to rdepends on
> `gtest/gmock-dev` for example.
>
> --
> Otavio Salvador O.S. Systems
> http://www.ossystems.com.brhttp://code.ossystems.com.br
> Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138613):
https://lists.openembedded.org/g/openembedded-core/message/138613
Mute This Topic: https://lists.openembedded.org/mt/74408257/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH] checklayer: Skip layers without a collection
As in other places in the file, skip layers that don't define a collection when searching for a layer to resolve a dependency. Fixes KeyError exceptions when attempting to access the layer collections later Signed-off-by: Joshua Watt --- scripts/lib/checklayer/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index 5aeec2f00f..1138000275 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py @@ -143,6 +143,9 @@ def detect_layers(layer_directories, no_auto): def _find_layer_depends(depend, layers): for layer in layers: +if 'collections' not in layer: +continue + for collection in layer['collections']: if depend == collection: return layer -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138612): https://lists.openembedded.org/g/openembedded-core/message/138612 Mute This Topic: https://lists.openembedded.org/mt/74409708/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] gtest and gmock not added to SDK
On Fri, May 22, 2020 at 5:48 PM Tom Hochstein wrote:
> The gtest and gmock packages provided by googletest are not added to the SDK
> by default. I assume it is because the googletest main package is empty?
>
> I added an RDEPENDS_${PN} from the dependent package to fix it. Is there a
> better solution?
You can change the packages to have their `-dev` to rdepends on
`gtest/gmock-dev` for example.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138611):
https://lists.openembedded.org/g/openembedded-core/message/138611
Mute This Topic: https://lists.openembedded.org/mt/74408257/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] gtest and gmock not added to SDK
The gtest and gmock packages provided by googletest are not added to the SDK by
default. I assume it is because the googletest main package is empty?
I added an RDEPENDS_${PN} from the dependent package to fix it. Is there a
better solution?
Tom
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138610):
https://lists.openembedded.org/g/openembedded-core/message/138610
Mute This Topic: https://lists.openembedded.org/mt/74408257/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] rm_work causes image tasks to re-run
On Friday 22 May 2020 at 19:02:47 +0200, Jacob Kroon wrote: > Hi Mike, > > On 5/22/20 10:13 AM, Mike Crowe via lists.openembedded.org wrote: > > When we have rm_work enabled all image tasks are built every time. This has > > been happening since at least warrior and is still happening as of master > > today (8fc19639f47b959a141dae231395bbababa644e1). > > > > Steps to reproduce: > > > > bitbake core-image-minimal > > bitbake core-image-minimal > > echo 'INHERIT += "rm_work"' >> conf/local.conf > > bitbake core-image-minimal > > bitbake core-image-minimal > > > > The second invocation of bitbake doesn't build anything at all (as would be > > expected.) > > > > The fourth invocation of bitbake always builds: > > > > Sstate summary: Wanted 43 Found 43 Missed 0 Current 436 (100% match, 100% > > complete) > > NOTE: Executing Tasks > > NOTE: Setscene tasks completed > > NOTE: Running noexec task 1750 of 2000 > > (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work_all) > > NOTE: Running task 1998 of 2000 > > (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_populate_lic_deploy) > > NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: > > Started > > NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: > > Succeeded > > NOTE: Running task 1999 of 2000 > > (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work) > > NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Started > > NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Succeeded > > NOTE: Running noexec task 2000 of 2000 > > (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_build) > > NOTE: Tasks Summary: Attempted 2000 tasks of which 1996 didn't need to be > > rerun and all succeeded. > > > > If I teach rm_work.bbclass to also skip files matching > > "*do_populate_lic_deploy*" then this problem goes away. However, I have > > form for breaking things in rm_work so I suspect that this isn't the > > correct fix. Is there a better one? > > > > Thanks. > > > > Mike. > > > > Since I'm the last guy touching rm_work.bbclass ... > > I don't see the rebuilds in my images. Although I do see > > core-image-minimal.bb:do_populate_lic_deploy > > being run, there is no regeneration of the rootfs images. I was originally investigating on warrior where the do_rootfs task does run unnecessarily. It turns out that if I cherry-pick the three subsequent rm_work changes from master back to warrior then it behaves the same as master. I shall do that in our tree. Is it possible to avoid the do_populate_lic_deploy task running unnecessarily on master too? Thanks. Mike. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138609): https://lists.openembedded.org/g/openembedded-core/message/138609 Mute This Topic: https://lists.openembedded.org/mt/74394858/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/4] go-mod.bbclass: Add class for `go mod` support
On Fri, May 22, 2020 at 2:23 PM Khem Raj wrote: ... > > +# Copyright 2020 (C) O.S. Systems Software LTDA. > > + > > Do you also want to add license on top along with copyrights ? It is same as OE-Core, if desired, I can make it explicit. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138608): https://lists.openembedded.org/g/openembedded-core/message/138608 Mute This Topic: https://lists.openembedded.org/mt/74391109/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Hi Paulo,
Yes, this is handled by the bitbake data handlers automatically. You can
check this by trying the following:
python do_test() {
d.setVar("HELLO", "world!")
d.setVar("HELLO_space", "space!")
bb.warn("HELLO: %s" % d.getVar("HELLO", True))
d.setVar("OVERRIDES", "space")
bb.warn("HELLO: %s" % d.getVar("HELLO", True))
}
addtask test
Then calling this task with bitbake:
$ bitbake zip -c test | tee
...
WARNING: zip-3.0-r2 do_test: HELLO: world!
WARNING: zip-3.0-r2 do_test: HELLO: space!
I don't know the code or tests in oe that implement this functionality off
the top of my head so I can't point you to the oe.selftest coverage.
Kind regards,
Michael
On Fri, May 22, 2020 at 8:09 PM Paulo Neves wrote:
> Hello Michael,
>
> The behavior you describe is indeed what i wanted. If you say this is
> already working then my patches are redundant. Even so i am surprised
> it is working. Is it done automatically by the getVar function?
>
> def get_package_additional_metadata (pkg_type, d):
> base_key = "PACKAGE_ADD_METADATA"
> for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
> if d.getVar(key, False) is None:
> continue
> d.setVarFlag(key, "type", "list")
> if d.getVarFlag(key, "separator") is None:
> d.setVarFlag(key, "separator", "\\n")
> metadata_fields = [field.strip() for field in
> oe.data.typed_value(key, d)]
> return "\n".join(metadata_fields).strip()
>
> From my understanding, i do not see how the per package override
> happens. Do you have the test for this functionality in oe-selftest?
>
> Grateful for the feedback
> Paulo Neves
>
> On Fri, May 22, 2020 at 8:00 PM Michael Ho wrote:
> >
> > Hi Paulo,
> >
> > I actually have some patches in my "to send upstream list" to address
> the documentation and some sstate-caching bugs with these variables so it's
> fresh to me at the moment.
> > Correct me if I'm wrong but I think this is already available in the
> code (applying metadata specific to a certain package in a recipe, that is).
> >
> > eg.
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass
> at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is
> set, it overrides PACKAGE_ADD_METADATA_IPK.
> >
> > For rpm, see
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298
> where the recipe wide variable is fetched
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338
> where the local override is also set
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354
> where the package specific variables are fetched
> >
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436
> where the package specific variables are applied to rpm packages
> >
> > I tested the zip recipe by applying these two lines:
> > PACKAGE_ADD_METADATA_RPM = "Vendor: None"
> > PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!"
> > and could see differing results in the two rpm files produced.
> >
> > I think this covers the use case you're showing in your patches already,
> what do you think?
> >
> > Kind regards,
> > Michael
> >
> > (sorry if this shows up as a triple email, my mail client wasn't
> cooperating).
> >
> > On Fri, May 22, 2020 at 5:29 PM Paulo Neve wrote:
> >>
> >> Is ./meta/lib/oeqa/selftest/cases/package.py the right place?
> >> If yes i can work on it. Note that this functionality is not used
> >> anywhere in poky and is not documented at all. It just happened to
> >> exist for a long time and be useful for my case.
> >>
> >> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin
> >> wrote:
> >> >
> >> > Should there be a test for this functionality? Somewhere in
> oe-selftest perhaps where various package manager features are tested?
> >> >
> >> > Alex
> >> >
> >> > On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
> >> >>
> >> >> Up to now the user defined metadata was set recipe wide,
> >> >> meaning all the packages generated in a recipe where the
> >> >> variable was set would get the same metadata. That is not
> >> >> always ideal and is counter to the per package control that
> >> >> is usually available.
> >> >>
> >> >> Keep support for package agnostic metadata but also add option
> >> >> to add it to a specific option like:
> >> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
> >> >>
> >> >> Signed-off-by: Paulo Neves
> >> >> ---
> >> >> meta/classes/package.bbclass | 4 ++--
> >> >> meta/classes/package_deb.bbclass | 2 +-
> >> >> meta/classes/package_ipk.bbclass | 2 +-
> >> >> meta/classes/package_rpm.bbclass | 5 +++--
> >> >> 4 files changed, 7 insertions(+), 6 deletions(-)
> >> >>
> >> >> diff --git a/meta/classes/package.bbclass
> b/meta/classes/package.bbclass
> >> >> index 0b5cf47749..1678e0d794 100644
> >> >> --- a/meta/classes/package.bbclass
> >> >> +++
[OE-core] [PATCH] go-1.14: Update to 1.14.3 minor release
Signed-off-by: Khem Raj
---
meta/recipes-devtools/go/go-1.14.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/go/go-1.14.inc
b/meta/recipes-devtools/go/go-1.14.inc
index c52593db6b..d729b65267 100644
--- a/meta/recipes-devtools/go/go-1.14.inc
+++ b/meta/recipes-devtools/go/go-1.14.inc
@@ -1,7 +1,7 @@
require go-common.inc
GO_BASEVERSION = "1.14"
-GO_MINOR = ".1"
+GO_MINOR = ".3"
PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
@@ -18,5 +18,4 @@ SRC_URI += "\
file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
"
SRC_URI_append_libc-musl = "
file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
-
-SRC_URI[main.sha256sum] =
"2ad2572115b0d1b4cb4c138e6b3a31cee6294cb48af75ee86bec3dca04507676"
+SRC_URI[main.sha256sum] =
"93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56"
--
2.26.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138606):
https://lists.openembedded.org/g/openembedded-core/message/138606
Mute This Topic: https://lists.openembedded.org/mt/74405643/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Hello Michael,
The behavior you describe is indeed what i wanted. If you say this is
already working then my patches are redundant. Even so i am surprised
it is working. Is it done automatically by the getVar function?
def get_package_additional_metadata (pkg_type, d):
base_key = "PACKAGE_ADD_METADATA"
for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
if d.getVar(key, False) is None:
continue
d.setVarFlag(key, "type", "list")
if d.getVarFlag(key, "separator") is None:
d.setVarFlag(key, "separator", "\\n")
metadata_fields = [field.strip() for field in
oe.data.typed_value(key, d)]
return "\n".join(metadata_fields).strip()
>From my understanding, i do not see how the per package override
happens. Do you have the test for this functionality in oe-selftest?
Grateful for the feedback
Paulo Neves
On Fri, May 22, 2020 at 8:00 PM Michael Ho wrote:
>
> Hi Paulo,
>
> I actually have some patches in my "to send upstream list" to address the
> documentation and some sstate-caching bugs with these variables so it's fresh
> to me at the moment.
> Correct me if I'm wrong but I think this is already available in the code
> (applying metadata specific to a certain package in a recipe, that is).
>
> eg.
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass
> at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is
> set, it overrides PACKAGE_ADD_METADATA_IPK.
>
> For rpm, see
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298
> where the recipe wide variable is fetched
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338
> where the local override is also set
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354
> where the package specific variables are fetched
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436
> where the package specific variables are applied to rpm packages
>
> I tested the zip recipe by applying these two lines:
> PACKAGE_ADD_METADATA_RPM = "Vendor: None"
> PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!"
> and could see differing results in the two rpm files produced.
>
> I think this covers the use case you're showing in your patches already, what
> do you think?
>
> Kind regards,
> Michael
>
> (sorry if this shows up as a triple email, my mail client wasn't cooperating).
>
> On Fri, May 22, 2020 at 5:29 PM Paulo Neve wrote:
>>
>> Is ./meta/lib/oeqa/selftest/cases/package.py the right place?
>> If yes i can work on it. Note that this functionality is not used
>> anywhere in poky and is not documented at all. It just happened to
>> exist for a long time and be useful for my case.
>>
>> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin
>> wrote:
>> >
>> > Should there be a test for this functionality? Somewhere in oe-selftest
>> > perhaps where various package manager features are tested?
>> >
>> > Alex
>> >
>> > On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
>> >>
>> >> Up to now the user defined metadata was set recipe wide,
>> >> meaning all the packages generated in a recipe where the
>> >> variable was set would get the same metadata. That is not
>> >> always ideal and is counter to the per package control that
>> >> is usually available.
>> >>
>> >> Keep support for package agnostic metadata but also add option
>> >> to add it to a specific option like:
>> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
>> >>
>> >> Signed-off-by: Paulo Neves
>> >> ---
>> >> meta/classes/package.bbclass | 4 ++--
>> >> meta/classes/package_deb.bbclass | 2 +-
>> >> meta/classes/package_ipk.bbclass | 2 +-
>> >> meta/classes/package_rpm.bbclass | 5 +++--
>> >> 4 files changed, 7 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
>> >> index 0b5cf47749..1678e0d794 100644
>> >> --- a/meta/classes/package.bbclass
>> >> +++ b/meta/classes/package.bbclass
>> >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,
>> >> depversions=None):
>> >>
>> >> return pkg
>> >>
>> >> -def get_package_additional_metadata (pkg_type, d):
>> >> +def get_package_additional_metadata (pkg_type, pkg_name, d):
>> >> base_key = "PACKAGE_ADD_METADATA"
>> >> -for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
>> >> +for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" %
>> >> (base_key, pkg_name, pkg_type.upper()), base_key):
>> >> if d.getVar(key, False) is None:
>> >> continue
>> >> d.setVarFlag(key, "type", "list")
>> >> diff --git a/meta/classes/package_deb.bbclass
>> >> b/meta/classes/package_deb.bbclass
>> >> index 790b26aef2..6ef9c8cb3a 100644
>> >> --- a/meta/classes/package_deb.bbclass
>> >> +++ b/meta/classes/package_deb.bbclass
>> >> @@ -167,7 +167,7 @@ def
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Hi Paulo,
I actually have some patches in my "to send upstream list" to address the
documentation and some sstate-caching bugs with these variables so it's
fresh to me at the moment.
Correct me if I'm wrong but I think this is already available in the code
(applying metadata specific to a certain package in a recipe, that is).
eg.
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass
at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is
set, it overrides PACKAGE_ADD_METADATA_IPK.
For rpm, see
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298
where the recipe wide variable is fetched
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338
where the local override is also set
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354
where the package specific variables are fetched
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436
where the package specific variables are applied to rpm packages
I tested the zip recipe by applying these two lines:
PACKAGE_ADD_METADATA_RPM = "Vendor: None"
PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!"
and could see differing results in the two rpm files produced.
I think this covers the use case you're showing in your patches already,
what do you think?
Kind regards,
Michael
(sorry if this shows up as a triple email, my mail client wasn't
cooperating).
On Fri, May 22, 2020 at 5:29 PM Paulo Neve wrote:
> Is ./meta/lib/oeqa/selftest/cases/package.py the right place?
> If yes i can work on it. Note that this functionality is not used
> anywhere in poky and is not documented at all. It just happened to
> exist for a long time and be useful for my case.
>
> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin
> wrote:
> >
> > Should there be a test for this functionality? Somewhere in oe-selftest
> perhaps where various package manager features are tested?
> >
> > Alex
> >
> > On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
> >>
> >> Up to now the user defined metadata was set recipe wide,
> >> meaning all the packages generated in a recipe where the
> >> variable was set would get the same metadata. That is not
> >> always ideal and is counter to the per package control that
> >> is usually available.
> >>
> >> Keep support for package agnostic metadata but also add option
> >> to add it to a specific option like:
> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
> >>
> >> Signed-off-by: Paulo Neves
> >> ---
> >> meta/classes/package.bbclass | 4 ++--
> >> meta/classes/package_deb.bbclass | 2 +-
> >> meta/classes/package_ipk.bbclass | 2 +-
> >> meta/classes/package_rpm.bbclass | 5 +++--
> >> 4 files changed, 7 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> >> index 0b5cf47749..1678e0d794 100644
> >> --- a/meta/classes/package.bbclass
> >> +++ b/meta/classes/package.bbclass
> >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,
> depversions=None):
> >>
> >> return pkg
> >>
> >> -def get_package_additional_metadata (pkg_type, d):
> >> +def get_package_additional_metadata (pkg_type, pkg_name, d):
> >> base_key = "PACKAGE_ADD_METADATA"
> >> -for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
> >> +for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" %
> (base_key, pkg_name, pkg_type.upper()), base_key):
> >> if d.getVar(key, False) is None:
> >> continue
> >> d.setVarFlag(key, "type", "list")
> >> diff --git a/meta/classes/package_deb.bbclass
> b/meta/classes/package_deb.bbclass
> >> index 790b26aef2..6ef9c8cb3a 100644
> >> --- a/meta/classes/package_deb.bbclass
> >> +++ b/meta/classes/package_deb.bbclass
> >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d):
> >>
> >> # more fields
> >>
> >> -custom_fields_chunk = get_package_additional_metadata("deb",
> localdata)
> >> +custom_fields_chunk = get_package_additional_metadata("deb",
> pkgname, localdata)
> >> if custom_fields_chunk:
> >> ctrlfile.write(custom_fields_chunk)
> >> ctrlfile.write("\n")
> >> diff --git a/meta/classes/package_ipk.bbclass
> b/meta/classes/package_ipk.bbclass
> >> index c008559e4a..f78cec7a70 100644
> >> --- a/meta/classes/package_ipk.bbclass
> >> +++ b/meta/classes/package_ipk.bbclass
> >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d):
> >> else:
> >> ctrlfile.write(c % tuple(pullData(fs, localdata)))
> >>
> >> -custom_fields_chunk = get_package_additional_metadata("ipk",
> localdata)
> >> +custom_fields_chunk = get_package_additional_metadata("ipk",
> pkgname, localdata)
> >> if custom_fields_chunk is not None:
> >> ctrlfile.write(custom_fields_chunk)
> >> ctrlfile.write("\n")
> >> diff --git
Re: [OE-core] [PATCH 1/4] go-mod.bbclass: Add class for `go mod` support
On 5/21/20 7:22 PM, Otavio Salvador wrote:
When using Go Modules, the the current working directory MUST be at or
below the location of the 'go.mod' file when the go tool is used, and
there is no way to tell it to look elsewhere. It will automatically
look upwards for the file, but not downwards.
To support this use case, we provide the `GO_WORKDIR` variable, which
defaults to `GO_IMPORT` but allows for easy override.
[YOCTO #13883]
This series looks ok
Signed-off-by: Otavio Salvador
---
meta/classes/go-mod.bbclass | 20
1 file changed, 20 insertions(+)
create mode 100644 meta/classes/go-mod.bbclass
diff --git a/meta/classes/go-mod.bbclass b/meta/classes/go-mod.bbclass
new file mode 100644
index 00..5871d02506
--- /dev/null
+++ b/meta/classes/go-mod.bbclass
@@ -0,0 +1,20 @@
+# Handle Go Modules support
+#
+# When using Go Modules, the the current working directory MUST be at or below
+# the location of the 'go.mod' file when the go tool is used, and there is no
+# way to tell it to look elsewhere. It will automatically look upwards for the
+# file, but not downwards.
+#
+# To support this use case, we provide the `GO_WORKDIR` variable, which
defaults
+# to `GO_IMPORT` but allows for easy override.
+#
+# Copyright 2020 (C) O.S. Systems Software LTDA.
+
Do you also want to add license on top along with copyrights ?
+# The '-modcacherw' option ensures we have write access to the cached objects
so
+# we avoid errors during clean task as well as when removing the TMPDIR.
+export GOBUILDFLAGS ?= "-v ${GO_LDFLAGS} -modcacherw"
+
+inherit go
+
+GO_WORKDIR ?= "${GO_IMPORT}"
+do_compile[dirs] += "${B}/src/${GO_WORKDIR}"
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138603):
https://lists.openembedded.org/g/openembedded-core/message/138603
Mute This Topic: https://lists.openembedded.org/mt/74391109/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] rm_work causes image tasks to re-run
Hi Mike, On 5/22/20 10:13 AM, Mike Crowe via lists.openembedded.org wrote: When we have rm_work enabled all image tasks are built every time. This has been happening since at least warrior and is still happening as of master today (8fc19639f47b959a141dae231395bbababa644e1). Steps to reproduce: bitbake core-image-minimal bitbake core-image-minimal echo 'INHERIT += "rm_work"' >> conf/local.conf bitbake core-image-minimal bitbake core-image-minimal The second invocation of bitbake doesn't build anything at all (as would be expected.) The fourth invocation of bitbake always builds: Sstate summary: Wanted 43 Found 43 Missed 0 Current 436 (100% match, 100% complete) NOTE: Executing Tasks NOTE: Setscene tasks completed NOTE: Running noexec task 1750 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work_all) NOTE: Running task 1998 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_populate_lic_deploy) NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: Started NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: Succeeded NOTE: Running task 1999 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work) NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Started NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Succeeded NOTE: Running noexec task 2000 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_build) NOTE: Tasks Summary: Attempted 2000 tasks of which 1996 didn't need to be rerun and all succeeded. If I teach rm_work.bbclass to also skip files matching "*do_populate_lic_deploy*" then this problem goes away. However, I have form for breaking things in rm_work so I suspect that this isn't the correct fix. Is there a better one? Thanks. Mike. Since I'm the last guy touching rm_work.bbclass ... I don't see the rebuilds in my images. Although I do see core-image-minimal.bb:do_populate_lic_deploy being run, there is no regeneration of the rootfs images. Do you have any more information about the setup so that I can reproduce ? /Jacob -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138602): https://lists.openembedded.org/g/openembedded-core/message/138602 Mute This Topic: https://lists.openembedded.org/mt/74394858/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Is ./meta/lib/oeqa/selftest/cases/package.py the right place?
If yes i can work on it. Note that this functionality is not used
anywhere in poky and is not documented at all. It just happened to
exist for a long time and be useful for my case.
On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin
wrote:
>
> Should there be a test for this functionality? Somewhere in oe-selftest
> perhaps where various package manager features are tested?
>
> Alex
>
> On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
>>
>> Up to now the user defined metadata was set recipe wide,
>> meaning all the packages generated in a recipe where the
>> variable was set would get the same metadata. That is not
>> always ideal and is counter to the per package control that
>> is usually available.
>>
>> Keep support for package agnostic metadata but also add option
>> to add it to a specific option like:
>> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
>>
>> Signed-off-by: Paulo Neves
>> ---
>> meta/classes/package.bbclass | 4 ++--
>> meta/classes/package_deb.bbclass | 2 +-
>> meta/classes/package_ipk.bbclass | 2 +-
>> meta/classes/package_rpm.bbclass | 5 +++--
>> 4 files changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
>> index 0b5cf47749..1678e0d794 100644
>> --- a/meta/classes/package.bbclass
>> +++ b/meta/classes/package.bbclass
>> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,
>> depversions=None):
>>
>> return pkg
>>
>> -def get_package_additional_metadata (pkg_type, d):
>> +def get_package_additional_metadata (pkg_type, pkg_name, d):
>> base_key = "PACKAGE_ADD_METADATA"
>> -for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
>> +for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" %
>> (base_key, pkg_name, pkg_type.upper()), base_key):
>> if d.getVar(key, False) is None:
>> continue
>> d.setVarFlag(key, "type", "list")
>> diff --git a/meta/classes/package_deb.bbclass
>> b/meta/classes/package_deb.bbclass
>> index 790b26aef2..6ef9c8cb3a 100644
>> --- a/meta/classes/package_deb.bbclass
>> +++ b/meta/classes/package_deb.bbclass
>> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d):
>>
>> # more fields
>>
>> -custom_fields_chunk = get_package_additional_metadata("deb",
>> localdata)
>> +custom_fields_chunk = get_package_additional_metadata("deb",
>> pkgname, localdata)
>> if custom_fields_chunk:
>> ctrlfile.write(custom_fields_chunk)
>> ctrlfile.write("\n")
>> diff --git a/meta/classes/package_ipk.bbclass
>> b/meta/classes/package_ipk.bbclass
>> index c008559e4a..f78cec7a70 100644
>> --- a/meta/classes/package_ipk.bbclass
>> +++ b/meta/classes/package_ipk.bbclass
>> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d):
>> else:
>> ctrlfile.write(c % tuple(pullData(fs, localdata)))
>>
>> -custom_fields_chunk = get_package_additional_metadata("ipk",
>> localdata)
>> +custom_fields_chunk = get_package_additional_metadata("ipk",
>> pkgname, localdata)
>> if custom_fields_chunk is not None:
>> ctrlfile.write(custom_fields_chunk)
>> ctrlfile.write("\n")
>> diff --git a/meta/classes/package_rpm.bbclass
>> b/meta/classes/package_rpm.bbclass
>> index 9145717f98..ab019192da 100644
>> --- a/meta/classes/package_rpm.bbclass
>> +++ b/meta/classes/package_rpm.bbclass
>> @@ -295,7 +295,6 @@ python write_specfile () {
>> srcmaintainer = d.getVar('MAINTAINER')
>> srchomepage= d.getVar('HOMEPAGE')
>> srcdescription = d.getVar('DESCRIPTION') or "."
>> -srccustomtagschunk = get_package_additional_metadata("rpm", d)
>>
>> srcdepends = d.getVar('DEPENDS')
>> srcrdepends= []
>> @@ -333,6 +332,8 @@ python write_specfile () {
>> pkgname = localdata.getVar('PKG_%s' % pkg)
>> if not pkgname:
>> pkgname = pkg
>> +
>> +srccustomtagschunk = get_package_additional_metadata("rpm",
>> pkgname, d)
>> localdata.setVar('PKG', pkgname)
>>
>> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" +
>> pkg)
>> @@ -351,7 +352,7 @@ python write_specfile () {
>> splitlicense = (localdata.getVar('LICENSE') or "")
>> splitsection = (localdata.getVar('SECTION') or "")
>> splitdescription = (localdata.getVar('DESCRIPTION') or ".")
>> -splitcustomtagschunk = get_package_additional_metadata("rpm",
>> localdata)
>> +splitcustomtagschunk = get_package_additional_metadata("rpm",
>> pkgname, localdata)
>>
>> translate_vers('RDEPENDS', localdata)
>> translate_vers('RRECOMMENDS', localdata)
>> --
>> 2.20.1
>>
>>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138601):
https://lists.openembedded.org/g/openembedded-core/message/138601
Mute This Topic:
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Should there be a test for this functionality? Somewhere in oe-selftest
perhaps where various package manager features are tested?
Alex
On Fri, 22 May 2020 at 17:13, Paulo Neve wrote:
> Up to now the user defined metadata was set recipe wide,
> meaning all the packages generated in a recipe where the
> variable was set would get the same metadata. That is not
> always ideal and is counter to the per package control that
> is usually available.
>
> Keep support for package agnostic metadata but also add option
> to add it to a specific option like:
> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
>
> Signed-off-by: Paulo Neves
> ---
> meta/classes/package.bbclass | 4 ++--
> meta/classes/package_deb.bbclass | 2 +-
> meta/classes/package_ipk.bbclass | 2 +-
> meta/classes/package_rpm.bbclass | 5 +++--
> 4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 0b5cf47749..1678e0d794 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,
> depversions=None):
>
> return pkg
>
> -def get_package_additional_metadata (pkg_type, d):
> +def get_package_additional_metadata (pkg_type, pkg_name, d):
> base_key = "PACKAGE_ADD_METADATA"
> -for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
> +for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" %
> (base_key, pkg_name, pkg_type.upper()), base_key):
> if d.getVar(key, False) is None:
> continue
> d.setVarFlag(key, "type", "list")
> diff --git a/meta/classes/package_deb.bbclass
> b/meta/classes/package_deb.bbclass
> index 790b26aef2..6ef9c8cb3a 100644
> --- a/meta/classes/package_deb.bbclass
> +++ b/meta/classes/package_deb.bbclass
> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d):
>
> # more fields
>
> -custom_fields_chunk = get_package_additional_metadata("deb",
> localdata)
> +custom_fields_chunk = get_package_additional_metadata("deb",
> pkgname, localdata)
> if custom_fields_chunk:
> ctrlfile.write(custom_fields_chunk)
> ctrlfile.write("\n")
> diff --git a/meta/classes/package_ipk.bbclass
> b/meta/classes/package_ipk.bbclass
> index c008559e4a..f78cec7a70 100644
> --- a/meta/classes/package_ipk.bbclass
> +++ b/meta/classes/package_ipk.bbclass
> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d):
> else:
> ctrlfile.write(c % tuple(pullData(fs, localdata)))
>
> -custom_fields_chunk = get_package_additional_metadata("ipk",
> localdata)
> +custom_fields_chunk = get_package_additional_metadata("ipk",
> pkgname, localdata)
> if custom_fields_chunk is not None:
> ctrlfile.write(custom_fields_chunk)
> ctrlfile.write("\n")
> diff --git a/meta/classes/package_rpm.bbclass
> b/meta/classes/package_rpm.bbclass
> index 9145717f98..ab019192da 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -295,7 +295,6 @@ python write_specfile () {
> srcmaintainer = d.getVar('MAINTAINER')
> srchomepage= d.getVar('HOMEPAGE')
> srcdescription = d.getVar('DESCRIPTION') or "."
> -srccustomtagschunk = get_package_additional_metadata("rpm", d)
>
> srcdepends = d.getVar('DEPENDS')
> srcrdepends= []
> @@ -333,6 +332,8 @@ python write_specfile () {
> pkgname = localdata.getVar('PKG_%s' % pkg)
> if not pkgname:
> pkgname = pkg
> +
> +srccustomtagschunk = get_package_additional_metadata("rpm",
> pkgname, d)
> localdata.setVar('PKG', pkgname)
>
> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":"
> + pkg)
> @@ -351,7 +352,7 @@ python write_specfile () {
> splitlicense = (localdata.getVar('LICENSE') or "")
> splitsection = (localdata.getVar('SECTION') or "")
> splitdescription = (localdata.getVar('DESCRIPTION') or ".")
> -splitcustomtagschunk = get_package_additional_metadata("rpm",
> localdata)
> +splitcustomtagschunk = get_package_additional_metadata("rpm",
> pkgname, localdata)
>
> translate_vers('RDEPENDS', localdata)
> translate_vers('RRECOMMENDS', localdata)
> --
> 2.20.1
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138600):
https://lists.openembedded.org/g/openembedded-core/message/138600
Mute This Topic: https://lists.openembedded.org/mt/74401146/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Up to now the user defined metadata was set recipe wide,
meaning all the packages generated in a recipe where the
variable was set would get the same metadata. That is not
always ideal and is counter to the per package control that
is usually available.
Keep support for package agnostic metadata but also add option
to add it to a specific option like:
PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue"
Signed-off-by: Paulo Neves
---
meta/classes/package.bbclass | 4 ++--
meta/classes/package_deb.bbclass | 2 +-
meta/classes/package_ipk.bbclass | 2 +-
meta/classes/package_rpm.bbclass | 5 +++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0b5cf47749..1678e0d794 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, depversions=None):
return pkg
-def get_package_additional_metadata (pkg_type, d):
+def get_package_additional_metadata (pkg_type, pkg_name, d):
base_key = "PACKAGE_ADD_METADATA"
-for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key):
+for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" %
(base_key, pkg_name, pkg_type.upper()), base_key):
if d.getVar(key, False) is None:
continue
d.setVarFlag(key, "type", "list")
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 790b26aef2..6ef9c8cb3a 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d):
# more fields
-custom_fields_chunk = get_package_additional_metadata("deb", localdata)
+custom_fields_chunk = get_package_additional_metadata("deb", pkgname,
localdata)
if custom_fields_chunk:
ctrlfile.write(custom_fields_chunk)
ctrlfile.write("\n")
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index c008559e4a..f78cec7a70 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d):
else:
ctrlfile.write(c % tuple(pullData(fs, localdata)))
-custom_fields_chunk = get_package_additional_metadata("ipk", localdata)
+custom_fields_chunk = get_package_additional_metadata("ipk", pkgname,
localdata)
if custom_fields_chunk is not None:
ctrlfile.write(custom_fields_chunk)
ctrlfile.write("\n")
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 9145717f98..ab019192da 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -295,7 +295,6 @@ python write_specfile () {
srcmaintainer = d.getVar('MAINTAINER')
srchomepage= d.getVar('HOMEPAGE')
srcdescription = d.getVar('DESCRIPTION') or "."
-srccustomtagschunk = get_package_additional_metadata("rpm", d)
srcdepends = d.getVar('DEPENDS')
srcrdepends= []
@@ -333,6 +332,8 @@ python write_specfile () {
pkgname = localdata.getVar('PKG_%s' % pkg)
if not pkgname:
pkgname = pkg
+
+srccustomtagschunk = get_package_additional_metadata("rpm", pkgname, d)
localdata.setVar('PKG', pkgname)
localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
@@ -351,7 +352,7 @@ python write_specfile () {
splitlicense = (localdata.getVar('LICENSE') or "")
splitsection = (localdata.getVar('SECTION') or "")
splitdescription = (localdata.getVar('DESCRIPTION') or ".")
-splitcustomtagschunk = get_package_additional_metadata("rpm",
localdata)
+splitcustomtagschunk = get_package_additional_metadata("rpm", pkgname,
localdata)
translate_vers('RDEPENDS', localdata)
translate_vers('RRECOMMENDS', localdata)
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138599):
https://lists.openembedded.org/g/openembedded-core/message/138599
Mute This Topic: https://lists.openembedded.org/mt/74401146/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH] 1/2] package-manager: Allow for package manager user fields.
We want the user metadata added on the packages but
if the index generator filters them they are useless
as they get to the index.
Allow user fields when populating the package index.
Signed-off-by: Paulo Neves
---
meta/lib/oe/package_manager.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index c055d2b0f7..b4b3324d0a 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -218,7 +218,7 @@ class OpkgIndexer(Indexer):
if not os.path.exists(pkgs_file):
open(pkgs_file, "w").close()
-index_cmds.add('%s --checksum md5 --checksum sha256 -r %s -p
%s -m %s' %
+index_cmds.add('%s --checksum md5 -f --checksum sha256 -r %s
-p %s -m %s' %
(opkg_index_cmd, pkgs_file, pkgs_file,
pkgs_dir))
index_sign_files.add(pkgs_file)
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138598):
https://lists.openembedded.org/g/openembedded-core/message/138598
Mute This Topic: https://lists.openembedded.org/mt/74401145/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 0/8] Pull request
Please merge these changes into warrior
The following changes since commit ae341aed81be28232cc34daf4684bc0922f17699:
yocto-uninative.inc: version 2.8 updates glibc to 2.31 (2020-03-26 07:04:11
-0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/warrior-next
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/warrior-next
Adrian Bunk (3):
git: Upgrade 2.20.1 -> 2.20.4
python: Upgrade 2.7.17 -> 2.17.18
openssl: Upgrade 1.1.1d -> 1.1.1e
Alexander Kanavin (1):
openssl: update to 1.1.1f
Denys Dmytriyenko (1):
openssl: recommend cryptodev-module for corresponding PACKAGECONFIG
Jan Luebbe (1):
openssl: upgrade 1.1.1f -> 1.1.1g
Lee Chee Yang (1):
cve-check: CPE version '-' as all version
Richard Purdie (1):
openssl: Fix reproducibility issue
meta/classes/cve-check.bbclass| 2 +-
.../openssl/openssl/CVE-2019-1551.patch | 758 --
.../openssl/openssl/reproducible.patch| 32 +
.../{openssl_1.1.1d.bb => openssl_1.1.1g.bb} | 7 +-
.../recipes-core/meta/cve-update-db-native.bb | 2 +-
meta/recipes-devtools/git/git_2.20.1.bb | 11 -
meta/recipes-devtools/git/git_2.20.4.bb | 11 +
...tive_2.7.17.bb => python-native_2.7.18.bb} | 0
meta/recipes-devtools/python/python.inc | 6 +-
.../{python_2.7.17.bb => python_2.7.18.bb}| 0
10 files changed, 51 insertions(+), 778 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb =>
openssl_1.1.1g.bb} (97%)
delete mode 100644 meta/recipes-devtools/git/git_2.20.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.20.4.bb
rename meta/recipes-devtools/python/{python-native_2.7.17.bb =>
python-native_2.7.18.bb} (100%)
rename meta/recipes-devtools/python/{python_2.7.17.bb => python_2.7.18.bb}
(100%)
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138589):
https://lists.openembedded.org/g/openembedded-core/message/138589
Mute This Topic: https://lists.openembedded.org/mt/74400098/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 5/8] openssl: Upgrade 1.1.1d -> 1.1.1e
From: Adrian Bunk
Backported patch removed.
Signed-off-by: Adrian Bunk
Signed-off-by: Richard Purdie
(cherry picked from commit 710bc0f8544f54750c8fb7b8affa243932927a24)
[AK: bug fix only update]
Signed-off-by: Armin Kuster
---
.../openssl/openssl/CVE-2019-1551.patch | 758 --
.../{openssl_1.1.1d.bb => openssl_1.1.1e.bb} | 4 +-
2 files changed, 1 insertion(+), 761 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
rename meta/recipes-connectivity/openssl/{openssl_1.1.1d.bb =>
openssl_1.1.1e.bb} (97%)
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
b/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
deleted file mode 100644
index 0cc19cb5f4..00
--- a/meta/recipes-connectivity/openssl/openssl/CVE-2019-1551.patch
+++ /dev/null
@@ -1,758 +0,0 @@
-From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001
-From: Andy Polyakov
-Date: Wed, 4 Dec 2019 12:48:21 +0100
-Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr
-
-There is an overflow bug in the x64_64 Montgomery squaring procedure used in
-exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis
-suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as
a
-result of this defect would be very difficult to perform and are not believed
-likely. Attacks against DH512 are considered just feasible. However, for an
-attack the target would have to re-use the DH512 private key, which is not
-recommended anyway. Also applications directly using the low level API
-BN_mod_exp may be affected if they use BN_FLG_CONSTTIME.
-
-CVE-2019-1551
-
-Reviewed-by: Paul Dale
-Reviewed-by: Bernd Edlinger
-(Merged from https://github.com/openssl/openssl/pull/10575)
-
-CVE: CVE-2019-1551
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal
- crypto/bn/asm/rsaz-x86_64.pl | 381 ++-
- 1 file changed, 197 insertions(+), 184 deletions(-)
-
-diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl
-index b1797b649f0..7534d5cd03e 100755
a/crypto/bn/asm/rsaz-x86_64.pl
-+++ b/crypto/bn/asm/rsaz-x86_64.pl
-@@ -116,7 +116,7 @@
- subq\$128+24, %rsp
- .cfi_adjust_cfa_offset128+24
- .Lsqr_body:
-- movq$mod, %rbp # common argument
-+ movq$mod, %xmm1 # common off-load
- movq($inp), %rdx
- movq8($inp), %rax
- movq$n0, 128(%rsp)
-@@ -134,7 +134,8 @@
- .Loop_sqr:
- movl$times,128+8(%rsp)
- #first iteration
-- movq%rdx, %rbx
-+ movq%rdx, %rbx # 0($inp)
-+ mov %rax, %rbp # 8($inp)
- mulq%rdx
- movq%rax, %r8
- movq16($inp), %rax
-@@ -173,31 +174,29 @@
- mulq%rbx
- addq%rax, %r14
- movq%rbx, %rax
-- movq%rdx, %r15
-- adcq\$0, %r15
-+ adcq\$0, %rdx
-
-- addq%r8, %r8#shlq \$1, %r8
-- movq%r9, %rcx
-- adcq%r9, %r9#shld \$1, %r8, %r9
-+ xorq%rcx,%rcx # rcx:r8 = r8 << 1
-+ addq%r8, %r8
-+ movq %rdx, %r15
-+ adcq\$0, %rcx
-
- mulq%rax
-- movq%rax, (%rsp)
-- addq%rdx, %r8
-- adcq\$0, %r9
-+ addq%r8, %rdx
-+ adcq\$0, %rcx
-
-- movq%r8, 8(%rsp)
-- shrq\$63, %rcx
-+ movq%rax, (%rsp)
-+ movq%rdx, 8(%rsp)
-
- #second iteration
-- movq8($inp), %r8
- movq16($inp), %rax
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r10
- movq24($inp), %rax
- movq%rdx, %rbx
- adcq\$0, %rbx
-
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r11
- movq32($inp), %rax
- adcq\$0, %rdx
-@@ -205,7 +204,7 @@
- movq%rdx, %rbx
- adcq\$0, %rbx
-
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r12
- movq40($inp), %rax
- adcq\$0, %rdx
-@@ -213,7 +212,7 @@
- movq%rdx, %rbx
- adcq\$0, %rbx
-
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r13
- movq48($inp), %rax
- adcq\$0, %rdx
-@@ -221,7 +220,7 @@
- movq%rdx, %rbx
- adcq\$0, %rbx
-
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r14
- movq56($inp), %rax
- adcq\$0, %rdx
-@@ -229,39 +228,39 @@
- movq%rdx, %rbx
- adcq\$0, %rbx
-
-- mulq%r8
-+ mulq%rbp
- addq%rax, %r15
-- movq%r8, %rax
-+ movq%rbp, %rax
- adcq\$0, %rdx
- addq%rbx, %r15
-- movq%rdx, %r8
-- movq%r10, %rdx
-- adcq\$0, %r8
-+ adcq\$0, %rdx
-
-- add %rdx, %rdx
-- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10
-- movq%r11, %rbx
--
[OE-core] [warrior 2/8] python: Upgrade 2.7.17 -> 2.17.18
From: Adrian Bunk
LICENSE checksum changed due to 2019 -> 2020 update.
Signed-off-by: Adrian Bunk
Signed-off-by: Anuj Mittal
Signed-off-by: Armin Kuster
---
.../{python-native_2.7.17.bb => python-native_2.7.18.bb}| 0
meta/recipes-devtools/python/python.inc | 6 +++---
.../python/{python_2.7.17.bb => python_2.7.18.bb} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python-native_2.7.17.bb =>
python-native_2.7.18.bb} (100%)
rename meta/recipes-devtools/python/{python_2.7.17.bb => python_2.7.18.bb}
(100%)
diff --git a/meta/recipes-devtools/python/python-native_2.7.17.bb
b/meta/recipes-devtools/python/python-native_2.7.18.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-native_2.7.17.bb
rename to meta/recipes-devtools/python/python-native_2.7.18.bb
diff --git a/meta/recipes-devtools/python/python.inc
b/meta/recipes-devtools/python/python.inc
index a2424a67bf..bd214e8f8b 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -5,13 +5,13 @@ SECTION = "devel/python"
# bump this on every change in contrib/python/generate-manifest-2.7.py
INC_PR = "r1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e466242989bd33c1bd2b6a526a742498"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=203a6dbc802ee896020a47161e759642"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
"
-SRC_URI[md5sum] = "b3b6d2c92f42a60667814358ab9f0cfd"
-SRC_URI[sha256sum] =
"4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41"
+SRC_URI[md5sum] = "fd6cc8ec0a78c44036f825e739f36e5a"
+SRC_URI[sha256sum] =
"b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
# python recipe is actually python 2.x
# also, exclude pre-releases for both python 2.x and 3.x
diff --git a/meta/recipes-devtools/python/python_2.7.17.bb
b/meta/recipes-devtools/python/python_2.7.18.bb
similarity index 100%
rename from meta/recipes-devtools/python/python_2.7.17.bb
rename to meta/recipes-devtools/python/python_2.7.18.bb
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138591):
https://lists.openembedded.org/g/openembedded-core/message/138591
Mute This Topic: https://lists.openembedded.org/mt/74400100/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 4/8] openssl: recommend cryptodev-module for corresponding PACKAGECONFIG
From: Denys Dmytriyenko
Signed-off-by: Denys Dmytriyenko
Signed-off-by: Richard Purdie
(cherry picked from commit 57fcf9b517fe95e871122946cb99fe7fa9fd2e26)
Signed-off-by: Armin Kuster
---
meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
index 67eea6592e..d656cb3cfa 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
@@ -33,7 +33,7 @@ PACKAGECONFIG ?= ""
PACKAGECONFIG_class-native = ""
PACKAGECONFIG_class-nativesdk = ""
-PACKAGECONFIG[cryptodev-linux] =
"enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux"
+PACKAGECONFIG[cryptodev-linux] =
"enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module"
B = "${WORKDIR}/build"
do_configure[cleandirs] = "${B}"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138593):
https://lists.openembedded.org/g/openembedded-core/message/138593
Mute This Topic: https://lists.openembedded.org/mt/74400102/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 3/8] openssl: Fix reproducibility issue
From: Richard Purdie
There was a build architecture leaking into the target ptest which
could vary depending upon host. Remove it as its cosmetic.
[YOCTO #13770]
(From OE-Core rev: 37db519eedb7eb5cd4f14d05f30f5d580aa7458d)
(From OE-Core rev: c31c676319812e6fc036741db2ab8e16eccff723)
Signed-off-by: Richard Purdie
Signed-off-by: Armin Kuster
---
.../openssl/openssl/reproducible.patch| 32 +++
.../openssl/openssl_1.1.1d.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducible.patch
diff --git a/meta/recipes-connectivity/openssl/openssl/reproducible.patch
b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
new file mode 100644
index 00..a24260c95d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/reproducible.patch
@@ -0,0 +1,32 @@
+The value for perl_archname can vary depending on the host, e.g.
+x86_64-linux-gnu-thread-multi or x86_64-linux-thread-multi which
+makes the ptest package non-reproducible. Its unused other than
+these references so drop it.
+
+RP 2020/2/6
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie
+
+Index: openssl-1.1.1d/Configure
+===
+--- openssl-1.1.1d.orig/Configure
openssl-1.1.1d/Configure
+@@ -286,7 +286,7 @@ if (defined env($local_config_envname))
+ # Save away perl command information
+ $config{perl_cmd} = $^X;
+ $config{perl_version} = $Config{version};
+-$config{perl_archname} = $Config{archname};
++#$config{perl_archname} = $Config{archname};
+
+ $config{prefix}="";
+ $config{openssldir}="";
+@@ -2517,7 +2517,7 @@ _
+ @{$config{perlargv}}), "\n";
+ print "\nPerl information:\n\n";
+ print '',$config{perl_cmd},"\n";
+-print '',$config{perl_version},' for
',$config{perl_archname},"\n";
++print '',$config{perl_version},"\n";
+ }
+ if ($dump || $options) {
+ my $longest = 0;
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
index d256646934..67eea6592e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz
\
file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
file://afalg.patch \
file://CVE-2019-1551.patch \
+ file://reproducible.patch \
"
SRC_URI_append_class-nativesdk = " \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138592):
https://lists.openembedded.org/g/openembedded-core/message/138592
Mute This Topic: https://lists.openembedded.org/mt/74400101/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 6/8] openssl: update to 1.1.1f
From: Alexander Kanavin
This also un-breaks python3 ptest which got broken
with 1.1.1e update.
Signed-off-by: Alexander Kanavin
Signed-off-by: Richard Purdie
(cherry picked from commit b4ddf5b9d8cd769b7026663f93c8bc69b55d8cbf)
[AK: bugfix only update]
Signed-off-by: Armin Kuster
---
.../openssl/{openssl_1.1.1e.bb => openssl_1.1.1f.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/openssl/{openssl_1.1.1e.bb =>
openssl_1.1.1f.bb} (98%)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
similarity index 98%
rename from meta/recipes-connectivity/openssl/openssl_1.1.1e.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
index d016bb67e7..204dc7c6fe 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
@@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \
file://environment.d-openssl.sh \
"
-SRC_URI[sha256sum] =
"694f61ac11cb51c9bf73f54e771ff6022b0327a43bbdfa1b2f19de1662a6dcbe"
+SRC_URI[sha256sum] =
"186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"
inherit lib_package multilib_header ptest
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138595):
https://lists.openembedded.org/g/openembedded-core/message/138595
Mute This Topic: https://lists.openembedded.org/mt/74400104/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 1/8] git: Upgrade 2.20.1 -> 2.20.4
From: Adrian Bunk
This includes the fixes for CVE-2020-5260 and CVE-2020-11008.
Signed-off-by: Adrian Bunk
Signed-off-by: Armin Kuster
---
meta/recipes-devtools/git/git_2.20.1.bb | 11 ---
meta/recipes-devtools/git/git_2.20.4.bb | 11 +++
2 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.20.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.20.4.bb
diff --git a/meta/recipes-devtools/git/git_2.20.1.bb
b/meta/recipes-devtools/git/git_2.20.1.bb
deleted file mode 100644
index 877fb05e58..00
--- a/meta/recipes-devtools/git/git_2.20.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "7a7769e5c957364ed0aed89e6e67c254"
-SRC_URI[tarball.sha256sum] =
"edc3bc1495b69179ba4e272e97eff93334a20decb1d8db6ec3c19c16417738fd"
-SRC_URI[manpages.md5sum] = "78c6e54a61a167dab5e8ae07036293ab"
-SRC_URI[manpages.sha256sum] =
"e9c123463abd05e142defe44a8060ce6e9853dfd8c83b2542e38b7deac4e6d4c"
diff --git a/meta/recipes-devtools/git/git_2.20.4.bb
b/meta/recipes-devtools/git/git_2.20.4.bb
new file mode 100644
index 00..e44da452ad
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.20.4.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "6f524e37186a79848a716e2a91330868"
+SRC_URI[tarball.sha256sum] =
"92719084d7648b69038ea617a3bc45ec74f60ed7eef753ae2ad84b6f0b268e9a"
+SRC_URI[manpages.md5sum] = "dceabcda244042a06ed4cabd754627a5"
+SRC_URI[manpages.sha256sum] =
"72fdd1799756b1240921d10eb5c67de9a651b44d429ba7293929c9d5344ad3e0"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138590):
https://lists.openembedded.org/g/openembedded-core/message/138590
Mute This Topic: https://lists.openembedded.org/mt/74400099/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 7/8] openssl: upgrade 1.1.1f -> 1.1.1g
From: Jan Luebbe
This also fixes CVE-2020-1967.
Signed-off-by: Jan Luebbe
Signed-off-by: Anuj Mittal
Signed-off-by: Armin Kuster
---
.../openssl/{openssl_1.1.1f.bb => openssl_1.1.1g.bb}| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/openssl/{openssl_1.1.1f.bb =>
openssl_1.1.1g.bb} (98%)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
similarity index 98%
rename from meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
rename to meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
index 204dc7c6fe..a57e09c802 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1f.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1g.bb
@@ -23,7 +23,7 @@ SRC_URI_append_class-nativesdk = " \
file://environment.d-openssl.sh \
"
-SRC_URI[sha256sum] =
"186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"
+SRC_URI[sha256sum] =
"ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46"
inherit lib_package multilib_header ptest
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138596):
https://lists.openembedded.org/g/openembedded-core/message/138596
Mute This Topic: https://lists.openembedded.org/mt/74400106/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [warrior 8/8] cve-check: CPE version '-' as all version
From: Lee Chee Yang CPE version could be '-' to mean no version info. Current cve_check treat it as not valid and does not report these CVE but some of these could be a valid vulnerabilities. Since non-valid CVE can be whitelisted, so treat '-' as all version and report all these CVE to capture possible vulnerabilities. Non-valid CVE to be whitelisted separately. [YOCTO #13617] Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit c69ee3594079589d27c10db32bc288566ebde9ef) Signed-off-by: Armin Kuster --- meta/classes/cve-check.bbclass | 2 +- meta/recipes-core/meta/cve-update-db-native.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 01b3637469..0ab022b135 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -214,7 +214,7 @@ def check_cves(d, patched_cves): (_, _, _, version_start, operator_start, version_end, operator_end) = row #bb.debug(2, "Evaluating row " + str(row)) -if (operator_start == '=' and pv == version_start): +if (operator_start == '=' and pv == version_start) or version_start == '-': vulnerable = True else: if operator_start: diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 575254af40..1b4f31692b 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -122,7 +122,7 @@ def parse_node_and_insert(c, node, cveId): product = cpe23[4] version = cpe23[5] -if version != '*': +if version != '*' and version != '-': # Version is defined, this is a '=' match yield [cveId, vendor, product, version, '=', '', ''] else: -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138597): https://lists.openembedded.org/g/openembedded-core/message/138597 Mute This Topic: https://lists.openembedded.org/mt/74400107/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] ruby: upgrade 2.7.0 -> 2.7.1
Signed-off-by: Zheng Ruoqin
---
meta/recipes-devtools/ruby/{ruby_2.7.0.bb => ruby_2.7.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/ruby/{ruby_2.7.0.bb => ruby_2.7.1.bb} (95%)
diff --git a/meta/recipes-devtools/ruby/ruby_2.7.0.bb
b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
similarity index 95%
rename from meta/recipes-devtools/ruby/ruby_2.7.0.bb
rename to meta/recipes-devtools/ruby/ruby_2.7.1.bb
index 7f07080497..3dd9fb0a62 100644
--- a/meta/recipes-devtools/ruby/ruby_2.7.0.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb
@@ -8,8 +8,8 @@ SRC_URI += " \
file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \
"
-SRC_URI[md5sum] = "bf4a54e8231176e109a42c546b4725a9"
-SRC_URI[sha256sum] =
"8c99aa93b5e2f1bc8437d1bbbefd27b13e7694025331f77245d0c068ef1f8cbe"
+SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909"
+SRC_URI[sha256sum] =
"d418483bdd576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
PACKAGECONFIG ??= ""
PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138588):
https://lists.openembedded.org/g/openembedded-core/message/138588
Mute This Topic: https://lists.openembedded.org/mt/74399226/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Send bitbake cache (from recipe parsing) to another server
On Fri, May 22, 2020 at 05:04 AM, Richard Purdie wrote: > > Low. Its not designed to do that and you should never need to. Why > can't it reparse? I tried to reduce building time. I know, that it is not a big time, but multiplying by build count it could bring some benefits. Nevertheless thanks for the answer. At least I know, that I should abandon this idea. Br, Krzysztof Taborski -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138587): https://lists.openembedded.org/g/openembedded-core/message/138587 Mute This Topic: https://lists.openembedded.org/mt/74397324/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Send bitbake cache (from recipe parsing) to another server
On Fri, 2020-05-22 at 04:59 -0700, krzysztof.tabor...@nokia.com wrote: > I am wondering, if it is possible to archive bitbake cache and send > to another server. Only under very specific conditions. The paths and timestamps for the metadata would all have to match perfectly. The cache is not designed to be moved anywhere at all. > I tried to archive cache and tmp/cache directories and use them on > another server (configs and recipes/workspace name/user name and > build server image were same), but for some reason recipes are re- > parsed by bitbake. Not surprising as there are timestamps stored in them. > First of all, I am wondering, if I have even chances to success in > such scenario. Low. Its not designed to do that and you should never need to. Why can't it reparse? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138586): https://lists.openembedded.org/g/openembedded-core/message/138586 Mute This Topic: https://lists.openembedded.org/mt/74397324/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] Send bitbake cache (from recipe parsing) to another server
Hello, I am wondering, if it is possible to archive bitbake cache and send to another server. I tried to archive cache and tmp/cache directories and use them on another server (configs and recipes/workspace name/user name and build server image were same), but for some reason recipes are re-parsed by bitbake. First of all, I am wondering, if I have even chances to success in such scenario. If yes I am guessing, that I should modify BB_HASHCONFIG_WHITELIST , but how to check what can be missing? Best regards, Krzysztof Taborski -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138585): https://lists.openembedded.org/g/openembedded-core/message/138585 Mute This Topic: https://lists.openembedded.org/mt/74397324/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] iproute2: upgrade 5.5.0 -> 5.6.0
Signed-off-by: Wang Mingyu
---
.../iproute2/{iproute2_5.5.0.bb => iproute2_5.6.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/iproute2/{iproute2_5.5.0.bb =>
iproute2_5.6.0.bb} (65%)
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb
b/meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb
similarity index 65%
rename from meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb
index 7ad4b8eee6..9ab9053739 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.5.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb
@@ -4,8 +4,8 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://0001-libc-compat.h-add-musl-workaround.patch \
"
-SRC_URI[md5sum] = "ee8e2cdb416d4a8ef39525d39ab7c2d0"
-SRC_URI[sha256sum] =
"bac543435cac208a11db44c9cc8e35aa902befef8750594654ee71941c388f7b"
+SRC_URI[md5sum] = "9da0c352707c34b8b1fec3bf42fcfd09"
+SRC_URI[sha256sum] =
"1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692"
# CFLAGS are computed in Makefile and reference CCOPTS
#
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138584):
https://lists.openembedded.org/g/openembedded-core/message/138584
Mute This Topic: https://lists.openembedded.org/mt/74395521/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] boost: upgrade 1.72.0 -> 1.73.0
refresh 0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
remove 0001-revert-cease-dependence-on-range.patch
since it is included in 1.73.0
Signed-off-by: Wang Mingyu
---
...native_1.72.0.bb => bjam-native_1.73.0.bb} | 0
.../{boost-1.72.0.inc => boost-1.73.0.inc}| 4 +-
...h-instruction-set-flags-we-do-that-o.patch | 15 --
.../{boost_1.72.0.bb => boost_1.73.0.bb} | 1 -
...001-revert-cease-dependence-on-range.patch | 53 ---
5 files changed, 12 insertions(+), 61 deletions(-)
rename meta/recipes-support/boost/{bjam-native_1.72.0.bb =>
bjam-native_1.73.0.bb} (100%)
rename meta/recipes-support/boost/{boost-1.72.0.inc => boost-1.73.0.inc} (85%)
rename meta/recipes-support/boost/{boost_1.72.0.bb => boost_1.73.0.bb} (86%)
delete mode 100644
meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch
diff --git a/meta/recipes-support/boost/bjam-native_1.72.0.bb
b/meta/recipes-support/boost/bjam-native_1.73.0.bb
similarity index 100%
rename from meta/recipes-support/boost/bjam-native_1.72.0.bb
rename to meta/recipes-support/boost/bjam-native_1.73.0.bb
diff --git a/meta/recipes-support/boost/boost-1.72.0.inc
b/meta/recipes-support/boost/boost-1.73.0.inc
similarity index 85%
rename from meta/recipes-support/boost/boost-1.72.0.inc
rename to meta/recipes-support/boost/boost-1.73.0.inc
index 55a095bf1c..b574757199 100644
--- a/meta/recipes-support/boost/boost-1.72.0.inc
+++ b/meta/recipes-support/boost/boost-1.73.0.inc
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
BOOST_P = "boost_${BOOST_VER}"
SRC_URI =
"https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2;
-SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0"
-SRC_URI[sha256sum] =
"59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"
+SRC_URI[md5sum] = "9273c8c4576423562bbe84574b07b2bd"
+SRC_URI[sha256sum] =
"4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402"
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/;
UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/source/"
diff --git
a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
index 68d6e6417f..7c6b62e383 100644
---
a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
+++
b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
@@ -1,21 +1,22 @@
From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin
Date: Tue, 18 Dec 2018 15:42:57 +0100
-Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves
+Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
+ourselves
Upstream-Status: Inappropriate
Signed-off-by: Christopher Larson
Signed-off-by: Alexander Kanavin
---
- tools/build/src/tools/gcc.jam | 132 --
- 1 file changed, 132 deletions(-)
+ tools/build/src/tools/gcc.jam | 133 --
+ 1 file changed, 133 deletions(-)
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
-index b9bb9cf2a..c7e3cf3fe 100644
+index 8910a55f2..ed7e7b20c 100644
--- a/tools/build/src/tools/gcc.jam
+++ b/tools/build/src/tools/gcc.jam
-@@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture
: instruction-set + :
+@@ -1195,136 +1195,3 @@ local rule cpu-flags ( toolset variable : architecture
: instruction-set + :
$(architecture)/$(instruction-set)
: $(values) ;
}
@@ -149,5 +150,9 @@ index b9bb9cf2a..c7e3cf3fe 100644
-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
+-cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
-# AIX variant of RS/6000 & PowerPC
-toolset.flags gcc AROPTIONS 64/aix : "-X64" ;
+--
+2.17.1
+
diff --git a/meta/recipes-support/boost/boost_1.72.0.bb
b/meta/recipes-support/boost/boost_1.73.0.bb
similarity index 86%
rename from meta/recipes-support/boost/boost_1.72.0.bb
rename to meta/recipes-support/boost/boost_1.73.0.bb
index 0b7badbc76..5e9e0d87d7 100644
--- a/meta/recipes-support/boost/boost_1.72.0.bb
+++ b/meta/recipes-support/boost/boost_1.73.0.bb
@@ -7,5 +7,4 @@ SRC_URI += "file://arm-intrinsics.patch \
file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
file://0001-dont-setup-compiler-flags-m32-m64.patch \
- file://0001-revert-cease-dependence-on-range.patch \
"
diff --git
a/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch
b/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch
deleted file
[OE-core] [PATCH] iso-codes: upgrade 4.4 -> 4.5.0
Signed-off-by: Wang Mingyu
---
.../iso-codes/{iso-codes_4.4.bb => iso-codes_4.5.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/iso-codes/{iso-codes_4.4.bb => iso-codes_4.5.0.bb}
(92%)
diff --git a/meta/recipes-support/iso-codes/iso-codes_4.4.bb
b/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb
similarity index 92%
rename from meta/recipes-support/iso-codes/iso-codes_4.4.bb
rename to meta/recipes-support/iso-codes/iso-codes_4.5.0.bb
index 332af025dd..6f9868ffea 100644
--- a/meta/recipes-support/iso-codes/iso-codes_4.4.bb
+++ b/meta/recipes-support/iso-codes/iso-codes_4.5.0.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "git://salsa.debian.org/iso-codes-team/iso-codes.git;protocol=http"
-SRCREV = "38edb926592954b87eb527124da0ec68d2a748f3"
+SRCREV = "a36019e5014bff251f83d522ddcfebaecf52afd3"
# inherit gettext cannot be used, because it adds gettext-native to
BASEDEPENDS which
# are inhibited by allarch
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138583):
https://lists.openembedded.org/g/openembedded-core/message/138583
Mute This Topic: https://lists.openembedded.org/mt/74395520/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] rm_work causes image tasks to re-run
When we have rm_work enabled all image tasks are built every time. This has been happening since at least warrior and is still happening as of master today (8fc19639f47b959a141dae231395bbababa644e1). Steps to reproduce: bitbake core-image-minimal bitbake core-image-minimal echo 'INHERIT += "rm_work"' >> conf/local.conf bitbake core-image-minimal bitbake core-image-minimal The second invocation of bitbake doesn't build anything at all (as would be expected.) The fourth invocation of bitbake always builds: Sstate summary: Wanted 43 Found 43 Missed 0 Current 436 (100% match, 100% complete) NOTE: Executing Tasks NOTE: Setscene tasks completed NOTE: Running noexec task 1750 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work_all) NOTE: Running task 1998 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_populate_lic_deploy) NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: Started NOTE: recipe core-image-minimal-1.0-r0: task do_populate_lic_deploy: Succeeded NOTE: Running task 1999 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_rm_work) NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Started NOTE: recipe core-image-minimal-1.0-r0: task do_rm_work: Succeeded NOTE: Running noexec task 2000 of 2000 (/fast2/mac/git/oe-core/meta/recipes-core/images/core-image-minimal.bb:do_build) NOTE: Tasks Summary: Attempted 2000 tasks of which 1996 didn't need to be rerun and all succeeded. If I teach rm_work.bbclass to also skip files matching "*do_populate_lic_deploy*" then this problem goes away. However, I have form for breaking things in rm_work so I suspect that this isn't the correct fix. Is there a better one? Thanks. Mike. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138581): https://lists.openembedded.org/g/openembedded-core/message/138581 Mute This Topic: https://lists.openembedded.org/mt/74394858/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 1/2] libsecret: add meson option introspection
From: Kai Kang
Add meson option 'introspection' for libsecret. For bsp which doesn't
support qemu usermode, it could disable gobject introspection build.
Then remove distro feature check for 'gobject-introspection-data' too.
Signed-off-by: Kai Kang
---
.../0001-meson-add-option-introspection.patch | 137 ++
.../libsecret/libsecret_0.20.3.bb | 8 +-
2 files changed, 140 insertions(+), 5 deletions(-)
create mode 100644
meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
diff --git
a/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
b/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
new file mode 100644
index 00..51ee66f42b
--- /dev/null
+++
b/meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch
@@ -0,0 +1,137 @@
+meson: add option introspection
+
+Add an option 'introspection' for meson which could control whether
+build GIR files or not.
+
+Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/53]
+
+Signed-off-by: Kai Kang
+---
+ libsecret/meson.build | 86 ++-
+ meson.build | 1 +
+ meson_options.txt | 1 +
+ 3 files changed, 46 insertions(+), 42 deletions(-)
+
+diff --git a/libsecret/meson.build b/libsecret/meson.build
+index 759b5ef..2ee8850 100644
+--- a/libsecret/meson.build
b/libsecret/meson.build
+@@ -104,50 +104,52 @@ libsecret_dep = declare_dependency(
+ )
+
+ # GObject Introspection
+-libsecret_gir_sources = [
+- 'secret-attributes.c',
+- 'secret-attributes.h',
+- 'secret-backend.c',
+- 'secret-backend.h',
+- 'secret-collection.c',
+- 'secret-collection.h',
+- 'secret-item.c',
+- 'secret-item.h',
+- 'secret-methods.c',
+- 'secret-password.c',
+- 'secret-password.h',
+- 'secret-paths.c',
+- 'secret-paths.h',
+- 'secret-prompt.c',
+- 'secret-prompt.h',
+- 'secret-retrievable.c',
+- 'secret-retrievable.h',
+- 'secret-schema.c',
+- 'secret-schema.h',
+- 'secret-schemas.c',
+- 'secret-schemas.h',
+- 'secret-service.c',
+- 'secret-service.h',
+- 'secret-types.h',
+- 'secret-value.c',
+- 'secret-value.h',
+-]
+-libsecret_gir_sources += version_h
+-libsecret_gir_sources += _enums_generated
+-
+-libsecret_gir = gnome.generate_gir(libsecret,
+- sources: libsecret_gir_sources,
+- namespace: 'Secret',
+- nsversion: api_version_major,
+- export_packages: 'libsecret-@0@'.format(api_version_major),
+- includes: [ 'GObject-2.0', 'Gio-2.0' ],
+- header: 'libsecret/secret.h',
+- extra_args: [ '-D SECRET_COMPILATION'],
+- install: true,
+-)
++if with_gir
++ libsecret_gir_sources = [
++'secret-attributes.c',
++'secret-attributes.h',
++'secret-backend.c',
++'secret-backend.h',
++'secret-collection.c',
++'secret-collection.h',
++'secret-item.c',
++'secret-item.h',
++'secret-methods.c',
++'secret-password.c',
++'secret-password.h',
++'secret-paths.c',
++'secret-paths.h',
++'secret-prompt.c',
++'secret-prompt.h',
++'secret-retrievable.c',
++'secret-retrievable.h',
++'secret-schema.c',
++'secret-schema.h',
++'secret-schemas.c',
++'secret-schemas.h',
++'secret-service.c',
++'secret-service.h',
++'secret-types.h',
++'secret-value.c',
++'secret-value.h',
++ ]
++ libsecret_gir_sources += version_h
++ libsecret_gir_sources += _enums_generated
++
++ libsecret_gir = gnome.generate_gir(libsecret,
++sources: libsecret_gir_sources,
++namespace: 'Secret',
++nsversion: api_version_major,
++export_packages: 'libsecret-@0@'.format(api_version_major),
++includes: [ 'GObject-2.0', 'Gio-2.0' ],
++header: 'libsecret/secret.h',
++extra_args: [ '-D SECRET_COMPILATION'],
++install: true,
++ )
++endif
+
+ # Vapi
+-if with_vapi
++if with_vapi and with_gir
+ libsecret_vapi =
gnome.generate_vapi('libsecret-@0@'.format(api_version_major),
+ sources: libsecret_gir[0],
+ metadata_dirs: meson.source_root() / 'libsecret',
+diff --git a/meson.build b/meson.build
+index a26d046..d22e008 100644
+--- a/meson.build
b/meson.build
+@@ -22,6 +22,7 @@ with_gcrypt = get_option('gcrypt')
+ enable_debug = get_option('debugging')
+ with_vapi = get_option('vapi')
+ with_gtkdoc = get_option('gtk_doc')
++with_gir = get_option('introspection')
+
+ # Some variables
+ config_h_dir = include_directories('.')
+diff --git a/meson_options.txt b/meson_options.txt
+index c1fda5d..445aeb0 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -3,3 +3,4 @@ option('gcrypt', type: 'boolean', value: true, description:
'With gcrypt and tra
+ option('debugging', type: 'boolean', value: false, description: 'Turn
debugging on/off')
+ option('vapi', type: 'boolean', value: true, description: 'Create VAPI file.')
+ option('gtk_doc', type: 'boolean', value: true, description: 'Build reference
documentation using gtk-doc')
[OE-core] [PATCH v2 0/2] Add meson option introspection for libsecret
From: Kai Kang v2: * revert distro feature check for 'gobject-introspection-data' Build with/without config DISTRO_FEATURES_remove = "gobject-introspection-data" $ bitbake webkitgtk pinentry Build successfully. Kai Kang (2): libsecret: add meson option introspection Revert "webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled" .../0001-meson-add-option-introspection.patch | 137 ++ .../libsecret/libsecret_0.20.3.bb | 8 +- meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 6 +- .../pinentry/pinentry_1.1.0.bb| 5 +- 4 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-gnome/libsecret/files/0001-meson-add-option-introspection.patch -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138579): https://lists.openembedded.org/g/openembedded-core/message/138579 Mute This Topic: https://lists.openembedded.org/mt/74394050/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2 2/2] Revert "webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled"
From: Kai Kang
This reverts commit 91264e5e0ab40b796e214edd84c72bc88b363778.
It adds meson options 'instrospection' to disable gobject introspection
files build. So no need to check distro feature 'gobject-introspection-data'
any longer.
Keep the spaces adjustment and comment removal.
Signed-off-by: Kai Kang
---
meta/recipes-sato/webkit/webkitgtk_2.28.2.bb| 6 ++
meta/recipes-support/pinentry/pinentry_1.1.0.bb | 5 ++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb
b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb
index 51596077b4..e9941c7a2c 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.28.2.bb
@@ -26,9 +26,7 @@ SRC_URI[sha256sum] =
"b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc6
inherit cmake pkgconfig gobject-introspection perlnative features_check
upstream-version-is-even gtk-doc
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'opengl', '', d)} \
-${@bb.utils.contains('PACKAGECONFIG', 'libsecret',
'gobject-introspection-data', '', d)} \
-"
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
'opengl', '', d)}"
CVE_PRODUCT = "webkitgtk webkitgtk\+"
@@ -44,7 +42,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES',
'wayland x11', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',
'webgl opengl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl
gles2', d)} \
enchant \
- ${@bb.utils.contains('DISTRO_FEATURES',
'gobject-introspection-data', 'libsecret', '', d)} \
+ libsecret \
"
PACKAGECONFIG[wayland] =
"-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe
wpebackend-fdo wayland-native"
diff --git a/meta/recipes-support/pinentry/pinentry_1.1.0.bb
b/meta/recipes-support/pinentry/pinentry_1.1.0.bb
index dc9069b9d5..d9ca0732f7 100644
--- a/meta/recipes-support/pinentry/pinentry_1.1.0.bb
+++ b/meta/recipes-support/pinentry/pinentry_1.1.0.bb
@@ -19,9 +19,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6"
SRC_URI[sha256sum] =
"68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
-inherit autotools pkgconfig features_check
-
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret',
'gobject-introspection-data', '', d)}"
+inherit autotools pkgconfig
PACKAGECONFIG ??= "ncurses libcap"
@@ -29,6 +27,7 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses
--with-ncurses-include-dir=${STAGING
PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap"
PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt,
qtbase-native qtbase"
PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+
glib-2.0"
+
PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret"
EXTRA_OECONF = " \
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138578):
https://lists.openembedded.org/g/openembedded-core/message/138578
Mute This Topic: https://lists.openembedded.org/mt/74394048/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
