[OE-core] [PATCH] man-db:upgrade 2.8.5 -> 2.8.6.1
Signed-off-by: Zang Ruochen
---
meta/recipes-extended/man-db/{man-db_2.8.5.bb => man-db_2.8.6.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/man-db/{man-db_2.8.5.bb => man-db_2.8.6.1.bb}
(92%)
diff --git a/meta/recipes-extended/man-db/man-db_2.8.5.bb
b/meta/recipes-extended/man-db/man-db_2.8.6.1.bb
similarity index 92%
rename from meta/recipes-extended/man-db/man-db_2.8.5.bb
rename to meta/recipes-extended/man-db/man-db_2.8.6.1.bb
index 441e2f4..ec9eb83 100644
--- a/meta/recipes-extended/man-db/man-db_2.8.5.bb
+++ b/meta/recipes-extended/man-db/man-db_2.8.6.1.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM =
"file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
file://99_mandb \
file://man_db.conf-avoid-multilib-install-file-conflict.patch"
-SRC_URI[md5sum] = "c5c6c3434be14a5527d43b5ad0f09a13"
-SRC_URI[sha256sum] =
"b64d52747534f1fe873b2876eb7f01319985309d5d7da319d2bc52ba1e73f6c1"
+SRC_URI[md5sum] = "22e82fe1127f4ca95de7100168a927d1"
+SRC_URI[sha256sum] =
"2c77a2bb9dbf06f72417a6f63063e204888a22a5020ff77334d304d55f813a28"
DEPENDS = "libpipeline gdbm groff-native base-passwd"
RDEPENDS_${PN} += "base-passwd"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub/grub-efi: fix conflict for aach64
From: Changqing Li
MACHINE = qemuarm64
IMAGE_INSTALL_append = ' grub grub-efi'
do_rootfs failed with error:
file /usr/lib64/grub/arm64-efi/acpi.module conflicts between attempted installs
of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
file /usr/lib64/grub/arm64-efi/adler32.module conflicts between attempted
installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
...
file /usr/lib64/grub/arm64-efi/zfsinfo.module conflicts between attempted
installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64
For arm64, grub and grub-efi both compiled GRUBD2 with platform
arm64-efi, arm64 only support platform efi. So both packages have
almost same folder and content /usr/lib64/grub/arm64-efi/*
if Machine set to qemux86_64, do_rootfs will not have this problem,
since for grub, it compiled with platform i386-pc, for grub-efi,
compiled with platform x86-64-efi.
>From commit:
commit 4e9bb03238af48c70075037a77094a8c1bddf284
Author: Hongxu Jia
Date: Wed Jan 17 03:25:58 2018 -0500
grub/grub-efi: fix conflict
While installing grub and grub-efi, there are conflict files
in ${sysconfdir} ${datadir} ${bindir} ${sbindir}.
- Since all of the conflicted files are tools which is
common for grub and grub-efi, we split them (except
grub-editenv) to grub-common in grub.
common tools for grub and grub-efi are installed into grub-common,
for aarch64, also shipped libdir into this common packages.
in this way, for qemuarm64, package grub is empty, and package grub-efi
use lib in package grub-common
Signed-off-by: Changqing Li
---
meta/recipes-bsp/grub/grub-efi_2.04.bb | 5 +
meta/recipes-bsp/grub/grub_2.04.bb | 4
2 files changed, 9 insertions(+)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb
b/meta/recipes-bsp/grub/grub-efi_2.04.bb
index 0028a9b..104a1c0 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.04.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb
@@ -81,6 +81,10 @@ do_install_class-target() {
{} +
}
+do_install_append_aarch64() {
+rm -rf ${D}/${prefix}/
+}
+
GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
efi_gop iso9660 configfile search loadenv test"
@@ -99,6 +103,7 @@ FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \
/boot/EFI/BOOT/${GRUB_IMAGE} \
"
+FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi"
# 64-bit binaries are expected for the bootloader with an x32 userland
INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"
diff --git a/meta/recipes-bsp/grub/grub_2.04.bb
b/meta/recipes-bsp/grub/grub_2.04.bb
index e097375..1d1a456 100644
--- a/meta/recipes-bsp/grub/grub_2.04.bb
+++ b/meta/recipes-bsp/grub/grub_2.04.bb
@@ -14,6 +14,10 @@ FILES_${PN}-common = " \
${datadir}/grub \
"
+FILES_${PN}-common_append_aarch64 = " \
+${libdir}/${BPN} \
+"
+
do_install_append () {
install -d ${D}${sysconfdir}/grub.d
# Remove build host references...
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] go/go-runtime: use update-alternative for zdefaultcc.go
On 8/7/19 10:16 PM, Richard Purdie wrote: On Wed, 2019-08-07 at 10:35 +0800, Changqing Li wrote: On 8/6/19 6:47 PM, Richard Purdie wrote: On Tue, 2019-08-06 at 14:54 +0800, changqing...@windriver.com wrote: From: Changqing Li fix below error: file /usr/lib64/go/src/cmd/cgo/zdefaultcc.go conflicts between attempted installs of go-dev-1.12.6-r0.core2_64 and go-runtime- dev- 1.12.6-r0.core2_64 file /usr/lib64/go/src/cmd/go/internal/cfg/zdefaultcc.go conflicts between attempted installs of go-dev-1.12.6-r0.core2_64 and go- runtime-dev-1.12.6-r0.core2_64 Signed-off-by: Changqing Li --- meta/recipes-devtools/go/go-runtime_1.12.bb | 6 ++ meta/recipes-devtools/go/go_1.12.bb | 7 +++ 2 files changed, 13 insertions(+) It seems odd that both of these packages should provide this, perhaps one version should just be deleted? Cheers, Richard These 2 recipes don't have any DEPEND or RDEPEND relationship, so they are independent from the point of recipe. Make one of dev packages empty seems not proper ? Let me put this another way. What is the difference between these two binaries? When should you use one, when should you use the other? Or are they the same thing? Cheers, Richard go is for building go compiler, and go-runtime only contains go standard runtime library There are 2 use caes: 1. on target, user only install go-runtime to provide libstd.so for other go apps. 2. on target, user install both go and go-runtime in my opinion, only in case2, install dev pkg is meaningful, so maybe we can remove the conflict part of files from go-runtime. @Matt, you have do lots of work related these recipes, could you also give your opinion? Thanks. -- BRs Sandy(Li Changqing) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] deb: allow custom dpkg command
trying to reduce the turnaround times for local builds, i'm trying to
find a way to inject `-Zgzip -z1` into the dkpg-deb command line.
attached patch introduces a `DPKG_BUILDCMD` variable for this purpose.
(i'm not very familiar with the whole bitbake infrastructure, so i'm
wondering: do i have to add it to the `vardeps` of do_package_deb?)
tia,
tim
From 62d4930d307d5d07844889001e8a1c3111b72b98 Mon Sep 17 00:00:00 2001
From: Tim Blechmann
Date: Thu, 8 Aug 2019 06:48:54 +0200
Subject: [PATCH] package_deb: allow dpkg-deb to be customized via
DPKG_BUILDCMD
the command line to invoke `dpkg-deb` is hardcoded. there are certain use
cases where we want to tweak how debian packages are compiled: e.g. the
default uses xz compression, which is rather CPU intensive. for local
builds one might want to pass `-Zgzip -z1` to favor speed over compression
ratio.
we therefore introduce a `DPKG_BUILDCMD` variable which allows downstream
code to customize how dpkg-deb is executed
Signed-off-by: Tim Blechmann
---
meta/classes/package_deb.bbclass | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 6f81591653..790b26aef2 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -6,6 +6,8 @@ inherit package
IMAGE_PKGTYPE ?= "deb"
+DPKG_BUILDCMD ??= "dpkg-deb"
+
DPKG_ARCH ?= "${@debian_arch_map(d.getVar('TARGET_ARCH'),
d.getVar('TUNE_FEATURES'))}"
DPKG_ARCH[vardepvalue] = "${DPKG_ARCH}"
@@ -269,7 +271,8 @@ def deb_write_pkg(pkg, d):
conffiles.close()
os.chdir(basedir)
-subprocess.check_output("PATH=\"%s\" dpkg-deb -b %s %s" %
(localdata.getVar("PATH"), root, pkgoutdir),
+subprocess.check_output("PATH=\"%s\" %s -b %s %s" %
(localdata.getVar("PATH"), localdata.getVar("DPKG_BUILDCMD"),
+ root, pkgoutdir),
stderr=subprocess.STDOUT,
shell=True)
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel-fitimage: uboot-sign: fix missing signature
Hi Richard,
Any thoughts on cherry-pick this patch to warrior-dev branch?
Jun
Jun Nie 于2019年7月25日周四 下午4:26写道：
>
> Jun Nie 于2019年7月10日周三 下午3:11写道：
> >
> > u-boot.bin with dtb & signature should be placed in ${B} so that
> > it can be deployed by u-boot as expected. Otherwise, the version
> > without signature is installed.
> >
> > Signed-off-by: Jun Nie
>
> Hi Richard,
>
> Could you also help to cherry pick this patch to warrior branch?
>
> Thanks!
> Jun
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-mako: 1.0.14 -> 1.1.0
Upgrade python3-mako from 1.0.14 to 1.1.0.
Signed-off-by: Zheng Ruoqin
---
.../python/{python3-mako_1.0.14.bb => python3-mako_1.1.0.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-mako_1.0.14.bb =>
python3-mako_1.1.0.bb} (75%)
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.14.bb
b/meta/recipes-devtools/python/python3-mako_1.1.0.bb
similarity index 75%
rename from meta/recipes-devtools/python/python3-mako_1.0.14.bb
rename to meta/recipes-devtools/python/python3-mako_1.1.0.bb
index d2f5188cc4..b139e5ab00 100644
--- a/meta/recipes-devtools/python/python3-mako_1.0.14.bb
+++ b/meta/recipes-devtools/python/python3-mako_1.1.0.bb
@@ -8,8 +8,8 @@ PYPI_PACKAGE = "Mako"
inherit pypi setuptools3
-SRC_URI[md5sum] = "e162578170331f0cc6a4adb063c7c0f6"
-SRC_URI[sha256sum] =
"f5a642d8c5699269ab62a68b296ff990767eb120f51e2e8f3d6afb16bdb57f4b"
+SRC_URI[md5sum] = "6c3f2da0b74af529a4c4a537d0848bf2"
+SRC_URI[sha256sum] =
"a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b"
RDEPENDS_${PN} = "${PYTHON_PN}-html \
${PYTHON_PN}-netclient \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] musl: Update to master tip
Fix for RISC-V build regression 64bit time syscall plumbing Changes are here [1] [1] https://git.musl-libc.org/cgit/musl/log/?qt=range=0ce49d0a301b4142741b32773492af90f66ed3ca..d0b547dfb5f7678cab6bc39dd736ed6454357ca4 Signed-off-by: Khem Raj --- v2: - Move to latest tip - Add a fix to fix the ssh issue seen on AB testing v3: - Update to latest tip which includes the regression fix as well meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 039932a3bc..c3786c4eb3 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "0ce49d0a301b4142741b32773492af90f66ed3ca" +SRCREV = "d0b547dfb5f7678cab6bc39dd736ed6454357ca4" BASEVER = "1.1.23" -- 2.22.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/7] insane.bbclass: in file-rdeps do not look into RDEPENDS recursively
On Wed, 2019-08-07 at 12:29 +0200, Alexander Kanavin wrote: > Recursive RDEPENDS resolution requires that all of the dependent > recipes' packaging has completed. There is no mechanism to ensure > that > and therefore races were observed. > > This change effectively requires recipes to list their runtime file > dependencies explicitly rather than have them pulled indirectly. > This may require a bit of fixing in layers, but should result > in a better definition of runtime file dependencies. > > Signed-off-by: Alexander Kanavin > --- > meta/classes/insane.bbclass | 18 -- > 1 file changed, 18 deletions(-) You might want to have a look at https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/621 and maybe other pieces of that build yet to finish, not sure... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] ovmf: Bump to edk2-stable201905 and add improvements
On Wed, Aug 07, 2019 at 07:36:26PM +0100, Richard Purdie wrote: > On Tue, 2019-08-06 at 18:44 -0700, Ricardo Neri wrote: > > Hi, > > > > Fixes [YOCTO #13438] > > > > I have implemented this patchset to bump the OVMF recipe to the > > latest > > stable release of OVMF: edk2-stable201905. I continued Ross Burton's > > initial work to update the recipe [1]. > > > > The majority of the patches we were carrying with the recipe have > > been > > taken upstream in EDK2 and I have removed them. Plus, EDK2 now adds > > openssl as a git submodule and not a patching script. Thus, I removed > > support for this script and switched to the gitsm bitbake fetcher. > > > > Also, now the EnrollDefaultKeys EFI application requires a separate > > Platform Key and first Key Exchange Key certificate instead of an > > hard-coded certificate embedded in the application. The hypervisor > > shall > > pass this certificated to EnrollDefaultKeys via the Type 11 SMBus > > table. > > I have updated the ovmf recipe to create the needed certificate and > > also updated runqemu to provide such certificate when using an OVMF > > binary with support for Secure Boot. > > > > Lastly, I defined the recipe's PV and took Ross' change to use > > python3 > > from HOSTTOOLS. > > Thanks for the patches. I can't get the to apply at all. I know we have > problems due to the line endings in ovmf and the mailing list is > probably messing them up. Could you share a git tree with the patches > in somewhere please? Thanks for considering the patches, Richard! You can pull the patches from here: The following changes since commit 96decf673992b1cd1eebac45a5cd534eef27ebd7: waffle: upgrade 1.5.2 -> 1.6.0 (2019-08-07 16:08:08 +0100) are available in the Git repository at: https://github.com/ricardon/openembedded-core.git rneri/ovmf_updates for you to fetch changes up to e81cf432b29056dda5496a5454fdfb9cc15dc2fa: runqemu: Add support to handle EnrollDefaultKeys PK/KEK1 certificate (2019-08-07 13:09:32 -0700) Ricardo Neri (5): ovmf: Update to version edk2-stable201905 ovmf: Set PV ovmf: Use HOSTTOOLS' python3 ovmf: Generate test Platform key and first Key Exchange Key runqemu: Add support to handle EnrollDefaultKeys PK/KEK1 certificate .../ovmf/0001-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch | 71 --- meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch | 46 -- .../ovmf/ovmf/0002-BaseTools-header.makefile-add-Wno-restrict.patch| 102 --- .../ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch | 53 -- .../ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch| 33 +- .../ovmf/0004-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch | 66 -- .../ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch | 1124 - meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch | 26 +- meta/recipes-core/ovmf/ovmf_git.bb | 40 +- scripts/runqemu| 32 + 10 files changed, 90 insertions(+), 1503 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0002-BaseTools-header.makefile-add-Wno-restrict.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0003-BaseTools-header.makefile-revert-gcc-8-Wno-xxx-optio.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0004-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch delete mode 100644 meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch Thanks and BR, Ricardo -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for ovmf: Bump to edk2-stable201905 and add improvements
On Wed, Aug 07, 2019 at 02:02:07AM -, Patchwork wrote:
> == Series Details ==
>
> Series: ovmf: Bump to edk2-stable201905 and add improvements
> Revision: 1
> URL : https://patchwork.openembedded.org/series/19138/
> 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 f03ab9b21c)
It looks like patchtest thinks the patchset does not apply because of
the line endings EDK2 uses. If patchest used git am --keep-cr the
patches would apply cleanly.
Also the Patch class in lib/patchestpatch.py in the patch test repo
reads the patch using f.read() with the newline parameter implicitly set
to None and this causes newlines to be translated from \r\n into \n.
Hence, when applying the patch with git am it fails; even when using
--keep-cr.
I was able to pass the patchtest tests with this change:
diff --git a/lib/patchtestpatch.py b/lib/patchtestpatch.py
index e05d22f..4583b5c 100644
--- a/lib/patchtestpatch.py
+++ b/lib/patchtestpatch.py
@@ -47,7 +47,7 @@ class Patch(object):
if self._forcereload or (not self._contents):
logger.debug('Reading %s contents' % self._path)
try:
-with open(self._path) as _f:
+with open(self._path, newline='') as _f:
self._contents = _f.read()
except IOError:
logger.warn("Reading the mbox %s failed" % self.resource)
diff --git a/lib/patchtestrepo.py b/lib/patchtestrepo.py
index edc17d4..3c38b9c 100644
--- a/lib/patchtestrepo.py
+++ b/lib/patchtestrepo.py
@@ -71,7 +71,7 @@ class Repo(object):
# Check if patch can be merged using git-am
self._patchcanbemerged = True
try:
-self._exec({'cmd': ['git', 'am'], 'input': self._patch.contents})
+self._exec({'cmd': ['git', 'am', '--keep-cr'], 'input':
self._patch.contents})
except utils.CmdException as ce:
self._exec({'cmd': ['git', 'am', '--abort']})
self._patchcanbemerged = False
@@ -174,7 +174,7 @@ class Repo(object):
def merge(self):
if self._patchcanbemerged:
-self._exec({'cmd': ['git', 'am'],
+self._exec({'cmd': ['git', 'am', '--keep-cr'],
'input': self._patch.contents,
'updateenv': {'PTRESOURCE':self._patch.path}})
self._patchmerged = True
diff --git a/scripts/test-mboxes b/scripts/test-mboxes
index 9137ba4..1d0c6f7 100755
--- a/scripts/test-mboxes
+++ b/scripts/test-mboxes
@@ -116,13 +116,13 @@ function testpatch() {
# try patch merge
if git apply --check $patch 2> /dev/null; then
if [ -n "$mergeall" ]; then
- git am --quiet $patch 2>/dev/null && gitnotes
+ git am --quiet --keep-cr $patch 2>/dev/null && gitnotes
echo -e "\tPatch merged into '${assemblebranch}' including
all test results"
else
- if [ "$(echo "$PTRESULTS" | any-fail)" == "yes"]; then
+ if [ "$(echo "$PTRESULTS" | any-fail)" == "yes" ]; then
echo -e "\tPatch has test failures, skipping"
else
- git am --quiet $patch 2>/dev/null && gitnotes
+ git am --quiet --keep-cr $patch 2>/dev/null && gitnotes
echo -e "\tPatch merged into '${assemblebranch}' with
no test failures"
fi
fi
Thanks and BR,
Ricardo
>
>
>
> 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
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] musl: Update to master tip
Fix for RISC-V build regression
64bit time syscall plumbing
select API regression fix
Changes are here [1]
[1]
https://git.musl-libc.org/cgit/musl/log/?qt=range=0ce49d0a301b4142741b32773492af90f66ed3ca..f522de81ac88dddb58266c15bcfaa044c4065e19
Signed-off-by: Khem Raj
---
v2:
- Move to latest tip
- Add a fix to fix the ssh issue seen on AB testing
...regression-in-select-with-no-timeout.patch | 34 +++
meta/recipes-core/musl/musl_git.bb| 3 +-
2 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-core/musl/musl/0001-fix-regression-in-select-with-no-timeout.patch
diff --git
a/meta/recipes-core/musl/musl/0001-fix-regression-in-select-with-no-timeout.patch
b/meta/recipes-core/musl/musl/0001-fix-regression-in-select-with-no-timeout.patch
new file mode 100644
index 00..b53236d41d
--- /dev/null
+++
b/meta/recipes-core/musl/musl/0001-fix-regression-in-select-with-no-timeout.patch
@@ -0,0 +1,34 @@
+From 6528f806d290378da5103cd02a6a1a3b6109b41b Mon Sep 17 00:00:00 2001
+From: Rich Felker
+Date: Wed, 7 Aug 2019 10:18:18 -0700
+Subject: [PATCH] fix regression in select with no timeout
+
+commit 722a1ae3351a03ab25010dbebd492eced664853b inadvertently passed a
+copy of {s,us} to the syscall even if the timeout argument tv was
+null, thereby causing immediate timeout (polling) in place of
+unlimited timeout. only archs using SYS_select were affected.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj
+---
+ src/select/select.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/select/select.c b/src/select/select.c
+index e84c887f..8a786884 100644
+--- a/src/select/select.c
b/src/select/select.c
+@@ -35,7 +35,8 @@ int select(int n, fd_set *restrict rfds, fd_set *restrict
wfds, fd_set *restrict
+ return __syscall_ret(r);
+ #endif
+ #ifdef SYS_select
+- return syscall_cp(SYS_select, n, rfds, wfds, efds, ((long[]){s, us}));
++ return syscall_cp(SYS_select, n, rfds, wfds, efds,
++ tv ? ((long[]){s, us}) : 0);
+ #else
+ return syscall_cp(SYS_pselect6, n, rfds, wfds, efds,
+ tv ? ((long[]){s, ns}) : 0, ((syscall_arg_t[]){ 0, _NSIG/8 }));
+--
+2.22.0
+
diff --git a/meta/recipes-core/musl/musl_git.bb
b/meta/recipes-core/musl/musl_git.bb
index 039932a3bc..69a007721c 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,7 +4,7 @@
require musl.inc
inherit linuxloader
-SRCREV = "0ce49d0a301b4142741b32773492af90f66ed3ca"
+SRCREV = "f522de81ac88dddb58266c15bcfaa044c4065e19"
BASEVER = "1.1.23"
@@ -15,6 +15,7 @@ PV = "${BASEVER}+git${SRCPV}"
SRC_URI = "git://git.musl-libc.org/musl \
file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
+ file://0001-fix-regression-in-select-with-no-timeout.patch \
"
S = "${WORKDIR}/git"
--
2.22.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] systemd-boot:grub-efi:wic: add variable APPENDS for multiple boot configuration
Hi, On Mon, 2019-08-05 at 08:40 +, Lee, Chee Yang wrote: > would KERNEL_CMD_LINES a better variable name for this case? I'd like to understand which code is using the variable as that might help name it correctly. I'd have said it should be CMDLINE without the space as that is generally how the kernel refers to it. I think the prefix should indicate which code is going to end up using it so KERNEL may be too generic. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] ovmf: Bump to edk2-stable201905 and add improvements
On Tue, 2019-08-06 at 18:44 -0700, Ricardo Neri wrote: > Hi, > > Fixes [YOCTO #13438] > > I have implemented this patchset to bump the OVMF recipe to the > latest > stable release of OVMF: edk2-stable201905. I continued Ross Burton's > initial work to update the recipe [1]. > > The majority of the patches we were carrying with the recipe have > been > taken upstream in EDK2 and I have removed them. Plus, EDK2 now adds > openssl as a git submodule and not a patching script. Thus, I removed > support for this script and switched to the gitsm bitbake fetcher. > > Also, now the EnrollDefaultKeys EFI application requires a separate > Platform Key and first Key Exchange Key certificate instead of an > hard-coded certificate embedded in the application. The hypervisor > shall > pass this certificated to EnrollDefaultKeys via the Type 11 SMBus > table. > I have updated the ovmf recipe to create the needed certificate and > also updated runqemu to provide such certificate when using an OVMF > binary with support for Secure Boot. > > Lastly, I defined the recipe's PV and took Ross' change to use > python3 > from HOSTTOOLS. Thanks for the patches. I can't get the to apply at all. I know we have problems due to the line endings in ovmf and the mailing list is probably messing them up. Could you share a git tree with the patches in somewhere please? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] go/go-runtime: use update-alternative for zdefaultcc.go
On Wed, 2019-08-07 at 10:35 +0800, Changqing Li wrote: > On 8/6/19 6:47 PM, Richard Purdie wrote: > > On Tue, 2019-08-06 at 14:54 +0800, changqing...@windriver.com > > wrote: > > > From: Changqing Li > > > > > > fix below error: > > > file /usr/lib64/go/src/cmd/cgo/zdefaultcc.go conflicts between > > > attempted installs of go-dev-1.12.6-r0.core2_64 and go-runtime- > > > dev- > > > 1.12.6-r0.core2_64 > > > file /usr/lib64/go/src/cmd/go/internal/cfg/zdefaultcc.go > > > conflicts > > > between attempted installs of go-dev-1.12.6-r0.core2_64 and go- > > > runtime-dev-1.12.6-r0.core2_64 > > > > > > Signed-off-by: Changqing Li > > > --- > > > meta/recipes-devtools/go/go-runtime_1.12.bb | 6 ++ > > > meta/recipes-devtools/go/go_1.12.bb | 7 +++ > > > 2 files changed, 13 insertions(+) > > It seems odd that both of these packages should provide this, > > perhaps > > one version should just be deleted? > > > > Cheers, > > > > Richard > > These 2 recipes don't have any DEPEND or RDEPEND relationship, so > they > are independent from the point of recipe. > > Make one of dev packages empty seems not proper ? Let me put this another way. What is the difference between these two binaries? When should you use one, when should you use the other? Or are they the same thing? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] aspell: update to 0.60.7
On Wed, Aug 07, 2019 at 04:01:47PM +0200, Oleksandr Kravchuk wrote: >... > --- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb > +++ b/meta/recipes-support/aspell/aspell_0.60.7.bb > @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" > > PR = "r1" >... PR should be dropped on version upgrade. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] aspell: update to 0.60.7
Removed patch was upstreamed.
Signed-off-by: Oleksandr Kravchuk
---
...60.6.1.bbappend => aspell_0.60.7.bbappend} | 0
meta/recipes-support/aspell/aspell/gcc7.patch | 40 ---
.../{aspell_0.60.6.1.bb => aspell_0.60.7.bb} | 8 ++--
3 files changed, 3 insertions(+), 45 deletions(-)
rename meta-selftest/recipes-test/aspell/{aspell_0.60.6.1.bbappend =>
aspell_0.60.7.bbappend} (100%)
delete mode 100644 meta/recipes-support/aspell/aspell/gcc7.patch
rename meta/recipes-support/aspell/{aspell_0.60.6.1.bb => aspell_0.60.7.bb}
(78%)
diff --git a/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
b/meta-selftest/recipes-test/aspell/aspell_0.60.7.bbappend
similarity index 100%
rename from meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
rename to meta-selftest/recipes-test/aspell/aspell_0.60.7.bbappend
diff --git a/meta/recipes-support/aspell/aspell/gcc7.patch
b/meta/recipes-support/aspell/aspell/gcc7.patch
deleted file mode 100644
index 6ffd0772fa..00
--- a/meta/recipes-support/aspell/aspell/gcc7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001
-From: Kevin Atkinson
-Date: Thu, 29 Dec 2016 00:50:31 -0500
-Subject: [PATCH] Compile Fixes for GCC 7.
-
-Closes #519.
-Signed-off-by: Khem Raj
-Upstream-Status: Backport
-
- modules/filter/tex.cpp | 2 +-
- prog/check_funs.cpp| 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
-index a979539..19ab63c 100644
a/modules/filter/tex.cpp
-+++ b/modules/filter/tex.cpp
-@@ -174,7 +174,7 @@ namespace {
-
- if (c == '{') {
-
-- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
-+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
- push_command(Parm);
-
- top.in_what = Parm;
-diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
-index db54f3d..89ee09d 100644
a/prog/check_funs.cpp
-+++ b/prog/check_funs.cpp
-@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word,
int width) {
- }
- }
- if (i == width-1) {
--if (word == '\0')
-+if (*word == '\0')
- put(out,' ');
- else if (word[len] == '\0')
- put(out, word, len);
diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
b/meta/recipes-support/aspell/aspell_0.60.7.bb
similarity index 78%
rename from meta/recipes-support/aspell/aspell_0.60.6.1.bb
rename to meta/recipes-support/aspell/aspell_0.60.7.bb
index 161bb5ce20..da99d12630 100644
--- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb
+++ b/meta/recipes-support/aspell/aspell_0.60.7.bb
@@ -6,11 +6,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
PR = "r1"
-SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \
- file://gcc7.patch \
- "
-SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7"
-SRC_URI[sha256sum] =
"f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
+SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
+SRC_URI[md5sum] = "8ef2252609c511cd2bb26f3a3932ef28"
+SRC_URI[sha256sum] =
"5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4"
PACKAGECONFIG ??= ""
PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for buildhistory: call a dependency parser only on actual dependency lists (rev2)
== Series Details == Series: buildhistory: call a dependency parser only on actual dependency lists (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/17240/ 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 Errors in your Python code were encountered [test_pylint] Suggested fixCorrect the lines introduced by your patch Output Please, fix the listed issues: meta/lib/oe/buildhistory_analysis.py does not exist 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 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][thud] buildhistory: call a dependency parser only on actual dependency lists
From: Alexander Kanavin Previously it was also called on filelists and possibly other items which broke the parser. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/lib/oe/buildhistory_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index ad7fceb8bbc..d3cde4f6509 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -127,7 +127,7 @@ class ChangeRecord: removed = list(set(aitems) - set(bitems)) added = list(set(bitems) - set(aitems)) -if not removed and not added: +if not removed and not added and self.fieldname in ['RPROVIDES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RREPLACES', 'RCONFLICTS']: depvera = bb.utils.explode_dep_versions2(self.oldvalue, sort=False) depverb = bb.utils.explode_dep_versions2(self.newvalue, sort=False) for i, j in zip(depvera.items(), depverb.items()): -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/9] python-setuptools: update to 41.0.1
On 07/08/2019 11:22, Alexander Kanavin wrote: On Wed, 7 Aug 2019 at 01:14, Paul Eggleton mailto:paul.eggle...@linux.intel.com>> wrote: Did you get anywhere with this? FYI I filed a bug for the issue: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13467 Yes, it is already fixed in master: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=ac5b7cef596114ec96fcff34a3251ebf959395fd Good find. I tried, and failed, to reproduce this in thud. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] insane.bbclass: in file-rdeps do not look into RDEPENDS recursively
Recursive RDEPENDS resolution requires that all of the dependent
recipes' packaging has completed. There is no mechanism to ensure that
and therefore races were observed.
This change effectively requires recipes to list their runtime file
dependencies explicitly rather than have them pulled indirectly.
This may require a bit of fixing in layers, but should result
in a better definition of runtime file dependencies.
Signed-off-by: Alexander Kanavin
---
meta/classes/insane.bbclass | 18 --
1 file changed, 18 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 35c4fdb4913..9b886d13805 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -722,25 +722,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip,
taskdeps, packages, d):
filerdepends[subkey] = key[13:]
if filerdepends:
-next = rdepends
done = rdepends[:]
-# Find all the rdepends on the dependency chain
-while next:
-new = []
-for rdep in next:
-rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
-sub_rdeps = rdep_data.get("RDEPENDS_" + rdep)
-if not sub_rdeps:
-continue
-for sub_rdep in bb.utils.explode_deps(sub_rdeps):
-if sub_rdep in done:
-continue
-if oe.packagedata.has_subpkgdata(sub_rdep, d):
-# It's a new rdep
-done.append(sub_rdep)
-new.append(sub_rdep)
-next = new
-
# Add the rprovides of itself
if pkg not in done:
done.insert(0, pkg)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] stress-ng: add a patch to remove unneeded bash dependency
Signed-off-by: Alexander Kanavin
---
...tion-remove-the-shebang-at-the-start.patch | 23 +++
.../stress-ng/stress-ng_0.10.00.bb| 1 +
2 files changed, 24 insertions(+)
create mode 100644
meta/recipes-extended/stress-ng/stress-ng/0001-bash-completion-remove-the-shebang-at-the-start.patch
diff --git
a/meta/recipes-extended/stress-ng/stress-ng/0001-bash-completion-remove-the-shebang-at-the-start.patch
b/meta/recipes-extended/stress-ng/stress-ng/0001-bash-completion-remove-the-shebang-at-the-start.patch
new file mode 100644
index 000..66d99dd885f
--- /dev/null
+++
b/meta/recipes-extended/stress-ng/stress-ng/0001-bash-completion-remove-the-shebang-at-the-start.patch
@@ -0,0 +1,23 @@
+From 042147675c7c2ea7dd65b2597f2e350376a710aa Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Tue, 6 Aug 2019 17:28:56 +0200
+Subject: [PATCH] bash-completion: remove the shebang at the start
+
+bash completion files do not need to specify that.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin
+---
+ bash-completion/stress-ng | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/bash-completion/stress-ng b/bash-completion/stress-ng
+index 8b1421c..7f195be 100755
+--- a/bash-completion/stress-ng
b/bash-completion/stress-ng
+@@ -1,5 +1,3 @@
+-#!/bin/bash
+-#
+ # stress-ng tab completion for bash.
+ #
+ # Copyright (C) 2019 Canonical
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
b/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
index f7faf97e681..e800040c371 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
+ file://0001-bash-completion-remove-the-shebang-at-the-start.patch \
"
SRC_URI[md5sum] = "46aa41d37690324ceab4febfcc549018"
SRC_URI[sha256sum] =
"d09dd2a1aea549e478995bf9be90b38906a4cdf33ea7b245ef9d46aa5213c074"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] bluez5: correct the python3 runtime dependency
Signed-off-by: Alexander Kanavin
---
meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
b/meta/recipes-connectivity/bluez5/bluez5.inc
index 28aaeea418f..bffd174c0a0 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -139,7 +139,7 @@ def get_noinst_tools_paths (d, bb, tools):
FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb,
d.getVar('NOINST_TOOLS'))}"
-RDEPENDS_${PN}-testtools += "python3 python3-dbus"
+RDEPENDS_${PN}-testtools += "python3-core python3-dbus"
RDEPENDS_${PN}-testtools += "${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'python3-pygobject', '', d)}"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd',
'bluetooth.service', '', d)}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] apt: add a missing perl runtime dependency
/usr/lib/dpkg/methods/apt/setup is a perl script.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/apt/apt-package.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/apt/apt-package.inc
b/meta/recipes-devtools/apt/apt-package.inc
index da91451d7f6..922f739d0d0 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -35,6 +35,7 @@ FILES_${PN} = "${bindir}/apt-cdrom ${bindir}/apt-get \
${libdir}/dpkg \
${systemd_unitdir}/system \
"
+RDEPENDS_${PN} += "perl"
FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, d.getVar('apt-manpages'))} \
${docdir}/apt"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] ofono: correct the python3 runtime dependency
Signed-off-by: Alexander Kanavin
---
meta/recipes-connectivity/ofono/ofono.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/ofono/ofono.inc
b/meta/recipes-connectivity/ofono/ofono.inc
index 03d0fd53a61..bdbb0b5bc61 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -35,5 +35,5 @@ RRECOMMENDS_${PN} += "kernel-module-tun
mobile-broadband-provider-info"
FILES_${PN} += "${systemd_unitdir}"
FILES_${PN}-tests = "${libdir}/${BPN}/test"
-RDEPENDS_${PN}-tests = "python3 python3-dbus"
+RDEPENDS_${PN}-tests = "python3-core python3-dbus"
RDEPENDS_${PN}-tests += "${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'python3-pygobject', '', d)}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] elfutils: use PRIVATE_LIBS for the ptest package
EXCLUDE_PACKAGES_FROM_SHLIBS is too broad: it suppresses both generation
of required and provided shlibs. We need to suppress only the provided shlibs
(to avoid clashes with the main package providing the same shlibs),
and run the required shlib dependencies generator as usual.
Signed-off-by: Alexander Kanavin
---
meta/recipes-devtools/elfutils/elfutils_0.176.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index 75acf59d26e..d98457e3f9f 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -142,4 +142,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \
"
-EXCLUDE_PACKAGES_FROM_SHLIBS = "${PN}-ptest"
+PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] attr: add a missing perl runtime dependency
/usr/lib/attr/ptest/test/sort-getfattr-output is a perl script.
Signed-off-by: Alexander Kanavin
---
meta/recipes-support/attr/attr.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 1a29eb339e7..3503d66b9e1 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -41,6 +41,6 @@ do_install_ptest() {
sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
}
-RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix make"
+RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix make perl"
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/9] python-setuptools: update to 41.0.1
On Wed, 7 Aug 2019 at 01:14, Paul Eggleton wrote: > > Did you get anywhere with this? > > FYI I filed a bug for the issue: > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13467 > > Yes, it is already fixed in master: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=ac5b7cef596114ec96fcff34a3251ebf959395fd Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libx11-compose-data: upgrade 1.6.7 -> 1.6.8
Refresh the patch to fix the do_patch QA warning.
Signed-off-by: Yi Zhao
---
.../libx11-compose-data/0001-Drop-x11-dependencies.patch | 12 ++--
...11-compose-data_1.6.7.bb => libx11-compose-data_1.6.8.bb} | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11-compose-data_1.6.7.bb =>
libx11-compose-data_1.6.8.bb} (84%)
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
index fbd9684..46a53a1 100644
---
a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
+++
b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch
@@ -1,4 +1,4 @@
-From a60f5058136aeadceebfccadf606d8210f8d3ca6 Mon Sep 17 00:00:00 2001
+From e1f9b0b531c6ddb11a85c0664051e2e4efc589fb Mon Sep 17 00:00:00 2001
From: Ming Liu
Date: Sun, 5 May 2019 11:55:14 +0200
Subject: [PATCH] Drop x11 dependencies
@@ -11,11 +11,11 @@ Signed-off-by: Ming Liu
1 file changed, 44 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 3090845..d14063f 100644
+index a5fd706..b42488c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -66,27 +66,8 @@ fi
- AC_SUBST(LDFLAGS_FOR_BUILD)
+@@ -76,27 +76,8 @@ fi
+ AC_SUBST([EXEEXT_FOR_BUILD])
# Checks for pkg-config packages
-
@@ -42,7 +42,7 @@ index 3090845..d14063f 100644
# Check for dlopen
AC_MSG_CHECKING([if run-time linking is supported])
AC_SEARCH_LIBS(dlopen,[dl svld])
-@@ -226,30 +207,6 @@ AC_SUBST(XTHREAD_CFLAGS)
+@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])],
)
@@ -73,7 +73,7 @@ index 3090845..d14063f 100644
AC_ARG_ENABLE(xcms,
AS_HELP_STRING([--disable-xcms],
[Disable Xlib support for CMS *EXPERIMENTAL*]),
-@@ -329,7 +286,6 @@ X11_LIBDIR="${libdir}/X11"
+@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11"
AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
rename to meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
index 9dace70..cabb84e 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
@@ -11,8 +11,8 @@ require xorg-lib-common.inc
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] =
"910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
+SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
+SRC_URI[sha256sum] =
"b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
SRC_URI += "file://0001-Drop-x11-dependencies.patch"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub: add grub-native
Not only grub-efi-native, but also add grub-native to provide
grub utilities on host
Signed-off-by: Hongxu Jia
---
meta/recipes-bsp/grub/grub-efi_2.04.bb | 2 --
meta/recipes-bsp/grub/grub2.inc| 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb
b/meta/recipes-bsp/grub/grub-efi_2.04.bb
index 0a1f7d1..ea8cda9 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.04.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb
@@ -107,5 +107,3 @@ INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"
INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch"
INSANE_SKIP_${PN}_append_linux-muslx32 = " arch"
INSANE_SKIP_${PN}-dbg_append_linux-muslx32 = " arch"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 9544b36..c81def2 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -65,3 +65,5 @@ do_configure_prepend() {
}
RDEPENDS_${PN}_class-native = ""
+
+BBCLASSEXTEND = "native"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libglu:upgrade 9.0.0 -> 9.0.1
Signed-off-by: Zang Ruochen
---
meta/recipes-graphics/mesa/{libglu_9.0.0.bb => libglu_9.0.1.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/mesa/{libglu_9.0.0.bb => libglu_9.0.1.bb} (85%)
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb
b/meta/recipes-graphics/mesa/libglu_9.0.1.bb
similarity index 85%
rename from meta/recipes-graphics/mesa/libglu_9.0.0.bb
rename to meta/recipes-graphics/mesa/libglu_9.0.1.bb
index eeb898f..068fb19 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.0.bb
+++ b/meta/recipes-graphics/mesa/libglu_9.0.1.bb
@@ -12,10 +12,10 @@ LIC_FILES_CHKSUM =
"file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645
PE = "2"
PR = "0"
-SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.bz2;
+SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz;
-SRC_URI[md5sum] = "be9249132ff49275461cf92039083030"
-SRC_URI[sha256sum] =
"1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12"
+SRC_URI[md5sum] = "5599a0e0a97335e10239d9165aced60d"
+SRC_URI[sha256sum] =
"f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7"
S = "${WORKDIR}/glu-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] inetutils: Fix abort on invalid files
When the code is compiled with "-fstack-protector-strong
-D_FORTIFY_SOURCE=2", everytime ftpfd is asked for a non existent file,
it crashes with the following error:
*** buffer overflow detected ***:
Aborted
This seems to be a bug/feature of gcc. A bug has been open on their
bugzilla, and also inetutils have been posted with the proposed patch.
Without this patch, pxelinux fails to boot because it keeps asking the
server for the pxelinux.cfg/00-01-02-03-04 and never jumps to /default.
Signed-off-by: Ricardo Ribalda Delgado
---
.../inetutils/fix-buffer-fortify-tfpt.patch | 25 +++
.../inetutils/inetutils_1.9.4.bb | 1 +
2 files changed, 26 insertions(+)
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
diff --git
a/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
b/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
new file mode 100644
index 00..a91913cb51
--- /dev/null
+++
b/meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
@@ -0,0 +1,25 @@
+tftpd: Fix abort on error path
+
+When trying to fetch a non existent file, the app crashes with:
+
+*** buffer overflow detected ***:
+Aborted
+
+
+Upstream-Status: Submitted
[https://www.mail-archive.com/bug-inetutils@gnu.org/msg03036.html
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205]
+Signed-off-by: Ricardo Ribalda Delgado
+diff --git a/src/tftpd.c b/src/tftpd.c
+index 56002a0..144012f 100644
+--- a/src/tftpd.c
b/src/tftpd.c
+@@ -864,9 +864,8 @@ nak (int error)
+ pe->e_msg = strerror (error - 100);
+ tp->th_code = EUNDEF; /* set 'undef' errorcode */
+ }
+- strcpy (tp->th_msg, pe->e_msg);
+ length = strlen (pe->e_msg);
+- tp->th_msg[length] = '\0';
++ memcpy(tp->th_msg, pe->e_msg, length + 1);
+ length += 5;
+ if (sendto (peer, buf, length, 0, (struct sockaddr *) , fromlen) !=
length)
+ syslog (LOG_ERR, "nak: %m\n");
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index ac2e017d8b..684fbe09e1 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -22,6 +22,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
file://inetutils-1.9-PATH_PROCNET_DEV.patch \
file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
file://0001-rcp-fix-to-work-with-large-files.patch \
+ file://fix-buffer-fortify-tfpt.patch \
"
SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2] gpgme:upgrade 1.13.0 -> 1.13.1
From: Yuan Chao
Refresh the following patch:
0007-python-Add-variables-to-tests.patch
Signed-off-by: Yuan Chao
---
.../gpgme/0007-python-Add-variables-to-tests.patch | 24 --
.../gpgme/{gpgme_1.13.0.bb => gpgme_1.13.1.bb} | 4 ++--
2 files changed, 15 insertions(+), 13 deletions(-)
rename meta/recipes-support/gpgme/{gpgme_1.13.0.bb => gpgme_1.13.1.bb} (96%)
diff --git
a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
index af9ddbf..4c97f63 100644
--- a/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
+++ b/meta/recipes-support/gpgme/gpgme/0007-python-Add-variables-to-tests.patch
@@ -1,6 +1,6 @@
-From 317cdf60165d760572a26db317e3d6edb159b04e Mon Sep 17 00:00:00 2001
-From: Hongxu Jia
-Date: Wed, 17 Oct 2018 23:41:09 +0800
+From 093c88817397425ee4c2333c469467229a46c9e1 Mon Sep 17 00:00:00 2001
+From: Yuan Chao
+Date: Mon, 5 Aug 2019 01:00:58 +0900
Subject: [PATCH 7/7] python: Add variables to tests
* configure.ac, lang/python/Makefile.am:
@@ -9,16 +9,18 @@ Subject: [PATCH 7/7] python: Add variables to tests
Upstream-Status: Submitted [gnupg-de...@gnupg.org]
Signed-off-by: Hongxu Jia
+
+Signed-off-by: Yuan Chao
---
configure.ac| 5 +
lang/python/Makefile.am | 3 +++
2 files changed, 8 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 865bd10..03a 100644
+index bd85886..b5ae42e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -535,6 +535,11 @@ AC_ARG_ENABLE(g13-test,
+@@ -533,6 +533,11 @@ AC_ARG_ENABLE(g13-test,
run_g13_test=$enableval)
AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes")
@@ -31,17 +33,17 @@ index 865bd10..03a 100644
# Checks for header files.
AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
-index ce9a108..0c8cfdc 100644
+index 551deee..0fd555e 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
-@@ -25,7 +25,10 @@ EXTRA_DIST = \
- doc \
- src
+@@ -23,7 +23,10 @@ EXTRA_DIST = \
+ gpgme.i \
+ helpers.c helpers.h private.h
++SUBDIRS = . examples doc src
+if RUN_LANG_PYTHON_TESTS
- SUBDIRS = . tests
+ SUBDIRS = . tests examples doc src
+endif
-+
.PHONY: prepare
prepare: copystamp
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.0.bb
b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
similarity index 96%
rename from meta/recipes-support/gpgme/gpgme_1.13.0.bb
rename to meta/recipes-support/gpgme/gpgme_1.13.1.bb
index cbd37da..9fc1ae2 100644
--- a/meta/recipes-support/gpgme/gpgme_1.13.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.13.1.bb
@@ -22,8 +22,8 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
file://0008-do-not-auto-check-var-PYTHON.patch \
"
-SRC_URI[md5sum] = "e511a0d95c507ab87e713140c82fc7d0"
-SRC_URI[sha256sum] =
"d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630"
+SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645"
+SRC_URI[sha256sum] =
"c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46"
DEPENDS = "libgpg-error libassuan"
RDEPENDS_${PN}-cpp += "libstdc++"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH 4/4] efibootmgr: Pass correct flags to compiler from pkg-config
From: Khem Raj efivar.h is in usr/include/efirvar directory so it should be added to include search path via -I to compiler cmdline to fix make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop. | make[1]: *** Waiting for unfinished jobs When running clang to generate dependencies -MM -MG -MF it still parses the compile unit and complains if certain header is not found where as gcc does not do that, hence the compile error is only seen when compiling with clang. (From OE-Core rev: db4fa7e765cb434119d816d86b943eeb62235601) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../97668ae0bce776a36ea2001dea63d376be8274ac.patch | 83 ++ meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 1 + 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch b/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch new file mode 100644 index 000..9525ed8 --- /dev/null +++ b/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch @@ -0,0 +1,83 @@ +From 97668ae0bce776a36ea2001dea63d376be8274ac Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 6 Mar 2019 13:08:33 -0500 +Subject: [PATCH] Make sure PKGS= is propogated into the submake for "make + deps" + +When we're doing make deps with "$(CC) -MF", gcc and clang have different +behavior, both broken in different ways, which we're hitting because of a +missing -I argument for libefivar's includes. On clang, when a header can't +be found, it emits a rule with the header as a prerequisite without a path, +such as efivar.h here: + +efibootmgr.o: efibootmgr.c fix_coverity.h efivar.h efiboot.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +Then the build that utilizes that rule will fail to find the +prerequisite and tell you something like: + +make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'. Stop. +make[1]: Leaving directory '/home/pjones/devel/github.com/efibootmgr/master/src' + +With gcc, when a header can't be found, it emits a rule without that header +as a prerequisite, as such (again with efivar.h): + +efibootmgr.o: efibootmgr.c fix_coverity.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +And then your build will fail if you haven't adjusted CFLAGS to tell it +where to find the header. + +Both of these would be better just erroring, but at least gcc's doesn't +insert a *wrong* dependency. + +This patch adds "PKGS=efivar efibootmgr popt" for all deps under src/. +Technically that's overkill, as efibootmgr itself doesn't need popt, but it +doesn't hurt anything to have the extra part there. The resulting +.efibootmgr.d file has the prerequisites expressed correctly: + +efibootmgr.o: efibootmgr.c fix_coverity.h /usr/include/efivar/efivar.h \ + /usr/include/efivar/efiboot.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \ + /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \ + error.h + +This fixes the issue described in github PR #96 + +Signed-off-by: Peter Jones +Upstream-Status: Backport [https://github.com/rhboot/efibootmgr/commit/97668ae0bce776a36ea2001dea63d376be8274ac] +--- + src/Makefile | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 258bac1..32fa188 100644 +--- a/src/Makefile b/src/Makefile +@@ -31,8 +31,13 @@ efibootdump : PKGS=efivar efiboot popt + efibootnext : $(call objects-of,$(EFIBOOTNEXT_SOURCES)) + efibootnext : PKGS=efivar efiboot popt + ++deps : PKGS=efivar efiboot popt + deps : $(ALL_SOURCES) +- $(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" ++ $(MAKE) -f $(TOPDIR)/Make.deps \ ++ SOURCES="$(ALL_SOURCES)" \ ++ SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" \ ++ PKGS="$(PKGS)" \ ++ deps + + clean : + @rm -rfv *.o *.a *.so $(TARGETS) diff --git
[OE-core] [warrior][PATCH 3/4] efibootmgr: add
From: Ross Burton
This was in meta-oe but EFI is sufficiently widespread now that we need it in
core.
The recipe is based on the one in meta-oe but with several updates.
(From OE-Core rev: 275e5e7ecf4f79b7892ae35a47902188d9905bd0)
Signed-off-by: Ross Burton
Signed-off-by: Richard Purdie
---
meta/conf/distro/include/maintainers.inc | 1 +
.../efibootmgr/0001-remove-extra-decl.patch| 31
meta/recipes-bsp/efibootmgr/efibootmgr_17.bb | 34 ++
3 files changed, 66 insertions(+)
create mode 100644
meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
create mode 100644 meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 7d31e4f..af2c4c3 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -162,6 +162,7 @@ RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin
RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang "
RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-efivar = "Ross Burton "
+RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton "
RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-eglinfo-wayland = "Alexander Kanavin
"
diff --git
a/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
b/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
new file mode 100644
index 000..42f3a81
--- /dev/null
+++ b/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
@@ -0,0 +1,31 @@
+From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
+From: Peter Jones
+Date: Wed, 13 Jun 2018 09:41:01 -0400
+Subject: [PATCH] remove extra decl
+
+Signed-off-by: Peter Jones
+
+Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
+Signed-off-by: Hongxu Jia
+
+---
+ src/efibootmgr.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/efibootmgr.c b/src/efibootmgr.c
+index de38f01..4e1a680 100644
+--- a/src/efibootmgr.c
b/src/efibootmgr.c
+@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
+ "invalid numeric value %s\n",
+ optarg);
+ }
+-/* XXX efivar-36 accidentally doesn't have a public
+- * header for this */
+- extern int efi_set_verbose(int verbosity, FILE *errlog);
+ efi_set_verbose(opts.verbose - 2, stderr);
+ break;
+ case 'V':
+--
+2.7.4
+
diff --git a/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
new file mode 100644
index 000..0e5a81e
--- /dev/null
+++ b/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Linux user-space application to modify the EFI Boot Manager."
+SUMMARY = "EFI Boot Manager"
+HOMEPAGE = "https://github.com/rhboot/efibootmgr;
+SECTION = "base"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+
+DEPENDS = "efivar popt"
+
+COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
+
+SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https \
+ file://0001-remove-extra-decl.patch \
+ "
+SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+# The directory under the ESP that the default bootloader is found in. When
+# wic uses a subdirectory, this should use the same one too.
+EFIDIR ?= "/"
+
+EXTRA_OEMAKE += "'EFIDIR=${EFIDIR}'"
+
+CFLAGS += " -Wno-error"
+
+do_install () {
+ oe_runmake install DESTDIR="${D}"
+}
+
+CLEANBROKEN = "1"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
