Re: [OE-core] [V2][PATCH] mime.bbclass: fix post install scriptlet error
On Thu, Jun 18, 2020 at 3:16 AM Changqing Li wrote: > > From: Changqing Li > > fix error during post uninstall: > %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 > + '[' 0 = 0 ']' > + set -e > + '[' x '!=' x ']' > + echo 'Updating MIME database... this may take a while.' > Updating MIME database... this may take a while. > + update-mime-database /usr/share/mime > Directory '/usr/share/mime/packages' does not exist! > %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status > 100 > warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, > exit status 1 > > when run post uninstall scriptlet, /usr/share/mime/packages has been > removed during unintall, while update-mime-database will check xml under > /usr/share/mime/packages. > > workaround by create this dir before update, then remove it > > Signed-off-by: Changqing Li > --- > meta/classes/mime.bbclass | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass > index c9072adf3b..728fba1d94 100644 > --- a/meta/classes/mime.bbclass > +++ b/meta/classes/mime.bbclass > @@ -24,7 +24,13 @@ if [ "x$D" != "x" ]; then > mimedir=${MIMEDIR} > else > echo "Updating MIME database... this may take a while." > - update-mime-database $D${MIMEDIR} > + if [ ! -d $D${MIMEDIR}/packages ]; then > + mkdir $D${MIMEDIR}/packages ^ Add '-p' otherwise an error is created for path already existing > + update-mime-database $D${MIMEDIR} > + rmdir $D${MIMEDIR}/packages ^ Similar: add '--ignore-fail-on-non-empty' otherwise all 'non-last' is going to create an error > + else > + update-mime-database $D${MIMEDIR} > + fi > fi > } > And maybe a short comment would be helpful to understand why the mkdir/rmdir-dance is done (otherwise somebody else could be tempted to remove it later :) Andreas -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139626): https://lists.openembedded.org/g/openembedded-core/message/139626 Mute This Topic: https://lists.openembedded.org/mt/74950565/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/1] classes/kernel: Use a copy for kernel*.rpm when fs don't support symlink
On 6/17/20 9:48 PM, Bruce Ashfield wrote: On Wed, Jun 17, 2020 at 2:20 AM wrote: From: Yanfei Xu Some filesystems don't support symlink, then you will get failed when you install or update the kernel rpm package. Now we use a copy for these filesystems instead of symlink. Suggested-by: Bruce Ashfield Signed-off-by: Yanfei Xu --- meta/classes/kernel.bbclass | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 41101a64a0..e9b5a84de7 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -94,6 +94,14 @@ python __anonymous () { d.appendVar('RDEPENDS_%s-image' % kname, ' %s-image-%s' % (kname, typelower)) d.setVar('PKG_%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') +d.setVar('pkg_postinst_ontarget_%s-image-%s' % (kname,typelower), """ +set +e +ln -sf %s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 +if [ $? -ne 0 ]; then +echo "Filesystem on ${KERNEL_IMAGEDEST}/ doesn't support symlink, then use a copy." This could say "... doesn't support symlinks, falling back to copied image (%s)" (and fill in the image file we are actually using). This discription is more clear. I will rewrite the message. +fi I expected to see the fallback copy here in the postinstall, but this looks ok to me .. I'm going to just type in my process of reading the At the beginning, I was going to only place versioned-image in rpm package, then make symlink or copy in postinstall on target. But it will cause rpm package don't contain no-versioned image. However, ARM device may use the no-versioned image for booting in boot partation. So I didn't implement it like that. patch so you can correct me if I'm wrong. The logic is split between the two places. Below during the build (do_install), and here in the postinstall. In do_install(), we no longer symlink, but instead copy the versioned image into the non versioned 'image' file. And then in the postinstall, we try and make a symlink (which may fail) to the same thing (the versioned image to a non versioned one), and that's a force symlink so it will clobber the previously copied one if possible, or implicitly fall back if the symlink fails. Your understanding is right. So yes, that logic seems fine to me. The reason I went through all that, is that for on-target upgrades. You won't have the do_install() to place the versioned image, have you confirmed that the versioned image file is packaged and will be I have confirmed that both non versioned image and versioned image are packaged in rpm package. [bcm_2xxx_rpi4]$ rpm -qpl kernel-image-image-5.4.46-yocto-standard-5.4.x+git0+f8c88c4331_87b52c3030-r0.bcm_2xxx_rpi4.rpm /boot /boot/Image /boot/Image-5.4.46-yocto-standard Besides, I have tested "dnf install" on target, it did place files of package and then run postinstall script. present on an on-target install ? So the logic is the same with the symlink ? It should be, otherwise this would never work, but I just wanted to be sure. Yes, the logic is the same with the original symlink, hence I also think there is no new bug introduced to on-target upgrades. +set -e +""" % (type, type)) image = d.getVar('INITRAMFS_IMAGE') # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0, @@ -386,7 +394,7 @@ kernel_do_install() { for imageType in ${KERNEL_IMAGETYPES} ; do install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then - ln -sf ${imageType}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${imageType} + install -m 0644 ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} ${D}/${KERNEL_IMAGEDEST}/${imageType} Looking at this, can the existing line: install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} be combined with the one you added ? We are copying the non-versioned image into a versioned image file, and then in the new logic, coping that versioned image into a non-versioned one. Couldn't we just have one copy of the non-versioned image, into the non-versioned image in KERNEL_IMAGEDEST ? I don't think it could be. Cause the existing line : "if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then" can't be ingnored. Thanks for reviewing, Yanfei Cheers, Bruce fi done install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} @@ -602,6 +610,7 @@ pkg_postinst_${KERNEL_PACKAGE_NAME}-base () { fi } + PACKAGESPLITFUNCS_prepend = "split_kernel_packages " python split_kernel_packages () { -- 2.18.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messa
Re: [OE-core][PATCH] igt-gpu-tools: add new package
Hi Alex, Would it be a sufficient reason for doing that? Or any thought could be shared from you? Thank you so much, Arthur On Tue, Jun 16, 2020 at 12:16 AM Mittal, Anuj wrote: > Hi Alex > > On Tue, 2020-06-16 at 09:04 +0200, Alexander Kanavin wrote: > > Usually it's the other way around - what is the reason to have this > > recipe in core? > > > > I had requested Arthur to send this to oe-core since this provides > a core validation functionality that is needed by all providing DRM > drivers and is applicable not just to a single arch. > > It's a well maintained project and I can keep the recipe updated and > working. If it can be in oe-core, I can remove it from meta-intel layer > and avoid having a duplicate recipe. > > Thanks, > > Anuj > > > Alex > > > > On Tue, 16 Jun 2020 at 06:45, Arthur She > > wrote: > > > Hi Alexander and Denys, > > > Thanks for your feedback. > > > I have no problem submitting it to meta-oe. > > > Since the meta-intel maintainer requested to submit it to oe-core, > > > do you mind sharing some thought about the reason? > > > > > > Thank you so much, > > > Arthur > > > > > > On Mon, Jun 15, 2020 at 12:56 AM Denys Dmytriyenko > > > wrote: > > > > https://lists.openembedded.org/g/openembedded-devel/topic/74775294 > > > > > > > > But I tend to agree. > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139624): https://lists.openembedded.org/g/openembedded-core/message/139624 Mute This Topic: https://lists.openembedded.org/mt/74889257/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] ✗ patchtest: failure for Misc fixes
On Thursday, 18 June 2020 16:02:25 NZST Patchwork wrote: > * Issue Added patch file is missing Upstream-Status in the > header [test_upstream_status_presence_format] Oops, typo - I have fixed the patch header and pushed the branch again. Paul -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139623): https://lists.openembedded.org/g/openembedded-core/message/139623 Mute This Topic: https://lists.openembedded.org/mt/74952580/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 Misc fixes
== Series Details == Series: Misc fixes Revision: 1 URL : https://patchwork.openembedded.org/series/24727/ 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 Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fixAdd Upstream-Status: to the header of meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.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 (#139622): https://lists.openembedded.org/g/openembedded-core/message/139622 Mute This Topic: https://lists.openembedded.org/mt/74952580/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/3] dpkg-native: rebase and reinstate fix for "tar: file changed as we read it"
In OE-Core rev 8ee36a5f2f9367550d28bf271afc53bca6ff3d5f a patch was added for dpkg to ignore a return of 1 from dpkg's calls to tar (which indicates that files changed in some way while tar was operating) we were observing failures on the autobuilder due to changes to link counts in hard-linked file trees. The patch was subsequently rebased and then later removed during an upgrade in 3812f58b3a438ae533c282170416cdd1681868e0 on the assumption that the fix had been applied upstream, however that was not the case. I am now occasionally seeing these errors in my builds without any apparent material change to the files, so rebase and reinstate the patch. Fixes [YOCTO #13913]. Signed-off-by: Paul Eggleton --- ...01-build.c-ignore-return-of-1-from-tar-cf.patch | 52 ++ meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 2 + 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch new file mode 100644 index 000..6c5a91d --- /dev/null +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -0,0 +1,52 @@ +From 450fece894fce750502be8accabfd88c585bda4c Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 16 Jun 2020 03:57:25 + +Subject: [PATCH] build.c: ignore return of 1 from tar -cf + +When running do_package_write_deb, we have trees of hardlinked files +such as the dbg source files in ${PN}-dbg. If something makes another +copy of one of those files (or deletes one), the number of links a file +has changes and tar can notice this, e.g.: + +| DEBUG: Executing python function do_package_deb +| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'. +| tar: ./usr/lib/sed/ptest/testsuite/tst-regex2: file changed as we read it +| dpkg-deb: error: subprocess tar -cf returned error exit status 1 + +Tar returns an error of 1 when files 'change' and other errors codes +in other error cases. We tweak dpkg-deb here so that it ignores an exit +code of 1 from tar. The files don't really change (and we have locking in +place to avoid that kind of issue). + +Upsteam-Status: Inappropriate + +Original patch by RP 2015/3/27, rebased by Paul Eggleton + +Signed-off-by: Paul Eggleton +--- + dpkg-deb/build.c | 5 - + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c +index a3d1912..1de7f9c 100644 +--- a/dpkg-deb/build.c b/dpkg-deb/build.c +@@ -427,6 +427,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, + { + int pipe_filenames[2], pipe_tarball[2]; + pid_t pid_tar, pid_comp; ++ int rc; + + /* Fork off a tar. We will feed it a list of filenames on stdin later. */ + m_pipe(pipe_filenames); +@@ -477,7 +478,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, + /* All done, clean up wait for tar and to finish their job. */ + close(pipe_filenames[1]); + subproc_reap(pid_comp, _(" from tar -cf"), 0); +- subproc_reap(pid_tar, "tar -cf", 0); ++ rc = subproc_reap(pid_tar, "tar -cf", SUBPROC_RETERROR); ++ if (rc && rc != 1) ++ohshite(_("subprocess %s returned error exit status %d"), "tar -cf", rc); + } + + static time_t diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb index d539c57..c98a9e5 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.20.0.bb @@ -16,5 +16,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \ file://0001-Add-support-for-riscv32-CPU.patch \ " +SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" + SRC_URI[md5sum] = "f88f077236a3ff3decae3b25c989893d" SRC_URI[sha256sum] = "b633cc2b0e030efb61e11029d8a3fb1123f719864c9992da2e52b471c96d0900" -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139620): https://lists.openembedded.org/g/openembedded-core/message/139620 Mute This Topic: https://lists.openembedded.org/mt/74952488/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 3/3] devtool: fix typo
specifiy -> specify Signed-off-by: Paul Eggleton --- scripts/lib/devtool/deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index 6a99773..b1749ce 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -330,7 +330,7 @@ def register_commands(subparsers, context): parser_deploy.add_argument('-e', '--ssh-exec', help='Executable to use in place of ssh') parser_deploy.add_argument('-P', '--port', help='Specify port to use for connection to the target') parser_deploy.add_argument('-I', '--key', - help='Specifiy ssh private key for connection to the target') + help='Specify ssh private key for connection to the target') strip_opts = parser_deploy.add_mutually_exclusive_group(required=False) strip_opts.add_argument('-S', '--strip', @@ -355,6 +355,6 @@ def register_commands(subparsers, context): parser_undeploy.add_argument('-e', '--ssh-exec', help='Executable to use in place of ssh') parser_undeploy.add_argument('-P', '--port', help='Specify port to use for connection to the target') parser_undeploy.add_argument('-I', '--key', - help='Specifiy ssh private key for connection to the target') + help='Specify ssh private key for connection to the target') parser_undeploy.set_defaults(func=undeploy) -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139619): https://lists.openembedded.org/g/openembedded-core/message/139619 Mute This Topic: https://lists.openembedded.org/mt/74952487/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 0/3] Misc fixes
Reinstate a patch for dpkg-native that was removed some time ago, plus fix a couple of trivial things I noticed at the same time. The following changes since commit 878a8561e10017bb91ea42bbbe6d4acfc0985482: gstreamer1.0-plugins-bad: add support for vdpau (2020-06-17 16:31:48 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/fixes http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/fixes Paul Eggleton (3): dpkg-native: rebase and reinstate fix for "tar: file changed as we read it" shadow-sysroot: drop unused SRC_URI checksums devtool: fix typo ...01-build.c-ignore-return-of-1-from-tar-cf.patch | 52 ++ meta/recipes-devtools/dpkg/dpkg_1.20.0.bb | 2 + meta/recipes-extended/shadow/shadow-sysroot_4.6.bb | 3 -- scripts/lib/devtool/deploy.py | 4 +- 4 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139618): https://lists.openembedded.org/g/openembedded-core/message/139618 Mute This Topic: https://lists.openembedded.org/mt/74952486/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/3] shadow-sysroot: drop unused SRC_URI checksums
This recipe only fetches local files, so there's no need for a checksum. These have been present for some time and nobody noticed. Signed-off-by: Paul Eggleton --- meta/recipes-extended/shadow/shadow-sysroot_4.6.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index 79fc8b8..a8c1539 100644 --- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -14,9 +14,6 @@ PR = "r3" # can add custom users/groups for recipes that use inherit useradd. SRC_URI = "file://login.defs_shadow-sysroot" -SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" -SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" - S = "${WORKDIR}" do_install() { -- 1.8.3.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139621): https://lists.openembedded.org/g/openembedded-core/message/139621 Mute This Topic: https://lists.openembedded.org/mt/74952489/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][dunfell 00/20] Pull request (cover letter only)
The following changes since commit 6fa967f194edd314c9026c80f8d93360ac6d9efa: build-appliance-image: Update to dunfell head revision (2020-06-08 21:45:09 +0100) are available in the Git repository at: git://git.openembedded.org/openembedded-core-contrib stable/dunfell-next http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-next Alexander Kanavin (3): lz4: disable static library linux-firmware: upgrade 20200421 -> 20200519 build-sysroots: add sysroot paths with native binaries to PATH Chen Qi (1): db: do not install db_verify if 'verify' is not enabled Joe Slater (2): qemu: force build type to production vim: _FORTIFY_SOURCE=2 be gone Konrad Weihmann (2): sysfsutils: rem leftover settings for libsysfs-dev cogl: point to correct HOMEPAGE Marco Felsch (1): util-linux: alternatify rtcwake Paul Barker (3): archiver: Fix test case for srpm archiver mode oe-selftest: Allow overriding the build directory used for tests oe-selftest: Recursively patch test case paths Peter Kjellerstedt (1): cairo: Do not try to remove nonexistent directories Ralph Siemsen (1): cve-check: include epoch in product version output Richard Purdie (5): ltp: Exclude the memcg_stress tests due to timeout problems maintainers: Update Ross' email address logrotate: Drop obsolete setting/comment oeqa/targetcontrol: Rework exception handling to avoid warnings patchelf: Add patch to address corrupt shared library issue hongxu (1): core-image-minimal-initramfs: keep restriction with initramfs-module-install meta/classes/cve-check.bbclass| 2 +- meta/conf/distro/include/maintainers.inc | 126 +- meta/lib/oeqa/selftest/cases/archiver.py | 1 + meta/lib/oeqa/selftest/context.py | 24 +++- meta/lib/oeqa/targetcontrol.py| 5 +- meta/lib/oeqa/utils/commands.py | 5 +- .../images/core-image-minimal-initramfs.bb| 4 +- meta/recipes-core/meta/build-sysroots.bb | 4 + .../sysfsutils/sysfsutils_2.1.0.bb| 2 - meta/recipes-core/util-linux/util-linux.inc | 1 + .../patchelf/patchelf/fix-phdrs.patch | 37 + .../patchelf/patchelf_0.10.bb | 1 + meta/recipes-devtools/qemu/qemu_4.2.0.bb | 5 + .../logrotate/logrotate_3.15.1.bb | 7 - meta/recipes-extended/ltp/ltp_20200120.bb | 4 + meta/recipes-graphics/cairo/cairo_1.16.0.bb | 6 +- meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +- ...20200421.bb => linux-firmware_20200519.bb} | 5 +- meta/recipes-support/db/db_5.3.28.bb | 3 + meta/recipes-support/lz4/lz4_1.9.2.bb | 2 +- meta/recipes-support/vim/vim_8.2.bb | 5 + 21 files changed, 160 insertions(+), 91 deletions(-) create mode 100644 meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200421.bb => linux-firmware_20200519.bb} (99%) -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139617): https://lists.openembedded.org/g/openembedded-core/message/139617 Mute This Topic: https://lists.openembedded.org/mt/74951991/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] xinit: add xterm to RDEPENDS
On 6/18/20 2:28 AM, Randy MacLeod wrote: On 2020-06-17 6:51 a.m., Richard Purdie wrote: On Wed, 2020-06-17 at 12:07 +0800, Changqing Li wrote: From: Changqing Li startx RDEPENDS on xterm, fix below error: /etc/X11/xinit/xinitrc: line 55: exec: xterm: not found Signed-off-by: Changqing Li --- meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index c9e28d9bba..5f8c370c59 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -19,4 +19,4 @@ SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" -RDEPENDS_${PN} += "util-linux-mcookie" +RDEPENDS_${PN} += "util-linux-mcookie xterm" https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/2015 ERROR: Nothing RPROVIDES 'xterm' (but /home/pokybuild/yocto-worker/qemux86-64-x32/build/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb RDEPENDS on or otherwise requires it) xterm is in meta-oe. It seems to be a bit out of date: https://invisible-mirror.net/archives/xterm/ so please update to version 356 While we could pull xterm into oe-core, it's old crufty code with several dependencies on similarily crufty libraries: https://layers.openembedded.org/layerindex/recipe/5041/ It would be better to understand why startx wants it and use rxvt perhaps. People have been trying to get rid of xterm and libxaw for many, many years. It seems that xinit does have configure time support to specify what app to use instead of xterm: $ git blame configure.ac | grep xterm | \ sed -e 's/ //' 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 47) DEFAULT_XTERM=xterm 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 74) AC_ARG_WITH(xterm, 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 75) AS_HELP_STRING([--with-xterm=XTERM], [Path to xterm]), and that 'feature' has survived. Can you see if we use rxvt by default and have a PACKAGECONFIG to use xterm optionally? ../Randy OK, I will check this. Thanks Randy. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139616): https://lists.openembedded.org/g/openembedded-core/message/139616 Mute This Topic: https://lists.openembedded.org/mt/74931705/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] mime.bbclass: change postrm to prerm
On 6/17/20 5:50 PM, Andreas Müller wrote: On Wed, Jun 17, 2020 at 10:10 AM Changqing Li wrote: From: Changqing Li fix error during post uninstall: %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 + '[' 0 = 0 ']' + set -e + '[' x '!=' x ']' + echo 'Updating MIME database... this may take a while.' Updating MIME database... this may take a while. + update-mime-database /usr/share/mime Directory '/usr/share/mime/packages' does not exist! %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status 100 warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, exit status 1 when run post uninstall scriptlet, /usr/share/mime/packages has been removed during unintall, while update-mime-database need to use /usr/share/mime/packages/freedesktop.org.xml correct by change postrm to prerm Signed-off-by: Changqing Li --- meta/classes/mime.bbclass | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index c9072adf3b..a0943b4476 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass @@ -17,7 +17,7 @@ else fi } -mime_postrm() { +mime_prerm() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_mime_database ${PKG} \ mlprefix=${MLPREFIX} \ @@ -42,17 +42,17 @@ python populate_packages_append () { mimes_types_found = True break if mimes_types_found: -bb.note("adding mime postinst and postrm scripts to %s" % pkg) +bb.note("adding mime postinst and prerm scripts to %s" % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('mime_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) -postrm = d.getVar('pkg_postrm_%s' % pkg) -if not postrm: -postrm = '#!/bin/sh\n' -postrm += d.getVar('mime_postrm') -d.setVar('pkg_postrm_%s' % pkg, postrm) +prerm = d.getVar('pkg_prerm_%s' % pkg) +if not prerm: +prerm = '#!/bin/sh\n' +prerm += d.getVar('mime_prerm') +d.setVar('pkg_prerm_%s' % pkg, prerm) if pkg != 'shared-mime-info-data': bb.note("adding shared-mime-info-data dependency to %s" % pkg) d.appendVar('RDEPENDS_' + pkg, " " + d.getVar('MLPREFIX')+"shared-mime-info-data") -- 2.17.1 If I understand this correctly * The error pops up once the LAST package with files in /usr/share/mime/packages is removed. If not something else is wrong * This is not a fix but a workaround leaving mime db inconsistent with entries removed later. Andreas Thanks. this fix is not correct, I have send a V2. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139615): https://lists.openembedded.org/g/openembedded-core/message/139615 Mute This Topic: https://lists.openembedded.org/mt/74933440/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [V2][PATCH] mime.bbclass: fix post install scriptlet error
From: Changqing Li fix error during post uninstall: %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 + '[' 0 = 0 ']' + set -e + '[' x '!=' x ']' + echo 'Updating MIME database... this may take a while.' Updating MIME database... this may take a while. + update-mime-database /usr/share/mime Directory '/usr/share/mime/packages' does not exist! %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status 100 warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, exit status 1 when run post uninstall scriptlet, /usr/share/mime/packages has been removed during unintall, while update-mime-database will check xml under /usr/share/mime/packages. workaround by create this dir before update, then remove it Signed-off-by: Changqing Li --- meta/classes/mime.bbclass | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index c9072adf3b..728fba1d94 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass @@ -24,7 +24,13 @@ if [ "x$D" != "x" ]; then mimedir=${MIMEDIR} else echo "Updating MIME database... this may take a while." - update-mime-database $D${MIMEDIR} + if [ ! -d $D${MIMEDIR}/packages ]; then + mkdir $D${MIMEDIR}/packages + update-mime-database $D${MIMEDIR} + rmdir $D${MIMEDIR}/packages + else + update-mime-database $D${MIMEDIR} + fi fi } -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139614): https://lists.openembedded.org/g/openembedded-core/message/139614 Mute This Topic: https://lists.openembedded.org/mt/74950565/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][dunfell 08/21] cairo: Do not try to remove nonexistent directories
On Tue, Jun 16, 2020 at 10:11:57AM -1000, Steve Sakoman wrote: > On Tue, Jun 16, 2020 at 9:49 AM Adrian Bunk wrote: > > > > On Mon, Jun 15, 2020 at 09:35:27AM -1000, Steve Sakoman wrote: > > > From: Peter Kjellerstedt > > > > > > Commit 0e1f8fa0 (bitbake.conf: propagate 'opengl' DISTRO_FEATURE to > > > native/nativesdk from target) changed the default PACKAGECONFIG for > > > native and nativesdk so that it becomes empty unless "x11" is in > > > DISTRO_FEATURES since "trace" was also removed (propbably > > > unintentionally). This highlighted than an empty PACKAGECONFIG would > > > lead to a build failure since /usr/bin is never created under these > > > conditions, but the recipe still tried to remove it. > > >... > > > > Isn't this a fix for a bug that is not in dunfell? > > My impression was that while the bitbake.conf change that highlighted > the issue with an empty PACKAGECONFIG isn't in dunfell, the underlying > bug that this change uncovered does exist in dunfell. >... I failed to reproduce the problem in dunfell, but the change looks harmless enough that adding it to dunfell it is unlikely to cause problems. > Steve cu Adrian -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139613): https://lists.openembedded.org/g/openembedded-core/message/139613 Mute This Topic: https://lists.openembedded.org/mt/74902433/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] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools
On Wed, 2020-06-17 at 16:07 -0700, Christopher Clark wrote: > Both grub-native and grub-efi-native included packaging for the > grub-mkimage and grub-editenv tools, which prevented concurrent > installation of both the grub-native and grub-efi-native packages. > This caused errors on image generation with wic when populating > partitions with both legacy and efi boot support, so resolve this by > removing the duplicated tools from grub-efi-native and add a > runtime dependency from it to grub-native. > > Signed-off-by: Christopher Clark > --- > meta/recipes-bsp/grub/grub-efi_2.04.bb | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes- > bsp/grub/grub-efi_2.04.bb > index b9d6225d27..ed43dee152 100644 > --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb > +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb > @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi" > > DEPENDS_append_class-target = " grub-efi-native" > RDEPENDS_${PN}_class-target = "grub-common virtual/grub-bootconf" > +RDEPENDS_${PN}_class-native = "grub-native" > > SRC_URI += " \ > file://cfg \ > @@ -61,9 +62,7 @@ do_install_append_class-target() { > } > > do_install_class-native() { > - install -d ${D}${bindir} > - install -m 755 grub-mkimage ${D}${bindir} > - install -m 755 grub-editenv ${D}${bindir} > + : > } > > do_install_class-target() { I think we want to PROVIDES_append_class-native = " grub-efi-native" in grub and then drop the BBCLASSEXTEND from grub-efi? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139612): https://lists.openembedded.org/g/openembedded-core/message/139612 Mute This Topic: https://lists.openembedded.org/mt/74948517/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] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools
Both grub-native and grub-efi-native included packaging for the grub-mkimage and grub-editenv tools, which prevented concurrent installation of both the grub-native and grub-efi-native packages. This caused errors on image generation with wic when populating partitions with both legacy and efi boot support, so resolve this by removing the duplicated tools from grub-efi-native and add a runtime dependency from it to grub-native. Signed-off-by: Christopher Clark --- meta/recipes-bsp/grub/grub-efi_2.04.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes-bsp/grub/grub-efi_2.04.bb index b9d6225d27..ed43dee152 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi" DEPENDS_append_class-target = " grub-efi-native" RDEPENDS_${PN}_class-target = "grub-common virtual/grub-bootconf" +RDEPENDS_${PN}_class-native = "grub-native" SRC_URI += " \ file://cfg \ @@ -61,9 +62,7 @@ do_install_append_class-target() { } do_install_class-native() { - install -d ${D}${bindir} - install -m 755 grub-mkimage ${D}${bindir} - install -m 755 grub-editenv ${D}${bindir} + : } do_install_class-target() { -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139611): https://lists.openembedded.org/g/openembedded-core/message/139611 Mute This Topic: https://lists.openembedded.org/mt/74948517/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] zlib: build and package minigzip
Hi Richard, > > do_install() { > > oe_runmake DESTDIR=${D} install > > + > > + install -d ${D}${sbindir} > > + install -m 0755 ${B}/minigzip ${D}${sbindir} > > + install -m 0755 ${B}/minigzipsh ${D}${sbindir} > > + install -m 0755 ${B}/minigzip64 ${D}${sbindir} > > } > > > > do_install_ptest() { > > Breaks oe-selftest: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1039 > > Reproducer: > oe-selftest -r pkgdata.OePkgdataUtilTests.test_list_pkgs > > Also breaks meta-mingw: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/2031 Thanks for the report. The problem is that minigzip64 is not generated with toolchains without large file support. I'll fix and send V2. Thanks, Sergio Prado Embedded Labworks -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139610): https://lists.openembedded.org/g/openembedded-core/message/139610 Mute This Topic: https://lists.openembedded.org/mt/74847703/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] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools?
On Wed, Jun 17, 2020 at 5:35 AM Richard Purdie wrote: > > On Wed, 2020-06-17 at 11:15 +0200, Jacob Kroon wrote: > > On 6/17/20 8:07 AM, Jacob Kroon wrote: > > > On 6/17/20 4:28 AM, Christopher Clark wrote: > > > > was: Re: [OE-core] [PATCH] grub-efi-native: Install grub-editenv > > > > > > > > On Sat, Apr 13, 2019 at 7:49 AM Jacob Kroon < > > > > jacob.kr...@gmail.com> > > > > wrote: > > > > > Having a native version of grub-editenv around can be useful > > > > > for > > > > > setting the targets grub environment. > > > > > > > > Would it be acceptable to replace the tools being packaged in > > > > grub-efi-native with a RDEPENDS from grub-efi-native to grub- > > > > native, > > > > and so use the grub-mkimage and grub-editenv tools from the grub > > > > recipe instead? > > > > > > > > The problem I'm encountering with the current dual packaging of > > > > grub-mkimage and grub-editenv tools, in both grub and grub-efi > > > > recipes, is that it prevents grub-native and grub-efi-native from > > > > being installed concurrently, and breaks my image build: > > > > > > > > ERROR: xen-image-minimal-1.0-r0 do_image_wic: The file > > > > /usr/bin/grub-mkimage is installed by both grub-efi-native and > > > > grub-native, aborting > > > > > > > > There's a wic script here: > > > > openembedded-core/scripts/lib/wic/plugins/source/bootimg- > > > > biosplusefi.py > > > > that may also be affected since it creates a boot partition with > > > > both > > > > legacy and EFI content. > > > > > > > > The patch below resolves the error that I encountered. Does this > > > > change look OK? > > > > > > > > Christopher > > > > > > > > > > > > diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > > b/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > > index b9d6225d27..5dd3398540 100644 > > > > --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > > +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > > @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi" > > > > > > > > DEPENDS_append_class-target = " grub-efi-native" > > > > RDEPENDS_${PN}_class-target = "grub-common virtual/grub- > > > > bootconf" > > > > +RDEPENDS_${PN}_class-native = "grub-native" > > > > > > > > SRC_URI += " \ > > > > file://cfg \ > > > > @@ -61,9 +62,7 @@ do_install_append_class-target() { > > > > } > > > > > > > > do_install_class-native() { > > > > - install -d ${D}${bindir} > > > > - install -m 755 grub-mkimage ${D}${bindir} > > > > - install -m 755 grub-editenv ${D}${bindir} > > > > +: > > > > } > > > > > > > > do_install_class-target() { > > > > > > > > > > This change looks good to me. I added 'grub-editenv' before > > > realizing > > > that the tools were duplicated in 'grub', and I believe they are > > > interchangeable. > > > > > > > .. but this make grub-efi-native's sysroot empty in my build. Which > > then > > begs the question whether a native version of grub-efi is necessary > > at all ? That is a fair question. I don't know of a reason for it to remain, other than perhaps to ease transition to use of grub-native instead? > If someone can confirm these tools are the same and have no difference > in functionality, then yes, grub-native and grub-efi-native should be > merged. The two binaries currently installed in grub-efi-native are: - grub-editenv - grub-mkimage In my local build: The grub-editenv binary is identical when built with either grub-native or grub-efi-native recipe. The grub-mkimage binary produced is almost identical (compared via objdump) and the differences appear to be due to the slightly different filesystem paths that are recorded via the GRUB_PKGLIBDIR argument that is passed into compilation. Running 'strings grub-mkimage | grep recipe-sysroot' shows four filesystem paths that refer to the native build directory, and these paths differ slightly between the two recipe builds. Based on that, I believe that these tools are the same and have no difference in functionality; so it looks OK to retire the grub-efi-native versions in favour of grub-native. Christopher -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139609): https://lists.openembedded.org/g/openembedded-core/message/139609 Mute This Topic: https://lists.openembedded.org/mt/74930505/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] toolchain-shar-relocate.sh: check for environment-setup beforehand
The script runs a 'cat' on the script and if it isn't present in the sdk the cat command waits on the std input and hence the installation process simply sits there. Signed-off-by: Awais Belal --- meta/files/toolchain-shar-relocate.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index e3c10018ef..02a05664c6 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -3,6 +3,12 @@ if ! xargs --version > /dev/null 2>&1; then exit 1 fi +# check if we have a valid env-setup script +if [ ! -f "$env_setup_script" ]; then + echo "Main environment-setup file not found. Abort!" + exit 1 +fi + # fix dynamic loader paths in all ELF SDK binaries native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139608): https://lists.openembedded.org/g/openembedded-core/message/139608 Mute This Topic: https://lists.openembedded.org/mt/74946187/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] Yocto Project Status WW23'20
On 2020-06-14 8:32 p.m., Randy MacLeod wrote: On 2020-06-09 10:43 a.m., Stephen Jolley wrote: One which isn’t and is looking slightly more problematic is the qemu upgrade to 5.0.0, help would be welcome there. Sakib and Joe have worked on upreving qemu. If things go well they'll send the uprev this week. I wouldn't hold M1 for it. We could send the update now since all the oe-core workflows that we have run work fine but we did find a WR specific test that is failing so we're going to resolve that first. Richard, Let us know if the YP AB is bored and you really want to test the qemu update today rather than later this week or early next week. -- # Randy MacLeod # Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139607): https://lists.openembedded.org/g/openembedded-core/message/139607 Mute This Topic: https://lists.openembedded.org/mt/74775592/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] xinit: add xterm to RDEPENDS
On 2020-06-17 6:51 a.m., Richard Purdie wrote: On Wed, 2020-06-17 at 12:07 +0800, Changqing Li wrote: From: Changqing Li startx RDEPENDS on xterm, fix below error: /etc/X11/xinit/xinitrc: line 55: exec: xterm: not found Signed-off-by: Changqing Li --- meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index c9e28d9bba..5f8c370c59 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -19,4 +19,4 @@ SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" -RDEPENDS_${PN} += "util-linux-mcookie" +RDEPENDS_${PN} += "util-linux-mcookie xterm" https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/2015 ERROR: Nothing RPROVIDES 'xterm' (but /home/pokybuild/yocto-worker/qemux86-64-x32/build/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb RDEPENDS on or otherwise requires it) xterm is in meta-oe. It seems to be a bit out of date: https://invisible-mirror.net/archives/xterm/ so please update to version 356 While we could pull xterm into oe-core, it's old crufty code with several dependencies on similarily crufty libraries: https://layers.openembedded.org/layerindex/recipe/5041/ It would be better to understand why startx wants it and use rxvt perhaps. People have been trying to get rid of xterm and libxaw for many, many years. It seems that xinit does have configure time support to specify what app to use instead of xterm: $ git blame configure.ac | grep xterm | \ sed -e 's///' 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 47) DEFAULT_XTERM=xterm 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 74) AC_ARG_WITH(xterm, 0a063866 (Kevin E Martin 2005-11-15 04:05:59 + \ 75)AS_HELP_STRING([--with-xterm=XTERM], [Path to xterm]), and that 'feature' has survived. Can you see if we use rxvt by default and have a PACKAGECONFIG to use xterm optionally? ../Randy Cheers, Richard -- # Randy MacLeod # Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139606): https://lists.openembedded.org/g/openembedded-core/message/139606 Mute This Topic: https://lists.openembedded.org/mt/74931705/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] gcc10: Update to GCC 10.1 Release
On Wed, Jun 17, 2020 at 12:02 AM Kang Kai wrote: > > On 2020/5/12 上午2:28, Khem Raj wrote: > > * Package new gomp header acc_prof.h > * Package lto-dump which is a new tool in gcc10 > * All Changes are here [1] > * Porting apps to gcc 10 help is here [2] > * Backport a patch to fix CET errors on cross builds > * Add patch to fix mingw libstdc++ > > Hi Khem, > > I found that the size of buildtools-extended-tarball increased a lot after > this commit. It increases from 47MB to 54MB without recipe update. > > Any thought of what may cause that problem, please? if you are comparing between 9x and 10x then its expected to be larger since its a major compiler release. But if you can compare the content of both tarballs and single out binaries which grew alarmingly may be we can look into them. > > Thanks. > > Kai > > > > > [1] https://gcc.gnu.org/gcc-10/changes.html > [2] https://gcc.gnu.org/gcc-10/porting_to.html > > Signed-off-by: Khem Raj > --- > v2: Correct SRC_URI checksums > v3: Drop icu change > Backport a patch for CET cross compile > > meta/conf/distro/include/maintainers.inc | 2 +- > meta/conf/distro/include/tcmode-default.inc | 2 +- > .../gcc/{gcc-9.3.inc => gcc-10.1.inc} | 53 +++ > ...0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 15 +- > .../0002-gcc-poison-system-directories.patch | 47 +++--- > ...-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 11 +- > .../0004-64-bit-multilib-hack.patch | 15 +- > .../0005-optional-libstdc.patch | 29 ++-- > .../0006-COLLECT_GCC_OPTIONS.patch| 11 +- > ...ts.h-in-B-instead-of-S-and-t-oe-in-B.patch | 20 +-- > .../0008-fortran-cross-compile-hack.patch | 15 +- > .../0009-cpp-honor-sysroot.patch | 13 +- > .../0010-MIPS64-Default-to-N64-ABI.patch | 11 +- > ...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 33 ++-- > ...gcc-Fix-argument-list-too-long-error.patch | 11 +- > .../0013-Disable-sdt.patch| 23 ++- > .../{gcc-9.3 => gcc-10.1}/0014-libtool.patch | 9 +- > ...s-fix-v4bx-to-linker-to-support-EABI.patch | 11 +- > ...-config-files-from-B-instead-of-usin.patch | 25 ++- > ...ir-from-.la-which-usually-points-to-.patch | 11 +- > .../0018-export-CPP.patch | 9 +- > ...e-target-gcc-headers-can-be-included.patch | 13 +- > ...-directory-during-relink-if-inst_pr.patch} | 11 +- > ...R-replacement-instead-of-hardcoding.patch} | 9 +- > ...2-aarch64-Add-support-for-musl-ldso.patch} | 9 +- > ...fix-libcc1-s-install-path-and-rpath.patch} | 9 +- > ...e-sysroot-support-for-nativesdk-gcc.patch} | 112 ++--- > ...root-gcc-version-specific-dirs-with.patch} | 13 +- > ...us-_FOR_BUILD-and-related-variables.patch} | 27 ++-- > ...27-nios2-Define-MUSL_DYNAMIC_LINKER.patch} | 9 +- > ...-to-link-commandline-for-musl-targe.patch} | 15 +- > ...sing-LDFLAGS-not-just-SHLIB_LDFLAGS.patch} | 9 +- > .../0030-sync-gcc-stddef.h-with-musl.patch} | 9 +- > ...fault-in-precompiled-header-generat.patch} | 11 +- > .../0032-Fix-for-testsuite-failure.patch} | 9 +- > ...e-introduce-spe-commandline-options.patch} | 11 +- > ...s-for-__cpu_indicator_init-instead-.patch} | 29 ++-- > ...-Do-not-use-__LINE__-for-maintainin.patch} | 55 +++ > ...le-CET-in-cross-compiler-if-possible.patch | 150 ++ > ...v3-Include-system_error-for-std-errc.patch | 23 +++ > ...ild-with-disable-dependency-tracking.patch | 54 --- > .../gcc/gcc-9.3/0030-ldbl128-config.patch | 79 - > ...heck-zero-value-in-simple_object_elf.patch | 48 -- > ...ands-Don-t-match-user-defined-regs-o.patch | 100 > ...dian_9.3.bb => gcc-cross-canadian_10.1.bb} | 0 > .../{gcc-cross_9.3.bb => gcc-cross_10.1.bb} | 0 > ...c-crosssdk_9.3.bb => gcc-crosssdk_10.1.bb} | 0 > meta/recipes-devtools/gcc/gcc-runtime.inc | 1 + > ...gcc-runtime_9.3.bb => gcc-runtime_10.1.bb} | 0 > ...nitizers_9.3.bb => gcc-sanitizers_10.1.bb} | 0 > .../{gcc-source_9.3.bb => gcc-source_10.1.bb} | 0 > meta/recipes-devtools/gcc/gcc-target.inc | 1 + > .../gcc/{gcc_9.3.bb => gcc_10.1.bb} | 0 > ...-initial_9.3.bb => libgcc-initial_10.1.bb} | 0 > .../gcc/{libgcc_9.3.bb => libgcc_10.1.bb} | 0 > ...libgfortran_9.3.bb => libgfortran_10.1.bb} | 0 > meta/recipes-support/icu/icu/filter.json | 2 - > 57 files changed, 491 insertions(+), 703 deletions(-) > rename meta/recipes-devtools/gcc/{gcc-9.3.inc => gcc-10.1.inc} (65%) > rename meta/recipes-devtools/gcc/{gcc-9.3 => > gcc-10.1}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (79%) > rename meta/recipes-devtools/gcc/{gcc-9.3 => > gcc-10.1}/0002-gcc-poison-system-directories.patch (85%) > rename meta/recipes-devtools/gcc/{gcc-9.3 => > gcc-10.1}/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (92%) > rename meta/recipes-devtools/gcc/{gcc-9.3 => > gcc-10.1}/0004-64-bit-multilib-hack.patch (95%) > rename meta/recipes-dev
[OE-core] [PATCH][dunfell] common-licenses: add BSD-2-Clause-Patent
From: Ross Burton Signed-off-by: Ross Burton --- .../common-licenses/BSD-2-Clause-Patent.txt | 47 +++ 1 file changed, 47 insertions(+) create mode 100644 meta/files/common-licenses/BSD-2-Clause-Patent.txt diff --git a/meta/files/common-licenses/BSD-2-Clause-Patent.txt b/meta/files/common-licenses/BSD-2-Clause-Patent.txt new file mode 100644 index 00..1184c02957 --- /dev/null +++ b/meta/files/common-licenses/BSD-2-Clause-Patent.txt @@ -0,0 +1,47 @@ +Copyright (c) + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +Subject to the terms and conditions of this license, each copyright holder +and contributor hereby grants to those receiving rights under this license +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent license +to make, have made, use, offer to sell, sell, import, and otherwise transfer +this software, where such license applies only to those patent claims, already +acquired or hereafter acquired, licensable by such copyright holder or contributor +that are necessarily infringed by: + +(a) their Contribution(s) (the licensed copyrights of copyright holders and +non-copyrightable additions of contributors, in source or binary form) alone; +or + +(b) combination of their Contribution(s) with the work of authorship to which +such Contribution(s) was added by such copyright holder or contributor, if, +at the time the Contribution is added, such addition causes such combination +to be necessarily infringed. The patent license shall not apply to any other +combinations which include the Contribution. + +Except as expressly stated above, no rights or licenses from any copyright +holder or contributor is granted under this license, whether expressly, by +implication, estoppel or otherwise. + +DISCLAIMER + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139604): https://lists.openembedded.org/g/openembedded-core/message/139604 Mute This Topic: https://lists.openembedded.org/mt/74938681/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 powertop: upgrade 2.12 -> 2.13
== Series Details == Series: powertop: upgrade 2.12 -> 2.13 Revision: 1 URL : https://patchwork.openembedded.org/series/24716/ 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 cb02137218) 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 (#139603): https://lists.openembedded.org/g/openembedded-core/message/139603 Mute This Topic: https://lists.openembedded.org/mt/74938008/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/1] classes/kernel: Use a copy for kernel*.rpm when fs don't support symlink
On Wed, Jun 17, 2020 at 2:20 AM wrote: > > From: Yanfei Xu > > Some filesystems don't support symlink, then you will get failed when > you install or update the kernel rpm package. Now we use a copy for > these filesystems instead of symlink. > > Suggested-by: Bruce Ashfield > Signed-off-by: Yanfei Xu > --- > meta/classes/kernel.bbclass | 11 ++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index 41101a64a0..e9b5a84de7 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -94,6 +94,14 @@ python __anonymous () { > d.appendVar('RDEPENDS_%s-image' % kname, ' %s-image-%s' % (kname, > typelower)) > d.setVar('PKG_%s-image-%s' % (kname,typelower), > '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower)) > d.setVar('ALLOW_EMPTY_%s-image-%s' % (kname, typelower), '1') > +d.setVar('pkg_postinst_ontarget_%s-image-%s' % (kname,typelower), """ > +set +e > +ln -sf %s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1 > +if [ $? -ne 0 ]; then > +echo "Filesystem on ${KERNEL_IMAGEDEST}/ doesn't support symlink, then > use a copy." This could say "... doesn't support symlinks, falling back to copied image (%s)" (and fill in the image file we are actually using). > +fi I expected to see the fallback copy here in the postinstall, but this looks ok to me .. I'm going to just type in my process of reading the patch so you can correct me if I'm wrong. The logic is split between the two places. Below during the build (do_install), and here in the postinstall. In do_install(), we no longer symlink, but instead copy the versioned image into the non versioned 'image' file. And then in the postinstall, we try and make a symlink (which may fail) to the same thing (the versioned image to a non versioned one), and that's a force symlink so it will clobber the previously copied one if possible, or implicitly fall back if the symlink fails. So yes, that logic seems fine to me. The reason I went through all that, is that for on-target upgrades. You won't have the do_install() to place the versioned image, have you confirmed that the versioned image file is packaged and will be present on an on-target install ? So the logic is the same with the symlink ? It should be, otherwise this would never work, but I just wanted to be sure. > +set -e > +""" % (type, type)) > > image = d.getVar('INITRAMFS_IMAGE') > # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to > 0, > @@ -386,7 +394,7 @@ kernel_do_install() { > for imageType in ${KERNEL_IMAGETYPES} ; do > install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} > ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} > if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then > - ln -sf ${imageType}-${KERNEL_VERSION} > ${D}/${KERNEL_IMAGEDEST}/${imageType} > + install -m 0644 > ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} > ${D}/${KERNEL_IMAGEDEST}/${imageType} Looking at this, can the existing line: install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} ${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION} be combined with the one you added ? We are copying the non-versioned image into a versioned image file, and then in the new logic, coping that versioned image into a non-versioned one. Couldn't we just have one copy of the non-versioned image, into the non-versioned image in KERNEL_IMAGEDEST ? Cheers, Bruce > fi > done > install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} > @@ -602,6 +610,7 @@ pkg_postinst_${KERNEL_PACKAGE_NAME}-base () { > fi > } > > + > PACKAGESPLITFUNCS_prepend = "split_kernel_packages " > > python split_kernel_packages () { > -- > 2.18.2 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139602): https://lists.openembedded.org/g/openembedded-core/message/139602 Mute This Topic: https://lists.openembedded.org/mt/74932613/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] ell: upgrade 0.31 -> 0.32
This is a bugfix release: ver 0.32: Fix issue with handling D-Bus watch removal. Signed-off-by: Pierre-Jean Texier --- meta/recipes-core/ell/{ell_0.31.bb => ell_0.32.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-core/ell/{ell_0.31.bb => ell_0.32.bb} (83%) diff --git a/meta/recipes-core/ell/ell_0.31.bb b/meta/recipes-core/ell/ell_0.32.bb similarity index 83% rename from meta/recipes-core/ell/ell_0.31.bb rename to meta/recipes-core/ell/ell_0.32.bb index 1db7131..07dc4d4 100644 --- a/meta/recipes-core/ell/ell_0.31.bb +++ b/meta/recipes-core/ell/ell_0.32.bb @@ -14,8 +14,7 @@ DEPENDS = "dbus" inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz"; -SRC_URI[md5sum] = "3f670230be4d89d621b0508c70b1d36b" -SRC_URI[sha256sum] = "ae88617275452f9f5840b2365e33e6c7fb6fa3405d42cbf9367de642ee8b6701" +SRC_URI[sha256sum] = "42fdb9e24ff561a101389d51445cab1ff7d55f5385dc22a05b0493088cf99e30" do_configure_prepend () { mkdir -p ${S}/build-aux -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139601): https://lists.openembedded.org/g/openembedded-core/message/139601 Mute This Topic: https://lists.openembedded.org/mt/74937602/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] powertop: upgrade 2.12 -> 2.13
?Signed-off-by: Wang Mingyu --- .../powertop/{powertop_2.12.bb => powertop_2.13.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/powertop/{powertop_2.12.bb => powertop_2.13.bb} (95%) diff --git a/meta/recipes-kernel/powertop/powertop_2.12.bb b/meta/recipes-kernel/powertop/powertop_2.13.bb similarity index 95% rename from meta/recipes-kernel/powertop/powertop_2.12.bb rename to meta/recipes-kernel/powertop/powertop_2.13.bb index f085d9b482..8c7e78fd94 100644 --- a/meta/recipes-kernel/powertop/powertop_2.12.bb +++ b/meta/recipes-kernel/powertop/powertop_2.13.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ file://0001-wakeup_xxx.h-include-limits.h.patch \ " -SRCREV = "6988eaaa5bbcfff1dd86f757006c6c48cec965c5" +SRCREV = "184cee06b2d64679bae5f806fe0a218827fdde99" S = "${WORKDIR}/git" -- 2.17.1? -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139600): https://lists.openembedded.org/g/openembedded-core/message/139600 Mute This Topic: https://lists.openembedded.org/mt/74937535/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] classes/archiver: Create patched archive before configuring
Steve, I believe this patch should be backported to dunfell. Thanks On 6/16/20 9:39 AM, Joshua Watt wrote: do_configure and do_preconfigure can modify source files, which causes race conditions if these tasks run in parallel with do_ar_patched. Add explicit task dependencies to ensure that do_ar_patched finishes before these tasks start. Specifically, this fixes a race condition with gcc-source where do_ar_patched races with do_preconfigure deleting gcc/gengtype-lex.c Signed-off-by: Joshua Watt --- meta/classes/archiver.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index c2c049c343..e221fff695 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -583,7 +583,7 @@ addtask do_deploy_archives_setscene addtask do_ar_original after do_unpack addtask do_unpack_and_patch after do_patch -addtask do_ar_patched after do_unpack_and_patch +addtask do_ar_patched after do_unpack_and_patch before do_preconfigure do_configure addtask do_ar_configured after do_unpack_and_patch addtask do_ar_mirror after do_fetch addtask do_dumpdata -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139599): https://lists.openembedded.org/g/openembedded-core/message/139599 Mute This Topic: https://lists.openembedded.org/mt/74917298/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] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools?
On Wed, 2020-06-17 at 11:15 +0200, Jacob Kroon wrote: > On 6/17/20 8:07 AM, Jacob Kroon wrote: > > On 6/17/20 4:28 AM, Christopher Clark wrote: > > > was: Re: [OE-core] [PATCH] grub-efi-native: Install grub-editenv > > > > > > On Sat, Apr 13, 2019 at 7:49 AM Jacob Kroon < > > > jacob.kr...@gmail.com> > > > wrote: > > > > Having a native version of grub-editenv around can be useful > > > > for > > > > setting the targets grub environment. > > > > > > Would it be acceptable to replace the tools being packaged in > > > grub-efi-native with a RDEPENDS from grub-efi-native to grub- > > > native, > > > and so use the grub-mkimage and grub-editenv tools from the grub > > > recipe instead? > > > > > > The problem I'm encountering with the current dual packaging of > > > grub-mkimage and grub-editenv tools, in both grub and grub-efi > > > recipes, is that it prevents grub-native and grub-efi-native from > > > being installed concurrently, and breaks my image build: > > > > > > ERROR: xen-image-minimal-1.0-r0 do_image_wic: The file > > > /usr/bin/grub-mkimage is installed by both grub-efi-native and > > > grub-native, aborting > > > > > > There's a wic script here: > > > openembedded-core/scripts/lib/wic/plugins/source/bootimg- > > > biosplusefi.py > > > that may also be affected since it creates a boot partition with > > > both > > > legacy and EFI content. > > > > > > The patch below resolves the error that I encountered. Does this > > > change look OK? > > > > > > Christopher > > > > > > > > > diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > b/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > index b9d6225d27..5dd3398540 100644 > > > --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb > > > @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi" > > > > > > DEPENDS_append_class-target = " grub-efi-native" > > > RDEPENDS_${PN}_class-target = "grub-common virtual/grub- > > > bootconf" > > > +RDEPENDS_${PN}_class-native = "grub-native" > > > > > > SRC_URI += " \ > > > file://cfg \ > > > @@ -61,9 +62,7 @@ do_install_append_class-target() { > > > } > > > > > > do_install_class-native() { > > > - install -d ${D}${bindir} > > > - install -m 755 grub-mkimage ${D}${bindir} > > > - install -m 755 grub-editenv ${D}${bindir} > > > +: > > > } > > > > > > do_install_class-target() { > > > > > > > This change looks good to me. I added 'grub-editenv' before > > realizing > > that the tools were duplicated in 'grub', and I believe they are > > interchangeable. > > > > .. but this make grub-efi-native's sysroot empty in my build. Which > then > begs the question whether a native version of grub-efi is necessary > at all ? If someone can confirm these tools are the same and have no difference in functionality, then yes, grub-native and grub-efi-native should be merged. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139598): https://lists.openembedded.org/g/openembedded-core/message/139598 Mute This Topic: https://lists.openembedded.org/mt/74930505/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] python: use official "pypi.org" URLs for HOMEPAGE
As the URL pypi.python.org simply redirects to pypi.org, simplify a number of Python recipes by using that URL explicitly. Signed-off-by: Robert P. J. Day --- diff --git a/meta/recipes-devtools/python/python-extras.inc b/meta/recipes-devtools/python/python-extras.inc index b5e11b711a..335bde2724 100644 --- a/meta/recipes-devtools/python/python-extras.inc +++ b/meta/recipes-devtools/python/python-extras.inc @@ -1,5 +1,5 @@ SUMMARY = "Useful extra bits for Python - things that should be in the standard library" -HOMEPAGE = "https://pypi.python.org/pypi/extras/"; +HOMEPAGE = "https://pypi.org/project/extras/"; SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6d108f338b2f68fe48ac366c4650bd8b" diff --git a/meta/recipes-devtools/python/python-pbr.inc b/meta/recipes-devtools/python/python-pbr.inc index ce3c224d51..bc470e7274 100644 --- a/meta/recipes-devtools/python/python-pbr.inc +++ b/meta/recipes-devtools/python/python-pbr.inc @@ -1,6 +1,6 @@ SUMMARY = "Python Build Reasonableness" DESCRIPTION = "PBR is a library that injects some useful and sensible default behaviors into your setuptools run" -HOMEPAGE = "https://pypi.python.org/pypi/pbr"; +HOMEPAGE = "https://pypi.org/project/pbr"; SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc index 032d337424..9322ca9a05 100644 --- a/meta/recipes-devtools/python/python-setuptools.inc +++ b/meta/recipes-devtools/python/python-setuptools.inc @@ -1,5 +1,5 @@ SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "https://pypi.python.org/pypi/setuptools"; +HOMEPAGE = "https://pypi.org/project/setuptools"; SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158" diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc index 05b32810bd..df97f845bc 100644 --- a/meta/recipes-devtools/python/python-six.inc +++ b/meta/recipes-devtools/python/python-six.inc @@ -1,5 +1,5 @@ SUMMARY = "Python 2 and 3 compatibility library" -HOMEPAGE = "https://pypi.python.org/pypi/six/"; +HOMEPAGE = "https://pypi.org/project/six/"; SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d" diff --git a/meta/recipes-devtools/python/python-subunit.inc b/meta/recipes-devtools/python/python-subunit.inc index fc63b38aaf..a2f9c5c3ff 100644 --- a/meta/recipes-devtools/python/python-subunit.inc +++ b/meta/recipes-devtools/python/python-subunit.inc @@ -1,5 +1,5 @@ SUMMARY = "Python implementation of subunit test streaming protocol" -HOMEPAGE = "https://pypi.python.org/pypi/python-subunit/"; +HOMEPAGE = "https://pypi.org/project/python-subunit/"; SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://README.rst;beginline=1;endline=20;md5=909c08e291647fd985fbe5d9836d51b6" diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc index f1f1e26468..e8d308b717 100644 --- a/meta/recipes-devtools/python/python-testtools.inc +++ b/meta/recipes-devtools/python/python-testtools.inc @@ -1,5 +1,5 @@ SUMMARY = "Extensions to the Python standard library unit testing framework" -HOMEPAGE = "https://pypi.python.org/pypi/testtools/"; +HOMEPAGE = "https://pypi.org/project/testtools/"; SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a" diff --git a/meta/recipes-devtools/python/python3-iniparse_0.4.bb b/meta/recipes-devtools/python/python3-iniparse_0.4.bb index 4eba9ecd34..47cd6598cc 100644 --- a/meta/recipes-devtools/python/python3-iniparse_0.4.bb +++ b/meta/recipes-devtools/python/python3-iniparse_0.4.bb @@ -1,5 +1,5 @@ SUMMARY = "Accessing and Modifying INI files" -HOMEPAGE = "https://pypi.python.org/pypi/iniparse/"; +HOMEPAGE = "https://pypi.org/project/iniparse/"; LICENSE = "MIT & PSF" LIC_FILES_CHKSUM = "file://LICENSE-PSF;md5=1c78a5bb3584b353496d5f6f34edb4b2 \ file://LICENSE;md5=52f28065af11d69382693b45b5a8eb54" diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb index 96973db774..99eeea2edf 100644 --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -1,5 +1,5 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" -HOMEPAGE = "https://pypi.python.org/pypi/pip"; +HOMEPAGE = "https://pypi.org/project/pip"; SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" -- Robert P. J. Day
Re: [OE-core] [PATCH] xinit: add xterm to RDEPENDS
On Wed, 2020-06-17 at 12:07 +0800, Changqing Li wrote: > From: Changqing Li > > startx RDEPENDS on xterm, fix below error: > /etc/X11/xinit/xinitrc: line 55: exec: xterm: not found > > Signed-off-by: Changqing Li > --- > meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb > b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb > index c9e28d9bba..5f8c370c59 100644 > --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb > +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb > @@ -19,4 +19,4 @@ SRC_URI[sha256sum] = > "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa > > EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" > > -RDEPENDS_${PN} += "util-linux-mcookie" > +RDEPENDS_${PN} += "util-linux-mcookie xterm" https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/2015 ERROR: Nothing RPROVIDES 'xterm' (but /home/pokybuild/yocto-worker/qemux86-64-x32/build/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb RDEPENDS on or otherwise requires it) Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139596): https://lists.openembedded.org/g/openembedded-core/message/139596 Mute This Topic: https://lists.openembedded.org/mt/74931705/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] dhcp: use included bind version
This brings me to a question. Should we replace dhcp with kea? https://www.isc.org/kea/ Alex On Sat, 13 Jun 2020 at 10:31, Vyacheslav Yurkov wrote: > On 13.06.2020 02:41, Khem Raj wrote: > > I think it would be good to share if we can. Shipping two versions of > bind > > libraries is less than ideal, have you explored disabling threading in > the > > bind recipe and see if named is happy with that ? > > > Yes, I have. It partially solves the issue. At least DHCP doesn't > crash/fail anymore, but warnings from epoll enabled are still seen in > the logs. The other question is do we have to strip down BIND > functionality in order to make DHCP work? > > I understand that maintenance effort is at stake and we are looking for > the best possible solution here, but IMHO having one set of bind > libraries for both BIND and DHCP servers is not one of them. > > We could also go Ubuntu way here, by having two bind-9.11.x for DHCP and > upgrading BIND server to the latest stable (9.16.x if I'm not mistaken). > Then security support could be only done for 9.11.x version, the latest > stable should have most of security patches included already. > > Vyacheslav > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139595): https://lists.openembedded.org/g/openembedded-core/message/139595 Mute This Topic: https://lists.openembedded.org/mt/74797704/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/2] apr-util: make gdbm optional
This helps with gpl3-free builds. Signed-off-by: Alexander Kanavin --- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 3896c924f0..0dd8f025e8 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/"; SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk" @@ -23,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139593): https://lists.openembedded.org/g/openembedded-core/message/139593 Mute This Topic: https://lists.openembedded.org/mt/74934568/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/2] gobject-introspection: add a patch to fix a build race
Signed-off-by: Alexander Kanavin --- ...ency-for-g-ir-compiler-for-building-.patch | 33 +++ .../gobject-introspection_1.64.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch new file mode 100644 index 00..adb357b5ec --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch @@ -0,0 +1,33 @@ +From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 17 Jun 2020 11:43:16 +0200 +Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs + +meson inserts the dependency if the compiler is used directly, but +fails to do so if the compiler is run through a wrapper. This leads +to build race errors between building the compiler and using it. + +Fix provided by Quentin Schulz + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] +Signed-off-by: Alexander Kanavin +--- + gir/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gir/meson.build b/gir/meson.build +index b37fdb81..557e5517 100644 +--- a/gir/meson.build b/gir/meson.build +@@ -448,7 +448,7 @@ foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +-depends: [gobject_gir, ], ++depends: [gobject_gir, gircompiler, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +-- +2.27.0 + diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb index 9dfb55e055..7eefdd3e27 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ + file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ " SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139594): https://lists.openembedded.org/g/openembedded-core/message/139594 Mute This Topic: https://lists.openembedded.org/mt/74934569/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] patchelf: Upgrade 0.10 -> 0.11
Two patches were merged upstream, the other needed refreshing. Signed-off-by: Richard Purdie --- .../patchelf/fix-adjusting-startPage.patch| 45 --- .../patchelf/patchelf/fix-phdrs.patch | 37 --- .../patchelf/handle-read-only-files.patch | 18 .../{patchelf_0.10.bb => patchelf_0.11.bb}| 4 +- 4 files changed, 11 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch delete mode 100644 meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch rename meta/recipes-devtools/patchelf/{patchelf_0.10.bb => patchelf_0.11.bb} (73%) diff --git a/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch b/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch deleted file mode 100644 index a0988423fee..000 --- a/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1630d3f846c7721b1e7cd3b005bb2b34816e1d0f Mon Sep 17 00:00:00 2001 -From: Ed Bartosh -Date: Fri, 21 Jul 2017 12:33:53 +0300 -Subject: [PATCH] patchelf: fix segfault for binaries linked by gold - -commit 1cc234fea5600190d872329aca60e2365cefc39e - -fix adjusting startPage - -startPage is adjusted unconditionally for all executables. -This results in incorrect addresses assigned to INTERP and LOAD -program headers, which breaks patched executable. - -Adjusting startPage variable only when startOffset > startPage -should fix this. - -This change is related to the issue NixOS#10 - -Signed-off-by: Ed Bartosh - -Github PR: https://github.com/NixOS/patchelf/pull/127 - -Upstream-Status: Submitted - - src/patchelf.cc | 6 ++ - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index a63e3a11c61f..2483d25d78f1 100644 a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -756,10 +756,8 @@ void ElfFile::rewriteSectionsLibrary() -since DYN executables tend to start at virtual address 0, so -rewriteSectionsExecutable() won't work because it doesn't have -any virtual address space to grow downwards into. */ --if (isExecutable) { --if (startOffset >= startPage) { --debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); --} -+if (isExecutable && startOffset > startPage) { -+debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); - startPage = startOffset; - } - diff --git a/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch b/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch deleted file mode 100644 index d087bd7855c..000 --- a/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch +++ /dev/null @@ -1,37 +0,0 @@ -When running patchelf on some existing patchelf'd binaries to change to longer -RPATHS, ldd would report the binaries as invalid. The output of objdump -x on -those libraryies should show the top of the .dynamic section is getting trashed, -something like: - -0x60001 0x00429000 -0x335000 0x00335000 -0xc740 0xc740 -0x1000 0x9098 -SONAME libglib-2.0.so.0 - -(which should be RPATH and DT_NEEDED entries) - -This was tracked down to the code which injects the PT_LOAD section. - -The issue is that if the program headers were previously relocated to the end -of the file which was how patchelf operated previously, the relocation code -wouldn't work properly on a second run as it now assumes they're located after -the elf header. This change forces them back to immediately follow the elf -header which is where the code has made space for them. - -Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/202] -Signed-off-by: Richard Purdie -RP 2020/6/2 - -Index: git/src/patchelf.cc -=== git.orig/src/patchelf.cc -+++ git/src/patchelf.cc -@@ -762,6 +762,7 @@ void ElfFile::rewrite - } - - /* Add a segment that maps the replaced sections into memory. */ -+wri(hdr->e_phoff, sizeof(Elf_Ehdr)); - phdrs.resize(rdi(hdr->e_phnum) + 1); - wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); - Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch index 03b0d18a89f..bf721c1af86 100644 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch @@ -14,30 +14,32 @@ Signed-off-by: Fabio Berton src/patchelf.cc | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 0b4965adff83..b5db2aef0e8a 100644 a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -497,7 +497,1
Re: [OE-core] [PATCH] mime.bbclass: change postrm to prerm
On Wed, Jun 17, 2020 at 10:10 AM Changqing Li wrote: > > From: Changqing Li > > fix error during post uninstall: > %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 > + '[' 0 = 0 ']' > + set -e > + '[' x '!=' x ']' > + echo 'Updating MIME database... this may take a while.' > Updating MIME database... this may take a while. > + update-mime-database /usr/share/mime > Directory '/usr/share/mime/packages' does not exist! > %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status > 100 > warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, > exit status 1 > > when run post uninstall scriptlet, /usr/share/mime/packages has been > removed during unintall, while update-mime-database need to use > /usr/share/mime/packages/freedesktop.org.xml > > correct by change postrm to prerm > > Signed-off-by: Changqing Li > --- > meta/classes/mime.bbclass | 14 +++--- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass > index c9072adf3b..a0943b4476 100644 > --- a/meta/classes/mime.bbclass > +++ b/meta/classes/mime.bbclass > @@ -17,7 +17,7 @@ else > fi > } > > -mime_postrm() { > +mime_prerm() { > if [ "x$D" != "x" ]; then > $INTERCEPT_DIR/postinst_intercept update_mime_database ${PKG} \ > mlprefix=${MLPREFIX} \ > @@ -42,17 +42,17 @@ python populate_packages_append () { > mimes_types_found = True > break > if mimes_types_found: > -bb.note("adding mime postinst and postrm scripts to %s" % pkg) > +bb.note("adding mime postinst and prerm scripts to %s" % pkg) > postinst = d.getVar('pkg_postinst_%s' % pkg) > if not postinst: > postinst = '#!/bin/sh\n' > postinst += d.getVar('mime_postinst') > d.setVar('pkg_postinst_%s' % pkg, postinst) > -postrm = d.getVar('pkg_postrm_%s' % pkg) > -if not postrm: > -postrm = '#!/bin/sh\n' > -postrm += d.getVar('mime_postrm') > -d.setVar('pkg_postrm_%s' % pkg, postrm) > +prerm = d.getVar('pkg_prerm_%s' % pkg) > +if not prerm: > +prerm = '#!/bin/sh\n' > +prerm += d.getVar('mime_prerm') > +d.setVar('pkg_prerm_%s' % pkg, prerm) > if pkg != 'shared-mime-info-data': > bb.note("adding shared-mime-info-data dependency to %s" % > pkg) > d.appendVar('RDEPENDS_' + pkg, " " + > d.getVar('MLPREFIX')+"shared-mime-info-data") > -- > 2.17.1 > If I understand this correctly * The error pops up once the LAST package with files in /usr/share/mime/packages is removed. If not something else is wrong * This is not a fix but a workaround leaving mime db inconsistent with entries removed later. Andreas -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139591): https://lists.openembedded.org/g/openembedded-core/message/139591 Mute This Topic: https://lists.openembedded.org/mt/74933440/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] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools?
On 6/17/20 8:07 AM, Jacob Kroon wrote: On 6/17/20 4:28 AM, Christopher Clark wrote: was: Re: [OE-core] [PATCH] grub-efi-native: Install grub-editenv On Sat, Apr 13, 2019 at 7:49 AM Jacob Kroon wrote: Having a native version of grub-editenv around can be useful for setting the targets grub environment. Would it be acceptable to replace the tools being packaged in grub-efi-native with a RDEPENDS from grub-efi-native to grub-native, and so use the grub-mkimage and grub-editenv tools from the grub recipe instead? The problem I'm encountering with the current dual packaging of grub-mkimage and grub-editenv tools, in both grub and grub-efi recipes, is that it prevents grub-native and grub-efi-native from being installed concurrently, and breaks my image build: ERROR: xen-image-minimal-1.0-r0 do_image_wic: The file /usr/bin/grub-mkimage is installed by both grub-efi-native and grub-native, aborting There's a wic script here: openembedded-core/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py that may also be affected since it creates a boot partition with both legacy and EFI content. The patch below resolves the error that I encountered. Does this change look OK? Christopher diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes-bsp/grub/grub-efi_2.04.bb index b9d6225d27..5dd3398540 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi" DEPENDS_append_class-target = " grub-efi-native" RDEPENDS_${PN}_class-target = "grub-common virtual/grub-bootconf" +RDEPENDS_${PN}_class-native = "grub-native" SRC_URI += " \ file://cfg \ @@ -61,9 +62,7 @@ do_install_append_class-target() { } do_install_class-native() { - install -d ${D}${bindir} - install -m 755 grub-mkimage ${D}${bindir} - install -m 755 grub-editenv ${D}${bindir} + : } do_install_class-target() { This change looks good to me. I added 'grub-editenv' before realizing that the tools were duplicated in 'grub', and I believe they are interchangeable. .. but this make grub-efi-native's sysroot empty in my build. Which then begs the question whether a native version of grub-efi is necessary at all ? Jacob -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139590): https://lists.openembedded.org/g/openembedded-core/message/139590 Mute This Topic: https://lists.openembedded.org/mt/74930505/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] busybox: udhcpc: fix IPv6 support when using udhcpc
On 2020-06-16 11:50, Quentin Schulz wrote: > Hi all, > > On Wed, Jan 22, 2020 at 11:06:55AM +0100, Quentin Schulz wrote: >> > > The reason why I didn't bother to send a patch to busybox before pinging >> > > on this patch was that we're already different from the upstream >> > > simple.script >> > > so it didn't make sense to me to add the Upstream-Status: pending or >> > > something on the patch (in some ways, since it's patching the file >> > > directly and not adding a patch in SRC_URI). Anyway, digressing. Do you >> > > want a patch to be sent to busybox ML (or PR or whatever they use) >> > > before taking this patch? >> > > >> > >> > I think the problem this patch fixes is generic and somewhere the >> > script OE has is also derived from >> > that example, so while the patch in itself is enough for OE, it would >> > be better if it was in upstream too >> > perhaps one less thing to worry about when we cherry pick changes from >> > upstream script in future. >> > >> >> Agreed, I'll put it on my TODO-list. If I do not send an answer on this >> mail with the link to the PR or patch in the next week, anyone, please ping >> me. >> > > *cough* Took a bit more *cough* than a week *cough* > > http://lists.busybox.net/pipermail/busybox/2020-June/088028.html Cool, thx for upstreaming! -- Stefan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139589): https://lists.openembedded.org/g/openembedded-core/message/139589 Mute This Topic: https://lists.openembedded.org/mt/72391372/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] linux-firmware: add ice for Intel E800 series driver
Signed-off-by: Yongxin Liu --- meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb | 9 + 1 file changed, 9 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb index fcad7df629..18f44bccae 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200519.bb @@ -26,6 +26,7 @@ LICENSE = "\ & Firmware-i2400m \ & Firmware-i915 \ & Firmware-ibt_firmware \ +& Firmware-ice \ & Firmware-it913x \ & Firmware-iwlwifi_firmware \ & Firmware-IntcSST2 \ @@ -155,6 +156,7 @@ NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware" +NO_GENERIC_LICENSE[Firmware-ice] = "LICENSE.ice" NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" @@ -280,6 +282,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ ${PN}-ibt-17 \ ${PN}-i915-license ${PN}-i915 \ + ${PN}-ice-license ${PN}-ice \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ ${PN}-bnx2-mips \ ${PN}-liquidio \ @@ -828,6 +831,12 @@ FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" RDEPENDS_${PN}-i915 = "${PN}-i915-license" +LICENSE_${PN}-ice = "Firmware-ice" +LICENSE_${PN}-ice-license = "Firmware-ice" +FILES_${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice" +FILES_${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice" +RDEPENDS_${PN}-ice = "${PN}-ice-license" + FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" LICENSE_${PN}-adsp-sst= "Firmware-adsp_sst" LICENSE_${PN}-adsp-sst-license= "Firmware-adsp_sst" -- 2.14.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139588): https://lists.openembedded.org/g/openembedded-core/message/139588 Mute This Topic: https://lists.openembedded.org/mt/74933813/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] curl: add debug info
Currently, curl (and libcurl) is built without debug info, making the curl-dbg package rather useless. Since debug symbols are automatically stripped and put in that package by the build system, making sure that curl is built with -g shouldn't hurt anything, but will help those that try to debug a libcurl-using application and hence explicitly include curl-dbg in their rootfs. Unfortunately, setting --enable-debug then changes the default value of the optimize option from (assume yes) to (assume no), while also changing the default value of the curldebug option [which is a separate thing that actually changes generated code to add some memory tracking] from (assume no) to (assume yes). So explicitly pass the appropriate options that make those two have the same value as they used to have by default. Signed-off-by: Rasmus Villemoes --- meta/recipes-support/curl/curl_7.70.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/curl/curl_7.70.0.bb b/meta/recipes-support/curl/curl_7.70.0.bb index baf72f8e75..bb25677ef7 100644 --- a/meta/recipes-support/curl/curl_7.70.0.bb +++ b/meta/recipes-support/curl/curl_7.70.0.bb @@ -57,6 +57,9 @@ EXTRA_OECONF = " \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libmetalink \ --without-libpsl \ +--enable-debug \ +--enable-optimize \ +--disable-curldebug \ " do_install_append_class-target() { -- 2.23.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139587): https://lists.openembedded.org/g/openembedded-core/message/139587 Mute This Topic: https://lists.openembedded.org/mt/74933778/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] mime.bbclass: change postrm to prerm
please ignore this patch, I will send a V2 to fix this problem On 6/17/20 4:07 PM, Changqing Li wrote: From: Changqing Li fix error during post uninstall: %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 + '[' 0 = 0 ']' + set -e + '[' x '!=' x ']' + echo 'Updating MIME database... this may take a while.' Updating MIME database... this may take a while. + update-mime-database /usr/share/mime Directory '/usr/share/mime/packages' does not exist! %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status 100 warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, exit status 1 when run post uninstall scriptlet, /usr/share/mime/packages has been removed during unintall, while update-mime-database need to use /usr/share/mime/packages/freedesktop.org.xml correct by change postrm to prerm Signed-off-by: Changqing Li --- meta/classes/mime.bbclass | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index c9072adf3b..a0943b4476 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass @@ -17,7 +17,7 @@ else fi } -mime_postrm() { +mime_prerm() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_mime_database ${PKG} \ mlprefix=${MLPREFIX} \ @@ -42,17 +42,17 @@ python populate_packages_append () { mimes_types_found = True break if mimes_types_found: -bb.note("adding mime postinst and postrm scripts to %s" % pkg) +bb.note("adding mime postinst and prerm scripts to %s" % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('mime_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) -postrm = d.getVar('pkg_postrm_%s' % pkg) -if not postrm: -postrm = '#!/bin/sh\n' -postrm += d.getVar('mime_postrm') -d.setVar('pkg_postrm_%s' % pkg, postrm) +prerm = d.getVar('pkg_prerm_%s' % pkg) +if not prerm: +prerm = '#!/bin/sh\n' +prerm += d.getVar('mime_prerm') +d.setVar('pkg_prerm_%s' % pkg, prerm) if pkg != 'shared-mime-info-data': bb.note("adding shared-mime-info-data dependency to %s" % pkg) d.appendVar('RDEPENDS_' + pkg, " " + d.getVar('MLPREFIX')+"shared-mime-info-data") -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139586): https://lists.openembedded.org/g/openembedded-core/message/139586 Mute This Topic: https://lists.openembedded.org/mt/74933440/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [AUH] Upgrade status: 2020-06-17
Recipe upgrade statistics: * Failed (devtool error): 11 bind, 9.16.3, Armin Kuster dropbear, 2020.79, Yi Zhao elfutils, 0.180, Hongxu Jia gnu-config, 20200515-new-commits-available, Robert Yang libdnf, 0.48.0, Alexander Kanavin llvm, 10.0.0, Khem Raj patchelf, 0.11, Richard Purdie perl, 5.30.3, Alexander Kanavin qemu, 5.0.0, Richard Purdie mesa, 20.1.1, Otavio Salvador vulkan-demos, git-new-commits-available, Ross Burton * Succeeded: 20 ell, 0.32, Oleksandr Kravchuk bison, 3.6.4, Chen Qi dnf, 4.2.23, Alexander Kanavin file, 5.39, Yi Zhao meson, 0.54.3, Alexander Kanavin python3-cython, 0.29.20, Oleksandr Kravchuk python3-setuptools, 47.3.0, Oleksandr Kravchuk ethtool, 5.7, Changhyeok Bae man-pages, 5.07, Hongxu Jia stress-ng, 0.11.13, Anuj Mittal libhandy, 0.80.0, Alexander Kanavin piglit, 1.0-new-commits-available, Ross Burton powertop, 2.13, Alexander Kanavin systemtap-uprobes, 4.3, Victor Kamensky systemtap, 4.3, Victor Kamensky alsa-lib, 1.2.3, Tanu Kaskinen alsa-topology-conf, 1.2.3, Tanu Kaskinen alsa-ucm-conf, 1.2.3, Tanu Kaskinen alsa-utils, 1.2.3, Tanu Kaskinen puzzles, 0.0-new-commits-available, Anuj Mittal * Failed(other errors): 2 vulkan-headers, 1.2.141.0, Anuj Mittal vulkan-loader, 1.2.141.0, Anuj Mittal * Failed(do_compile): 3 vulkan-tools, 1.2.141.0, Anuj Mittal ffmpeg, 4.3, Alexander Kanavin libgpg-error, 1.38, Hongxu Jia TOTAL: attempted=36 succeeded=20(55.56%) failed=16(44.44%) Recipe upgrade statistics per Maintainer: Yi Zhao -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139585): https://lists.openembedded.org/g/openembedded-core/message/139585 Mute This Topic: https://lists.openembedded.org/mt/74933576/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] mime.bbclass: change postrm to prerm
From: Changqing Li fix error during post uninstall: %postun(shared-mime-info-data-2.0-r0.4.corei7_64): execv(/bin/sh) pid 78 + '[' 0 = 0 ']' + set -e + '[' x '!=' x ']' + echo 'Updating MIME database... this may take a while.' Updating MIME database... this may take a while. + update-mime-database /usr/share/mime Directory '/usr/share/mime/packages' does not exist! %postun(shared-mime-info-data-2.0-r0.4.corei7_64): waitpid(78) rc 78 status 100 warning: %postun(shared-mime-info-data-2.0-r0.4.corei7_64) scriptlet failed, exit status 1 when run post uninstall scriptlet, /usr/share/mime/packages has been removed during unintall, while update-mime-database need to use /usr/share/mime/packages/freedesktop.org.xml correct by change postrm to prerm Signed-off-by: Changqing Li --- meta/classes/mime.bbclass | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/mime.bbclass b/meta/classes/mime.bbclass index c9072adf3b..a0943b4476 100644 --- a/meta/classes/mime.bbclass +++ b/meta/classes/mime.bbclass @@ -17,7 +17,7 @@ else fi } -mime_postrm() { +mime_prerm() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_mime_database ${PKG} \ mlprefix=${MLPREFIX} \ @@ -42,17 +42,17 @@ python populate_packages_append () { mimes_types_found = True break if mimes_types_found: -bb.note("adding mime postinst and postrm scripts to %s" % pkg) +bb.note("adding mime postinst and prerm scripts to %s" % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('mime_postinst') d.setVar('pkg_postinst_%s' % pkg, postinst) -postrm = d.getVar('pkg_postrm_%s' % pkg) -if not postrm: -postrm = '#!/bin/sh\n' -postrm += d.getVar('mime_postrm') -d.setVar('pkg_postrm_%s' % pkg, postrm) +prerm = d.getVar('pkg_prerm_%s' % pkg) +if not prerm: +prerm = '#!/bin/sh\n' +prerm += d.getVar('mime_prerm') +d.setVar('pkg_prerm_%s' % pkg, prerm) if pkg != 'shared-mime-info-data': bb.note("adding shared-mime-info-data dependency to %s" % pkg) d.appendVar('RDEPENDS_' + pkg, " " + d.getVar('MLPREFIX')+"shared-mime-info-data") -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139584): https://lists.openembedded.org/g/openembedded-core/message/139584 Mute This Topic: https://lists.openembedded.org/mt/74933440/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-