[OE-core] [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects.
Function "contains_lfs" was only looking at the master branch when searching for LFS content. LFS may be configured in specific branches only, so we need to use the correct branch. Signed-off-by: Mauro Queiros --- lib/bb/fetch2/git.py | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index eab76a10..dbf87156 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -566,8 +566,15 @@ class Git(FetchMethod): """ Check if the repository has 'lfs' (large file) content """ -cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % ( -ud.basecmd) + +if not ud.nobranch: +branchname = ud.branches[ud.names[0]] +else: +branchname = "master" + +cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % ( +ud.basecmd, ud.branches[ud.names[0]]) + try: output = runfetchcmd(cmd, d, quiet=True, workdir=wd) if int(output) > 0: -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138911): https://lists.openembedded.org/g/openembedded-core/message/138911 Mute This Topic: https://lists.openembedded.org/mt/74540463/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/3] git.py: LFS bitbake note should not be printed if need_lfs is not set.
The message "Repository %s has LFS content but it is not being fetched" was
being printed, even when Git-LFS was available and "lfs=1" was set. In those
situations, we want to fetch LFS content, so that message would not make sense.
Signed-off-by: Mauro Queiros
---
lib/bb/fetch2/git.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 4c7d388e..eab76a10 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -509,7 +509,7 @@ class Git(FetchMethod):
if self._contains_lfs(ud, d, destdir):
if need_lfs and not self._find_git_lfs(d):
raise bb.fetch2.FetchError("Repository %s has LFS content,
install git-lfs on host to download (or set lfs=0 to ignore it)" % (repourl))
-else:
+elif not need_lfs:
bb.note("Repository %s has LFS content but it is not being
fetched" % (repourl))
if not ud.nocheckout:
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138910):
https://lists.openembedded.org/g/openembedded-core/message/138910
Mute This Topic: https://lists.openembedded.org/mt/74540462/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/3] git.py: skip smudging if lfs=0 is set
Git-LFS objects were being fetched even when lfs=0 was not set.
This patch disables LFS smudging when lfs=0. That way, only the LFS pointers
are downloaded during checkout.
Signed-off-by: Mauro Queiros
---
lib/bb/fetch2/git.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 5b3793a7..4c7d388e 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -475,6 +475,9 @@ class Git(FetchMethod):
need_lfs = ud.parm.get("lfs", "1") == "1"
+if not need_lfs:
+ud.basecmd = "GIT_LFS_SKIP_SMUDGE=1 " + ud.basecmd
+
source_found = False
source_error = []
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138909):
https://lists.openembedded.org/g/openembedded-core/message/138909
Mute This Topic: https://lists.openembedded.org/mt/74540461/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 v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects.
Please ignore. This was meant to bitbake-devel mailing list. Mauro Queiros escreveu no dia sexta, 29/05/2020 à(s) 11:02: > Function "contains_lfs" was only looking at the master branch when > searching for LFS > content. LFS may be configured in specific branches only, so we need to > use the > correct branch. > > Signed-off-by: Mauro Queiros > --- > lib/bb/fetch2/git.py | 11 +-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py > index eab76a10..dbf87156 100644 > --- a/lib/bb/fetch2/git.py > +++ b/lib/bb/fetch2/git.py > @@ -566,8 +566,15 @@ class Git(FetchMethod): > """ > Check if the repository has 'lfs' (large file) content > """ > -cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % ( > -ud.basecmd) > + > +if not ud.nobranch: > +branchname = ud.branches[ud.names[0]] > +else: > +branchname = "master" > + > +cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % ( > +ud.basecmd, ud.branches[ud.names[0]]) > + > try: > output = runfetchcmd(cmd, d, quiet=True, workdir=wd) > if int(output) > 0: > -- > 2.17.1 > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138913): https://lists.openembedded.org/g/openembedded-core/message/138913 Mute This Topic: https://lists.openembedded.org/mt/74540463/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 v2 1/3] git.py: skip smudging if lfs=0 is set
Please ignore. This was meant to bitbake-devel mailing list.
Mauro Queiros escreveu no dia sexta, 29/05/2020
à(s) 11:02:
> Git-LFS objects were being fetched even when lfs=0 was not set.
> This patch disables LFS smudging when lfs=0. That way, only the LFS
> pointers
> are downloaded during checkout.
>
> Signed-off-by: Mauro Queiros
> ---
> lib/bb/fetch2/git.py | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
> index 5b3793a7..4c7d388e 100644
> --- a/lib/bb/fetch2/git.py
> +++ b/lib/bb/fetch2/git.py
> @@ -475,6 +475,9 @@ class Git(FetchMethod):
>
> need_lfs = ud.parm.get("lfs", "1") == "1"
>
> +if not need_lfs:
> +ud.basecmd = "GIT_LFS_SKIP_SMUDGE=1 " + ud.basecmd
> +
> source_found = False
> source_error = []
>
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138914):
https://lists.openembedded.org/g/openembedded-core/message/138914
Mute This Topic: https://lists.openembedded.org/mt/74540461/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 v2 2/3] git.py: LFS bitbake note should not be printed if need_lfs is not set.
Please ignore. This was meant to bitbake-devel mailing list.
Mauro Queiros escreveu no dia sexta, 29/05/2020
à(s) 11:02:
> The message "Repository %s has LFS content but it is not being fetched" was
> being printed, even when Git-LFS was available and "lfs=1" was set. In
> those
> situations, we want to fetch LFS content, so that message would not make
> sense.
>
> Signed-off-by: Mauro Queiros
> ---
> lib/bb/fetch2/git.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
> index 4c7d388e..eab76a10 100644
> --- a/lib/bb/fetch2/git.py
> +++ b/lib/bb/fetch2/git.py
> @@ -509,7 +509,7 @@ class Git(FetchMethod):
> if self._contains_lfs(ud, d, destdir):
> if need_lfs and not self._find_git_lfs(d):
> raise bb.fetch2.FetchError("Repository %s has LFS
> content, install git-lfs on host to download (or set lfs=0 to ignore it)" %
> (repourl))
> -else:
> +elif not need_lfs:
> bb.note("Repository %s has LFS content but it is not
> being fetched" % (repourl))
>
> if not ud.nocheckout:
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138912):
https://lists.openembedded.org/g/openembedded-core/message/138912
Mute This Topic: https://lists.openembedded.org/mt/74540462/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] ✗ patchtest: failure for "[v2] git.py: skip smudging if ..." and 2 more
== Series Details == Series: "[v2] git.py: skip smudging if ..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/24383/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 662c688e63) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138915): https://lists.openembedded.org/g/openembedded-core/message/138915 Mute This Topic: https://lists.openembedded.org/mt/74540788/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] docbook-xml: update recipe to stick with the upstream
Perhaps directly is simplest, with a note on their origin above SRC_URI. Alex On Thu, 28 May 2020 at 23:12, Gregor Zatko wrote: > On Sun, 2020-05-24 at 16:24 +0100, Richard Purdie wrote: > > On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote: > > From: Gregor Zatko < > > gza...@zoznam.sk > > > > > > Until now a Debian package has been used as a source. > > This change just switches it to project's upstream. > > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270 > > > > Signed-off-by: Gregor Zatko < > > gza...@gmail.com > > > > > --- > > .../docbook-xml-update-catalog.xml.patch | 515 -- > > .../docbook-xml/docbook-xml-dtd4_4.5.bb | 65 ++- > > 2 files changed, 36 insertions(+), 544 deletions(-) > > delete mode 100644 > meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch > > > Unfortunately test builds failed: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176 > > > > Cheers, > > > Richard > > > > The catalogs of versions 4.0 and 4.1.2 are not present standalone in the > docbook.org page. > > A question is what is the best choice to include them into the file tree: > > 1) add them directly > > 2) add them as a patch > > 3) extract from a Ubuntu/Debian package where they are present > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138908): https://lists.openembedded.org/g/openembedded-core/message/138908 Mute This Topic: https://lists.openembedded.org/mt/74423806/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] python3-pygobject:upgrade 3.34.0 -> 3.36.1
Signed-off-by: Zang Ruochen
---
...ython3-pygobject_3.34.0.bb => python3-pygobject_3.36.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.34.0.bb =>
python3-pygobject_3.36.1.bb} (87%)
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.34.0.bb
b/meta/recipes-devtools/python/python3-pygobject_3.36.1.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-pygobject_3.34.0.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.36.1.bb
index 6babf0cae8..0a34d4373f 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.34.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.36.1.bb
@@ -14,8 +14,8 @@ SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz
\
file://0001-Do-not-build-tests.patch \
"
-SRC_URI[md5sum] = "ca1dc4f31c1d6d283758e8f315a88ab6"
-SRC_URI[sha256sum] =
"87e2c9aa785f352ef111dcc5f63df9b85cf6e05e52ff04f803ffbebdacf5271a"
+SRC_URI[md5sum] = "ebfebc4533856572281add29f08412bf"
+SRC_URI[sha256sum] =
"d1bf42802d1cec113b5adaa0e7bf7f3745b44521dc2163588d276d5cd61d718f"
UNKNOWN_CONFIGURE_WHITELIST = "introspection"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138907):
https://lists.openembedded.org/g/openembedded-core/message/138907
Mute This Topic: https://lists.openembedded.org/mt/74539466/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] python3-setuptools:upgrade 45.2.0 -> 47.1.1
Signed-off-by: Zang Ruochen
---
meta/recipes-devtools/python/python-setuptools.inc | 4 ++--
.../0001-change-shebang-to-python3.patch| 13 +
...tools_45.2.0.bb => python3-setuptools_47.1.1.bb} | 0
3 files changed, 3 insertions(+), 14 deletions(-)
rename meta/recipes-devtools/python/{python3-setuptools_45.2.0.bb =>
python3-setuptools_47.1.1.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index e9ad93dbee..c91cca9f06 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -12,8 +12,8 @@ SRC_URI_append_class-native = "
file://0001-conditionally-do-not-fetch-code-by-e
SRC_URI += "file://0001-change-shebang-to-python3.patch"
-SRC_URI[md5sum] = "0c956eea142af9c2b02d72e3c042af30"
-SRC_URI[sha256sum] =
"89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992ae3397f"
+SRC_URI[md5sum] = "6e9de90b242fdd60ef59f497424ce13a"
+SRC_URI[sha256sum] =
"145fa62b9d7bb544fce16e9b5a9bf4ab2032d2f758b7cd674af09a92736aff74"
DEPENDS += "${PYTHON_PN}"
diff --git
a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
index 33af8daed7..6dcf52771b 100644
---
a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
+++
b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
@@ -8,8 +8,7 @@ Upstream-Status: Pending
Signed-off-by: Changqing Li
---
pkg_resources/_vendor/appdirs.py | 2 +-
- setuptools/command/easy_install.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pkg_resources/_vendor/appdirs.py
b/pkg_resources/_vendor/appdirs.py
index ae67001..933e398 100644
@@ -21,16 +20,6 @@ index ae67001..933e398 100644
# -*- coding: utf-8 -*-
# Copyright (c) 2005-2010 ActiveState Software Inc.
# Copyright (c) 2013 Eddy Petrișor
-diff --git a/setuptools/command/easy_install.py
b/setuptools/command/easy_install.py
-index abca1ae..6bcdc98 100644
a/setuptools/command/easy_install.py
-+++ b/setuptools/command/easy_install.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- """
- Easy Install
-
--
2.24.1
diff --git a/meta/recipes-devtools/python/python3-setuptools_45.2.0.bb
b/meta/recipes-devtools/python/python3-setuptools_47.1.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_45.2.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_47.1.1.bb
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138906):
https://lists.openembedded.org/g/openembedded-core/message/138906
Mute This Topic: https://lists.openembedded.org/mt/74539465/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] llvm: upgrade 9.0.1 -> 10.0.0
On 5/28/20 9:57 PM, Khem Raj wrote:
On Wed, May 27, 2020 at 6:48 AM Trevor Gamblin
wrote:
Signed-off-by: Trevor Gamblin
---
meta/recipes-devtools/llvm/llvm_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb
b/meta/recipes-devtools/llvm/llvm_git.bb
index d24ed761bf..787cc3adcf 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,9 +19,9 @@ inherit cmake pkgconfig
PROVIDES += "llvm${PV}"
-MAJOR_VERSION = "9"
+MAJOR_VERSION = "10"
MINOR_VERSION = "0"
-PATCH_VERSION = "1"
+PATCH_VERSION = "0"
It also needs updating LLVMVERSION in
meta/conf/distro/include/tcmode-default.inc
secondly, I would suggest to wait for 10.0.1 which is releasing in a weeks time.
Alright, I'll watch for that release.
Thanks!
PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}"
@@ -29,7 +29,7 @@ LLVM_RELEASE = "${PV}"
LLVM_DIR = "llvm${LLVM_RELEASE}"
BRANCH = "release/${MAJOR_VERSION}.x"
-SRCREV = "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
+SRCREV = "d32170dbd5b0d54436537b6b75beaf44324e0c28"
SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2
\
file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2
\
--
2.24.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138916):
https://lists.openembedded.org/g/openembedded-core/message/138916
Mute This Topic: https://lists.openembedded.org/mt/74499834/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] Issue with qemu and a shared sstate-cache used by different linux distribution supported by yocto
On Fri, May 29, 2020 at 03:12:14PM +, vygu via lists.openembedded.org wrote: > After some investigation on the debian buildfarm, we can see in the > build/tmp/work/x86_64-linux/qemu-system-native/4.2.0-r0/temp/log.do_configure > "libnfs support yes". If we comment in > poky/meta/recipes-devtools/qemu/qemu.inc all the prepend > do_configure_prepend_class-native(), we obtain "libnfs support no". The > function do_configure_prepend_class-native, as written in commentaries, is to > find sdl. But we see now it adds more than just the sdl support. Is it > expected? No, it's not expected, you should add PACKAGECONFIG for nfs to make it consistent across various builders. signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138918): https://lists.openembedded.org/g/openembedded-core/message/138918 Mute This Topic: https://lists.openembedded.org/mt/74498490/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] Issue with qemu and a shared sstate-cache used by different linux distribution supported by yocto
After some investigation on the debian buildfarm, we can see in the build/tmp/work/x86_64-linux/qemu-system-native/4.2.0-r0/temp/log.do_configure "libnfs support yes". If we comment in poky/meta/recipes-devtools/qemu/qemu.inc all the prepend do_configure_prepend_class-native(), we obtain "libnfs support no". The function do_configure_prepend_class-native, as written in commentaries, is to find sdl. But we see now it adds more than just the sdl support. Is it expected? ‐‐‐ Original Message ‐‐‐ On Wednesday 27 May 2020 16:32, Alexander Kanavin wrote: > Runqemu is running qemu binaries from a different location (that of > qemu-helper-native sysroot), and on my machine, qemu in that location > resolves libraries correctly. Can you try the same please? > > ak@linux-f9zs:~/development/poky> ldd > build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-aarch64.real > linux-vdso.so.1 (0x7ffcf73d9000) > libvirglrenderer.so.1 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libvirglrenderer.so.1 > (0x7fdb2efce000) > libepoxy.so.0 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libepoxy.so.0 > (0x7fdb2ee9a000) > libgbm.so.1 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libgbm.so.1 > (0x7fdb2ee89000) > libasound.so.2 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libasound.so.2 > (0x7fdb2ed93000) > libSDL2-2.0.so.0 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libSDL2-2.0.so.0 > (0x7fdb2ec5f000) > libX11.so.6 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libX11.so.6 > (0x7fdb2eb1f000) > libgtk-3.so.0 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libgtk-3.so.0 > (0x7fdb2e44) > libgdk-3.so.0 => > /home/ak/development/poky/build-st/tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/../lib/libgdk-3.so.0 > (0x7fdb2e38c000) > > (etc, there is a lot of similar lines) > > Alex > > On Wed, 27 May 2020 at 15:59, vygu wrote: > >> For example: >> >> with the sstate-cache build on a debian, we have: >> >> $ ldd ../build/ >> tmp/work/x86_64-linux/qemu-system-native/4.1.0-r0/sysroot-destdir/home/user/yocto/build/tmp/work/x86_64-linux/qemu-system-native/4.1.0-r0/recipe-sysroot-native/usr/bin/qemu-system-aarch64 >> linux-vdso.so.1 (0x7ffe7dbc) >> libseccomp.so.2 => /lib/x86_64-linux-gnu/libseccomp.so.2 >> (0x7f533d18a000) >> libbrlapi.so.0.6 => /lib/x86_64-linux-gnu/libbrlapi.so.0.6 >> (0x7f533d17d000) >> libvdeplug.so.2 => /lib/libvdeplug.so.2 (0x7f533d175000) >> libasound.so.2 => /lib/x86_64-linux-gnu/libasound.so.2 >> (0x7f533d074000) >> libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x7f533ce56000) >> libnfs.so.8 => /lib/x86_64-linux-gnu/libnfs.so.8 (0x7f533cc1d000) >> librbd.so.1 => /lib/x86_64-linux-gnu/librbd.so.1 (0x7f533c8dc000) >> librados.so.2 => /lib/x86_64-linux-gnu/librados.so.2 >> (0x7f533c76c000) >> libacl.so.1 => /lib/x86_64-linux-gnu/libacl.so.1 (0x7f533c761000) >> libgfapi.so.0 => /lib/x86_64-linux-gnu/libgfapi.so.0 >> (0x7f533c732000) >> libglusterfs.so.0 => /lib/x86_64-linux-gnu/libglusterfs.so.0 >> (0x7f533c624000) >> libgfrpc.so.0 => /lib/x86_64-linux-gnu/libgfrpc.so.0 >> (0x7f533c604000) >> libgfxdr.so.0 => /lib/x86_64-linux-gnu/libgfxdr.so.0 >> (0x7f533c5e4000) >> libuuid.so.1 => /lib/x86_64-linux-gnu/libuuid.so.1 (0x7f533c5db000) >> libpixman-1.so.0 => /lib/x86_64-linux-gnu/libpixman-1.so.0 >> (0x7f533c535000) >> libutil.so.1 => /lib/x86_64-linux-gnu/libutil.so.1 (0x7f533c53) >> libfdt.so.1 => /lib/x86_64-linux-gnu/libfdt.so.1 (0x7f533c524000) >> libgthread-2.0.so.0 => /lib/x86_64-linux-gnu/libgthread-2.0.so.0 >> (0x7f533c51d000) >> libglib-2.0.so.0 => /lib/x86_64-linux-gnu/libglib-2.0.so.0 >> (0x7f533c3fe000) >> librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x7f533c3f4000) >> libstdc++.so.6 => /lib/x86_64-linux-gnu/libstdc++.so.6 >> (0x7f533c27) >> libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x7f533c0ed000) >> libgcc_s.so.1 => /lib/x86_64-linux-gnu/libgcc_s.so.1 >> (0x7f533c0d3000) >> libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 >> (0x7f533c0b) >> libc.so.6 =>
[OE-core] External sysroots?
Suppose that I want to cut a meta-toolchain build against a sysroot sourced from a different Linux distribution. (Obviously I would be responsible for ensuring that all required package dependencies exist in the sysroot.) In other words... like an external toolchain, but inverted. The purpose being to apply OE's toolchain infrastructure to other distros. In principle, could this be effected by e.g. liberal use of ASSUME_PROVIDED and by populating the target sysroot by hand? Or is there another way to do this in principle? Has anybody ever tried something like this before? -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138919): https://lists.openembedded.org/g/openembedded-core/message/138919 Mute This Topic: https://lists.openembedded.org/mt/74548752/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 V3 3/3] u-boot: introduce UBOOT_INITIAL_ENV
On Thu, May 28, 2020 at 02:41:29PM +0200, Ming Liu wrote:
> From: Ming Liu
>
> It defaults to ${PN}-initial-env, no functional changes with current
> implementation, but this allows it to be changed in individual u-boot
> recipes.
>
> If UBOOT_INITIAL_ENV is empty, then no initial env would be compiled/
> installed/deployed, set ALLOW_EMPTY_${PN}-env = "1".
>
> The major purpose for introducing this, is that the users might have
> some scripts on targets like:
> ```
> /sbin/fw_setenv -f /etc/u-boot-initial-env
> ```
>
> and it should be able to run against a identical path generated by
> different u-boot recipes.
>
> Signed-off-by: Ming Liu
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 55 +++---
> 1 file changed, 36 insertions(+), 19 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> index be15e1760f..8e60615e5c 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -60,6 +60,10 @@ UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}"
> UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}"
> UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}"
>
> +# Default name of u-boot initial env, but enable individual recipes to change
> +# this value.
> +UBOOT_INITIAL_ENV ?= "${PN}-initial-env"
> +
> # U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf
> # to find EXTLINUX conf file.
> UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux"
> @@ -137,8 +141,10 @@ do_compile () {
> done
>
> # Generate the uboot-initial-env
> -oe_runmake -C ${S} O=${B}/${config} u-boot-initial-env
> -cp ${B}/${config}/u-boot-initial-env
> ${B}/${config}/u-boot-initial-env-${type}
> +if [ -n "${UBOOT_INITIAL_ENV}" ]; then
> +oe_runmake -C ${S} O=${B}/${config}
> u-boot-initial-env
> +cp ${B}/${config}/u-boot-initial-env
> ${B}/${config}/u-boot-initial-env-${type}
> +fi
>
> unset k
> fi
> @@ -150,7 +156,9 @@ do_compile () {
> oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
>
> # Generate the uboot-initial-env
> -oe_runmake -C ${S} O=${B} u-boot-initial-env
> +if [ -n "${UBOOT_INITIAL_ENV}" ]; then
> +oe_runmake -C ${S} O=${B} u-boot-initial-env
> +fi
> fi
> }
>
> @@ -168,10 +176,12 @@ do_install () {
> ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
> ${D}/boot/${UBOOT_BINARY}
>
> # Install the uboot-initial-env
> -install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${type}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> +if [ -n "${UBOOT_INITIAL_ENV}" ]; then
> +install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> +ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${type}
> +ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${type}
> +ln -sf
> ${UBOOT_INITIAL_ENV}-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> +fi
> fi
> done
> unset j
> @@ -182,9 +192,11 @@ do_install () {
> ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>
> # Install the uboot-initial-env
> -install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
> -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
> -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> +if [ -n "${UBOOT_INITIAL_ENV}" ]; then
> +install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> +ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}-${MACHINE}
> +ln -sf ${UBOOT_INITIAL_ENV}-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${UBOOT_INITIAL_ENV}
> +fi
> fi
>
> if [ -n "${UBOOT_ELF}" ]
> @@ -255,8 +267,9 @@ do_install () {
>
[oe-core][PATCH 1/1] qemu: force target build type to production
qemu will not build for -Og optimization because macros
in lockable.h do not work as expected. Override DEBUG_BUILD.
Signed-off-by: Joe Slater
---
meta/recipes-devtools/qemu/qemu_4.2.0.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/qemu/qemu_4.2.0.bb
b/meta/recipes-devtools/qemu/qemu_4.2.0.bb
index a4018cc448..90b230d62f 100644
--- a/meta/recipes-devtools/qemu/qemu_4.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_4.2.0.bb
@@ -10,6 +10,10 @@ DEPENDS = "glib-2.0 zlib pixman bison-native"
RDEPENDS_${PN}_class-target += "bash"
+# Does not compile for -Og
+#
+DEBUG_BUILD_class-target = "0"
+
EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}"
EXTRA_OECONF_append_class-target_mipsarcho32 =
"${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '',
d)}"
EXTRA_OECONF_append_class-nativesdk = "
--target-list=${@get_qemu_target_list(d)}"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138922):
https://lists.openembedded.org/g/openembedded-core/message/138922
Mute This Topic: https://lists.openembedded.org/mt/74553632/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 V3 1/3] u-boot: support merging .cfg files for UBOOT_CONFIG
Is this change really required for UBOOT_INITIAL_ENV? I think you are merging
several patch series together?
On Thu, May 28, 2020 at 02:41:27PM +0200, Ming Liu wrote:
> From: Ming Liu
>
> U-boot recipe supports .cfg files in SRC_URI, but they would be merged
> to .config during do_configure only when UBOOT_MACHINE is set, we
> should also support merging .cfg files for UBOOT_CONFIG.
>
> Signed-off-by: Max Krummenacher
> Signed-off-by: Ming Liu
> ---
> meta/recipes-bsp/u-boot/u-boot.inc | 21 +
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> index 80f828df52..8cfd25020c 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -77,7 +77,23 @@ def find_cfgs(d):
> return sources_list
>
> do_configure () {
> -if [ -z "${UBOOT_CONFIG}" ]; then
> +if [ -n "${UBOOT_CONFIG}" ]; then
> +unset i j
> +for config in ${UBOOT_MACHINE}; do
> +i=$(expr $i + 1);
> +for type in ${UBOOT_CONFIG}; do
> +j=$(expr $j + 1);
> +if [ $j -eq $i ]; then
> +oe_runmake -C ${S} O=${B}/${config} ${config}
> +merge_config.sh -m -O ${B}/${config}
> ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
> +oe_runmake -C ${S} O=${B}/${config} oldconfig
> +fi
> +done
> +unset j
> +done
> +unset i
> +DEVTOOL_DISABLE_MENUCONFIG=true
> +else
> if [ -n "${UBOOT_MACHINE}" ]; then
> oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
> else
> @@ -85,8 +101,6 @@ do_configure () {
> fi
> merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
> cml1_do_configure
> -else
> -DEVTOOL_DISABLE_MENUCONFIG=true
> fi
> }
>
> @@ -114,7 +128,6 @@ do_compile () {
> j=$(expr $j + 1);
> if [ $j -eq $i ]
> then
> -oe_runmake -C ${S} O=${B}/${config} ${config}
> oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
> for binary in ${UBOOT_BINARIES}; do
> k=$(expr $k + 1);
> --
> 2.26.2
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138920):
https://lists.openembedded.org/g/openembedded-core/message/138920
Mute This Topic: https://lists.openembedded.org/mt/74520507/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 5/6] Revert "lib/oe/patch: fix handling of patches with no header"
* This reverts commit d9971f5dc8eb7de551fd6f5e058fd24770ef5d78.
* With the missing Subject line fixed in GitApplyTree.prepareCommit()
we should be able to revert, the fix which was trying to help it by
parsing GitApplyTree.patch_line_prefix ("%% original patch:") also
from Subject line, now GitApplyTree.patch_line_prefix should always
end on separate line which is then skipped when copying the lines to
resulting patch, see original commit message from Paul:
lib/oe/patch: fix handling of patches with no header
If a patch applied by a recipe has no header and we turn the recipe's
source into a git tree (when PATCHTOOL = "git" or when using devtool
extract / modify / upgrade), the commit message ends up consisting only
of the original filename marker ("%% original patch: filename.patch").
When we come to do turn the commits back into a set of patches in
extractPatches(), this first line ends up in the "Subject: " part of
the file, but we were ignoring it because the line didn't start with the
marker text. The end result was we weren't able to get the original
patch name. Strip off any "Subject [PATCH x/y]" part before looking for
the marker text to fix.
This caused "devtool modify openssl" followed by "devtool update-recipe
openssl" (without any changes in-between) to remove version-script.patch
because that patch has no header and we weren't able to determine the
original filename.
---
meta/lib/oe/patch.py | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index bb1c40aa1e..7ca2e28b1f 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -439,7 +439,6 @@ class GitApplyTree(PatchTree):
def extractPatches(tree, startcommit, outdir, paths=None):
import tempfile
import shutil
-import re
tempdir = tempfile.mkdtemp(prefix='oepatch')
try:
shellcmd = ["git", "format-patch", "--no-signature",
"--no-numbered", startcommit, "-o", tempdir]
@@ -455,13 +454,10 @@ class GitApplyTree(PatchTree):
try:
with open(srcfile, 'r', encoding=encoding) as f:
for line in f:
-checkline = line
-if checkline.startswith('Subject: '):
-checkline = re.sub(r'\[.+?\]\s*', '',
checkline[9:])
-if
checkline.startswith(GitApplyTree.patch_line_prefix):
+if
line.startswith(GitApplyTree.patch_line_prefix):
outfile = line.split()[-1].strip()
continue
-if
checkline.startswith(GitApplyTree.ignore_commit_prefix):
+if
line.startswith(GitApplyTree.ignore_commit_prefix):
continue
patchlines.append(line)
except UnicodeDecodeError:
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138927):
https://lists.openembedded.org/g/openembedded-core/message/138927
Mute This Topic: https://lists.openembedded.org/mt/74554375/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 1/6] devtool: use -f and don't use --exclude-standard when adding files to workspace
* I see a case where a tarball contains .gitignore and bunch of files
which are normally ignored in git, but still included in the tarball
(e.g. configure script next to configure.ac)
* when devtool is creating a git repo in workspace it won't include these
files from tarball in the initial devtool-base commit, because
git ls-files won't list them
* but then the first .patch file (without git headers) when applied with
GitApplyTree._applypatch() will add all these still ignored files to a
commit which used to only modify some files, because it's using -f:
# Add all files
shellcmd = ["git", "add", "-f", "-A", "."]
output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir)
at least in this case it would be better to add all ignored files in
the initial devtool-base commit and then --force-patch-refresh will just
include the small modification as before instead of adding unrelated
files, just because they were initially ignored - this behavior will
also match with the do_patch task in the actual build where the
.gitignore is ignored when unpacking some tarball
* my use-case is fixed in setup_git_repo, but similar function is in
devtool upgrade, I've changed it there as well
Signed-off-by: Martin Jansa
---
scripts/lib/devtool/__init__.py | 2 +-
scripts/lib/devtool/upgrade.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index d39c474fbd..6ebe368a9e 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -196,7 +196,7 @@ def setup_git_repo(repodir, version, devbranch,
basetag='devtool-base', d=None):
if not os.path.exists(os.path.join(repodir, '.git')):
bb.process.run('git init', cwd=repodir)
bb.process.run('git config --local gc.autodetach 0', cwd=repodir)
-bb.process.run('git add .', cwd=repodir)
+bb.process.run('git add -f -A .', cwd=repodir)
commit_cmd = ['git']
oe.patch.GitApplyTree.gitCommandUserOptions(commit_cmd, d=d)
commit_cmd += ['commit', '-q']
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index f962a71e41..ebe72282bb 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -235,14 +235,14 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev,
srcbranch, branch, kee
# Copy in new ones
_copy_source_code(tmpsrctree, srctree)
-(stdout,_) = __run('git ls-files --modified --others
--exclude-standard')
+(stdout,_) = __run('git ls-files --modified --others')
filelist = stdout.splitlines()
pbar = bb.ui.knotty.BBProgress('Adding changed files', len(filelist))
pbar.start()
batchsize = 100
for i in range(0, len(filelist), batchsize):
batch = filelist[i:i+batchsize]
-__run('git add -A %s' % ' '.join(['"%s"' % item for item in
batch]))
+__run('git add -f -A %s' % ' '.join(['"%s"' % item for item in
batch]))
pbar.update(i)
pbar.finish()
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138923):
https://lists.openembedded.org/g/openembedded-core/message/138923
Mute This Topic: https://lists.openembedded.org/mt/74554370/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 2/6] meta-selftest: add test of .gitignore in tarball
Signed-off-by: Martin Jansa
---
.../devtool/devtool-test-ignored.bb | 9 ++
.../devtool-test-ignored.patch| 7 +
.../devtool-test-ignored.patch.expected | 16 +++
.../devtool-test-ignored.tar.gz | Bin 0 -> 205 bytes
meta/lib/oeqa/selftest/cases/devtool.py | 26 ++
5 files changed, 58 insertions(+)
create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-ignored.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.tar.gz
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-ignored.bb
b/meta-selftest/recipes-test/devtool/devtool-test-ignored.bb
new file mode 100644
index 00..6a3d58c884
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-ignored.bb
@@ -0,0 +1,9 @@
+LICENSE = "CLOSED"
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "file://${BPN}.tar.gz \
+ file://${BPN}.patch"
+
+S = "${WORKDIR}/${BPN}"
+
+EXCLUDE_FROM_WORLD = "1"
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch
b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch
new file mode 100644
index 00..96ea0eb4e3
--- /dev/null
+++
b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch
@@ -0,0 +1,7 @@
+diff --git a/ignored b/ignored
+index a579759..e3d7b43 100644
+--- a/ignored
b/ignored
+@@ -1 +1 @@
+-I'm so ignored
++# I'm so ignored
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected
b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected
new file mode 100644
index 00..68ec6d9875
--- /dev/null
+++
b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch.expected
@@ -0,0 +1,16 @@
+From 3a286343cc5cadd83f41d524ee3606ae51df9ee7 Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Thu, 28 May 2020 01:32:31 +0200
+Subject: [PATCH] meta-selftest: add test of .gitignore in tarball
+
+---
+ ignored | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ignored b/ignored
+index a579759..e3d7b43 100644
+--- a/ignored
b/ignored
+@@ -1 +1 @@
+-I'm so ignored
++# I'm so ignored
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.tar.gz
b/meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.tar.gz
new file mode 100644
index
..b2e9935eb9d3fdbeb24345435b11df2438dfd6eb
GIT binary patch
literal 205
zcmb2|=3oE==C@Zbay1!<9QzpiU1ay`Q@1YUp1+XH(Z#WH!RqJvlU!S#o;6tVpZ_6`
z$hpRTJXCbhl_l-zS!7
zv263d2X(2vuf1FMFYo1FH__ss{-$C5h6&;QK+e#YKLv3_;TiTI;Z4`$n+|Gy>w
z$%T`eAMdU|e(+S<_x}M`|JC(fO0N8W|9$=J*88l#_cMvfL);7^8{Y0_d|~|5m_dVq
F0RY~yWY_=z
literal 0
HcmV?d1
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 5886862d6c..0218f0821c 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1108,6 +1108,32 @@ class DevtoolUpdateTests(DevtoolBase):
('??', '.*/0001-Add-new-file.patch$')]
self._check_repo_status(os.path.dirname(recipefile), expected_status)
+def test_devtool_update_recipe_with_gitignore(self):
+# First, modify the recipe
+testrecipe = 'devtool-test-ignored'
+bb_vars = get_bb_vars(['FILE'], testrecipe)
+recipefile = bb_vars['FILE']
+patchfile = os.path.join(os.path.dirname(recipefile), testrecipe,
testrecipe + '.patch')
+newpatchfile = os.path.join(os.path.dirname(recipefile), testrecipe,
testrecipe + '.patch.expected')
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+# (don't bother with cleaning the recipe on teardown, we won't be
building it)
+result = runCmd('devtool modify %s' % testrecipe)
+self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
os.path.basename(recipefile)))
+result = runCmd('devtool finish --force-patch-refresh %s
meta-selftest' % testrecipe)
+# Check recipe got changed as expected
+with open(newpatchfile, 'r') as f:
+desiredlines = f.readlines()
+with open(patchfile, 'r') as f:
+newlines = f.readlines()
+# Ignore the initial lines, because oe-selftest creates own
meta-selftest repo
+# which changes the metadata subject which is added into
[OE-core] [PATCH 4/6] lib/oe/patch: GitApplyTree: save 1 echo in commit-msg hook
* also remove the extra blank lines which is often added to patches
when refreshed with devtool (GitApplyTree.patch_line_prefix lines
are ignored when refreshing .patch files, but newly added blank
lines aren't - the leading blank line wasneeded for patches with
just the subject line (to prevent the GitApplyTree.patch_line_prefix
line ending appended to the commit summary), but we can add it
in prepareCommit instead
Signed-off-by: Martin Jansa
---
meta/lib/oe/patch.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index fa92abe248..bb1c40aa1e 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -508,8 +508,7 @@ class GitApplyTree(PatchTree):
with open(commithook, 'w') as f:
# NOTE: the formatting here is significant; if you change it
you'll also need to
# change other places which read it back
-f.write('echo >> $1\n')
-f.write('echo "%s: $PATCHFILE" >> $1\n' %
GitApplyTree.patch_line_prefix)
+f.write('echo "\n%s: $PATCHFILE" >> $1' %
GitApplyTree.patch_line_prefix)
os.chmod(commithook, 0o755)
shutil.copy2(commithook, applyhook)
try:
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#138926):
https://lists.openembedded.org/g/openembedded-core/message/138926
Mute This Topic: https://lists.openembedded.org/mt/74554374/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 6/6] meta-selftest: add test for .patch file with long filename and without subject
Signed-off-by: Martin Jansa
---
.../devtool/devtool-test-long-filename.bb | 9 ++
...nly-if-devtool-lets-me-to-do-it-corr.patch | 7 +
...vtool-lets-me-to-do-it-corr.patch.expected | 16 +++
.../devtool-test-long-filename.tar.gz | Bin 0 -> 180 bytes
meta/lib/oeqa/selftest/cases/devtool.py | 27 ++
5 files changed, 59 insertions(+)
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-long-filename.bb
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected
create mode 100644
meta-selftest/recipes-test/devtool/devtool-test-long-filename/devtool-test-long-filename.tar.gz
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-long-filename.bb
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename.bb
new file mode 100644
index 00..3ec22cae7f
--- /dev/null
+++ b/meta-selftest/recipes-test/devtool/devtool-test-long-filename.bb
@@ -0,0 +1,9 @@
+LICENSE = "CLOSED"
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "file://${BPN}.tar.gz \
+
file://0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch"
+
+S = "${WORKDIR}/${BPN}"
+
+EXCLUDE_FROM_WORLD = "1"
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch
new file mode 100644
index 00..6aaf409ebc
--- /dev/null
+++
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch
@@ -0,0 +1,7 @@
+diff --git a/patch-me b/patch-me
+index a20b29a..5e35d1b 100644
+--- a/patch-me
b/patch-me
+@@ -1 +1 @@
+-please
++NO
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected
new file mode 100644
index 00..1bf25a61d0
--- /dev/null
+++
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch.expected
@@ -0,0 +1,16 @@
+From 45ba3d107ea60777a6b6e134fd00fe5009749177 Mon Sep 17 00:00:00 2001
+From: Martin Jansa
+Date: Thu, 28 May 2020 02:03:39 +0200
+Subject: [PATCH] meta-selftest: add test for .patch file with long filename
+
+---
+ patch-me | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/patch-me b/patch-me
+index a20b29a..5e35d1b 100644
+--- a/patch-me
b/patch-me
+@@ -1 +1 @@
+-please
++NO
diff --git
a/meta-selftest/recipes-test/devtool/devtool-test-long-filename/devtool-test-long-filename.tar.gz
b/meta-selftest/recipes-test/devtool/devtool-test-long-filename/devtool-test-long-filename.tar.gz
new file mode 100644
index
..ab6242aae78dfc2257d44e5caef94f89a269f668
GIT binary patch
literal 180
zcmb2|=3oE==C>Dpxegf!v^`v7>#8TU)ZH>_rG-#Sg4!fc;x%dGf8Y|
zZR@$VUnvb-YM>``ePfQl7Q>hvITv`{x)3pPh5@{8z`6)~&6De$yYvq~%QG
zaInpbzn{UhZClKV`+J|f|K!BI()>sM)%nlw
bAAiuk;rBO5h{K@dy#jV)qm{E6G#D5Fy|+>h
literal 0
HcmV?d1
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index 0218f0821c..49cee6d6a8 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1134,6 +1134,33 @@ class DevtoolUpdateTests(DevtoolBase):
# devtool-test-ignored manually, then it should generate exactly the
same .patch file
self.assertEqual(desiredlines[5:], newlines[5:])
+def test_devtool_update_recipe_long_filename(self):
+# First, modify the recipe
+testrecipe = 'devtool-test-long-filename'
+bb_vars = get_bb_vars(['FILE'], testrecipe)
+recipefile = bb_vars['FILE']
+patchfilename =
'0001-I-ll-patch-you-only-if-devtool-lets-me-to-do-it-corr.patch'
+patchfile = os.path.join(os.path.dirname(recipefile), testrecipe,
patchfilename)
+newpatchfile = os.path.join(os.path.dirname(recipefile), testrecipe,
patchfilename + '.expected')
+tempdir = tempfile.mkdtemp(prefix='devtoolqa')
+self.track_for_cleanup(tempdir)
+self.track_for_cleanup(self.workspacedir)
+self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
+# (don't bother with cleaning the recipe on teardown, we won't be
building it)
+result = runCmd('devtool modify %s' % testrecipe)
+self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' %
(os.path.dirname(recipefile), testrecipe, testrecipe,
[OE-core] [PATCH 3/6] lib/oe/patch: prevent applying patches without any subject
* this was discovered with $ devtool finish --force-patch-refresh where it was removing some patches and replacing them with patch in filename called "patch:" e.g. this .patch file: https://github.com/OSSystems/meta-browser/blob/311067d2d8a50cee5c836892606444f63f2bb3ab/dynamic-layers/rust-layer/recipes-browser/firefox/firefox/fixes/fix-camera-permission-dialg-doesnot-close.patch confuses devtool which results to create new .patch file called "patch:" $ devtool finish --force-patch-refresh firefox meta-browser NOTE: Starting bitbake server... WARNING: Host distribution "ubuntu-20.04" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution. Loading cache: 100% |###| Time: 0:00:00 Loaded 2480 entries from dependency cache. Parsing recipes: 100% |#| Time: 0:00:00 Parsing of 1718 .bb files complete (1717 cached, 1 parsed). 2480 targets, 68 skipped, 0 masked, 0 errors. Summary: There was 1 WARNING message shown. INFO: Updating patch 0001-Bug-1554949-Fix-WebRTC-build-failure-with-newer-linu.patch ... INFO: Updating patch pre-generated-old-configure.patch INFO: Adding new patch patch: INFO: Updating recipe firefox_68.0esr.bb INFO: Removing file /OE/build/test-oe-build-time/poky/meta-browser/dynamic-layers/rust-layer/recipes-browser/firefox/firefox/fixes/fix-camera-permission-dialg-doesnot-close.patch INFO: Cleaning sysroot for recipe firefox... INFO: Leaving source tree /OE/build/test-oe-build-time/poky/build/workspace/sources/firefox as-is; if you no longer need it then please delete it manually this looked like incorrect parsing of the git format-patch files exported from workspace/sources (the git format-patch version of fix-camera-permission-dialg-doesnot-close.patch starts like this: $ head 0008-original-patch-fix-camera-permission-dialg-doesnot-c.patch From 37dfa11961b48024bedcfb9336f49107c9535638 Mon Sep 17 00:00:00 2001 From: Takuro Ashie Date: Mon, 20 Aug 2018 10:16:20 +0900 Subject: [PATCH 08/34] %% original patch: fix-camera-permission-dialg-doesnot-close.patch so first I've modified GitApplyTree.extractPatches() to be able to parse the original patch name correctly even in this case where subject is wrapped, but then it still wasn't right, because we ended with correctly named .patch file, but all we could use for Subject line was the name of the original .patch file (instead of the Subject from metadata commit which introduced this .patch files as some other .patch files get when refreshed with devtool. In the end the issue happens even sooner in GitApplyTree.prepareCommit() where it correctly found the Subject from metadata commit, but then didn't apply it when there weren't any other outlines from patch headers. Signed-off-by: Martin Jansa --- meta/lib/oe/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 2b1eee1003..fa92abe248 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -416,7 +416,7 @@ class GitApplyTree(PatchTree): date = newdate if not subject: subject = newsubject -if subject and outlines and not outlines[0].strip() == subject: +if subject and not (outlines and outlines[0].strip() == subject): outlines.insert(0, '%s\n\n' % subject.strip()) # Write out commit message to a file -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138925): https://lists.openembedded.org/g/openembedded-core/message/138925 Mute This Topic: https://lists.openembedded.org/mt/74554372/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] ✗ patchtest: failure for "devtool: use -f and don't use ..." and 5 more
== Series Details == Series: "devtool: use -f and don't use ..." and 5 more Revision: 1 URL : https://patchwork.openembedded.org/series/24387/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fixSign off the added patch file (meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fixAdd Upstream-Status: to the header of meta-selftest/recipes-test/devtool/devtool-test-ignored/devtool-test-ignored.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138929): https://lists.openembedded.org/g/openembedded-core/message/138929 Mute This Topic: https://lists.openembedded.org/mt/74554774/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
