Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 3:47 PM, Bruce Ashfieldwrote: > > > On Fri, Apr 21, 2017 at 1:50 PM, Bruce Ashfield > wrote: > >> >> >> On Fri, Apr 21, 2017 at 11:55 AM, akuster808 >> wrote: >> >>> >>> >>> On 04/21/2017 01:36 AM, Martin Jansa wrote: >>> >>> Anyone else seeing this as well? >>> >>> >>> yes >>> >> >> If you see it, can you take a look at the linux source dir and see if the >> directories are >> present ? >> >> I've been doing a tight loop on builds all day, and haven't seen this >> yet. >> >> Nothing has changed with the build process in months, so something else >> underneath >> is now causing this race/issue. >> >> > I finally managed to make this happen. > > Thanks for the report .. I can now spin a fix. > I'm no longer able to trigger the error, and I sent the patch to the list. Hopefully this never comes back .. but if anyone does see it after applying that patch, let me know. Cheers, Bruce > > Cheers, > > Bruce > > >> Bruce >> >> >>> >>> - armin >>> >>> I've updated to oe-core commit: >>> >>> c6cd5865b6914521a841ae0c9f4e2bcda99beff2 >>> >>> from some revision maybe 20-40 commits older and now I'm seeing: >>> >>> ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 >>> do_validate_branches: Function failed: do_validate_branches (log file is >>> located at >>> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) >>> ERROR: Logfile of failure stored in: >>> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 >>> Log data follows: >>> | DEBUG: Executing shell function do_validate_branches >>> | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base >>> | mkdir: cannot create directory ‘.’: File exists >>> | >>> | [ERROR] Can't find patch dir at ./patches/standard/base >>> | usage: kgit s2q >>> | WARNING: exit code 1 from a shell command. >>> | ERROR: Function failed: do_validate_branches (log file is located at >>> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) >>> NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task >>> do_validate_branches: Failed >>> ERROR: Task >>> (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) >>> failed with exit code '1' >>> >>> >>> >>> >>> >>> -- >>> ___ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >>> >> >> >> -- >> "Thou shalt not follow the NULL pointer, for chaos and madness await thee >> at its end" >> > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end" > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-yocto/kern-tools: fix do_validate_branches clean stage
It was reported that do_validate_branches was failing with the following error: Log data follows: | DEBUG: Executing shell function do_validate_branches | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base | mkdir: cannot create directory .: File exists | | [ERROR] Can't find patch dir at ./patches/standard/base | usage: kgit s2q | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_validate_branches This was triggered by the execution of 'kgit-s2q --clean' after forcing the SRCREV to something other than the tip of the branch. --clean is being run to remove any sentinel files from previous kernel builds to ensure that the tree is in a consistent state. There were two bugs, --clean was being executed and not exiting the script as it was supposed to. Hence validation for applying patches was done, and threw the error that eventually makes it to the console. And the second bug is that since do_validate_branches actually calls kgit-s2q --clean, the dependency on kern-tools-native needs to be on that function (versus do_kernel_metadata which runs later). With the tweaked kern-tool + the dependency fix, we no longer see this error. Signed-off-by: Bruce Ashfield--- meta/classes/kernel-yocto.bbclass | 2 +- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 0330270d3fea..96c06ef5d68e 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -254,7 +254,7 @@ do_kernel_checkout[dirs] = "${S}" addtask kernel_checkout before do_kernel_metadata after do_unpack addtask kernel_metadata after do_validate_branches do_unpack before do_patch -do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" +do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" do_kernel_configme[dirs] += "${S} ${B}" do_kernel_configme() { diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 03f8ce3cc253..5e65469a69ca 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1b DEPENDS = "git-native" -SRCREV = "5deada879404820db146685729e89ba0887fc0ee" +SRCREV = "bd7447cd6274d764a129dcdc246cdbfd8c47b991" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [morty][PATCH] sstate.bbclass: update .siginfo atime
Ping. It's been over a month now... On Mon, Mar 20, 2017 at 01:38:20PM -0400, Denys Dmytriyenko wrote: > From: Ed Bartosh> > .siginfo files are not being accessed from local or NFS-mounted > sstate mirrors when sstate package is installed, so their atime > is not updated. If sstate mirror is cleaned based on access time, > they get deleted, even though they are still being used. > > Updated atime of .siginfo symlinks with 'touch -a'. This command > dereferences symlinks pointing to the local mirror and updates > atime of the .siginfo file on the mirror. > > [YOCTO #10857] > > Signed-off-by: Ed Bartosh > Signed-off-by: Ross Burton > Signed-off-by: Denys Dmytriyenko > --- > meta/classes/sstate.bbclass | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass > index 8643f3d..4fdfcc8 100644 > --- a/meta/classes/sstate.bbclass > +++ b/meta/classes/sstate.bbclass > @@ -724,6 +724,8 @@ python sstate_sign_package () { > # > sstate_unpack_package () { > tar -xvzf ${SSTATE_PKG} > + # update .siginfo atime on local/NFS mirror > + [ -h ${SSTATE_PKG}.siginfo ] && touch -a ${SSTATE_PKG}.siginfo > # Use "! -w ||" to return true for read only files > [ ! -w ${SSTATE_PKG} ] || touch --no-dereference ${SSTATE_PKG} > [ ! -w ${SSTATE_PKG}.sig ] || [ ! -e ${SSTATE_PKG}.sig ] || touch > --no-dereference ${SSTATE_PKG}.sig > -- > 2.7.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] parselogs: whitelist bluetooth firmware load error for intel-corei7-64
The NUC6 has issues bringing up Bluetooth early in the boot sequence. We see: [4.091790] Bluetooth: hci0: Minimum firmware build 1 week 10 2014 [4.097326] Bluetooth: hci0: Found device firmware: intel/ibt-11-5.sfi [4.145317] Bluetooth: hci0: Failed to send firmware data (-38) Followed by this later on: [ 11.509870] Bluetooth: hci0: Minimum firmware build 1 week 10 2014 [ 11.509988] Bluetooth: hci0: Found device firmware: intel/ibt-11-5.sfi [ 13.090308] Bluetooth: hci0: Waiting for firmware download to complete [ 13.090829] Bluetooth: hci0: Firmware loaded in 1549114 usecs [ 13.090987] Bluetooth: hci0: Waiting for device to boot [ 13.101958] Bluetooth: hci0: Device booted in 10818 usecs Bluetooth does successfully come up and the firmware is loaded. This behavior is consistent across all kernels I've tested. [YOCTO #10628]. Signed-off-by: California Sullivan--- meta/lib/oeqa/runtime/cases/parselogs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 6e92946..8a9231f 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -151,6 +151,7 @@ ignore_errors = { 'failed to read out thermal zone', 'Bluetooth: hci0: Setting Intel event mask failed', 'ttyS2 - failed to request DMA', +'Bluetooth: hci0: Failed to send firmware data (-38)', ] + x86_common, 'crownbay' : x86_common, 'genericx86' : x86_common, -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] parselogs: whitelist failed to enable keyboard error on intel-corei7-64
This error is seen on the Braswell RVP platform we have been using for testing. The error is caused by atkbd.c keyboard driver, which is only for AT and PS/2 keyboards. I tested a PS/2 keyboard with the board, which worked fine, and the board does not have a separate AT connector, so this error won't cause any functional issues. [YOCTO #10110]. Signed-off-by: California Sullivan--- meta/lib/oeqa/runtime/cases/parselogs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/runtime/cases/parselogs.py b/meta/lib/oeqa/runtime/cases/parselogs.py index 8a9231f..c4d347d 100644 --- a/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/meta/lib/oeqa/runtime/cases/parselogs.py @@ -152,6 +152,7 @@ ignore_errors = { 'Bluetooth: hci0: Setting Intel event mask failed', 'ttyS2 - failed to request DMA', 'Bluetooth: hci0: Failed to send firmware data (-38)', +'atkbd serio0: Failed to enable keyboard on isa0060/serio0', ] + x86_common, 'crownbay' : x86_common, 'genericx86' : x86_common, -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 01/11] libiconv: remove recipe
On 21 April 2017 at 13:39, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > It was in use only when uclibc was used, and so serves no purpose anymore. > Both glibc and musl provide their own implementation. > As per https://autobuilder.yocto.io/builders/nightly-qa-extras/builds/238 this is still needed by mingw builds, so maybe the recipe should be moved into meta-mingw? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert "kernel: Fix symlinks"
On Fri, Apr 21, 2017 at 2:48 PM, Andreas Oberritterwrote: > On Fri, 21 Apr 2017 14:37:36 +0200 > David Vincent wrote: > >> On 2017-04-21 13:30 GMT+02:00 Andreas Oberritter : >> > On Fri, 21 Apr 2017 13:02:51 +0200 >> > Andrea Adami wrote: >> > >> >> On Fri, Apr 21, 2017 at 12:39 PM, Andreas Oberritter >> >> wrote: >> >> > This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. >> >> > >> >> > It broke dpkg's update-alternatives, which requires absolute paths. >> >> >> >> This is really uncommon. >> > >> > Actually it's not. Try it on any Debian or Ubuntu system. >> > >> >> I had already expressed my negative opinion about absolute paths for kernel [1]. >> >> Personally, I had to patch the bootloader (kexecboot). >> >> Same here, that's why I submitted it in the first place. Didn't >> thought that would break dpkg... >> >> >> >> >> So please try some workaround instead of changing it back. >> > >> > Well, there's no workaround. Other than opkg's update-alternatives, dpkg's maintains >> > an alternatives database in /etc/alternatives, so the symlink is going to point to >> > an absolute path outside of /boot anyway. >> >> The problem is that, for bootloaders, it is not always possible to >> mount the rootfs. So, it must only rely on information in the boot >> partition that can be mounted anywhere. > > I understand the problem the patch tried to address. > > Those bootloaders don't find the kernel by chance. The name of the image > is usually set in the environment. You can update the environment in postinst- > scripts or just change the name of the kernel image to match the bootloader's > expectations, just to name some alternatives. > >> > >> > To fix your problem, kernel.bbclass should be changed to not use update-alternatives >> > at all. But it's definitely wrong to break the original u-a by using invalid command- >> > line arguments. >> > >> >> And reverting this patch breaks boot for those who rely on a relative >> symlink ; that is also wrong. > > Yes. However, I'd argue that a regression is worse than a problem that > persisted for years. We lived for years with the relative symlink. Then 78ee4d8 broke the bootloaders in 2014 Finally it was reverted end 2016 and now it is under review again...ouch What broke what? My point is, while I had the sources and could modify and reflash the bootloader, the same is not valid for many people. Anyway, I have found out that there was a workaround to allow boot from NFS: +ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative;" Cheers Andrea -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][morty] glibc: Security fix CVE-2016-6323
On 4/21/17 3:37 AM, Andrej Valek wrote: > arm: mark __startcontext as .cantunwind, GNU > > CVE: CVE-2016-6323 > Signed-off-by: Andrej Valek> Signed-off-by: Pascal Bach what is different about this one and the one sent on the 19th? -armin > --- > meta/recipes-core/glibc/glibc/CVE-2016-6323.patch | 39 > +++ > meta/recipes-core/glibc/glibc_2.24.bb | 1 + > 2 files changed, 40 insertions(+) > create mode 100644 meta/recipes-core/glibc/glibc/CVE-2016-6323.patch > > diff --git a/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch > b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch > new file mode 100644 > index 000..f9b9fa5 > --- /dev/null > +++ b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch > @@ -0,0 +1,39 @@ > +glibc-2.24: Fix CVE-2016-6323 > + > +[No upstream tracking] -- > https://sourceware.org/bugzilla/show_bug.cgi?id=20435 > + > +arm: mark __startcontext as .cantunwind, GNU > + > +Glibc bug where the makecontext function would create > +an execution context which is incompatible with the unwinder, > +causing it to hang when the generation of a backtrace is attempted. > + > +Upstream-Status: Backport > [https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617] > +CVE: CVE-2016-6323 > +Signed-off-by: Andrej Valek > +Signed-off-by: Pascal Bach > + > +diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S > b/sysdeps/unix/sysv/linux/arm/setcontext.S > +index 603e508..d1f168f 100644 > +--- a/sysdeps/unix/sysv/linux/arm/setcontext.S > b/sysdeps/unix/sysv/linux/arm/setcontext.S > +@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext) > + > + /* Called when a makecontext() context returns. Start the > +context in R4 or fall through to exit(). */ > ++/* Unwind descriptors are looked up based on PC - 2, so we have to > ++ make sure to mark the instruction preceding the __startcontext > ++ label as .cantunwind. */ > ++.fnstart > ++.cantunwind > ++nop > + ENTRY(__startcontext) > + movsr0, r4 > + bne PLTJMP(__setcontext) > + > + @ New context was 0 - exit > + b PLTJMP(HIDDEN_JUMPTARGET(exit)) > ++.fnend > + END(__startcontext) > + > + #ifdef PIC > diff --git a/meta/recipes-core/glibc/glibc_2.24.bb > b/meta/recipes-core/glibc/glibc_2.24.bb > index f5a21b2..bce06c7 100644 > --- a/meta/recipes-core/glibc/glibc_2.24.bb > +++ b/meta/recipes-core/glibc/glibc_2.24.bb > @@ -37,6 +37,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ > > file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ > file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ > file://0026-build_local_scope.patch \ > + file://CVE-2016-6323.patch \ > " > > SRC_URI += "\ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] grub: Fix build with gcc7
backport patches from upsteam and adapt them to 2.0 codebase Signed-off-by: Khem Raj--- ...-avoid-used-uninitialized-error-with-GCC7.patch | 36 +++ ...-ppc-fix-switch-fallthrough-cases-with-GC.patch | 248 + ...0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch | 38 ...aining-cases-of-gcc-7-fallthrough-warning.patch | 175 +++ meta/recipes-bsp/grub/grub2.inc| 4 + 5 files changed, 501 insertions(+) create mode 100644 meta/recipes-bsp/grub/files/0001-btrfs-avoid-used-uninitialized-error-with-GCC7.patch create mode 100644 meta/recipes-bsp/grub/files/0002-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch create mode 100644 meta/recipes-bsp/grub/files/0003-Add-gnulib-fix-gcc7-fallthrough.diff.patch create mode 100644 meta/recipes-bsp/grub/files/0004-Fix-remaining-cases-of-gcc-7-fallthrough-warning.patch diff --git a/meta/recipes-bsp/grub/files/0001-btrfs-avoid-used-uninitialized-error-with-GCC7.patch b/meta/recipes-bsp/grub/files/0001-btrfs-avoid-used-uninitialized-error-with-GCC7.patch new file mode 100644 index 000..217a775609e --- /dev/null +++ b/meta/recipes-bsp/grub/files/0001-btrfs-avoid-used-uninitialized-error-with-GCC7.patch @@ -0,0 +1,36 @@ +From 6cef7f6079550af3bf91dbff824398eaef08c3c5 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Tue, 4 Apr 2017 19:22:32 +0300 +Subject: [PATCH 1/4] btrfs: avoid "used uninitialized" error with GCC7 + +sblock was local and so considered new variable on every loop +iteration. + +Closes: 50597 +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + grub-core/fs/btrfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 9cffa91..4849c1c 100644 +--- a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +@@ -227,11 +227,11 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, + static grub_err_t + read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb) + { ++ struct grub_btrfs_superblock sblock; + unsigned i; + grub_err_t err = GRUB_ERR_NONE; + for (i = 0; i < ARRAY_SIZE (superblock_sectors); i++) + { +- struct grub_btrfs_superblock sblock; + /* Don't try additional superblocks beyond device size. */ + if (i && (grub_le_to_cpu64 (sblock.this_device.size) + >> GRUB_DISK_SECTOR_BITS) <= superblock_sectors[i]) +-- +1.9.1 + diff --git a/meta/recipes-bsp/grub/files/0002-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch b/meta/recipes-bsp/grub/files/0002-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch new file mode 100644 index 000..94f048c28b0 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0002-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch @@ -0,0 +1,248 @@ +From 4bd4a88725604471fdbd86316c91967a7f4dba5a Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Tue, 4 Apr 2017 19:23:55 +0300 +Subject: [PATCH 2/4] i386, x86_64, ppc: fix switch fallthrough cases with GCC7 + +In util/getroot and efidisk slightly modify exitsing comment to mostly +retain it but still make GCC7 compliant with respect to fall through +annotation. + +In grub-core/lib/xzembed/xz_dec_lzma2.c it adds same comments as +upstream. + +In grub-core/tests/setjmp_tets.c declare functions as "noreturn" to +suppress GCC7 warning. + +In grub-core/gnulib/regexec.c use new __attribute__, because existing +annotation is not recognized by GCC7 parser (which requires that comment +immediately precedes case statement). + +Otherwise add FALLTHROUGH comment. + +Closes: 50598 +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj + + grub-core/commands/hdparm.c | 1 + + grub-core/commands/nativedisk.c | 1 + + grub-core/disk/cryptodisk.c | 1 + + grub-core/disk/efi/efidisk.c | 2 +- + grub-core/efiemu/mm.c | 1 + + grub-core/gdb/cstub.c | 1 + + grub-core/gnulib/regexec.c| 3 +++ + grub-core/lib/xzembed/xz_dec_lzma2.c | 4 + grub-core/lib/xzembed/xz_dec_stream.c | 6 ++ + grub-core/loader/i386/linux.c | 3 +++ + grub-core/tests/setjmp_test.c | 5 - + grub-core/video/ieee1275.c| 1 + + grub-core/video/readers/jpeg.c| 1 + + util/getroot.c| 2 +- + util/grub-install.c | 1 + + util/grub-mkimagexx.c | 1 + + util/grub-mount.c | 1 + + 17 files changed, 32 insertions(+), 3 deletions(-) + +Index: grub-2.00/grub-core/commands/hdparm.c +=== +--- grub-2.00.orig/grub-core/commands/hdparm.c grub-2.00/grub-core/commands/hdparm.c +@@ -328,6 +328,7 @@ grub_cmd_hdparm (grub_extcmd_context_t c + ata = ((struct grub_scsi *) disk->data)->data; + break; + } ++ /* FALLTHROUGH */ +
[OE-core] [PATCH 2/2] ovmf: Fix build with gcc7
backport a patch which fixing warnings with gcc7 Signed-off-by: Khem Raj--- ...g-UefiHiiLib-Fix-incorrect-comparison-exp.patch | 45 ++ meta/recipes-core/ovmf/ovmf_git.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch diff --git a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch new file mode 100644 index 000..0529a27b168 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch @@ -0,0 +1,45 @@ +From 73692710d50da1f421b0e6ddff784ca3135389b3 Mon Sep 17 00:00:00 2001 +From: Dandan Bi +Date: Sat, 1 Apr 2017 10:31:14 +0800 +Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression + +Fix the incorrect comparison between pointer and constant zero character. + +https://bugzilla.tianocore.org/show_bug.cgi?id=416 + +V2: The pointer StringPtr points to a string returned +by ExtractConfig/ExportConfig, if it is NULL, function +InternalHiiIfrValueAction will return FALSE. So in +current usage model, the StringPtr can not be NULL before +using it, so we can add ASSERT here. + +Cc: Eric Dong +Cc: Liming Gao +Contributed-under: TianoCore Contribution Agreement 1.0 +Signed-off-by: Dandan Bi +Reviewed-by: Eric Dong +--- +Upstream-Status: Backport + + MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +index 8579501..46ca7bc 100644 +--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +@@ -2180,8 +2180,9 @@ InternalHiiIfrValueAction ( + } + + StringPtr = ConfigAltResp; +- +- while (StringPtr != L'\0') { ++ ASSERT (StringPtr != NULL); ++ ++ while (*StringPtr != L'\0') { + // + // 1. Find GUID=...=...=... + // +-- +1.9.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 73fdfc6239e..9d988e9d414 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://VfrCompile-increase-path-length-limit.patch \ +file://0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch \ " SRC_URI_append_class-target = " \ -- 2.12.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 1:50 PM, Bruce Ashfieldwrote: > > > On Fri, Apr 21, 2017 at 11:55 AM, akuster808 wrote: > >> >> >> On 04/21/2017 01:36 AM, Martin Jansa wrote: >> >> Anyone else seeing this as well? >> >> >> yes >> > > If you see it, can you take a look at the linux source dir and see if the > directories are > present ? > > I've been doing a tight loop on builds all day, and haven't seen this yet. > > Nothing has changed with the build process in months, so something else > underneath > is now causing this race/issue. > > I finally managed to make this happen. Thanks for the report .. I can now spin a fix. Cheers, Bruce > Bruce > > >> >> - armin >> >> I've updated to oe-core commit: >> >> c6cd5865b6914521a841ae0c9f4e2bcda99beff2 >> >> from some revision maybe 20-40 commits older and now I'm seeing: >> >> ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 >> do_validate_branches: Function failed: do_validate_branches (log file is >> located at >> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) >> ERROR: Logfile of failure stored in: >> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 >> Log data follows: >> | DEBUG: Executing shell function do_validate_branches >> | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base >> | mkdir: cannot create directory ‘.’: File exists >> | >> | [ERROR] Can't find patch dir at ./patches/standard/base >> | usage: kgit s2q >> | WARNING: exit code 1 from a shell command. >> | ERROR: Function failed: do_validate_branches (log file is located at >> linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) >> NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task >> do_validate_branches: Failed >> ERROR: Task >> (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) >> failed with exit code '1' >> >> >> >> >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> >> > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end" > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] valgrind: Fix arm build with gcc7
Add function to remove -mcpu compiler options on arm Signed-off-by: Khem Raj--- ...rop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | 108 + meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 14 ++- 2 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch new file mode 100644 index 000..9f1da7bac68 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch @@ -0,0 +1,108 @@ +From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Apr 2017 10:11:16 -0700 +Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm + architecture + +We can not assume that all arches armv7+ are cortex-a8 only +it fails to build for rpi which is armv7ve based (cortex-a8) cpu +implementation. +Fixes +| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Makefile.all.am| 6 +++--- + helgrind/tests/Makefile.am | 6 +++--- + none/tests/arm/Makefile.am | 18 +- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/Makefile.all.am b/Makefile.all.am +index 02059a3..c7c4700 100644 +--- a/Makefile.all.am b/Makefile.all.am +@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g + + AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ + AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ +- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 ++ $(AM_CFLAGS_BASE) -marm + AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ +- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) ++ -marm $(AM_CFLAGS_PSO_BASE) + AM_CCASFLAGS_ARM_LINUX= @FLAG_M32@ \ +- -marm -mcpu=cortex-a8 -g ++ -marm -g + + AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ + AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +index df82169..07eb66a 100644 +--- a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN + endif + + if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX +-annotate_hbefore_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8 +-tc07_hbl1_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 +-tc08_hbl2_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 ++annotate_hbefore_CFLAGS = $(AM_CFLAGS) ++tc07_hbl1_CFLAGS= $(AM_CFLAGS) ++tc08_hbl2_CFLAGS= $(AM_CFLAGS) + else + annotate_hbefore_CFLAGS = $(AM_CFLAGS) + tc07_hbl1_CFLAGS= $(AM_CFLAGS) +diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am +index 024eb6d..ccecb90 100644 +--- a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am +@@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ + # need special helping w.r.t -mfpu and -mfloat-abi, though. + # Also force -O0 since -O takes hundreds of MB of memory + # for v6intThumb.c. +-v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -marm +-v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb ++v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm ++v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb + +-v6media_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb ++v6media_CFLAGS= $(AM_CFLAGS) -g -O0 -mthumb + + v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm + v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb +@@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ + v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ + -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb + +-vfp_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++vfp_CFLAGS= $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + + +-neon128_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++neon128_CFLAGS= $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + +-neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++neon64_CFLAGS = $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + + intdiv_CFLAGS = $(AM_CFLAGS) -g -march=armv7ve -mcpu=cortex-a15 -mthumb +-ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb +-ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm ++ldrt_CFLAGS = $(AM_CFLAGS) -g -mthumb ++ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -marm
[OE-core] [PATCH] puzzles: Add -Wno-error=format-overflow if compiler supports it
Fixes build with gcc7 in such a way that it keeps working with older compilers who dont support -Wno-error=format-overflow= option Signed-off-by: Khem Raj--- ...or-format-overflow-if-the-compiler-suppor.patch | 32 ++ meta/recipes-sato/puzzles/puzzles_git.bb | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch diff --git a/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch new file mode 100644 index 000..d40a3b1ef94 --- /dev/null +++ b/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch @@ -0,0 +1,32 @@ +From 337799e40350b3db2441cc98f65ec36a74dfb356 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 21 Apr 2017 12:18:08 -0700 +Subject: [PATCH] Use -Wno-error=format-overflow= if the compiler supports it + +we need this warning to be suppressed with gcc7+ +however older compilers dont support it so we need +a way to disble it only if compiler supports it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3a38c95..bb9035e 100644 +--- a/configure.ac b/configure.ac +@@ -42,7 +42,7 @@ fi + if test "x$GCC" = "xyes"; then + AC_MSG_CHECKING([for usable gcc warning flags]) + gccwarningflags= +- for flag in -Wall -Werror -std=c89 -pedantic; do ++ for flag in -Wall -Werror -std=c89 -pedantic -Wno-error=format-overflow=; do + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS$gccwarningflags $flag $GTK_CFLAGS" +-- +2.12.2 + diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index a25c00760a5..7b8495ff75d 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb @@ -14,7 +14,8 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://0001-Use-labs-instead-of-abs.patch \ file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ file://0001-Clarify-conditions-to-avoid-compiler-errors.patch \ -" + file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ + " SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3" PE = "1" PV = "0.0+git${SRCPV}" -- 2.12.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] valgrind: Fix arm build with gcc7
On Fri, Apr 21, 2017 at 9:32 AM, Khem Rajwrote: > On Thu, Apr 20, 2017 at 6:29 PM, Andre McCurdy wrote: >> On Thu, Apr 20, 2017 at 6:06 PM, Khem Raj wrote: >>> On Thu, Apr 20, 2017 at 5:56 PM, Andre McCurdy wrote: On Thu, Apr 20, 2017 at 11:20 AM, Khem Raj wrote: > Signed-off-by: Khem Raj > --- > ...rop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | 108 > + > meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 3 +- > 2 files changed, 110 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch > > diff --git > a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch > > b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch > new file mode 100644 > index 000..9f1da7bac68 > --- /dev/null > +++ > b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch > @@ -0,0 +1,108 @@ > +From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001 > +From: Khem Raj > +Date: Thu, 20 Apr 2017 10:11:16 -0700 > +Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm > + architecture > + > +We can not assume that all arches armv7+ are cortex-a8 only > +it fails to build for rpi which is armv7ve based (cortex-a8) cpu > +implementation. > +Fixes > +| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve > switch The valgrind tests are built for fixed CPU targets which are known to support the instructions being tested (since those instructions may not be supported by the target CPU which valgrind itself is being built for). It may be safer to add -march=armv7a to the -mcpu=cortex-a8 tests (and ensure that -march=armv7ve doesn't leak through) rather than remove -mcpu=cortex-a8. >>> >>> OE always passes mcpu flags, therefore it wont be an issue unless you >>> are saying thats not the case. >> >> OE won't pass an -mcpu flag for generic DEFAULTTUNE values such as >> "armv7athf". >> >>> For upstreaming it might be OK, but I >>> think this will need a different for upstreaming since it should >>> configure mcpu/march based on some configure input or some such >>> instead of hardcoding it. >> >> For the ../tests/... Makefiles, the mcpu/march flags should absolutely >> be hardcoded. e.g. the test for "idiv" should always be built in >> exactly the same way, regardless of whether or not the target arch you >> configure and build valgrind itself for is armv7ve. >> > > what is the purpose of compiling such a test case for a machine > where it will cause SIGILL ? I don't think it will when executed via valgrind, since valgrind acts as an interpreter for the binaries it runs. In the past I've used valgrind to run an x86 binary which used cmov on a VIA C3 CPU which didn't support that instruction. I guess a similar approach would work for ARM - ie you could use valgrind to run an armv7ve binary on an armv7a CPU. See the comments in: http://git.openembedded.org/openembedded-core/commit/?id=3e94af90d90f6db6bab66ae87a47b31f3a0474f6 The change to the toplevel Makefile.all.am looks OK. > +Upstream-Status: Pending > + > +Signed-off-by: Khem Raj > +--- > + Makefile.all.am| 6 +++--- > + helgrind/tests/Makefile.am | 6 +++--- > + none/tests/arm/Makefile.am | 18 +- > + 3 files changed, 15 insertions(+), 15 deletions(-) > + > +diff --git a/Makefile.all.am b/Makefile.all.am > +index 02059a3..c7c4700 100644 > +--- a/Makefile.all.am > b/Makefile.all.am > +@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g > + > + AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ > + AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ > +- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 > ++ $(AM_CFLAGS_BASE) -marm > + AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ > +- -marm -mcpu=cortex-a8 > $(AM_CFLAGS_PSO_BASE) > ++ -marm $(AM_CFLAGS_PSO_BASE) > + AM_CCASFLAGS_ARM_LINUX= @FLAG_M32@ \ > +- -marm -mcpu=cortex-a8 -g > ++ -marm -g > + > + AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ > + AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) > +diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am > +index df82169..07eb66a 100644
[OE-core] [PATCH V2] valgrind: Fix arm build with gcc7
Add function to remove -mcpu compiler options on arm Signed-off-by: Khem Raj--- ...rop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | 108 + meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 14 ++- 2 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch new file mode 100644 index 000..9f1da7bac68 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch @@ -0,0 +1,108 @@ +From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Apr 2017 10:11:16 -0700 +Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm + architecture + +We can not assume that all arches armv7+ are cortex-a8 only +it fails to build for rpi which is armv7ve based (cortex-a8) cpu +implementation. +Fixes +| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Makefile.all.am| 6 +++--- + helgrind/tests/Makefile.am | 6 +++--- + none/tests/arm/Makefile.am | 18 +- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/Makefile.all.am b/Makefile.all.am +index 02059a3..c7c4700 100644 +--- a/Makefile.all.am b/Makefile.all.am +@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g + + AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ + AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ +- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 ++ $(AM_CFLAGS_BASE) -marm + AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ +- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) ++ -marm $(AM_CFLAGS_PSO_BASE) + AM_CCASFLAGS_ARM_LINUX= @FLAG_M32@ \ +- -marm -mcpu=cortex-a8 -g ++ -marm -g + + AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ + AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +index df82169..07eb66a 100644 +--- a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN + endif + + if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX +-annotate_hbefore_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8 +-tc07_hbl1_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 +-tc08_hbl2_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 ++annotate_hbefore_CFLAGS = $(AM_CFLAGS) ++tc07_hbl1_CFLAGS= $(AM_CFLAGS) ++tc08_hbl2_CFLAGS= $(AM_CFLAGS) + else + annotate_hbefore_CFLAGS = $(AM_CFLAGS) + tc07_hbl1_CFLAGS= $(AM_CFLAGS) +diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am +index 024eb6d..ccecb90 100644 +--- a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am +@@ -52,10 +52,10 @@ allexec_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@ + # need special helping w.r.t -mfpu and -mfloat-abi, though. + # Also force -O0 since -O takes hundreds of MB of memory + # for v6intThumb.c. +-v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -marm +-v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb ++v6intARM_CFLAGS = $(AM_CFLAGS) -g -O0 -marm ++v6intThumb_CFLAGS = $(AM_CFLAGS) -g -O0 -mthumb + +-v6media_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 -mthumb ++v6media_CFLAGS= $(AM_CFLAGS) -g -O0 -mthumb + + v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm + v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb +@@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \ + v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \ + -march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb + +-vfp_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++vfp_CFLAGS= $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + + +-neon128_CFLAGS= $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++neon128_CFLAGS= $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + +-neon64_CFLAGS = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \ ++neon64_CFLAGS = $(AM_CFLAGS) -g -O0 \ + -mfpu=neon \ + -mthumb + + intdiv_CFLAGS = $(AM_CFLAGS) -g -march=armv7ve -mcpu=cortex-a15 -mthumb +-ldrt_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mthumb +-ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -marm ++ldrt_CFLAGS = $(AM_CFLAGS) -g -mthumb ++ldrt_arm_CFLAGS = $(AM_CFLAGS) -g -marm
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 11:55 AM, akuster808wrote: > > > On 04/21/2017 01:36 AM, Martin Jansa wrote: > > Anyone else seeing this as well? > > > yes > If you see it, can you take a look at the linux source dir and see if the directories are present ? I've been doing a tight loop on builds all day, and haven't seen this yet. Nothing has changed with the build process in months, so something else underneath is now causing this race/issue. Bruce > > - armin > > I've updated to oe-core commit: > > c6cd5865b6914521a841ae0c9f4e2bcda99beff2 > > from some revision maybe 20-40 commits older and now I'm seeing: > > ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 > do_validate_branches: Function failed: do_validate_branches (log file is > located at > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) > ERROR: Logfile of failure stored in: > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 > Log data follows: > | DEBUG: Executing shell function do_validate_branches > | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base > | mkdir: cannot create directory ‘.’: File exists > | > | [ERROR] Can't find patch dir at ./patches/standard/base > | usage: kgit s2q > | WARNING: exit code 1 from a shell command. > | ERROR: Function failed: do_validate_branches (log file is located at > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) > NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task > do_validate_branches: Failed > ERROR: Task > (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) > failed with exit code '1' > > > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3 2/8] bluez5: remove libasound-module references
Noted. Thanks for the input. Marc On Fri, Apr 21, 2017 at 11:33 AM, Burton, Rosswrote: > > On 18 April 2017 at 14:20, Marc Ferland wrote: > >> -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex >> ${PN}-noinst-tools" >> +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" >> > > packagegroup-base still refers to this package though: > > - nothing provides libasound-module-bluez needed by > packagegroup-base-bluetooth-1.0-r83.0.qemux86_64 > > Ross > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 2/2] tcf-agent: enable default target debugging features
On 20 April 2017 at 20:08, Gernot Hillierwrote: > A number of features were disabled in OE due to historic problems > on ARM. In tcf-agent 1.4, they compile cleanly on all architectures > besides mips. These features are required for target debugging with > Eclipse Neon, CDT and TCF plugins - for example used by Xilinx Vivado > SDK 2016.4. > Would this be responsible for this failure under musl on the autobuilder: system/GNU/Linux/tcf/context-linux.c:490:10: error: variable 'cmd' has initializer but incomplete type enum __ptrace_request cmd = PTRACE_SINGLESTEP; ^~~~ Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] valgrind: Fix arm build with gcc7
On Thu, Apr 20, 2017 at 6:29 PM, Andre McCurdywrote: > On Thu, Apr 20, 2017 at 6:06 PM, Khem Raj wrote: >> On Thu, Apr 20, 2017 at 5:56 PM, Andre McCurdy wrote: >>> On Thu, Apr 20, 2017 at 11:20 AM, Khem Raj wrote: Signed-off-by: Khem Raj --- ...rop-setting-mcpu-to-cortex-a8-on-arm-arch.patch | 108 + meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 3 +- 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch new file mode 100644 index 000..9f1da7bac68 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch @@ -0,0 +1,108 @@ +From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Apr 2017 10:11:16 -0700 +Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm + architecture + +We can not assume that all arches armv7+ are cortex-a8 only +it fails to build for rpi which is armv7ve based (cortex-a8) cpu +implementation. +Fixes +| cc1: warning: switch -mcpu=cortex-a8 conflicts with -march=armv7ve switch >>> >>> The valgrind tests are built for fixed CPU targets which are known to >>> support the instructions being tested (since those instructions may >>> not be supported by the target CPU which valgrind itself is being >>> built for). >>> >>> It may be safer to add -march=armv7a to the -mcpu=cortex-a8 tests (and >>> ensure that -march=armv7ve doesn't leak through) rather than remove >>> -mcpu=cortex-a8. >> >> OE always passes mcpu flags, therefore it wont be an issue unless you >> are saying thats not the case. > > OE won't pass an -mcpu flag for generic DEFAULTTUNE values such as > "armv7athf". > >> For upstreaming it might be OK, but I >> think this will need a different for upstreaming since it should >> configure mcpu/march based on some configure input or some such >> instead of hardcoding it. > > For the ../tests/... Makefiles, the mcpu/march flags should absolutely > be hardcoded. e.g. the test for "idiv" should always be built in > exactly the same way, regardless of whether or not the target arch you > configure and build valgrind itself for is armv7ve. > what is the purpose of compiling such a test case for a machine where it will cause SIGILL ? >>> >>> See the comments in: >>> >>> >>> http://git.openembedded.org/openembedded-core/commit/?id=3e94af90d90f6db6bab66ae87a47b31f3a0474f6 >>> >>> The change to the toplevel Makefile.all.am looks OK. >>> +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + Makefile.all.am| 6 +++--- + helgrind/tests/Makefile.am | 6 +++--- + none/tests/arm/Makefile.am | 18 +- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/Makefile.all.am b/Makefile.all.am +index 02059a3..c7c4700 100644 +--- a/Makefile.all.am b/Makefile.all.am +@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g + + AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ + AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ +- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 ++ $(AM_CFLAGS_BASE) -marm + AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ +- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE) ++ -marm $(AM_CFLAGS_PSO_BASE) + AM_CCASFLAGS_ARM_LINUX= @FLAG_M32@ \ +- -marm -mcpu=cortex-a8 -g ++ -marm -g + + AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ + AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) +diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +index df82169..07eb66a 100644 +--- a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am +@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN + endif + + if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX +-annotate_hbefore_CFLAGS = $(AM_CFLAGS) -mcpu=cortex-a8 +-tc07_hbl1_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 +-tc08_hbl2_CFLAGS= $(AM_CFLAGS) -mcpu=cortex-a8 ++annotate_hbefore_CFLAGS = $(AM_CFLAGS) ++tc07_hbl1_CFLAGS= $(AM_CFLAGS) ++tc08_hbl2_CFLAGS= $(AM_CFLAGS) +
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On 04/21/2017 01:36 AM, Martin Jansa wrote: Anyone else seeing this as well? yes - armin I've updated to oe-core commit: c6cd5865b6914521a841ae0c9f4e2bcda99beff2 from some revision maybe 20-40 commits older and now I'm seeing: ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_validate_branches: Function failed: do_validate_branches (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) ERROR: Logfile of failure stored in: linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 Log data follows: | DEBUG: Executing shell function do_validate_branches | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base | mkdir: cannot create directory ‘.’: File exists | | [ERROR] Can't find patch dir at ./patches/standard/base | usage: kgit s2q | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_validate_branches (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task do_validate_branches: Failed ERROR: Task (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) failed with exit code '1' -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3 2/8] bluez5: remove libasound-module references
On 18 April 2017 at 14:20, Marc Ferlandwrote: > -PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex > ${PN}-noinst-tools" > +PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" > packagegroup-base still refers to this package though: - nothing provides libasound-module-bluez needed by packagegroup-base-bluetooth-1.0-r83.0.qemux86_64 Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] webkitgtk: Upgrade to 2.16.1
On Fri, Apr 21, 2017 at 7:51 AM, Burton, Rosswrote: > > On 21 April 2017 at 06:55, Khem Raj wrote: >> >> Drop patches that were backports or have been upstreamed > > > This doesn't apply to master, can you recheck? > yeah I had forgotten to squash a prior patch. Resent a v2 now > Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] webkitgtk: Upgrade to 2.16.1
Fix build with gcc7 Move all patches to webkit folder Drop patches that were backports or have been upstreamed Signed-off-by: Khem Raj--- ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 185 - .../recipes-sato/webkit/files/detect_atomics.patch | 38 - ...Introspection.cmake-prefix-variables-obta.patch | 0 ...ix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 0 ...cmake-drop-the-hardcoded-introspection-gt.patch | 0 ...c-settings-so-that-gtkdoc-generation-work.patch | 0 ...ng-introspection-files-add-CMAKE_C_FLAGS-.patch | 0 .../{files => webkitgtk}/cross-compile.patch | 0 meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 +++ .../webkit/{files => webkitgtk}/musl-fixes.patch | 0 .../webkit/{files => webkitgtk}/ppc-musl-fix.patch | 0 .../webkit/webkitgtk/x32_support.patch | 13 +- .../{webkitgtk_2.14.5.bb => webkitgtk_2.16.1.bb} | 8 +- 13 files changed, 32 insertions(+), 235 deletions(-) delete mode 100644 meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch delete mode 100644 meta/recipes-sato/webkit/files/detect_atomics.patch rename meta/recipes-sato/webkit/{files => webkitgtk}/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/cross-compile.patch (100%) create mode 100644 meta/recipes-sato/webkit/webkitgtk/gcc7.patch rename meta/recipes-sato/webkit/{files => webkitgtk}/musl-fixes.patch (100%) rename meta/recipes-sato/webkit/{files => webkitgtk}/ppc-musl-fix.patch (100%) rename meta/recipes-sato/webkit/{webkitgtk_2.14.5.bb => webkitgtk_2.16.1.bb} (95%) diff --git a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch deleted file mode 100644 index a4face2765b..000 --- a/meta/recipes-sato/webkit/files/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 20ee11dd188e1538f8cdd17a289dc6f9c63a011e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 17 Apr 2016 12:35:41 -0700 -Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem - -gcc-6 has now introduced stdlib.h in libstdc++ for better -compliance and its including the C library stdlib.h using -include_next which is sensitive to order of system header -include paths. Its infact better to not tinker with the -system header include paths at all. Since adding /usr/include -to -system is redundant and compiler knows about it moreover -now with gcc6 it interferes with compiler's functioning -and ends up with compile errors e.g. - -/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - -This is also an issue with clang (when using libstdc++ >= 6) - -Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=161697 - -Signed-off-by: Khem Raj -Upstream-Status: Pending - Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- - Source/WebCore/PlatformGTK.cmake | 6 +++--- - Source/WebKit2/PlatformGTK.cmake | 2 +- - Source/cmake/WebKitMacros.cmake| 2 +- - Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt | 2 +- - Tools/ImageDiff/CMakeLists.txt | 2 +- - Tools/MiniBrowser/gtk/CMakeLists.txt | 2 +- - Tools/TestWebKitAPI/PlatformGTK.cmake | 2 +- - Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt| 2 +- - Tools/WebKitTestRunner/CMakeLists.txt | 2 +- - 10 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt -index 155c797..80fe22b 100644 a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -20,7 +20,7 @@ WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() - - WEBKIT_WRAP_SOURCELIST(${JSC_SOURCES}) - include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES}) --include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) -+include_directories(${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}) - add_executable(jsc ${JSC_SOURCES}) - target_link_libraries(jsc ${JSC_LIBRARIES}) - -diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake -index 567bd79..1fabea8 100644
Re: [OE-core] [PATCH] webkitgtk: Upgrade to 2.16.1
On 21 April 2017 at 06:55, Khem Rajwrote: > Drop patches that were backports or have been upstreamed > This doesn't apply to master, can you recheck? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 9:44 AM, Martin Jansawrote: > On Fri, Apr 21, 2017 at 08:39:33AM -0400, Bruce Ashfield wrote: > > On Fri, Apr 21, 2017 at 8:36 AM, Alexander Kanavin < > > alexander.kana...@linux.intel.com> wrote: > > > > > On 04/21/2017 03:26 PM, Bruce Ashfield wrote: > > > > > > Anyone else seeing this as well? > > >> > > >> > > >> > > >> Richard saw this once last week, and we weren't able to reproduce it. > > >> I've just updated > > >> and am doing builds now. > > >> > > >> If anyone has info on their config, build steps, etc, I'm interested > to > > >> hear so I can figure > > >> out what is going on. > > >> > > > > > > I saw this once as well today. I nuked tmp/ and it was gone. > > > > > > > Interesting. I'm updating my existing build (I only ever have one that I > > constantly update and re-use), so maybe it'll show up in that existing > tmp > > dir. > > > > If there's a clean/rebuild cycle that was in play, let me know as well, > > since I'll try that as well. > > > > I've been carrying a config like Richard was using since last week and > > in all my builds it has never happened. > > I've seen it 4 times already in various builds executed today and > yesterday. All of them were incremental. > > Last failure was a bit different and failed in do_patch already (maybe > some race-condition between do_patch and do_validate_branches? > Could be. I've got my kernel builds running in a loop now. Maybe my builder is too slow to expose it .. but it can't hide from me forever. I'll start looking into the code while I wait for my build to explode. Cheers, Bruce > > ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: > Could not apply patches for qemux86. > ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: > Patch failures can be resolved in the linux source directory > work-shared/qemux86/kernel-source) > ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: > Function failed: do_patch (log file is located at linux-yocto/1_4.10.9+ > gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_patch.25077) > ERROR: Logfile of failure stored in: linux-yocto/1_4.10.9+ > gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_patch.25077 > Log data follows: > | DEBUG: Executing python function extend_recipe_sysroot > | NOTE: Direct dependencies are ['meta/recipes-devtools/quilt/ > quilt-native_0.65.bb:do_populate_sysroot', 'meta/recipes-kernel/kern- > tools/kern-tools-native_git.bb:do_populate_sysroot'] > | NOTE: Considering setscene task: ['icecc-create-env-native', > 'do_populate_sysroot'] > | considering dependency: ['quilt-native', 'do_populate_sysroot'] > | Adding dependency on icecc-create-env-native > | NOTE: quilt-native exists in sysroot, skipping > | NOTE: kern-tools-native exists in sysroot, skipping > | NOTE: icecc-create-env-native exists in sysroot, skipping > | DEBUG: Python function extend_recipe_sysroot finished > | DEBUG: Executing shell function do_patch > | ERROR: Could not apply patches for qemux86. > | ERROR: Patch failures can be resolved in the linux source directory > work-shared/qemux86/kernel-source) > | > | [ERROR] Can't find patch dir at .kernel-meta/ > | usage: kgit s2q > | WARNING: exit code 1 from a shell command. > | ERROR: Function failed: do_patch (log file is located at > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_ > patch.25077) > NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: > task do_patch: Failed > ERROR: Task (meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_patch) > failed with exit code '1' > > > > > Bruce > > > > > > > > > > Alex > > > > > > > > > -- > > > ___ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > > > > > > -- > > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > > at its end" > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 08:39:33AM -0400, Bruce Ashfield wrote: > On Fri, Apr 21, 2017 at 8:36 AM, Alexander Kanavin < > alexander.kana...@linux.intel.com> wrote: > > > On 04/21/2017 03:26 PM, Bruce Ashfield wrote: > > > > Anyone else seeing this as well? > >> > >> > >> > >> Richard saw this once last week, and we weren't able to reproduce it. > >> I've just updated > >> and am doing builds now. > >> > >> If anyone has info on their config, build steps, etc, I'm interested to > >> hear so I can figure > >> out what is going on. > >> > > > > I saw this once as well today. I nuked tmp/ and it was gone. > > > > Interesting. I'm updating my existing build (I only ever have one that I > constantly update and re-use), so maybe it'll show up in that existing tmp > dir. > > If there's a clean/rebuild cycle that was in play, let me know as well, > since I'll try that as well. > > I've been carrying a config like Richard was using since last week and > in all my builds it has never happened. I've seen it 4 times already in various builds executed today and yesterday. All of them were incremental. Last failure was a bit different and failed in do_patch already (maybe some race-condition between do_patch and do_validate_branches? ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: Could not apply patches for qemux86. ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: Patch failures can be resolved in the linux source directory work-shared/qemux86/kernel-source) ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_patch: Function failed: do_patch (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_patch.25077) ERROR: Logfile of failure stored in: linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_patch.25077 Log data follows: | DEBUG: Executing python function extend_recipe_sysroot | NOTE: Direct dependencies are ['meta/recipes-devtools/quilt/quilt-native_0.65.bb:do_populate_sysroot', 'meta/recipes-kernel/kern-tools/kern-tools-native_git.bb:do_populate_sysroot'] | NOTE: Considering setscene task: ['icecc-create-env-native', 'do_populate_sysroot'] | considering dependency: ['quilt-native', 'do_populate_sysroot'] | Adding dependency on icecc-create-env-native | NOTE: quilt-native exists in sysroot, skipping | NOTE: kern-tools-native exists in sysroot, skipping | NOTE: icecc-create-env-native exists in sysroot, skipping | DEBUG: Python function extend_recipe_sysroot finished | DEBUG: Executing shell function do_patch | ERROR: Could not apply patches for qemux86. | ERROR: Patch failures can be resolved in the linux source directory work-shared/qemux86/kernel-source) | | [ERROR] Can't find patch dir at .kernel-meta/ | usage: kgit s2q | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_patch (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_patch.25077) NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task do_patch: Failed ERROR: Task (meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_patch) failed with exit code '1' > > Bruce > > > > > > Alex > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end" > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [Openembedded-architecture] [RFC] Handling configuration files
On 4/21/17 5:49 AM, David Vincent wrote: > Following this thread on OE-Core > (http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135812.html), > the subject of handling configuration files for a machine just got > back. It seems there already was a discussion around it but I couldn't > find it. I know that 2.3 has now hit 'feature-freeze' status but I try > to gather some ideas for maybe an implementation in 2.4. > > Simply put, the problem is this: > I want to > - Override a configuration file in a package > - Make the configuration machine-specific > - Upgrade the configuration during package upgrade without human interaction > > For now, one way to do this is to append the recipe and to replace the > PACKAGE_ARCH with MACHINE_ARCH. The downside of this approach is that > a package is created for each machine on package repositories where > only the configuration is modified. > > Another way is to modify the file in ROOTFS_POSTPROCESS_COMMAND. The > downside is that depending on the packager, it would either not > survive the package upgrade or not be upgradable. Update is potentially an issue.. but not surviving a package upgrade means we've got a recipe/package manager bug to deal with. If the configuration items are properly specified, then a package upgrade should NOT destroy custom configurations... if it does, I consider this a bug. > The last way would be to use update-alternatives, but IMHO it does > feel weird. Another downside would be the need to modify all recipes > to mark the configurations as alternatives. > > My idea was the following. Maybe we could rely on the CONFFILES > variable to create a -conf package (like -dbg/-dev/-staticdev). If > possible, this package only should be marked as MACHINE_ARCH. This > could happen behind the scenes in package.bbclass. The only problem I > see for now is how to identify that the configuration file has been > overridden in a machine-specific recipe (SRC_URI or other variable ?). > Do you think it is feasible or am I missing something ? I could > proceed to implement that kind of behavior but I would like to know > beforehand if there are other things I should take into account. Unfortunately RPM does not permit generating a single package with multiple architectures. Also if even a piece of the constructed system is MACHINE specific, then usually all of it has to be rebuilt from source -- which would overwrite previous versions in the feeds. I agree the update-alternatives feels 'strange', because it effectively preserves the original and provides the 'custom' at the same time.. but functionally it will work fine. The other option is to go through the system and construct new 'conf' packages (to be used as dependencies for the runtime) for packages that typically get configured I'd almost suggest that a hybrid approach to this might be appropriate. Use the update-alternatives method for items that are not commonly modified in deployment... then use a "new" conf recipe for each item that is typically modified. (I'm worried this will add additional overhead to recipe upgrades and such, so I'm not convinced a conf recipe is actually a sustainable idea here.) --Mark > Thanks, > David > ___ > Openembedded-architecture mailing list > openembedded-architect...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-architecture > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: fix race condition with systemd-udev
On Fri, 2017-04-21 at 13:37 +0200, Andreas Oberritter wrote: > On Fri, 21 Apr 2017 11:25:34 +0300 > Dmitry Rozhkovwrote: > > > When a new USB network interface is plugged in systemd > > fails to rename the new interface (ethX) to a predictable > > name [1] because connman locks it first. > > > > The proposed solution is to blacklist unpredictable names > > in connman in case systemd is used as an init system. > > Also add a fix to connman that makes it to re-evaluate > > a known but blacklisted ethernet interface for enabling > > after it has got renamed. > > Doesn't this break networking for everybody not using these > "predictable" names? Right, it does if systemd is configured not to use them. Though the systemd recipe doesn't have such configuration option. Also it might break if net.ifnames=0 is put in the kernel cmdline. BR, Dmitry -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert "kernel: Fix symlinks"
On Fri, 21 Apr 2017 14:37:36 +0200 David Vincentwrote: > On 2017-04-21 13:30 GMT+02:00 Andreas Oberritter : > > On Fri, 21 Apr 2017 13:02:51 +0200 > > Andrea Adami wrote: > > > >> On Fri, Apr 21, 2017 at 12:39 PM, Andreas Oberritter > >> wrote: > >> > This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. > >> > > >> > It broke dpkg's update-alternatives, which requires absolute paths. > >> > >> This is really uncommon. > > > > Actually it's not. Try it on any Debian or Ubuntu system. > > > >> I had already expressed my negative opinion about absolute paths for > >> kernel [1]. > >> Personally, I had to patch the bootloader (kexecboot). > > Same here, that's why I submitted it in the first place. Didn't > thought that would break dpkg... > > >> > >> So please try some workaround instead of changing it back. > > > > Well, there's no workaround. Other than opkg's update-alternatives, dpkg's > > maintains > > an alternatives database in /etc/alternatives, so the symlink is going to > > point to > > an absolute path outside of /boot anyway. > > The problem is that, for bootloaders, it is not always possible to > mount the rootfs. So, it must only rely on information in the boot > partition that can be mounted anywhere. I understand the problem the patch tried to address. Those bootloaders don't find the kernel by chance. The name of the image is usually set in the environment. You can update the environment in postinst- scripts or just change the name of the kernel image to match the bootloader's expectations, just to name some alternatives. > > > > To fix your problem, kernel.bbclass should be changed to not use > > update-alternatives > > at all. But it's definitely wrong to break the original u-a by using > > invalid command- > > line arguments. > > > > And reverting this patch breaks boot for those who rely on a relative > symlink ; that is also wrong. Yes. However, I'd argue that a regression is worse than a problem that persisted for years. Regards, Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/11] oe-selftest: add a test for upstream version check regressions
The test runs an upstream version check, and then compares the list of recipes that failed the check (i.e. those where latest upstream version could not be established) against the list of known-broken upstreams. Mismatches either way (upstream check failed, recipe not in the exception list, or upstream check worked, recipe in exception list) fail the test. [YOCTO #11031] Signed-off-by: Alexander Kanavin--- meta-selftest/files/distrodata/checkpkg_exceptions | 27 ++ meta/lib/oeqa/selftest/distrodata.py | 41 ++ 2 files changed, 68 insertions(+) create mode 100644 meta-selftest/files/distrodata/checkpkg_exceptions create mode 100644 meta/lib/oeqa/selftest/distrodata.py diff --git a/meta-selftest/files/distrodata/checkpkg_exceptions b/meta-selftest/files/distrodata/checkpkg_exceptions new file mode 100644 index 000..f89f4d0bdf9 --- /dev/null +++ b/meta-selftest/files/distrodata/checkpkg_exceptions @@ -0,0 +1,27 @@ +build-compare +calibrateproto +dbus-wait +distcc +fstests +gnu-config +gst-player +libfakekey +libxcalibrate +linux-firmware +lsb +mailx +mmc-utils +ovmf +piglit +psplash +puzzles +rpm +squashfs-tools +tcf-agent +unzip +update-rc.d +x264 +xcursor-transparent-theme +xinetd +xvideo-tests +zip diff --git a/meta/lib/oeqa/selftest/distrodata.py b/meta/lib/oeqa/selftest/distrodata.py new file mode 100644 index 000..036560e23d3 --- /dev/null +++ b/meta/lib/oeqa/selftest/distrodata.py @@ -0,0 +1,41 @@ +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars +from oeqa.utils.decorators import testcase +from oeqa.utils.ftools import write_file + +class Distrodata(oeSelfTest): + +@classmethod +def setUpClass(cls): +pass + +def test_checkpkg(self): +""" +Summary: Test that upstream version checks do not regress +Expected:Upstream version checks should succeed except for the recipes listed in the exception list. +Product: oe-core +Author: Alexander Kanavin +""" +feature = 'INHERIT += "distrodata"\n' + +self.write_config(feature) +bitbake('-c checkpkg world') +checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:] +exceptions = [exc.strip() for exc in open(os.path.join(self.testlayer_path, 'files', 'distrodata', "checkpkg_exceptions")).readlines()] +failed_upstream_checks = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == ''] +regressed_failures = set(failed_upstream_checks) - set(exceptions) +regressed_successes = set(exceptions) - set(failed_upstream_checks) +msg = "" +if len(regressed_failures) > 0: +msg = msg + """ +The following packages failed upstream version checks. Please fix them using UPSTREAM_CHECK_URI/UPSTREAM_CHECK_REGEX +(when using tarballs) or UPSTREAM_CHECK_GITTAGREGEX (when using git). If an upstream version check cannot be performed +(for example, if upstream does not use git tags), you can add the package to list of exceptions in +meta-selftest/files/distrodata/checkpkg_exceptions. +""" + "\n".join(regressed_failures) +if len(regressed_successes) > 0: +msg = msg + """ +The following packages have been checked successfully for upstream versions (or they no longer exist in oe-core), +but are in the exceptions list in meta-selftest/files/distrodata/checkpkg_exceptions. Please remove them from that list. +""" + "\n".join(regressed_successes) +self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/11] python3-iniparse: fix upstream version check
Signed-off-by: Alexander Kanavin--- meta/recipes-devtools/python/python3-iniparse_0.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/python/python3-iniparse_0.4.bb b/meta/recipes-devtools/python/python3-iniparse_0.4.bb index 44e3c37f850..f51ce647c9b 100644 --- a/meta/recipes-devtools/python/python3-iniparse_0.4.bb +++ b/meta/recipes-devtools/python/python3-iniparse_0.4.bb @@ -8,6 +8,7 @@ SRC_URI = "https://files.pythonhosted.org/packages/source/i/iniparse/iniparse-${ file://0001-Add-python-3-compatibility.patch " SRC_URI[md5sum] = "5e573e9e9733d97623881ce9bbe5eca6" SRC_URI[sha256sum] = "abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/iniparse/; inherit distutils3 -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/11] libunwind: update to 1.2
Switch to using tarballs as git is unreliable (not responding right now). LICENSE file is gone; COPYING has an additional line on top with copyright attribution, the license text that follows has not changed. Signed-off-by: Alexander Kanavin--- meta/recipes-support/libunwind/libunwind.inc | 2 +- .../libunwind/{libunwind_git.bb => libunwind_1.2.bb} | 9 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) rename meta/recipes-support/libunwind/{libunwind_git.bb => libunwind_1.2.bb} (81%) diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index e4ae8df278f..4f64ad7f875 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -2,7 +2,7 @@ SUMMARY = "Library for obtaining the call-chain of a program" DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" HOMEPAGE = "http://www.nongnu.org/libunwind; LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" +LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" DEPENDS += "libatomic-ops" inherit autotools diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb similarity index 81% rename from meta/recipes-support/libunwind/libunwind_git.bb rename to meta/recipes-support/libunwind/libunwind_1.2.bb index b637c5c4482..a398d332e2c 100644 --- a/meta/recipes-support/libunwind/libunwind_git.bb +++ b/meta/recipes-support/libunwind/libunwind_1.2.bb @@ -1,10 +1,9 @@ require libunwind.inc -PV = "1.1+git${SRCPV}" +SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f" +SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992" -SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" - -SRC_URI = "git://git.sv.gnu.org/libunwind.git \ +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ file://0001-x86-Stub-out-x86_local_resume.patch \ @@ -25,6 +24,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" SECURITY_CFLAGS_remove_aarch64 = "-fpie" SECURITY_CFLAGS_append_aarch64 = " -fPIE" -S = "${WORKDIR}/git" - LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/11] python3-pygpgme: remove the recipe
It was required only by dnf, which has switched to official gpgme bindings. pygpgme itself is old and unmaintaned. Signed-off-by: Alexander Kanavin--- meta/recipes-devtools/python/python3-pygpgme_0.3.bb | 18 -- 1 file changed, 18 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-pygpgme_0.3.bb diff --git a/meta/recipes-devtools/python/python3-pygpgme_0.3.bb b/meta/recipes-devtools/python/python3-pygpgme_0.3.bb deleted file mode 100644 index 495f677cfa2..000 --- a/meta/recipes-devtools/python/python3-pygpgme_0.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A Python module for working with OpenPGP messages" -HOMEPAGE = "https://launchpad.net/pygpgme; -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://README;md5=2dc15a76acf01e126188c8de634ae4b3" - -SRC_URI = "https://launchpad.net/pygpgme/trunk/${PV}/+download/pygpgme-${PV}.tar.gz; -SRC_URI[md5sum] = "d38355af73f0352cde3d410b25f34fd0" -SRC_URI[sha256sum] = "5fd887c407015296a8fd3f4b867fe0fcca3179de97ccde90449853a3dfb802e1" - -S = "${WORKDIR}/pygpgme-${PV}" - -inherit distutils3 - -DEPENDS = "gpgme python3" - -RDEPENDS_${PN} += "python3-core" - -BBCLASSEXTEND = "native nativesdk" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/11] acpica: fix upstream version check
Signed-off-by: Alexander Kanavin--- meta/recipes-extended/acpica/acpica_20150515.bb| 1 + meta/recipes-extended/acpica/acpitests_20140828.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-extended/acpica/acpica_20150515.bb b/meta/recipes-extended/acpica/acpica_20150515.bb index b55f353241d..1326ebd59ec 100644 --- a/meta/recipes-extended/acpica/acpica_20150515.bb +++ b/meta/recipes-extended/acpica/acpica_20150515.bb @@ -23,6 +23,7 @@ SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ " SRC_URI[md5sum] = "2bc4a7ccc82de9df9fa964f784ecb29c" SRC_URI[sha256sum] = "61204ec56d71bc9bfa2ee2ade4c66f7e8541772ac72ef8ccc20b3f339cc96374" +UPSTREAM_CHECK_URI = "https://acpica.org/downloads; S = "${WORKDIR}/acpica-unix2-${PV}" diff --git a/meta/recipes-extended/acpica/acpitests_20140828.bb b/meta/recipes-extended/acpica/acpitests_20140828.bb index 409da5ccc41..45ac157e9a7 100644 --- a/meta/recipes-extended/acpica/acpitests_20140828.bb +++ b/meta/recipes-extended/acpica/acpitests_20140828.bb @@ -15,6 +15,7 @@ SRC_URI[acpitests.md5sum] = "db9d6fdaa8e3eb101d700ee5ba4938ed" SRC_URI[acpitests.sha256sum] = "e576c74bf1bf1c9f7348bf9419e05c8acfece7105abcdc052e66670c7af2cf00" SRC_URI[acpica.md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" SRC_URI[acpica.sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" +UPSTREAM_CHECK_URI = "https://acpica.org/downloads; S = "${WORKDIR}/acpitests-unix-${PV}" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/11] byacc: remove the recipe
It was used only by rpm5 and will be moved to meta-oe Signed-off-by: Alexander Kanavin--- meta/recipes-extended/byacc/byacc.inc | 22 --- .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 161 - meta/recipes-extended/byacc/byacc/byacc-open.patch | 25 meta/recipes-extended/byacc/byacc_20161202.bb | 12 -- .../packagegroup-core-full-cmdline.bb | 1 - 5 files changed, 221 deletions(-) delete mode 100644 meta/recipes-extended/byacc/byacc.inc delete mode 100644 meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch delete mode 100644 meta/recipes-extended/byacc/byacc/byacc-open.patch delete mode 100644 meta/recipes-extended/byacc/byacc_20161202.bb diff --git a/meta/recipes-extended/byacc/byacc.inc b/meta/recipes-extended/byacc/byacc.inc deleted file mode 100644 index adb07193d73..000 --- a/meta/recipes-extended/byacc/byacc.inc +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Berkeley LALR Yacc parser generator" -DESCRIPTION = "A parser generator utility that reads a grammar specification from a file and generates an LR(1) \ -parser for it. The parsers consist of a set of LALR(1) parsing tables and a driver routine written in the C \ -programming language." -SECTION = "devel" -LICENSE = "PD" - -SRC_URI = "ftp://invisible-island.net/byacc/byacc-${PV}.tgz \ - file://byacc-open.patch \ - file://0001-byacc-do-not-reorder-CC-and-CFLAGS.patch" - -EXTRA_OECONF += "--program-transform-name='s,^,b,'" - -BBCLASSEXTEND = "native" - -inherit autotools - -do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} diff --git a/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch deleted file mode 100644 index 7cd2510c8ed..000 --- a/meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ /dev/null @@ -1,161 +0,0 @@ -Subject: byacc: do not reorder $CC and $CFLAGS - -byacc tries to process $CC and decide which part should belong to CC and which -part should below to CFLAGS and then do reordering. It doesn't make much sense -for OE. And it doesn't do its work correctly. Some options are dropped. - -Delete all these stuff so that we could have all options we need. - -Upstream-Status: Inappropriate [OE Specific] - -Signed-off-by: Chen Qi - aclocal.m4 | 1 - - configure | 119 - - 2 files changed, 120 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 917a848..62ef241 100644 a/aclocal.m4 -+++ b/aclocal.m4 -@@ -1021,7 +1021,6 @@ CF_GCC_VERSION - CF_ACVERSION_CHECK(2.52, - [AC_PROG_CC_STDC], - [CF_ANSI_CC_REQD]) --CF_CC_ENV_FLAGS - ])dnl - dnl --- - dnl CF_PROG_GROFF version: 2 updated: 2015/07/04 11:16:27 -diff --git a/configure b/configure -index 9707e50..4f0497c 100755 a/configure -+++ b/configure -@@ -1946,125 +1946,6 @@ esac - # This should have been defined by AC_PROG_CC - : ${CC:=cc} - --echo "$as_me:1949: checking \$CC variable" >&5 --echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 --case "$CC" in --(*[\ \]-*) -- echo "$as_me:1953: result: broken" >&5 --echo "${ECHO_T}broken" >&6 -- { echo "$as_me:1955: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 --echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} -- # humor him... -- cf_flags=`echo "$CC" | sed -e 's/^.*[ ]\(-[^ ]\)/\1/'` -- CC=`echo "$CC " | sed -e 's/[ ]-[^].*$//' -e 's/[ ]*$//'` -- for cf_arg in $cf_flags -- do -- case "x$cf_arg" in -- (x-[IUDfgOW]*) -- --cf_fix_cppflags=no --cf_new_cflags= --cf_new_cppflags= --cf_new_extra_cppflags= -- --for cf_add_cflags in $cf_flags --do --case $cf_fix_cppflags in --(no) -- case $cf_add_cflags in -- (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) -- case $cf_add_cflags in -- (-D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` -- -- test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ -- && test -z "${cf_tst_cflags}" \ -- && cf_fix_cppflags=yes -- -- if test $cf_fix_cppflags = yes ; then -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" -- continue -- elif test "${cf_tst_cflags}" = "\"'" ; then --
[OE-core] [PATCH 06/11] dnf: update to 2.3.0
Drop dependency on pygpgme, replace it with gpgme's own bindings. Add a patch that fixes an upstream regression. Signed-off-by: Alexander Kanavin--- ...er-check-of-releasever-when-using-install.patch | 105 + meta/recipes-devtools/dnf/dnf_git.bb | 9 +- 2 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-devtools/dnf/dnf/0001-Revert-proper-check-of-releasever-when-using-install.patch diff --git a/meta/recipes-devtools/dnf/dnf/0001-Revert-proper-check-of-releasever-when-using-install.patch b/meta/recipes-devtools/dnf/dnf/0001-Revert-proper-check-of-releasever-when-using-install.patch new file mode 100644 index 000..879ecfa30d7 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-Revert-proper-check-of-releasever-when-using-install.patch @@ -0,0 +1,105 @@ +From 8cd0503612573c455f34db74cd1c2216ed25b69c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 12 Apr 2017 15:42:06 +0300 +Subject: [PATCH] Revert "proper check of releasever, when using installroot + (RhBug:1417542)" + +This reverts commit 3ddf684b7c67a2b384aa99dde53d8a43218f2e68, as it's causing +breakage when installing packages into a pristin rootfs. Upstream has been notified: +https://bugzilla.redhat.com/show_bug.cgi?id=1441636 + +Upstream-Status: Inappropriate [pending proper fix] +Signed-off-by: Alex Kanavin +--- + dnf/rpm/__init__.py | 59 + + doc/command_ref.rst | 3 +-- + 2 files changed, 29 insertions(+), 33 deletions(-) + +diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py +index 5976acd6..1d50e6a0 100644 +--- a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py +@@ -30,38 +30,35 @@ def detect_releasever(installroot): + # :api + """Calculate the release version for the system.""" + +-# if installroot is empty dir releasever is None, +-# that's why releasever is checked from '/' +-for root in [installroot, "/"]: +-ts = transaction.initReadOnlyTransaction(root=root) +-ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES | rpm._RPMVSF_NODIGESTS)) +-for distroverpkg in dnf.const.DISTROVERPKG: +-try: +-idx = ts.dbMatch('provides', distroverpkg) +-except (TypeError, rpm.error) as e: +-raise dnf.exceptions.Error('Error: %s' % str(e)) +-if not len(idx): +-continue +-try: +-hdr = next(idx) +-except StopIteration: +-msg = 'Error: rpmdb failed to list provides. Try: rpm --rebuilddb' +-raise dnf.exceptions.Error(msg) +-releasever = hdr['version'] +-try: +-off = hdr[rpm.RPMTAG_PROVIDENAME].index(distroverpkg) +-flag = hdr[rpm.RPMTAG_PROVIDEFLAGS][off] +-ver = hdr[rpm.RPMTAG_PROVIDEVERSION][off] +-if flag == rpm.RPMSENSE_EQUAL and ver: +-if hdr['name'] != distroverpkg: +-# override the package version +-releasever = ver +-except (ValueError, KeyError, IndexError): +-pass ++ts = transaction.initReadOnlyTransaction(root=installroot) ++ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES | rpm._RPMVSF_NODIGESTS)) ++for distroverpkg in dnf.const.DISTROVERPKG: ++try: ++idx = ts.dbMatch('provides', distroverpkg) ++except (TypeError, rpm.error) as e: ++raise dnf.exceptions.Error('Error: %s' % str(e)) ++if not len(idx): ++continue ++try: ++hdr = next(idx) ++except StopIteration: ++msg = 'Error: rpmdb failed to list provides. Try: rpm --rebuilddb' ++raise dnf.exceptions.Error(msg) ++releasever = hdr['version'] ++try: ++off = hdr[rpm.RPMTAG_PROVIDENAME].index(distroverpkg) ++flag = hdr[rpm.RPMTAG_PROVIDEFLAGS][off] ++ver = hdr[rpm.RPMTAG_PROVIDEVERSION][off] ++if flag == rpm.RPMSENSE_EQUAL and ver: ++if hdr['name'] != distroverpkg: ++# override the package version ++releasever = ver ++except (ValueError, KeyError, IndexError): ++pass + +-if is_py3bytes(releasever): +-releasever = str(releasever, "utf-8") +-return releasever ++if is_py3bytes(releasever): ++releasever = str(releasever, "utf-8") ++return releasever + return None + + +diff --git a/doc/command_ref.rst b/doc/command_ref.rst +index 77e885ab..3dd451b5 100644 +--- a/doc/command_ref.rst b/doc/command_ref.rst +@@ -205,8 +205,7 @@ Options + Note: You may also want to use the command-line option + ``--releasever=`` when creating the installroot otherwise the + *$releasever* value
[OE-core] [PATCH 05/11] libdnf: update to 0.8.1
Rebase the patches. Signed-off-by: Alexander Kanavin--- ...parameters-for-both-libsolv-and-libsolvext-libdn.patch | 13 +++-- ...libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 15 --- meta/recipes-devtools/libdnf/libdnf_git.bb| 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index 954add6e738..77b20c2734d 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch @@ -1,28 +1,29 @@ -From 5958b151a4dbb89114e90c971a34b74f873b7beb Mon Sep 17 00:00:00 2001 +From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Feb 2017 12:16:03 +0200 -Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is +Subject: [PATCH 5/5] Get parameters for both libsolv and libsolvext (libdnf is using both) Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted] Signed-off-by: Alexander Kanavin + --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b531da1..e512da0 100644 +index 8b2ab9a..e2d33d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ find_package (PkgConfig REQUIRED) +@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED) SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - pkg_check_modules (CHECK REQUIRED check) - pkg_check_modules (REPO REQUIRED librepo) + if (ENABLE_RHSM_SUPPORT) + pkg_check_modules (RHSM REQUIRED librhsm) -- 2.11.0 diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 931959b5f38..fc3b048b7d9 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch @@ -1,29 +1,30 @@ -From 6d2718b925453f9a6915001f489606eb8e4086c8 Mon Sep 17 00:00:00 2001 +From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:24:50 +0200 -Subject: [PATCH 4/4] Set libsolv variables with pkg-config (cmake's own module +Subject: [PATCH 4/5] Set libsolv variables with pkg-config (cmake's own module doesn't work properly). Upstream-Status: Pending Signed-off-by: Alexander Kanavin + --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8edb627..b531da1 100644 +index a75df04..8b2ab9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,8 @@ find_package (PkgConfig REQUIRED) +@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - pkg_check_modules (CHECK REQUIRED check) - pkg_check_modules (REPO REQUIRED librepo) - FIND_PROGRAM (VALGRIND_PROGRAM NAMES valgrind PATH /usr/bin /usr/local/bin) + if (ENABLE_RHSM_SUPPORT) + pkg_check_modules (RHSM REQUIRED librhsm) + include_directories (${RHSM_INCLUDE_DIRS}) -- 2.11.0 diff --git a/meta/recipes-devtools/libdnf/libdnf_git.bb b/meta/recipes-devtools/libdnf/libdnf_git.bb index ef28611f8a0..2acbd89659a 100644 --- a/meta/recipes-devtools/libdnf/libdnf_git.bb +++ b/meta/recipes-devtools/libdnf/libdnf_git.bb @@ -10,8 +10,8 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ " -PV = "0.2.3+git${SRCPV}" -SRCREV = "367545629cc01a8e622890d89bd13d062ce60d7b" +PV = "0.8.1" +SRCREV = "233287f4f80e24a917d5f6a26967f54080ffa255" S = "${WORKDIR}/git" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/11] libsolv: switch on ENABLE_COMPLEX_DEPS
This is required by recent versions of libdnf. Signed-off-by: Alexander Kanavin--- meta/recipes-extended/libsolv/libsolv_0.6.26.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.26.bb b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb index 42d63aeb136..a33c251ce14 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.26.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.6.26.bb @@ -20,7 +20,7 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON" +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" PACKAGES =+ "${PN}-tools ${PN}ext" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/11] libxml2: move python module to Python 3
Signed-off-by: Alexander Kanavin--- meta/recipes-core/libxml/libxml2_2.9.4.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb index 0c3d6836231..31cca487fc9 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.4.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -35,16 +35,16 @@ BINCONFIG = "${bindir}/xml2-config" PACKAGECONFIG ??= "python \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " -PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig binconfig-disabled ptest -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'pythonnative', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} -RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}" +RDEPENDS_${PN}-ptest += "make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" -RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python-core', '', d)}" +RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/11] Various updates for 2.4
Here are various updates that should be go into 2.4 branch: 1) remove a few unneeded recipes 2) update dnf/libdnf to latest upstream versions, which enables package feed signing 3) move libxml2 to Python 3 4) add an automated test for upstream version checks regressions, as I don't really want to keep fixing them by hand for other people. If you break it, autobuilder will complain. The following changes since commit 7a0e795373653886452a7a2992ced10080711c26: build-appliance-image: Update to master head revision (2017-04-21 08:22:18 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akanavin/package-version-updates http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/package-version-updates Alexander Kanavin (11): libiconv: remove recipe byacc: remove the recipe libxml2: move python module to Python 3 libsolv: switch on ENABLE_COMPLEX_DEPS libdnf: update to 0.8.1 dnf: update to 2.3.0 python3-pygpgme: remove the recipe libunwind: update to 1.2 acpica: fix upstream version check python3-iniparse: fix upstream version check oe-selftest: add a test for upstream version check regressions meta-selftest/files/distrodata/checkpkg_exceptions | 27 + meta/lib/oeqa/selftest/distrodata.py | 41 + meta/recipes-core/libxml/libxml2_2.9.4.bb |8 +- ...er-check-of-releasever-when-using-install.patch | 105 + meta/recipes-devtools/dnf/dnf_git.bb |9 +- ...ers-for-both-libsolv-and-libsolvext-libdn.patch | 13 +- ...-variables-with-pkg-config-cmake-s-own-mo.patch | 15 +- meta/recipes-devtools/libdnf/libdnf_git.bb |4 +- .../python/python3-iniparse_0.4.bb |1 + .../recipes-devtools/python/python3-pygpgme_0.3.bb | 18 - meta/recipes-extended/acpica/acpica_20150515.bb|1 + meta/recipes-extended/acpica/acpitests_20140828.bb |1 + meta/recipes-extended/byacc/byacc.inc | 22 - .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 161 - meta/recipes-extended/byacc/byacc/byacc-open.patch | 25 - meta/recipes-extended/byacc/byacc_20161202.bb | 12 - meta/recipes-extended/libsolv/libsolv_0.6.26.bb|2 +- .../packagegroup-core-full-cmdline.bb |1 - .../libiconv-1.14/add-relocatable-module.patch | 5008 .../libiconv/libiconv-1.14/autoconf.patch | 50 - meta/recipes-support/libiconv/libiconv_1.14.bb | 51 - meta/recipes-support/libunwind/libunwind.inc |2 +- .../{libunwind_git.bb => libunwind_1.2.bb} |9 +- 23 files changed, 207 insertions(+), 5379 deletions(-) create mode 100644 meta-selftest/files/distrodata/checkpkg_exceptions create mode 100644 meta/lib/oeqa/selftest/distrodata.py create mode 100644 meta/recipes-devtools/dnf/dnf/0001-Revert-proper-check-of-releasever-when-using-install.patch delete mode 100644 meta/recipes-devtools/python/python3-pygpgme_0.3.bb delete mode 100644 meta/recipes-extended/byacc/byacc.inc delete mode 100644 meta/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch delete mode 100644 meta/recipes-extended/byacc/byacc/byacc-open.patch delete mode 100644 meta/recipes-extended/byacc/byacc_20161202.bb delete mode 100644 meta/recipes-support/libiconv/libiconv-1.14/add-relocatable-module.patch delete mode 100644 meta/recipes-support/libiconv/libiconv-1.14/autoconf.patch delete mode 100644 meta/recipes-support/libiconv/libiconv_1.14.bb rename meta/recipes-support/libunwind/{libunwind_git.bb => libunwind_1.2.bb} (81%) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 8:36 AM, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > On 04/21/2017 03:26 PM, Bruce Ashfield wrote: > > Anyone else seeing this as well? >> >> >> >> Richard saw this once last week, and we weren't able to reproduce it. >> I've just updated >> and am doing builds now. >> >> If anyone has info on their config, build steps, etc, I'm interested to >> hear so I can figure >> out what is going on. >> > > I saw this once as well today. I nuked tmp/ and it was gone. > Interesting. I'm updating my existing build (I only ever have one that I constantly update and re-use), so maybe it'll show up in that existing tmp dir. If there's a clean/rebuild cycle that was in play, let me know as well, since I'll try that as well. I've been carrying a config like Richard was using since last week and in all my builds it has never happened. Bruce > > Alex > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: upgrade to 7.5p1
On 04/18/2017 01:20 PM, Burton, Ross wrote: Yes, but... people keep doing it despite you and me and everyone else telling them not to. How about someone would stash those updates to a kind of 'master-next-next' branch, and dump them to the list again when the merge window reopens? I can do that, if I would get a clear indication of when that work should start and finish. FWIW I'm collecting patches in ross/mut for when master re-opens. They've been posted to the list so don't need re-posting. That's great, then I can send some things that have piled up now :) Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Revert "kernel: Fix symlinks"
On 2017-04-21 13:30 GMT+02:00 Andreas Oberritter: > On Fri, 21 Apr 2017 13:02:51 +0200 > Andrea Adami wrote: > >> On Fri, Apr 21, 2017 at 12:39 PM, Andreas Oberritter >> wrote: >> > This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. >> > >> > It broke dpkg's update-alternatives, which requires absolute paths. >> >> This is really uncommon. > > Actually it's not. Try it on any Debian or Ubuntu system. > >> I had already expressed my negative opinion about absolute paths for kernel >> [1]. >> Personally, I had to patch the bootloader (kexecboot). Same here, that's why I submitted it in the first place. Didn't thought that would break dpkg... >> >> So please try some workaround instead of changing it back. > > Well, there's no workaround. Other than opkg's update-alternatives, dpkg's > maintains > an alternatives database in /etc/alternatives, so the symlink is going to > point to > an absolute path outside of /boot anyway. The problem is that, for bootloaders, it is not always possible to mount the rootfs. So, it must only rely on information in the boot partition that can be mounted anywhere. > > To fix your problem, kernel.bbclass should be changed to not use > update-alternatives > at all. But it's definitely wrong to break the original u-a by using invalid > command- > line arguments. > And reverting this patch breaks boot for those who rely on a relative symlink ; that is also wrong. Maybe you're right and update-alternatives should be abandoned altogether for managing kernel symlinks. > Regards, > Andreas > > >> Cheers >> Andrea David >> >> [1] >> http://lists.openembedded.org/pipermail/openembedded-core/2014-July/093988.html >> >> > >> > | update-alternatives: error: alternative path is not absolute as it >> > should be >> > >> > Signed-off-by: Andreas Oberritter >> > --- >> > meta/classes/kernel.bbclass | 6 +++--- >> > meta/recipes-kernel/linux/linux-dtb.inc | 4 ++-- >> > 2 files changed, 5 insertions(+), 5 deletions(-) >> > >> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >> > index 12a748d..8cf357f 100644 >> > --- a/meta/classes/kernel.bbclass >> > +++ b/meta/classes/kernel.bbclass >> > @@ -49,11 +49,10 @@ python __anonymous () { >> > >> > for type in types.split(): >> > typelower = type.lower() >> > -imagedest = d.getVar('KERNEL_IMAGEDEST') >> > >> > d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) >> > >> > -d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' >> > + type + '-${KERNEL_VERSION_NAME}') >> > +d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + >> > '-${KERNEL_VERSION_NAME}') >> > >> > d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + >> > typelower) >> > >> > @@ -61,8 +60,9 @@ python __anonymous () { >> > >> > d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1') >> > >> > +imagedest = d.getVar('KERNEL_IMAGEDEST') >> > priority = d.getVar('KERNEL_PRIORITY') >> > -postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + >> > imagedest + '/' + type + ' ' + type + ' ' + type + >> > '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' >> > +postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + >> > imagedest + '/' + type + ' ' + type + ' ' + '/' + imagedest + '/' + type + >> > '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' >> > d.setVar('pkg_postinst_kernel-image-' + typelower, postinst) >> > >> > postrm = '#!/bin/sh\n' + 'update-alternatives --remove' + ' ' + >> > type + ' ' + type + '-${KERNEL_VERSION_NAME} || true' + '\n' >> > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc >> > b/meta/recipes-kernel/linux/linux-dtb.inc >> > index 22e374f..41aad7c 100644 >> > --- a/meta/recipes-kernel/linux/linux-dtb.inc >> > +++ b/meta/recipes-kernel/linux/linux-dtb.inc >> > @@ -63,7 +63,7 @@ pkg_postinst_kernel-devicetree () { >> > DTB_EXT=${DTB##*.} >> > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` >> > DTB_SYMLINK_NAME=`echo ${symlink_name} | sed >> > "s/${MACHINE}/${DTB_BASE_NAME}/g"` >> > - update-alternatives --install >> > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} >> > ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} >> > ${KERNEL_PRIORITY} || true >> > + update-alternatives --install >> > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} >> > ${DTB_BASE_NAME}.${DTB_EXT} >> > /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true >> > done >> > done >> > } >> > @@ -76,7 +76,7 @@ pkg_postrm_kernel-devicetree () { >> > DTB_EXT=${DTB##*.} >> > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` >>
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On 04/21/2017 03:26 PM, Bruce Ashfield wrote: Anyone else seeing this as well? Richard saw this once last week, and we weren't able to reproduce it. I've just updated and am doing builds now. If anyone has info on their config, build steps, etc, I'm interested to hear so I can figure out what is going on. I saw this once as well today. I nuked tmp/ and it was gone. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Yocto cups serial port support
Hello, Thank you. Best Regards. 2017-04-19 10:18 GMT+01:00 John, Maxin: > Hi, > > > > Generally, cups serial backend is supported by “cups-filter” package. You > can find that package in the “meta-printing” layer: > > https://github.com/rossburton/meta-printing > > > > Hope this helps, > > Maxin > > > > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Weng > Josn > Sent: Tuesday, April 18, 2017 3:25 PM > To: yo...@yoctoproject.org; openembedded-de...@lists.openembedded.org; > Patches and discussions about the oe-core layer > > Subject: [OE-core] Yocto cups serial port support > > > > Hello, > > > > > > I checked /usr/lib/cups/backend not inclued "serial" backend. > > How can enable cups serial port ? > > > > > > > > Thanks. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] linux-yocto.do_validate_branches failing since last oe-core update
On Fri, Apr 21, 2017 at 4:36 AM, Martin Jansawrote: > Anyone else seeing this as well? > > > Richard saw this once last week, and we weren't able to reproduce it. I've just updated and am doing builds now. If anyone has info on their config, build steps, etc, I'm interested to hear so I can figure out what is going on. Bruce > I've updated to oe-core commit: > > c6cd5865b6914521a841ae0c9f4e2bcda99beff2 > > from some revision maybe 20-40 commits older and now I'm seeing: > > > ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 > do_validate_branches: Function failed: do_validate_branches (log file is > located at > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) > ERROR: Logfile of failure stored in: > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 > Log data follows: > | DEBUG: Executing shell function do_validate_branches > | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base > | mkdir: cannot create directory ‘.’: File exists > | > | [ERROR] Can't find patch dir at ./patches/standard/base > | usage: kgit s2q > | WARNING: exit code 1 from a shell command. > | ERROR: Function failed: do_validate_branches (log file is located at > linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) > NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task > do_validate_branches: Failed > ERROR: Task > (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) > failed with exit code '1' > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Building logrotate for older releases is broken
On 20 April 2017 at 17:48, Michael Halsteadwrote: > I've restored "4492b145b6d542e4a2f41e77fa199ab0 logrotate-3.9.1.tar.gz" > on downloads.yoctoproject.org and set it so it can't be overwritten. > > Please let me know if anything else is required. > Thanks Michael! Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic patch 2/5] wic: Use argparse instead of optparse
* optparse is deprecated and will not be developed further (see: https://docs.python.org/2/library/optparse.html) * argparse supports subcommands, which simplifies definition of arguments and options * reimplement help mechanism through sub-subcommands Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner --- scripts/lib/wic/engine.py | 11 +-- scripts/lib/wic/help.py | 23 +++-- scripts/wic | 213 -- 3 files changed, 154 insertions(+), 93 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index f59821fea6..647358287f 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -201,17 +201,18 @@ def wic_list(args, scripts_path): """ Print the list of images or source plugins. """ -if len(args) < 1: +if args.list_type is None: return False -if args == ["images"]: +if args.list_type == "images": + list_canned_images(scripts_path) return True -elif args == ["source-plugins"]: +elif args.list_type == "source-plugins": list_source_plugins() return True -elif len(args) == 2 and args[1] == "help": -wks_file = args[0] +elif len(args.help_for) == 1 and args.help_for[0] == 'help': +wks_file = args.list_type fullpath = find_canned_image(scripts_path, wks_file) if not fullpath: raise WicError("No image named %s found, exiting. " diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index aee2451a72..2c2dbdc3b5 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -56,7 +56,7 @@ def wic_help(args, usage_str, subcommands): """ Subcommand help dispatcher. """ -if len(args) == 1 or not display_help(args[1], subcommands): +if args.help_topic == None or not display_help(args.help_topic, subcommands): print(usage_str) @@ -82,19 +82,20 @@ def invoke_subcommand(args, parser, main_command_usage, subcommands): Dispatch to subcommand handler borrowed from combo-layer. Should use argparse, but has to work in 2.6. """ -if not args: +if not args.command: logger.error("No subcommand specified, exiting") parser.print_help() return 1 -elif args[0] == "help": +elif args.command == "help": wic_help(args, main_command_usage, subcommands) -elif args[0] not in subcommands: -logger.error("Unsupported subcommand %s, exiting\n", args[0]) +elif args.command not in subcommands: +logger.error("Unsupported subcommand %s, exiting\n", args.command) parser.print_help() return 1 else: -usage = subcommands.get(args[0], subcommand_error)[1] -subcommands.get(args[0], subcommand_error)[0](args[1:], usage) +subcmd = subcommands.get(args.command, subcommand_error) +usage = subcmd[1] +subcmd[0](args, usage) ## @@ -795,3 +796,11 @@ DESCRIPTION .wks files. """ + +wic_help_help = """ +NAME +wic help - display a help topic + +DESCRIPTION +Specify a help topic to display it. Topics are shown above. +""" diff --git a/scripts/wic b/scripts/wic index a5f2dbfc6f..49cad869e2 100755 --- a/scripts/wic +++ b/scripts/wic @@ -33,7 +33,7 @@ __version__ = "0.2.0" # Python Standard Library modules import os import sys -import optparse +import argparse import logging from distutils import spawn @@ -85,66 +85,30 @@ def rootfs_dir_to_args(krootfs_dir): rootfs_dir += '='.join([key, val]) return rootfs_dir.strip() -def callback_rootfs_dir(option, opt, value, parser): -""" -Build a dict using --rootfs_dir connection=dir -""" -if not type(parser.values.rootfs_dir) is dict: -parser.values.rootfs_dir = dict() -if '=' in value: -(key, rootfs_dir) = value.split('=') -else: -key = 'ROOTFS_DIR' -rootfs_dir = value +class RootfsArgAction(argparse.Action): +def __init__(self, **kwargs): +super().__init__(**kwargs) + +def __call__(self, parser, namespace, value, option_string=None): +if not "rootfs_dir" in vars(namespace) or \ + not type(namespace.__dict__['rootfs_dir']) is dict: +namespace.__dict__['rootfs_dir'] = {} + +if '=' in value: +(key, rootfs_dir) = value.split('=') +else: +key = 'ROOTFS_DIR' +rootfs_dir = value -parser.values.rootfs_dir[key] = rootfs_dir +namespace.__dict__['rootfs_dir'][key] = rootfs_dir -def wic_create_subcommand(args, usage_str): + +def wic_create_subcommand(options, usage_str): """ Command-line handling for image creation. The real work is done by image.engine.wic_create() """ -parser = optparse.OptionParser(usage=usage_str) - -
[OE-core] [wic patch 1/5] wic: Catch errors during image files clean-up
Handle exception if a file could not be deleted during clean-up of unwanted files, thus preventing a failure of wic in this case. Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner --- scripts/lib/wic/plugins/imager/direct.py | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index f2e6127331..d6b47ff0bb 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -541,7 +541,12 @@ class PartitionedImage(): def cleanup(self): # remove partition images for image in set(self.partimages): -os.remove(image) +try: +os.remove(image) +except IOError as e: +logger.warning( +"Could not delete file. {0}: I/O error ({1}): {2}\n".format( +image, e.errno, e.strerror)) def assemble(self): logger.debug("Installing partitions") -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic patch 3/5] wic: Add missing text to usage and help strings
Add missing parameters -c to and remove non-existent parameter -i from usage string for 'wic create'. Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner --- scripts/lib/wic/help.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 2c2dbdc3b5..ba0c8e5eea 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -131,10 +131,10 @@ wic_create_usage = """ Create a new OpenEmbedded image usage: wic create [-o | --outdir ] -[-i | --infile ] [-e | --image-name] [-s, --skip-build-check] [-D, --debug] [-r, --rootfs-dir] [-b, --bootimg-dir] [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] +[-c, --compress-with] [-m, --bmap] This command creates an OpenEmbedded image based on the 'OE kickstart commands' found in the . -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic patch 4/5] wic: Add option to keep partition images
Add new option -P, --keep-partition-images to prevent deletion of .p* files created by wic's direct imager plugin. Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner --- scripts/lib/wic/help.py | 5 + scripts/lib/wic/plugins/imager/direct.py | 28 +++- scripts/wic | 2 ++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index ba0c8e5eea..026a383155 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -134,6 +134,7 @@ wic_create_usage = """ [-e | --image-name] [-s, --skip-build-check] [-D, --debug] [-r, --rootfs-dir] [-b, --bootimg-dir] [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] +[-P, --keep-partition-images] [-c, --compress-with] [-m, --bmap] This command creates an OpenEmbedded image based on the 'OE kickstart @@ -155,6 +156,7 @@ SYNOPSIS [-e | --image-name] [-s, --skip-build-check] [-D, --debug] [-r, --rootfs-dir] [-b, --bootimg-dir] [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] +[-P, --keep-partition-images] [-c, --compress-with] [-m, --bmap] DESCRIPTION @@ -227,6 +229,9 @@ DESCRIPTION The -m option is used to produce .bmap file for the image. This file can be used to flash image using bmaptool utility. + +The -p option is used to keep the individual partition image files .p*, +created by the direct imager plugin. """ wic_list_usage = """ diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index d6b47ff0bb..b27584bdbe 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -84,8 +84,12 @@ class DirectPlugin(ImagerPlugin): break image_path = self._full_path(self.workdir, self.parts[0].disk, "direct") +self.keep_partimages = options.keep_partimages + self._image = PartitionedImage(image_path, self.ptable_format, - self.parts, self.native_sysroot) + self.parts, self.native_sysroot, + keep_partimages=self.keep_partimages) + def do_create(self): """ @@ -287,7 +291,9 @@ class PartitionedImage(): Partitioned image in a file. """ -def __init__(self, path, ptable_format, partitions, native_sysroot=None): +def __init__(self, path, ptable_format, partitions, native_sysroot=None, +keep_partimages=False): + self.path = path # Path to the image file self.numpart = 0 # Number of allocated partitions self.realpart = 0 # Number of partitions in the partition table @@ -325,6 +331,8 @@ class PartitionedImage(): else: # msdos partition table part.uuid = '%08x-%02d' % (self.identifier, part.realnum) +self.keep_partimages = keep_partimages + def prepare(self, imager): """Prepare an image. Call prepare method of all image partitions.""" for part in self.partitions: @@ -540,13 +548,15 @@ class PartitionedImage(): def cleanup(self): # remove partition images -for image in set(self.partimages): -try: -os.remove(image) -except IOError as e: -logger.warning( -"Could not delete file. {0}: I/O error ({1}): {2}\n".format( -image, e.errno, e.strerror)) +if not self.keep_partimages: +# remove partition images +for image in set(self.partimages): +try: +os.remove(image) +except IOError as e: +logger.warning( +"Could not delete file. {0}: I/O error ({1}): {2}\n".format( +image, e.errno, e.strerror)) def assemble(self): logger.debug("Installing partitions") diff --git a/scripts/wic b/scripts/wic index 49cad869e2..98f7405702 100755 --- a/scripts/wic +++ b/scripts/wic @@ -303,6 +303,8 @@ def wic_init_parser_create(subparser): "bitbake variables") subparser.add_argument("-D", "--debug", dest="debug", action="store_true", default=False, help="output debug information") +subparser.add_argument("-P", "--keep-partition-images", dest="keep_partimages", + action="store_true", default=False) return -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic patch 5/5] wic: Use enum like dicts for string constants
To increase code maintainability, use dictionaries as enum-like container for parameter string comparisons. Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner --- scripts/lib/wic/engine.py | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 647358287f..1428a73ba8 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -35,6 +35,16 @@ from wic import WicError from wic.pluginbase import PluginMgr from wic.utils.misc import get_bitbake_var +class StrEnum(dict): +__getattr__ = dict.get + +ListType = StrEnum({ +'LIST_IMAGES': "images", +'LIST_SRC_PLUGINS': "source-plugins" }) + +HelpArg = StrEnum({ +'HELP': "help" }) + logger = logging.getLogger('wic') def verify_build_env(): @@ -204,14 +214,14 @@ def wic_list(args, scripts_path): if args.list_type is None: return False -if args.list_type == "images": +if args.list_type == ListType.LIST_IMAGES: list_canned_images(scripts_path) return True -elif args.list_type == "source-plugins": +elif args.list_type == ListType.LIST_SRC_PLUGINS: list_source_plugins() return True -elif len(args.help_for) == 1 and args.help_for[0] == 'help': +elif len(args.help_for) == 1 and args.help_for[0] == HelpArg.HELP: wks_file = args.list_type fullpath = find_canned_image(scripts_path, wks_file) if not fullpath: -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic patch 0/5] Add option to wic and use argparse
This series consists of the following changes to wic: * wic previously introduced deletion of all single partition image files. In some cases, this deletion can fail, however this is no reason for wic to fail. Thus, exception handling was added to the clean-up function of the direct imager plugin. * wic uses optparse and a rather complicated approach of its initialization. It is much easier to switch from the deprecated optparse to the argparse library, which also supports sub-commands, which wic heavily makes use of. The second patch replaces optparse by argparse. * For some embedded projects it is necessary to keep the single partition image files to further process them. This is the case if a user has no rights to mount and cannot extract the images from the already merged .direct file, for example. For this purpose, a new option is introduced: -P, --keep-partition-images which prevents deletion of .p* files created by the direct imager plugin. * Maintainability improvement in engine.py by comparing parameters with enum-like string constants rather than repeating the strings and fixes in help texts. The new argument parser was tested with random sampling manually, since variable names were not changed inside the core of the subcommands and transition from optparse to argparse is straight forward regarding access to argument values. Signed-off-by: Andreas ReichelSigned-off-by: Jan Kiszka Signed-off-by: Daniel Wagner Reichel Andreas (5): wic: Catch errors during image files clean-up wic: Use argparse instead of optparse wic: Add missing text to usage and help strings wic: Add option to keep partition images wic: Use enum like dicts for string constants scripts/lib/wic/engine.py| 21 ++- scripts/lib/wic/help.py | 30 +++-- scripts/lib/wic/plugins/imager/direct.py | 23 +++- scripts/wic | 215 +++ 4 files changed, 191 insertions(+), 98 deletions(-) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: upgrade to 7.54.0
Signed-off-by: Oleksandr Kravchuk--- meta/recipes-support/curl/{curl_7.53.1.bb => curl_7.54.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/curl/{curl_7.53.1.bb => curl_7.54.0.bb} (94%) diff --git a/meta/recipes-support/curl/curl_7.53.1.bb b/meta/recipes-support/curl/curl_7.54.0.bb similarity index 94% rename from meta/recipes-support/curl/curl_7.53.1.bb rename to meta/recipes-support/curl/curl_7.54.0.bb index bc78ffb..ce5ca37 100644 --- a/meta/recipes-support/curl/curl_7.53.1.bb +++ b/meta/recipes-support/curl/curl_7.54.0.bb @@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "fb1f03a142236840c1a77c035fa4c542" -SRC_URI[sha256sum] = "1c7207c06d75e9136a944a2e0528337ce76f15b9ec9ae4bb30d703b59bf530e8" +SRC_URI[md5sum] = "89bb7ba87384dfbf4f1a3f953da42458" +SRC_URI[sha256sum] = "f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06" CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: fix race condition with systemd-udev
On Fri, 21 Apr 2017 11:25:34 +0300 Dmitry Rozhkovwrote: > When a new USB network interface is plugged in systemd > fails to rename the new interface (ethX) to a predictable > name [1] because connman locks it first. > > The proposed solution is to blacklist unpredictable names > in connman in case systemd is used as an init system. > Also add a fix to connman that makes it to re-evaluate > a known but blacklisted ethernet interface for enabling > after it has got renamed. Doesn't this break networking for everybody not using these "predictable" names? Regards, Andreas > > Fixes [YOCTO #11341] > > [1] > https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ > > Signed-off-by: Dmitry Rozhkov > --- > ...try-to-add-ether-interface-after-renaming.patch | 42 > ++ > .../recipes-connectivity/connman/connman/main.conf | 2 ++ > meta/recipes-connectivity/connman/connman_1.33.bb | 10 ++ > 3 files changed, 54 insertions(+) > create mode 100644 > meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch > create mode 100644 meta/recipes-connectivity/connman/connman/main.conf > > diff --git > a/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch > > b/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch > new file mode 100644 > index 000..e5f4360 > --- /dev/null > +++ > b/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch > @@ -0,0 +1,42 @@ > +From d92e713e112e48cb4434f1c67b97e6507a7cf9e8 Mon Sep 17 00:00:00 2001 > +From: Dmitry Rozhkov > +Date: Thu, 20 Apr 2017 15:54:29 +0300 > +Subject: [PATCH] rtnl: retry to add ether interface after renaming > + > +If eth* interfaces are blacklisted to avoid a race condition > +where connman may access an interface before systemd/udev can > +change it to use a predictable interface name then it's impossible > +to re-activate it under a new predictable name because an existing > +interface is considered to be already added to the technology. > + > +Once blacklisted an interface is not re-evaluated under a new name. > + > +This patch allows to re-evaluate an interface known to connman for > +adding it to the ethernet technology in case it's name has changed. > +E.g. after unplugging a cable and plugging it back. > + > +Upstream-Status: Submitted > [https://lists.01.org/pipermail/connman/2017-April/021790.html] > + > +Signed-off-by: Dmitry Rozhkov > +--- > + src/rtnl.c | 4 +++- > + 1 file changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/src/rtnl.c b/src/rtnl.c > +index d1b851f..19a999c 100644 > +--- a/src/rtnl.c > b/src/rtnl.c > +@@ -469,7 +469,9 @@ static void process_newlink(unsigned short type, int > index, unsigned flags, > + > + if (type == ARPHRD_ETHER) > + read_uevent(interface); > +-} else > ++} else if (type == ARPHRD_ETHER && interface->device_type == > CONNMAN_DEVICE_TYPE_UNKNOWN) > ++read_uevent(interface); > ++else > + interface = NULL; > + > + for (list = rtnl_list; list; list = list->next) { > +-- > +2.9.3 > + > diff --git a/meta/recipes-connectivity/connman/connman/main.conf > b/meta/recipes-connectivity/connman/connman/main.conf > new file mode 100644 > index 000..fcd6ca0 > --- /dev/null > +++ b/meta/recipes-connectivity/connman/connman/main.conf > @@ -0,0 +1,2 @@ > +[General] > +NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,docker,veth,eth,wlan > diff --git a/meta/recipes-connectivity/connman/connman_1.33.bb > b/meta/recipes-connectivity/connman/connman_1.33.bb > index 4129b05..02247cb 100644 > --- a/meta/recipes-connectivity/connman/connman_1.33.bb > +++ b/meta/recipes-connectivity/connman/connman_1.33.bb > @@ -1,5 +1,7 @@ > require connman.inc > > +OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > ':systemd', '', d)}" > + > SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ > > file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ > file://connman \ > @@ -9,8 +11,16 @@ SRC_URI = > "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ > " > SRC_URI_append_libc-musl = " > file://0002-resolve-musl-does-not-implement-res_ninit.patch \ > > file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch" > +SRC_URI_append_systemd = " > file://0001-rtnl-retry-to-add-ether-interface-after-renaming.patch \ > + file://main.conf" > + > > SRC_URI[md5sum] = "c51903fd3e7a6a371d12ac5d72a1fa01" > SRC_URI[sha256sum] = > "bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0" > >
Re: [OE-core] [PATCH] Revert "kernel: Fix symlinks"
On Fri, 21 Apr 2017 13:02:51 +0200 Andrea Adamiwrote: > On Fri, Apr 21, 2017 at 12:39 PM, Andreas Oberritter > wrote: > > This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. > > > > It broke dpkg's update-alternatives, which requires absolute paths. > > This is really uncommon. Actually it's not. Try it on any Debian or Ubuntu system. > I had already expressed my negative opinion about absolute paths for kernel > [1]. > Personally, I had to patch the bootloader (kexecboot). > > So please try some workaround instead of changing it back. Well, there's no workaround. Other than opkg's update-alternatives, dpkg's maintains an alternatives database in /etc/alternatives, so the symlink is going to point to an absolute path outside of /boot anyway. To fix your problem, kernel.bbclass should be changed to not use update-alternatives at all. But it's definitely wrong to break the original u-a by using invalid command- line arguments. Regards, Andreas > Cheers > Andrea > > [1] > http://lists.openembedded.org/pipermail/openembedded-core/2014-July/093988.html > > > > > | update-alternatives: error: alternative path is not absolute as it should > > be > > > > Signed-off-by: Andreas Oberritter > > --- > > meta/classes/kernel.bbclass | 6 +++--- > > meta/recipes-kernel/linux/linux-dtb.inc | 4 ++-- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > > index 12a748d..8cf357f 100644 > > --- a/meta/classes/kernel.bbclass > > +++ b/meta/classes/kernel.bbclass > > @@ -49,11 +49,10 @@ python __anonymous () { > > > > for type in types.split(): > > typelower = type.lower() > > -imagedest = d.getVar('KERNEL_IMAGEDEST') > > > > d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) > > > > -d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' > > + type + '-${KERNEL_VERSION_NAME}') > > +d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + > > '-${KERNEL_VERSION_NAME}') > > > > d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + > > typelower) > > > > @@ -61,8 +60,9 @@ python __anonymous () { > > > > d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1') > > > > +imagedest = d.getVar('KERNEL_IMAGEDEST') > > priority = d.getVar('KERNEL_PRIORITY') > > -postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + > > imagedest + '/' + type + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} > > ' + priority + ' || true' + '\n' > > +postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + > > imagedest + '/' + type + ' ' + type + ' ' + '/' + imagedest + '/' + type + > > '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' > > d.setVar('pkg_postinst_kernel-image-' + typelower, postinst) > > > > postrm = '#!/bin/sh\n' + 'update-alternatives --remove' + ' ' + > > type + ' ' + type + '-${KERNEL_VERSION_NAME} || true' + '\n' > > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc > > b/meta/recipes-kernel/linux/linux-dtb.inc > > index 22e374f..41aad7c 100644 > > --- a/meta/recipes-kernel/linux/linux-dtb.inc > > +++ b/meta/recipes-kernel/linux/linux-dtb.inc > > @@ -63,7 +63,7 @@ pkg_postinst_kernel-devicetree () { > > DTB_EXT=${DTB##*.} > > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` > > DTB_SYMLINK_NAME=`echo ${symlink_name} | sed > > "s/${MACHINE}/${DTB_BASE_NAME}/g"` > > - update-alternatives --install > > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} > > ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > > ${KERNEL_PRIORITY} || true > > + update-alternatives --install > > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} > > ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > > ${KERNEL_PRIORITY} || true > > done > > done > > } > > @@ -76,7 +76,7 @@ pkg_postrm_kernel-devicetree () { > > DTB_EXT=${DTB##*.} > > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` > > DTB_SYMLINK_NAME=`echo ${symlink_name} | sed > > "s/${MACHINE}/${DTB_BASE_NAME}/g"` > > - update-alternatives --remove > > ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > > ${KERNEL_PRIORITY} || true > > + update-alternatives --remove > > ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > > ${KERNEL_PRIORITY} || true > > done > > done > > } > > -- > > 2.7.4 > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > >
Re: [OE-core] [PATCH] Revert "kernel: Fix symlinks"
On Fri, Apr 21, 2017 at 12:39 PM, Andreas Oberritterwrote: > This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. > > It broke dpkg's update-alternatives, which requires absolute paths. This is really uncommon. I had already expressed my negative opinion about absolute paths for kernel [1]. Personally, I had to patch the bootloader (kexecboot). So please try some workaround instead of changing it back. Cheers Andrea [1] http://lists.openembedded.org/pipermail/openembedded-core/2014-July/093988.html > > | update-alternatives: error: alternative path is not absolute as it should be > > Signed-off-by: Andreas Oberritter > --- > meta/classes/kernel.bbclass | 6 +++--- > meta/recipes-kernel/linux/linux-dtb.inc | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index 12a748d..8cf357f 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -49,11 +49,10 @@ python __anonymous () { > > for type in types.split(): > typelower = type.lower() > -imagedest = d.getVar('KERNEL_IMAGEDEST') > > d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) > > -d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' + > type + '-${KERNEL_VERSION_NAME}') > +d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + > '-${KERNEL_VERSION_NAME}') > > d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + > typelower) > > @@ -61,8 +60,9 @@ python __anonymous () { > > d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1') > > +imagedest = d.getVar('KERNEL_IMAGEDEST') > priority = d.getVar('KERNEL_PRIORITY') > -postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + > imagedest + '/' + type + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} ' > + priority + ' || true' + '\n' > +postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + > imagedest + '/' + type + ' ' + type + ' ' + '/' + imagedest + '/' + type + > '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' > d.setVar('pkg_postinst_kernel-image-' + typelower, postinst) > > postrm = '#!/bin/sh\n' + 'update-alternatives --remove' + ' ' + type > + ' ' + type + '-${KERNEL_VERSION_NAME} || true' + '\n' > diff --git a/meta/recipes-kernel/linux/linux-dtb.inc > b/meta/recipes-kernel/linux/linux-dtb.inc > index 22e374f..41aad7c 100644 > --- a/meta/recipes-kernel/linux/linux-dtb.inc > +++ b/meta/recipes-kernel/linux/linux-dtb.inc > @@ -63,7 +63,7 @@ pkg_postinst_kernel-devicetree () { > DTB_EXT=${DTB##*.} > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` > DTB_SYMLINK_NAME=`echo ${symlink_name} | sed > "s/${MACHINE}/${DTB_BASE_NAME}/g"` > - update-alternatives --install > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} > devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true > + update-alternatives --install > /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} > /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true > done > done > } > @@ -76,7 +76,7 @@ pkg_postrm_kernel-devicetree () { > DTB_EXT=${DTB##*.} > DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` > DTB_SYMLINK_NAME=`echo ${symlink_name} | sed > "s/${MACHINE}/${DTB_BASE_NAME}/g"` > - update-alternatives --remove > ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > ${KERNEL_PRIORITY} || true > + update-alternatives --remove > ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} > ${KERNEL_PRIORITY} || true > done > done > } > -- > 2.7.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC] Handling configuration files
Following this thread on OE-Core (http://lists.openembedded.org/pipermail/openembedded-core/2017-April/135812.html), the subject of handling configuration files for a machine just got back. It seems there already was a discussion around it but I couldn't find it. I know that 2.3 has now hit 'feature-freeze' status but I try to gather some ideas for maybe an implementation in 2.4. Simply put, the problem is this: I want to - Override a configuration file in a package - Make the configuration machine-specific - Upgrade the configuration during package upgrade without human interaction For now, one way to do this is to append the recipe and to replace the PACKAGE_ARCH with MACHINE_ARCH. The downside of this approach is that a package is created for each machine on package repositories where only the configuration is modified. Another way is to modify the file in ROOTFS_POSTPROCESS_COMMAND. The downside is that depending on the packager, it would either not survive the package upgrade or not be upgradable. The last way would be to use update-alternatives, but IMHO it does feel weird. Another downside would be the need to modify all recipes to mark the configurations as alternatives. My idea was the following. Maybe we could rely on the CONFFILES variable to create a -conf package (like -dbg/-dev/-staticdev). If possible, this package only should be marked as MACHINE_ARCH. This could happen behind the scenes in package.bbclass. The only problem I see for now is how to identify that the configuration file has been overridden in a machine-specific recipe (SRC_URI or other variable ?). Do you think it is feasible or am I missing something ? I could proceed to implement that kind of behavior but I would like to know beforehand if there are other things I should take into account. Thanks, David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Revert "kernel: Fix symlinks"
This reverts commit c7bc46b9bc29dd0953ab8d63b50fa105bb66892e. It broke dpkg's update-alternatives, which requires absolute paths. | update-alternatives: error: alternative path is not absolute as it should be Signed-off-by: Andreas Oberritter--- meta/classes/kernel.bbclass | 6 +++--- meta/recipes-kernel/linux/linux-dtb.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 12a748d..8cf357f 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -49,11 +49,10 @@ python __anonymous () { for type in types.split(): typelower = type.lower() -imagedest = d.getVar('KERNEL_IMAGEDEST') d.appendVar('PACKAGES', ' ' + 'kernel-image-' + typelower) -d.setVar('FILES_kernel-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}') +d.setVar('FILES_kernel-image-' + typelower, '/boot/' + type + '-${KERNEL_VERSION_NAME}') d.appendVar('RDEPENDS_kernel-image', ' ' + 'kernel-image-' + typelower) @@ -61,8 +60,9 @@ python __anonymous () { d.setVar('ALLOW_EMPTY_kernel-image-' + typelower, '1') +imagedest = d.getVar('KERNEL_IMAGEDEST') priority = d.getVar('KERNEL_PRIORITY') -postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + imagedest + '/' + type + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' +postinst = '#!/bin/sh\n' + 'update-alternatives --install /' + imagedest + '/' + type + ' ' + type + ' ' + '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME} ' + priority + ' || true' + '\n' d.setVar('pkg_postinst_kernel-image-' + typelower, postinst) postrm = '#!/bin/sh\n' + 'update-alternatives --remove' + ' ' + type + ' ' + type + '-${KERNEL_VERSION_NAME} || true' + '\n' diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index 22e374f..41aad7c 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -63,7 +63,7 @@ pkg_postinst_kernel-devicetree () { DTB_EXT=${DTB##*.} DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true done done } @@ -76,7 +76,7 @@ pkg_postrm_kernel-devicetree () { DTB_EXT=${DTB##*.} DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true + update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true done done } -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][krogoth] glibc: Security fix CVE-2016-6323
arm: mark __startcontext as .cantunwind, GNU CVE: CVE-2016-6323 Signed-off-by: Andrej ValekSigned-off-by: Pascal Bach --- meta/recipes-core/glibc/glibc/CVE-2016-6323.patch | 39 +++ meta/recipes-core/glibc/glibc_2.23.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2016-6323.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch new file mode 100644 index 000..f9b9fa5 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch @@ -0,0 +1,39 @@ +glibc-2.24: Fix CVE-2016-6323 + +[No upstream tracking] -- https://sourceware.org/bugzilla/show_bug.cgi?id=20435 + +arm: mark __startcontext as .cantunwind, GNU + +Glibc bug where the makecontext function would create +an execution context which is incompatible with the unwinder, +causing it to hang when the generation of a backtrace is attempted. + +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617] +CVE: CVE-2016-6323 +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S +index 603e508..d1f168f 100644 +--- a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S +@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext) + + /* Called when a makecontext() context returns. Start the + context in R4 or fall through to exit(). */ ++ /* Unwind descriptors are looked up based on PC - 2, so we have to ++ make sure to mark the instruction preceding the __startcontext ++ label as .cantunwind. */ ++ .fnstart ++ .cantunwind ++ nop + ENTRY(__startcontext) + movsr0, r4 + bne PLTJMP(__setcontext) + + @ New context was 0 - exit + b PLTJMP(HIDDEN_JUMPTARGET(exit)) ++ .fnend + END(__startcontext) + + #ifdef PIC diff --git a/meta/recipes-core/glibc/glibc_2.23.bb b/meta/recipes-core/glibc/glibc_2.23.bb index 85b5215..3844587 100644 --- a/meta/recipes-core/glibc/glibc_2.23.bb +++ b/meta/recipes-core/glibc/glibc_2.23.bb @@ -41,6 +41,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://CVE-2016-1234.patch \ file://CVE-2016-3075.patch \ file://CVE-2016-5417.patch \ + file://CVE-2016-6323.patch \ " SRC_URI += "\ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][morty] glibc: Security fix CVE-2016-6323
arm: mark __startcontext as .cantunwind, GNU CVE: CVE-2016-6323 Signed-off-by: Andrej ValekSigned-off-by: Pascal Bach --- meta/recipes-core/glibc/glibc/CVE-2016-6323.patch | 39 +++ meta/recipes-core/glibc/glibc_2.24.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2016-6323.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch new file mode 100644 index 000..f9b9fa5 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2016-6323.patch @@ -0,0 +1,39 @@ +glibc-2.24: Fix CVE-2016-6323 + +[No upstream tracking] -- https://sourceware.org/bugzilla/show_bug.cgi?id=20435 + +arm: mark __startcontext as .cantunwind, GNU + +Glibc bug where the makecontext function would create +an execution context which is incompatible with the unwinder, +causing it to hang when the generation of a backtrace is attempted. + +Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9e2ff6c9cc54c0b4402b8d49e4abe7000fde7617] +CVE: CVE-2016-6323 +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S +index 603e508..d1f168f 100644 +--- a/sysdeps/unix/sysv/linux/arm/setcontext.S b/sysdeps/unix/sysv/linux/arm/setcontext.S +@@ -86,12 +86,19 @@ weak_alias(__setcontext, setcontext) + + /* Called when a makecontext() context returns. Start the + context in R4 or fall through to exit(). */ ++ /* Unwind descriptors are looked up based on PC - 2, so we have to ++ make sure to mark the instruction preceding the __startcontext ++ label as .cantunwind. */ ++ .fnstart ++ .cantunwind ++ nop + ENTRY(__startcontext) + movsr0, r4 + bne PLTJMP(__setcontext) + + @ New context was 0 - exit + b PLTJMP(HIDDEN_JUMPTARGET(exit)) ++ .fnend + END(__startcontext) + + #ifdef PIC diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb index f5a21b2..bce06c7 100644 --- a/meta/recipes-core/glibc/glibc_2.24.bb +++ b/meta/recipes-core/glibc/glibc_2.24.bb @@ -37,6 +37,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0024-eglibc-Forward-port-cross-locale-generation-support.patch \ file://0025-Define-DUMMY_LOCALE_T-if-not-defined.patch \ file://0026-build_local_scope.patch \ + file://CVE-2016-6323.patch \ " SRC_URI += "\ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] PulseAudio with WebRTC echo cancellation (aec): support for webrtc-audio-processing package
On Thu, 2017-04-20 at 22:14 +0200, Koenraad Verheyden wrote: > I am not familiar with the organization of the various recipes. I > mentioned oe-core since the original message was posted there. > Meta-oe seems more suitable indeed. > > How much work would it be to make a recipe for this? > I need it for a short-term project and am not in a position to further > support it afterwards. Writing the recipe should be fairly simple. I can do that at some point, but if you want it fast, write the recipe yourself. I volunteer to maintain it. -- Tanu https://www.patreon.com/tanuk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: properly relocate additional native tools
These tools are not currently used for anything, but we should still provide working versions of them. [YOCTO #11400] Signed-off-by: Alexander Kanavin--- meta/recipes-devtools/rpm/rpm_git.bb | 30 ++ 1 file changed, 30 insertions(+) diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb index 96f71d5bb57..f31932ef55a 100644 --- a/meta/recipes-devtools/rpm/rpm_git.bb +++ b/meta/recipes-devtools/rpm/rpm_git.bb @@ -90,6 +90,36 @@ do_install_append_class-native() { RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ RPM_NO_CHROOT_FOR_SCRIPTS=1 + +create_wrapper ${D}/${bindir}/rpm2archive \ +RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ +RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ +MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 + +create_wrapper ${D}/${bindir}/rpm2cpio \ +RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ +RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ +MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 + +create_wrapper ${D}/${bindir}/rpmdb \ +RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ +RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ +MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 + +create_wrapper ${D}/${bindir}/rpmgraph \ +RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ +RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ +MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 + +create_wrapper ${D}/${bindir}/rpmspec \ +RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ +RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \ +MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ +RPM_NO_CHROOT_FOR_SCRIPTS=1 } -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] linux-yocto.do_validate_branches failing since last oe-core update
Anyone else seeing this as well? I've updated to oe-core commit: c6cd5865b6914521a841ae0c9f4e2bcda99beff2 from some revision maybe 20-40 commits older and now I'm seeing: ERROR: linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0 do_validate_branches: Function failed: do_validate_branches (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) ERROR: Logfile of failure stored in: linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385 Log data follows: | DEBUG: Executing shell function do_validate_branches | HEAD is now at fe0fb8d Merge tag 'v4.10.9' into standard/base | mkdir: cannot create directory ‘.’: File exists | | [ERROR] Can't find patch dir at ./patches/standard/base | usage: kgit s2q | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_validate_branches (log file is located at linux-yocto/1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0/temp/log.do_validate_branches.5385) NOTE: recipe linux-yocto-1_4.10.9+gitAUTOINC+ad2e885015_fe0fb8da3d-r0: task do_validate_branches: Failed ERROR: Task (oe-core/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_validate_branches) failed with exit code '1' -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: fix race condition with systemd-udev
When a new USB network interface is plugged in systemd fails to rename the new interface (ethX) to a predictable name [1] because connman locks it first. The proposed solution is to blacklist unpredictable names in connman in case systemd is used as an init system. Also add a fix to connman that makes it to re-evaluate a known but blacklisted ethernet interface for enabling after it has got renamed. Fixes [YOCTO #11341] [1] https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ Signed-off-by: Dmitry Rozhkov--- ...try-to-add-ether-interface-after-renaming.patch | 42 ++ .../recipes-connectivity/connman/connman/main.conf | 2 ++ meta/recipes-connectivity/connman/connman_1.33.bb | 10 ++ 3 files changed, 54 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch create mode 100644 meta/recipes-connectivity/connman/connman/main.conf diff --git a/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch b/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch new file mode 100644 index 000..e5f4360 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/0001-rtnl-retry-to-add-ether-interface-after-renaming.patch @@ -0,0 +1,42 @@ +From d92e713e112e48cb4434f1c67b97e6507a7cf9e8 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov +Date: Thu, 20 Apr 2017 15:54:29 +0300 +Subject: [PATCH] rtnl: retry to add ether interface after renaming + +If eth* interfaces are blacklisted to avoid a race condition +where connman may access an interface before systemd/udev can +change it to use a predictable interface name then it's impossible +to re-activate it under a new predictable name because an existing +interface is considered to be already added to the technology. + +Once blacklisted an interface is not re-evaluated under a new name. + +This patch allows to re-evaluate an interface known to connman for +adding it to the ethernet technology in case it's name has changed. +E.g. after unplugging a cable and plugging it back. + +Upstream-Status: Submitted [https://lists.01.org/pipermail/connman/2017-April/021790.html] + +Signed-off-by: Dmitry Rozhkov +--- + src/rtnl.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/rtnl.c b/src/rtnl.c +index d1b851f..19a999c 100644 +--- a/src/rtnl.c b/src/rtnl.c +@@ -469,7 +469,9 @@ static void process_newlink(unsigned short type, int index, unsigned flags, + + if (type == ARPHRD_ETHER) + read_uevent(interface); +- } else ++ } else if (type == ARPHRD_ETHER && interface->device_type == CONNMAN_DEVICE_TYPE_UNKNOWN) ++ read_uevent(interface); ++ else + interface = NULL; + + for (list = rtnl_list; list; list = list->next) { +-- +2.9.3 + diff --git a/meta/recipes-connectivity/connman/connman/main.conf b/meta/recipes-connectivity/connman/connman/main.conf new file mode 100644 index 000..fcd6ca0 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/main.conf @@ -0,0 +1,2 @@ +[General] +NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,docker,veth,eth,wlan diff --git a/meta/recipes-connectivity/connman/connman_1.33.bb b/meta/recipes-connectivity/connman/connman_1.33.bb index 4129b05..02247cb 100644 --- a/meta/recipes-connectivity/connman/connman_1.33.bb +++ b/meta/recipes-connectivity/connman/connman_1.33.bb @@ -1,5 +1,7 @@ require connman.inc +OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ':systemd', '', d)}" + SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://connman \ @@ -9,8 +11,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ " SRC_URI_append_libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch \ file://0001-Fix-compile-on-musl-with-kernel-4.9-headers.patch" +SRC_URI_append_systemd = " file://0001-rtnl-retry-to-add-ether-interface-after-renaming.patch \ + file://main.conf" + SRC_URI[md5sum] = "c51903fd3e7a6a371d12ac5d72a1fa01" SRC_URI[sha256sum] = "bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0" +do_install_append_systemd() { +install -d ${D}${sysconfdir}/connman +install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman/main.conf +} + RRECOMMENDS_${PN} = "connman-conf" -- 2.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: Fix symlink creation
On 2017-04-20 15:04 GMT+02:00 Martin Jansa: > On Thu, Apr 20, 2017 at 03:37:24PM +0300, Alexander Kanavin wrote: >> On 04/19/2017 04:03 PM, David Vincent wrote: >> > The problem is that I must be able to manage the configuration of a machine >> > without physical intervention and only via package upgrades. A new >> > configuration can be applied simply by incrementing the PR of a >> > configuration >> > package. >> > >> > But maybe this is a use case only needed by me and I should manage it in my >> > own specific layer ? >> > >> > Now that I think of it, I have the same kind of problem for all machine >> > specific configurations. For now, I just replace the PACKAGE_ARCH in my BSP >> > layer with a machine specific one to indicate that a package contains a >> > configuration valid only for a specific machine. Maybe, in a future >> > release, it >> > should be desirable to create -conf packages based on the CONFFILES >> > variable ? >> > I don't know if it's a good idea, but maybe I could bring that up on the >> > architecture mailing list ? >> >> By all means please do so. Yocto lacks a solution for configuration >> management, and this was discussed some time ago, although I cannot >> anymore find where it happened. Mark, do you remember? Yes I'll bring that up on the architecture mailing list to gather some advices. > > I still haven't seen any argument why not use u-a like for any other > alternative files. I don't really have an argument, it's just that it feels wrong to me to manage configuration files via update-alternatives. Just like it did for initscripts. I agree that it works, until some corner cases reveal problems. (see https://bugzilla.yoctoproject.org/show_bug.cgi?id=10433) > > All you have to do is create openssl bbappend (this part might be > integrated into oe-core): > > inherit update-alternatives > ALTERNATIVE_${PN} = "openssl-cnf" > ALTERNATIVE_LINK_NAME[openssl-cnf] = "${sysconfdir}/ssl/openssl.cnf" > ALTERNATIVE_PRIORITY[openssl-cnf] ?= "1" > > And then in your recipe which provides alternative config add similar > fragment: > > inherit update-alternatives > ALTERNATIVE_${PN} = "openssl-cnf" > ALTERNATIVE_LINK_NAME[openssl-cnf] = "${sysconfdir}/ssl/openssl.cnf" > ALTERNATIVE_PRIORITY[openssl-cnf] ?= "10" > > And that's it. We're using this for last 4 years since: > https://github.com/openwebos/meta-webos/commit/b13980be3f28bf60582ec3f691e392db03942e21 > and it worked fine until this oe-core change was merged (and I had to > undo it in the same bbappend). OTOH, I could also append the install task for my target. There are many solutions to this problem, but I think that like it was said before, the main one is handling properly the configuration and provide a way to override it in BSP or distro layers. > > Regards, > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com David -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 0/1] Do not use command in profile
Will this patch get merge? Or do we have to include 'command' from now on? As this commit "busybox: In defconfig enable ASH_CMDCMD for built-in 'command'" suggests? Thanks, Hannes 2017-04-13 14:30 GMT+02:00 Peter Kjellerstedt: > Since we apparently cannot rely on the command utility to always > exist, it is better to avoid using it in the profile script. Rather > than using command to detect if tty and resize exist (which obviously > will not work if command itself does not exist), just call them > directly while piping any output for stderr to /dev/null. This should > actually be a little bit more efficient in the case that they do > exist, and the same in the case that they do not exist. > > I leave to you to decide whether you want to revert commit e41c90b852 > that enabled the command utility in busybox or not. > > PATCHv2: Correct a typo in the commit message > > //Peter > > The following changes since commit fe47bff64b17562593c620d2daf748735bb5c3d6: > > linux-yocto: Update genericx86* SRCREVs for linux-yocto 4.10 (2017-04-13 > 10:54:37 +0100) > > are available in the git repository at: > > git://git.yoctoproject.org/poky-contrib pkj/profile_without_command > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/profile_without_command > > Peter Kjellerstedt (1): > base-files: profile: Avoid using "command" to determine if programs > exist > > meta/recipes-core/base-files/base-files/profile | 14 ++ > 1 file changed, 6 insertions(+), 8 deletions(-) > > -- > 2.12.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for webkitgtk: Upgrade to 2.16.1
== Series Details == Series: webkitgtk: Upgrade to 2.16.1 Revision: 1 URL : https://patchwork.openembedded.org/series/6451/ 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 0126fe8934) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core