* Re: [PATCH] Add cxxtest framework to devtools.
From: Burton, Ross @ 2016-12-17 16:38 UTC (permalink / raw)
To: Daniel Hilst Selli; +Cc: OE-core
In-Reply-To: <20161217014805.6120-1-danielhilst@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
On 17 December 2016 at 01:48, Daniel Hilst Selli <danielhilst@gmail.com>
wrote:
> CxxTest is a C++ unit framework test that doesn't
> need precompiled library.
>
Unless you have a great reason for this to be in oe-core, it should
probably belong in meta-oe so please submit it to that layer.
Ross
[-- Attachment #2: Type: text/html, Size: 723 bytes --]
^ permalink raw reply
* is yoctoproject.org and openenembedded.org down?
From: akuster808 @ 2016-12-17 17:43 UTC (permalink / raw)
To: OE-core, yocto@yoctoproject.org
Hello,
Can anyone get to yoctoproject.org or openembedded.org?
they where working earlier this morning.
- Armin
^ permalink raw reply
* Re: [PATCH] gdb 7.11.1 -> 7.12
From: Richard Purdie @ 2016-12-17 9:45 UTC (permalink / raw)
To: Khem Raj, Zheng Ruoqin; +Cc: openembedded-core
In-Reply-To: <48DE1321-CAEA-4C5E-AAD5-6367729C3498@gmail.com>
On Fri, 2016-12-16 at 08:57 -0800, Khem Raj wrote:
> >
> > On Dec 15, 2016, at 1:16 AM, Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.
> > com> wrote:
> >
> > 1) Upgrade gdb from 7.11.1 to 7.12
> > 2) Delete 11 patches below, since they are integrated upstream.
> > 0001-include-sys-types.h-for-mode_t.patch
> > 0002-make-man-install-relative-to-DESTDIR.patch
> > 0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
> > 0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
> > 0005-Add-support-for-Renesas-SH-sh4-architecture.patch
> > 0006-Dont-disable-libreadline.a-when-using-disable-static.patch
> > 0007-use-asm-sgidefs.h.patch
> > 0008-Use-exorted-definitions-of-SIGRTMIN.patch
> > 0009-Change-order-of-CFLAGS.patch
> > 0010-resolve-restrict-keyword-conflict.patch
> > 0011-avx_mpx.patch
> I doubt if they all are merged. Can you check if you can build gdb
> for musl targets ?
Its confirmed as not building:
https://autobuilder.yocto.io/builders/nightly-musl/builds/104/steps/BuildImages/logs/stdio
Cheers,
Richard
^ permalink raw reply
* [PATCH] Add cxxtest framework to devtools.
From: Daniel Hilst Selli @ 2016-12-17 1:48 UTC (permalink / raw)
To: openembedded-core
CxxTest is a C++ unit framework test that doesn't
need precompiled library.
Signed-off-by: Daniel Hilst Selli <danielhilst@gmail.com>
---
meta/recipes-devtools/cxxtest/cxxtest_4.3.bb | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 meta/recipes-devtools/cxxtest/cxxtest_4.3.bb
diff --git a/meta/recipes-devtools/cxxtest/cxxtest_4.3.bb b/meta/recipes-devtools/cxxtest/cxxtest_4.3.bb
new file mode 100644
index 0000000..2915011
--- /dev/null
+++ b/meta/recipes-devtools/cxxtest/cxxtest_4.3.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit, CppUnit, and xUnit."
+HOMEPAGE = "http://cxxtest.com/"
+LICENSE = "LGPL-2.0"
+SECTION = "devel"
+
+SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz"
+SRC_URI[md5sum] = "b3a24b3e1aad9acf6adac37f4c3f83ec"
+SRC_URI[sha256sum] = "356d0f4810e8eb5c344147a0cca50fc0d84122c286e7644b61cb365c2ee22083"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
+S = "${WORKDIR}/cxxtest-${PV}/python"
+
+inherit distutils
+
+do_install_append() {
+ install -d ${D}${includedir}
+ cp -a ../cxxtest ${D}${includedir}
+ sed '1c\
+#!/usr/bin/env python' -i ${D}${bindir}/cxxtestgen
+}
+
+BBCLASSEXTEND = "native nativesdk"
--
2.10.2
^ permalink raw reply related
* [PATCH v2] binutils-2.27.inc: Fix alignment frags for aarch64
From: Manjukumar Matha @ 2016-12-17 1:43 UTC (permalink / raw)
To: openembedded-core
There was bug with alignment frags for aarch64 in binutils. This is fixed in
master of binutils. This patch backports the fix to binutils 2.27 version.
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
---
meta/recipes-devtools/binutils/binutils-2.27.inc | 1 +
...eration-of-alignment-frags-in-code-sectio.patch | 139 +++++++++++++++++++++
2 files changed, 140 insertions(+)
create mode 100644 meta/recipes-devtools/binutils/binutils/0017-Fix-the-generation-of-alignment-frags-in-code-sectio.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.27.inc b/meta/recipes-devtools/binutils/binutils-2.27.inc
index df8864c..5a65d91 100644
--- a/meta/recipes-devtools/binutils/binutils-2.27.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.27.inc
@@ -37,6 +37,7 @@ SRC_URI = "\
file://0015-binutils-mips-gas-pic-relax-linkonce.diff \
file://0015-Refine-.cfi_sections-check-to-only-consider-compact-.patch \
file://0016-Fix-seg-fault-in-ARM-linker-when-trying-to-parse-a-b.patch \
+ file://0017-Fix-the-generation-of-alignment-frags-in-code-sectio.patch \
file://0001-ppc-apuinfo-for-spe-parsed-incorrectly.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0017-Fix-the-generation-of-alignment-frags-in-code-sectio.patch b/meta/recipes-devtools/binutils/binutils/0017-Fix-the-generation-of-alignment-frags-in-code-sectio.patch
new file mode 100644
index 0000000..f8b46be
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0017-Fix-the-generation-of-alignment-frags-in-code-sectio.patch
@@ -0,0 +1,139 @@
+From 4a4286465b5d6c28968bc2b29ae08daca7f219a3 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Fri, 18 Nov 2016 11:42:48 -0800
+Subject: [PATCH] Fix the generation of alignment frags in code sections for AArch64.
+
+PR gas/20364
+* config/tc-aarch64.c (s_ltorg): Change the mapping state after
+aligning the frag.
+(aarch64_init): Treat rs_align frags in code sections as
+containing code, not data.
+* testsuite/gas/aarch64/pr20364.s: New test.
+* testsuite/gas/aarch64/pr20364.d: New test driver.
+
+Backporting the patch from binutils mainline
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7ea12e5c3ad54da440c08f32da09534e63e515ca
+
+Upstream-Status: Backport
+
+Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
+---
+ gas/ChangeLog | 10 ++++++++++
+ gas/config/tc-aarch64.c | 10 +++++++---
+ gas/testsuite/gas/aarch64/pr20364.d | 13 +++++++++++++
+ gas/testsuite/gas/aarch64/pr20364.s | 28 ++++++++++++++++++++++++++++
+ 4 files changed, 58 insertions(+), 3 deletions(-)
+ create mode 100644 gas/testsuite/gas/aarch64/pr20364.d
+ create mode 100644 gas/testsuite/gas/aarch64/pr20364.s
+
+diff --git a/gas/ChangeLog b/gas/ChangeLog
+index a39895a..fad06dc 100644
+--- a/gas/ChangeLog
++++ b/gas/ChangeLog
+@@ -1,3 +1,13 @@
++2016-08-05 Nick Clifton <nickc@redhat.com>
++
++ PR gas/20364
++ * config/tc-aarch64.c (s_ltorg): Change the mapping state after
++ aligning the frag.
++ (aarch64_init): Treat rs_align frags in code sections as
++ containing code, not data.
++ * testsuite/gas/aarch64/pr20364.s: New test.
++ * testsuite/gas/aarch64/pr20364.d: New test driver.
++
+ 2016-08-03 Tristan Gingold <gingold@adacore.com>
+
+ * configure: Regenerate.
+diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
+index ddc40f2..74933cb 100644
+--- a/gas/config/tc-aarch64.c
++++ b/gas/config/tc-aarch64.c
+@@ -1736,13 +1736,13 @@ s_ltorg (int ignored ATTRIBUTE_UNUSED)
+ if (pool == NULL || pool->symbol == NULL || pool->next_free_entry == 0)
+ continue;
+
+- mapping_state (MAP_DATA);
+-
+ /* Align pool as you have word accesses.
+ Only make a frag if we have to. */
+ if (!need_pass_2)
+ frag_align (align, 0, 0);
+
++ mapping_state (MAP_DATA);
++
+ record_alignment (now_seg, align);
+
+ sprintf (sym_name, "$$lit_\002%x", pool->id);
+@@ -6373,11 +6373,15 @@ aarch64_init_frag (fragS * fragP, int max_chars)
+
+ switch (fragP->fr_type)
+ {
+- case rs_align:
+ case rs_align_test:
+ case rs_fill:
+ mapping_state_2 (MAP_DATA, max_chars);
+ break;
++ case rs_align:
++ /* PR 20364: We can get alignment frags in code sections,
++ so do not just assume that we should use the MAP_DATA state. */
++ mapping_state_2 (subseg_text_p (now_seg) ? MAP_INSN : MAP_DATA, max_chars);
++ break;
+ case rs_align_code:
+ mapping_state_2 (MAP_INSN, max_chars);
+ break;
+diff --git a/gas/testsuite/gas/aarch64/pr20364.d b/gas/testsuite/gas/aarch64/pr20364.d
+new file mode 100644
+index 0000000..babcff1
+--- /dev/null
++++ b/gas/testsuite/gas/aarch64/pr20364.d
+@@ -0,0 +1,13 @@
++# Check that ".align <size>, <fill>" does not set the mapping state to DATA, causing unnecessary frag generation.
++#name: PR20364
++#objdump: -d
++
++.*: file format .*
++
++Disassembly of section \.vectors:
++
++0+000 <.*>:
++ 0: d2800000 mov x0, #0x0 // #0
++ 4: 94000000 bl 0 <plat_report_exception>
++ 8: 17fffffe b 0 <bl1_exceptions>
++
+diff --git a/gas/testsuite/gas/aarch64/pr20364.s b/gas/testsuite/gas/aarch64/pr20364.s
+new file mode 100644
+index 0000000..594ad7c
+--- /dev/null
++++ b/gas/testsuite/gas/aarch64/pr20364.s
+@@ -0,0 +1,28 @@
++ .macro vector_base label
++ .section .vectors, "ax"
++ .align 11, 0
++ \label:
++ .endm
++
++ .macro vector_entry label
++ .section .vectors, "ax"
++ .align 7, 0
++ \label:
++ .endm
++
++ .macro check_vector_size since
++ .if (. - \since) > (32 * 4)
++ .error "Vector exceeds 32 instructions"
++ .endif
++ .endm
++
++ .globl bl1_exceptions
++
++vector_base bl1_exceptions
++
++vector_entry SynchronousExceptionSP0
++ mov x0, #0x0
++ bl plat_report_exception
++ b SynchronousExceptionSP0
++ check_vector_size SynchronousExceptionSP0
++
+--
+2.7.4
+
--
2.7.4
^ permalink raw reply related
* [PATCH] systemd: point to correct resolv.conf when resolved is enabled
From: Khem Raj @ 2016-12-16 22:07 UTC (permalink / raw)
To: openembedded-core
latest systemd has changed the resolved defaults which points to
127.0.0.53 port 53 on local network. If someone wants to use
host-local IP address then it can be pointed to copy in /lib/systemd
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/systemd/systemd_232.bb | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index 5b45eb2..9b76b69 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -237,11 +237,12 @@ do_install() {
${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
fi
if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then
- # if resolved is disabled, it won't handle the link of resolv.conf, so
- # set it up ourselves
- ln -s ../run/resolv.conf ${D}${sysconfdir}/resolv.conf
- echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
- echo 'f /run/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
+ echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
+ echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
+ echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
+ ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv.conf
+ else
+ sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
fi
install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
}
--
2.10.2
^ permalink raw reply related
* Re: [PATCH v3 1/2] gummiboot: Remove/change gummiboot references with systemd-boot
From: Wold, Saul @ 2016-12-16 21:07 UTC (permalink / raw)
To: alejandro.hernandez@linux.intel.com,
openembedded-core@lists.openembedded.org
In-Reply-To: <20161130180043.2242-1-alejandro.hernandez@linux.intel.com>
Ping! Unfortunately this missed M1, but can we get it into M2 Early
please.
Thanks
Sau!
On Wed, 2016-11-30 at 12:00 -0600, Alejandro Hernandez wrote:
> After systemd-boot was introduced, its been tested for a while with
> no major
> issues being found until now, this patch completely replaces all
> gummiboot
> instances with systemd-boot ones, taking the next step into cleaning
> up systemd-boot/gummiboot.
>
> [YOCTO #10332]
>
> Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.c
> om>
> ---
> meta/classes/fs-uuid.bbclass | 2 +-
> meta/classes/systemd-boot.bbclass | 4 +---
> meta/conf/distro/include/distro_alias.inc | 2 +-
> meta/lib/oeqa/controllers/masterimage.py | 4 ++--
> meta/lib/oeqa/selftest/wic.py | 6 ++---
> meta/recipes-bsp/systemd-boot/systemd-boot.bb | 2 +-
> .../initrdscripts/files/init-install-efi-testfs.sh | 12 +++++-----
> .../initrdscripts/files/init-install-efi.sh | 12 +++++-----
> scripts/contrib/mkefidisk.sh | 26 +++++++++++-
> ----------
> scripts/lib/wic/plugins/source/bootimg-efi.py | 22 +++++++++---
> ------
> 10 files changed, 44 insertions(+), 48 deletions(-)
>
> diff --git a/meta/classes/fs-uuid.bbclass b/meta/classes/fs-
> uuid.bbclass
> index bd2613c..1d5d0c3 100644
> --- a/meta/classes/fs-uuid.bbclass
> +++ b/meta/classes/fs-uuid.bbclass
> @@ -13,7 +13,7 @@ def get_rootfs_uuid(d):
> bb.fatal('Could not determine filesystem UUID of %s' % rootfs)
>
> # Replace the special <<uuid-of-rootfs>> inside a string (like the
> -# root= APPEND string in a syslinux.cfg or gummiboot entry) with the
> +# root= APPEND string in a syslinux.cfg or systemd-boot entry) with
> the
> # actual UUID of the rootfs. Does nothing if the special string
> # is not used.
> def replace_rootfs_uuid(d, string):
> diff --git a/meta/classes/systemd-boot.bbclass
> b/meta/classes/systemd-boot.bbclass
> index 05244c7..3398218 100644
> --- a/meta/classes/systemd-boot.bbclass
> +++ b/meta/classes/systemd-boot.bbclass
> @@ -4,9 +4,7 @@
>
> # systemd-boot.bbclass - The "systemd-boot" is essentially the
> gummiboot merged into systemd.
> # The original standalone gummiboot project
> is dead without any more
> -# maintenance. As a start point, we replace
> all gummitboot occurrences
> -# with systemd-boot in gummiboot.bbclass to
> have a base version of this
> -# systemd-boot.bbclass.
> +# maintenance.
> #
> # Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live
> images instead of grub-efi
> # (images built by image-live.bbclass or image-vm.bbclass)
> diff --git a/meta/conf/distro/include/distro_alias.inc
> b/meta/conf/distro/include/distro_alias.inc
> index 10efb09..9c82854 100644
> --- a/meta/conf/distro/include/distro_alias.inc
> +++ b/meta/conf/distro/include/distro_alias.inc
> @@ -135,7 +135,7 @@ DISTRO_PN_ALIAS_pn-gtk-doc = "Fedora=gtk-doc
> Ubuntu=gtk-doc"
> DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-
> engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-
> engines"
> DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
> DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT"
> -DISTRO_PN_ALIAS_pn-gummiboot = "Debian=gummiboot Fedora=gummiboot"
> +DISTRO_PN_ALIAS_pn-systemd-boot = "Ubuntu=systemd-boot
> Fedora=systemd-boot"
> DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core"
> DISTRO_PN_ALIAS_pn-hostap-conf = "OE-Core"
> DISTRO_PN_ALIAS_pn-hwlatdetect = "OSPDT"
> diff --git a/meta/lib/oeqa/controllers/masterimage.py
> b/meta/lib/oeqa/controllers/masterimage.py
> index 9ce3bf8..7fcbb6d 100644
> --- a/meta/lib/oeqa/controllers/masterimage.py
> +++ b/meta/lib/oeqa/controllers/masterimage.py
> @@ -159,10 +159,10 @@ class
> MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget,
> metaclass=ABCMeta
> self.power_cycle(self.connection)
>
>
> -class GummibootTarget(MasterImageHardwareTarget):
> +class SystemdbootTarget(MasterImageHardwareTarget):
>
> def __init__(self, d):
> - super(GummibootTarget, self).__init__(d)
> + super(SystemdbootTarget, self).__init__(d)
> # this the value we need to set in the LoaderEntryOneShot
> EFI variable
> # so the system boots the 'test' bootloader label and not
> the default
> # The first four bytes are EFI bits, and the rest is an utf-
> 16le string
> diff --git a/meta/lib/oeqa/selftest/wic.py
> b/meta/lib/oeqa/selftest/wic.py
> index faac11e..61081cc 100644
> --- a/meta/lib/oeqa/selftest/wic.py
> +++ b/meta/lib/oeqa/selftest/wic.py
> @@ -243,9 +243,9 @@ class Wic(oeSelfTest):
> self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" %
> image)))
>
> @testcase(1349)
> - def test_mkgummidisk(self):
> - """Test creation of mkgummidisk image"""
> - image = "mkgummidisk"
> + def test_systemd-bootdisk(self):
> + """Test creation of systemd-bootdisk image"""
> + image = "systemd-bootdisk"
> self.assertEqual(0, runCmd("wic create %s -e core-image-
> minimal" \
> % image).status)
> self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" %
> image)))
> diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot.bb
> b/meta/recipes-bsp/systemd-boot/systemd-boot.bb
> index 7036664..602052c 100644
> --- a/meta/recipes-bsp/systemd-boot/systemd-boot.bb
> +++ b/meta/recipes-bsp/systemd-boot/systemd-boot.bb
> @@ -15,7 +15,7 @@ EXTRA_OECONF = " --enable-gnuefi \
> --disable-manpages \
> "
>
> -# Imported from gummiboot recipe
> +# Imported from the old gummiboot recipe
> TUNE_CCARGS_remove = "-mfpmath=sse"
> COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> index b562109..9c4b263 100644
> --- a/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-
> testfs.sh
> @@ -171,19 +171,19 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
> fi
>
> if [ -d /run/media/$1/loader ]; then
> - GUMMIBOOT_CFGS="/ssd/loader/entries/*.conf"
> - # copy config files for gummiboot
> + SYSTEMDBOOT_CFGS="/ssd/loader/entries/*.conf"
> + # copy config files for systemd-boot
> cp -dr /run/media/$1/loader /ssd
> # delete the install entry
> rm -f /ssd/loader/entries/install.conf
> # delete the initrd lines
> - sed -i "/initrd /d" $GUMMIBOOT_CFGS
> + sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
> # delete any LABEL= strings
> - sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS
> + sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
> # delete any root= strings
> - sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
> + sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
> # add the root= and other standard boot options
> - sed -i "s@options *@options root=$rootfs rw $rootwait quiet @"
> $GUMMIBOOT_CFGS
> + sed -i "s@options *@options root=$rootfs rw $rootwait quiet @"
> $SYSTEMDBOOT_CFGS
> # Add the test label
> echo -ne "title test\nlinux /test-kernel\noptions root=$testfs
> rw $rootwait quiet\n" > /ssd/loader/entries/test.conf
> fi
> diff --git a/meta/recipes-core/initrdscripts/files/init-install-
> efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> index ffb709c..5ad3a60 100644
> --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
> @@ -245,19 +245,19 @@ fi
>
> if [ -d /run/media/$1/loader ]; then
> rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
> - GUMMIBOOT_CFGS="/boot/loader/entries/*.conf"
> - # copy config files for gummiboot
> + SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
> + # copy config files for systemd-boot
> cp -dr /run/media/$1/loader /boot
> # delete the install entry
> rm -f /boot/loader/entries/install.conf
> # delete the initrd lines
> - sed -i "/initrd /d" $GUMMIBOOT_CFGS
> + sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
> # delete any LABEL= strings
> - sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS
> + sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
> # delete any root= strings
> - sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
> + sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
> # add the root= and other standard boot options
> - sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait
> quiet @" $GUMMIBOOT_CFGS
> + sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait
> quiet @" $SYSTEMDBOOT_CFGS
> fi
>
> umount /tgt_root
> diff --git a/scripts/contrib/mkefidisk.sh
> b/scripts/contrib/mkefidisk.sh
> index a175895..800733f 100755
> --- a/scripts/contrib/mkefidisk.sh
> +++ b/scripts/contrib/mkefidisk.sh
> @@ -384,7 +384,7 @@ EFIDIR="$BOOTFS_MNT/EFI/BOOT"
> cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to
> copy vmlinuz"
> # Copy the efi loader and configs (booti*.efi and grub.cfg if it
> exists)
> cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to
> copy EFI dir"
> -# Silently ignore a missing gummiboot loader dir (we might just be a
> GRUB image)
> +# Silently ignore a missing systemd-boot loader dir (we might just
> be a GRUB image)
> cp -r $HDDIMG_MNT/loader $BOOTFS_MNT >$OUT 2>&1
>
> # Update the boot loaders configurations for an installed image
> @@ -410,25 +410,25 @@ if [ -e "$GRUB_CFG" ]; then
> sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait
> console=ttyS0 console=tty0 @" $GRUB_CFG
> fi
>
> -# Look for a gummiboot installation
> -GUMMI_ENTRIES="$BOOTFS_MNT/loader/entries"
> -GUMMI_CFG="$GUMMI_ENTRIES/boot.conf"
> -if [ -d "$GUMMI_ENTRIES" ]; then
> - info "Configuring Gummiboot"
> +# Look for a systemd-boot installation
> +SYSTEMD_BOOT_ENTRIES="$BOOTFS_MNT/loader/entries"
> +SYSTEMD_BOOT_CFG="$SYSTEMD_BOOT_ENTRIES/boot.conf"
> +if [ -d "$SYSTEMD_BOOT_ENTRIES" ]; then
> + info "Configuring SystemD-boot"
> # remove the install target if it exists
> - rm $GUMMI_ENTRIES/install.conf >$OUT 2>&1
> + rm $SYSTEMD_BOOT_ENTRIES/install.conf >$OUT 2>&1
>
> - if [ ! -e "$GUMMI_CFG" ]; then
> - echo "ERROR: $GUMMI_CFG not found"
> + if [ ! -e "$SYSTEMD_BOOT_CFG" ]; then
> + echo "ERROR: $SYSTEMD_BOOT_CFG not found"
> fi
>
> - sed -i "/initrd /d" $GUMMI_CFG
> - sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG
> - sed -i "s@options *LABEL=boot @options LABEL=Boot
> root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @"
> $GUMMI_CFG
> + sed -i "/initrd /d" $SYSTEMD_BOOT_CFG
> + sed -i "s@ root=[^ ]*@ @" $SYSTEMD_BOOT_CFG
> + sed -i "s@options *LABEL=boot @options LABEL=Boot
> root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @"
> $SYSTEMD_BOOT_CFG
> fi
>
> # Ensure we have at least one EFI bootloader configured
> -if [ ! -e $GRUB_CFG ] && [ ! -e $GUMMI_CFG ]; then
> +if [ ! -e $GRUB_CFG ] && [ ! -e $SYSTEMD_BOOT_CFG ]; then
> die "No EFI bootloader configuration found"
> fi
>
> diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py
> b/scripts/lib/wic/plugins/source/bootimg-efi.py
> index 4adb80b..305e910 100644
> --- a/scripts/lib/wic/plugins/source/bootimg-efi.py
> +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
> @@ -36,7 +36,7 @@ from wic.utils.oe.misc import exec_cmd,
> exec_native_cmd, get_bitbake_var, \
> class BootimgEFIPlugin(SourcePlugin):
> """
> Create EFI boot partition.
> - This plugin supports GRUB 2 and gummiboot bootloaders.
> + This plugin supports GRUB 2 and systemd-boot bootloaders.
> """
>
> name = 'bootimg-efi'
> @@ -82,7 +82,7 @@ class BootimgEFIPlugin(SourcePlugin):
> cfg.close()
>
> @classmethod
> - def do_configure_gummiboot(cls, hdddir, creator, cr_workdir):
> + def do_configure_systemdboot(cls, hdddir, creator, cr_workdir):
> """
> Create loader-specific systemd-boot/gummiboot config
> """
> @@ -98,7 +98,7 @@ class BootimgEFIPlugin(SourcePlugin):
> loader_conf += "default boot\n"
> loader_conf += "timeout %d\n" % bootloader.timeout
>
> - msger.debug("Writing gummiboot config
> %s/hdd/boot/loader/loader.conf" \
> + msger.debug("Writing systemd-boot config
> %s/hdd/boot/loader/loader.conf" \
> % cr_workdir)
> cfg = open("%s/hdd/boot/loader/loader.conf" % cr_workdir,
> "w")
> cfg.write(loader_conf)
> @@ -109,16 +109,16 @@ class BootimgEFIPlugin(SourcePlugin):
> if configfile:
> custom_cfg = get_custom_config(configfile)
> if custom_cfg:
> - # Use a custom configuration for gummiboot
> + # Use a custom configuration for systemd-boot
> boot_conf = custom_cfg
> msger.debug("Using custom configuration file "
> - "%s for gummiboots's boot.conf" %
> configfile)
> + "%s for systemd-boots's boot.conf" %
> configfile)
> else:
> msger.error("configfile is specified but failed to "
> "get it from %s." % configfile)
>
> if not custom_cfg:
> - # Create gummiboot configuration using parameters from
> wks file
> + # Create systemd-boot configuration using parameters
> from wks file
> kernel = "/bzImage"
>
> boot_conf = ""
> @@ -127,7 +127,7 @@ class BootimgEFIPlugin(SourcePlugin):
> boot_conf += "options LABEL=Boot root=%s %s\n" % \
> (creator.rootdev, bootloader.append)
>
> - msger.debug("Writing gummiboot config
> %s/hdd/boot/loader/entries/boot.conf" \
> + msger.debug("Writing systemd-boot config
> %s/hdd/boot/loader/entries/boot.conf" \
> % cr_workdir)
> cfg = open("%s/hdd/boot/loader/entries/boot.conf" %
> cr_workdir, "w")
> cfg.write(boot_conf)
> @@ -149,9 +149,8 @@ class BootimgEFIPlugin(SourcePlugin):
> try:
> if source_params['loader'] == 'grub-efi':
> cls.do_configure_grubefi(hdddir, creator,
> cr_workdir)
> - elif source_params['loader'] == 'gummiboot' \
> - or source_params['loader'] == 'systemd-boot':
> - cls.do_configure_gummiboot(hdddir, creator,
> cr_workdir)
> + elif source_params['loader'] == 'systemd-boot':
> + cls.do_configure_systemdboot(hdddir, creator,
> cr_workdir)
> else:
> msger.error("unrecognized bootimg-efi loader: %s" %
> source_params['loader'])
> except KeyError:
> @@ -190,8 +189,7 @@ class BootimgEFIPlugin(SourcePlugin):
> exec_cmd(cp_cmd, True)
> shutil.move("%s/grub.cfg" % cr_workdir,
> "%s/hdd/boot/EFI/BOOT/grub.cfg" %
> cr_workdir)
> - elif source_params['loader'] == 'gummiboot' \
> - or source_params['loader'] == 'systemd-boot':
> + elif source_params['loader'] == 'systemd-boot':
> cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" %
> (bootimg_dir, hdddir)
> exec_cmd(cp_cmd, True)
> else:
> --
> 2.10.1
>
^ permalink raw reply
* [wic][PATCH] wic: look for wks files in <layer>/recipes-images
From: Ed Bartosh @ 2016-12-16 20:30 UTC (permalink / raw)
To: openembedded-core
Currently wic looks for wks files in
<layer dir>/scripts/lib/wic/canned-wks/ directories.
This path is too nested and doesn't look consistent with the
naming scheme of layer directories.
Added 'recipes-images' directory to the list of paths
to look for wks files.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/engine.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 5b10463..8353edb 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -52,6 +52,7 @@ def verify_build_env():
CANNED_IMAGE_DIR = "lib/wic/canned-wks" # relative to scripts
SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
+RECIPES_IMAGES_DIR = "recipes-images"
def build_canned_image_list(path):
layers_path = misc.get_bitbake_var("BBLAYERS")
@@ -59,8 +60,10 @@ def build_canned_image_list(path):
if layers_path is not None:
for layer_path in layers_path.split():
- cpath = os.path.join(layer_path, SCRIPTS_CANNED_IMAGE_DIR)
- canned_wks_layer_dirs.append(cpath)
+ for wks_path in (RECIPES_IMAGES_DIR, SCRIPTS_CANNED_IMAGE_DIR):
+ cpath = os.path.join(layer_path, wks_path)
+ if os.path.isdir(cpath):
+ canned_wks_layer_dirs.append(cpath)
cpath = os.path.join(path, CANNED_IMAGE_DIR)
canned_wks_layer_dirs.append(cpath)
--
2.1.4
^ permalink raw reply related
* bug with dpkg-native and sstate-cache mirrors
From: Anders Oleson @ 2016-12-16 19:31 UTC (permalink / raw)
To: openembedded-core
I originally posted this here:
https://lists.yoctoproject.org/pipermail/yocto/2016-December/033542.html.
Apologies, I did not know to report OE core issues here.
Also, following Jussi's advice I started reading the submission
guidelines and I posted the patch to dpkg itself to their list to see
if it was something that could be upstreamed. Led to a good discussion
here: https://lists.debian.org/debian-dpkg/2016/12/msg00013.html.
While this was an expedient way to fix my problem, it probably isn't
the best way forward as a real change to dpkg. They have offered to
look at submissions to fix what I think is the true root cause - the
non-override-able, hard-coded CONFIGDIR.
Problem description:
1. user "joe" clones the build repo, ex. poky from Yocto and builds
everything, ex. core-system-minimal completely clean build from
scratch. The local.conf is set to use package_deb for our system.
2. "joe" is the build master and then publishes the resultant
"sstate-cache" in a shared directory to be used as a mirror for the
other users. Makes the sstate-cache-mirror directory read-only, etc.
3. "joe" deletes the build directory creates a new one and tests the
build in a new directory which works fine and runs quickly using the
sstate-cache-mirror.
3. user "bob" clones a similar revision and builds using the
SSTATE_MIRROR pointing at the mirror.
4. During "do_rootfs" dpkg (dpkg-native) fails with the message:
dpkg: error: error opening configuration directory
'/home/net/joe/work/sysgen-mrp/build/tmp/sysroots/x86_64-linux/etc/dpkg/dpkg.cfg.d':
Permission denied
E: Sub-process dpkg returned an error code (2)
What happened is that in dpkg-native, the CONFIGDIR is compiled in and
hard-coded to the failing path. dpkg does not currently have a way to
override this at runtime in the same way as --instdir and --admindir.
So dpkg is still looking for config files user "joes" directory which
may:
- have wrong permissions
- be missing or parent dirs missing
- contain malicious garbage because "joe" wants to screw with "bob" :)
- any/all of the above (we had a combination)
Normally /etc/dpkg/dpkg.d is empty for the native sysroot, so our
quick fix was to modify dpkg to just ignore ANY error reading that
directory and pretend it was empty (which for Yocto builds it was
anyway). This was preferable to removing the whole package from the
SSTATE_MIRROR to force rebuilds in each work directory. See the patch
I posted to the Yocto list linked above. Debian dpkg developers don't
want to remove those checks and that seems advisable.
So that leaves two options that I can see (is there an easier/better fix?):
- we can carry a patch to dpkg-native similar to what I posted. For
Yocto/OE it probably is good enough, at least if we limit it to
dpkg-native
- add something like a --configdir command line switch to dpkg so that
we can point it toward the proper sysroot rather than use the compiled
in default
I'd actually prefer the second option because, for one thing, it would
eliminate the baked in paths that contain user names, etc. I'd suggest
that if we pass in --configdir we should configure/compile dpkg-native
with the default paths pointing to neutral, constant, invalid paths to
avoid leaking build specific information into sstate and to catch
errors.
Does this sound like I'm on the right track or like something that
could be included? I'd like to fix this so that it doesn't sneak up on
someone else.
I'm willing to take a hack at it and test it in the scenario where
this bit us. It would involve steps:
1. develop a patch to dpkg to add the option
2. develop a patch for OE to change the configure for dpkg-native
3. a patch for OE to pass --configdir to dpkg in all the right places.
I could use help to insure I find them all.
Thanks,
Anders
error log below:
----------------------
ERROR: system-image-1.0-r0 do_rootfs: Unable to install packages.
Command '/home/local/MrProductName/mrp-system/build/tmp/sysroots/x86_64-linux/usr/bin/apt-get
install --force-yes --allow-unauthenticated bash run-postinsts
packagegroup-core-eclipse-debug mrp-ofp dosfstools apt e2fsprogs dpkg
packagegroup-core-boot' returned 100:
Reading package lists...
Building dependency tree...
The following extra packages will be installed:
base-files base-passwd busybox busybox-hwclock busybox-syslog busybox-udhcpc
ca-certificates debianutils debianutils-run-parts e2fsprogs-badblocks
e2fsprogs-e2fsck e2fsprogs-mke2fs eudev gdbserver init-ifupdown initscripts
initscripts-functions kernel-4.4.26-yocto-standard kernel-module-uvesafb
libblkid1 libbz2-1 libc6 libc6-thread-db libcom-err2 libcrypto1.0.0 libcurl4
libe2p2 libext2fs2 libgcc1 libgmp10 libgnutls30 libidn11 libkmod2 liblzma5
libperl5 libss2 libssl1.0.0 libstdc++6 libtinfo5 libuuid1 libz1
modutils-initscripts ncurses-terminfo-base netbase nettle
openssh-sftp-server openssl-conf perl sysvinit sysvinit-inittab
sysvinit-pidof tcf-agent udev-cache update-alternatives-opkg update-rc.d
v86d xz
Suggested packages:
ncurses-terminfo
The following NEW packages will be installed:
apt mrp-ofp base-files base-passwd bash busybox busybox-hwclock
busybox-syslog busybox-udhcpc ca-certificates debianutils
debianutils-run-parts dosfstools dpkg e2fsprogs e2fsprogs-badblocks
e2fsprogs-e2fsck e2fsprogs-mke2fs eudev gdbserver init-ifupdown initscripts
initscripts-functions kernel-4.4.26-yocto-standard kernel-module-uvesafb
libblkid1 libbz2-1 libc6 libc6-thread-db libcom-err2 libcrypto1.0.0 libcurl4
libe2p2 libext2fs2 libgcc1 libgmp10 libgnutls30 libidn11 libkmod2 liblzma5
libperl5 libss2 libssl1.0.0 libstdc++6 libtinfo5 libuuid1 libz1
modutils-initscripts ncurses-terminfo-base netbase nettle
openssh-sftp-server openssl-conf packagegroup-core-boot
packagegroup-core-eclipse-debug perl run-postinsts sysvinit sysvinit-inittab
sysvinit-pidof tcf-agent udev-cache update-alternatives-opkg update-rc.d
v86d xz
0 upgraded, 66 newly installed, 0 to remove and 0 not upgraded.
Need to get 0 B/7850 kB of archives.
After this operation, 0 B of additional disk space will be used.
WARNING: The following packages cannot be authenticated!
libc6 libgcc1 libstdc++6 liblzma5 libz1 libgmp10 nettle libidn11 libgnutls30
libcurl4 update-alternatives-opkg libtinfo5 base-files bash run-postinsts
libperl5 perl xz libbz2-1 dpkg debianutils-run-parts debianutils apt mrp-ofp
base-passwd busybox busybox-hwclock busybox-syslog busybox-udhcpc
ca-certificates dosfstools libcom-err2 libss2 libuuid1 libblkid1 libe2p2
libext2fs2 e2fsprogs-badblocks e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs
libkmod2 eudev gdbserver netbase init-ifupdown initscripts-functions
initscripts kernel-4.4.26-yocto-standard kernel-module-uvesafb
libc6-thread-db libcrypto1.0.0 libssl1.0.0 modutils-initscripts
ncurses-terminfo-base openssh-sftp-server openssl-conf v86d sysvinit-pidof
sysvinit-inittab sysvinit packagegroup-core-boot tcf-agent
packagegroup-core-eclipse-debug udev-cache update-rc.d
Authentication warning overridden.
dpkg: error: error opening configuration directory
'/home/net/joe/work/sysgen-mrp/build/tmp/sysroots/x86_64-linux/etc/dpkg/dpkg.cfg.d':
Permission denied
E: Sub-process dpkg returned an error code (2)
ERROR: system-image-1.0-r0 do_rootfs: Function failed: do_rootfs
ERROR: Logfile of failure stored in:
/home/local/MrProductName/mrp-system/build/tmp/work/qemux86-hbdc-linux/system-image/1.0-r0/temp/log.do_rootfs.31848
ERROR: Task 9 (/home/local/MrProductName/mrp-system/poky/../meta-system/recipes-core/images/system-image.bb,
do_rootfs) failed with exit code '1'
^ permalink raw reply
* Re: [PATCH] curl: add ptest
From: Burton, Ross @ 2016-12-16 17:53 UTC (permalink / raw)
To: Maxin B. John; +Cc: Cristian Iorga, OE-core
In-Reply-To: <1481548162-22276-1-git-send-email-maxin.john@intel.com>
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
On 12 December 2016 at 13:09, Maxin B. John <maxin.john@intel.com> wrote:
> + python-argparse python-pprint diffutils openssh \
>
Sadly this dependency on openssh breaks images which pull in dropbear
explicitly, such as core-image-sato-dev.
Why does the curl ptest needs openssh, and can it use dropbear if that is
present?
Ross
[-- Attachment #2: Type: text/html, Size: 853 bytes --]
^ permalink raw reply
* Re: [wic][PATCH] meta-yocto-bsp: add kickstart file for MPC8315
From: Ed Bartosh @ 2016-12-16 17:14 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481907914-22383-1-git-send-email-ed.bartosh@linux.intel.com>
Sorry, wrong commit subject line.
Please, ignore.
On Fri, Dec 16, 2016 at 07:05:14PM +0200, Ed Bartosh wrote:
> Added kickstart file to produce partitioned image for
> MPC8315 reference hardware.
>
> [YOCTO #8719]
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
> scripts/lib/wic/canned-wks/mpc8315e-rdb.wks | 6 ++++++
> 1 file changed, 6 insertions(+)
> create mode 100644 scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
>
> diff --git a/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
> new file mode 100644
> index 0000000..af587b2
> --- /dev/null
> +++ b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
> @@ -0,0 +1,6 @@
> +# short-description: Create SD card image with a boot partition
> +# long-description: Creates a partitioned SD card image. Boot files
> +# are located in the first partition.
> +
> +part /boot --source bootimg-partition --ondisk sdb --fstype=ext3 --label boot
> +part / --source rootfs --ondisk sdb --fstype=ext3 --label root
> --
> 2.1.4
>
--
--
Regards,
Ed
^ permalink raw reply
* [wic][PATCH v2] wic: add kickstart file for MPC8315
From: Ed Bartosh @ 2016-12-16 17:12 UTC (permalink / raw)
To: openembedded-core
Added kickstart file to produce partitioned image for
MPC8315 reference hardware.
[YOCTO #8719]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/canned-wks/mpc8315e-rdb.wks | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
diff --git a/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
new file mode 100644
index 0000000..af587b2
--- /dev/null
+++ b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image with a boot partition
+# long-description: Creates a partitioned SD card image. Boot files
+# are located in the first partition.
+
+part /boot --source bootimg-partition --ondisk sdb --fstype=ext3 --label boot
+part / --source rootfs --ondisk sdb --fstype=ext3 --label root
--
2.1.4
^ permalink raw reply related
* [wic][PATCH] meta-yocto-bsp: add kickstart file for MPC8315
From: Ed Bartosh @ 2016-12-16 17:05 UTC (permalink / raw)
To: openembedded-core
Added kickstart file to produce partitioned image for
MPC8315 reference hardware.
[YOCTO #8719]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/canned-wks/mpc8315e-rdb.wks | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
diff --git a/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
new file mode 100644
index 0000000..af587b2
--- /dev/null
+++ b/scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image with a boot partition
+# long-description: Creates a partitioned SD card image. Boot files
+# are located in the first partition.
+
+part /boot --source bootimg-partition --ondisk sdb --fstype=ext3 --label boot
+part / --source rootfs --ondisk sdb --fstype=ext3 --label root
--
2.1.4
^ permalink raw reply related
* Re: [PATCH] gdb 7.11.1 -> 7.12
From: Khem Raj @ 2016-12-16 16:57 UTC (permalink / raw)
To: Zheng Ruoqin; +Cc: openembedded-core
In-Reply-To: <1481793382-34767-1-git-send-email-zhengrq.fnst@cn.fujitsu.com>
> On Dec 15, 2016, at 1:16 AM, Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> wrote:
>
> 1) Upgrade gdb from 7.11.1 to 7.12
> 2) Delete 11 patches below, since they are integrated upstream.
> 0001-include-sys-types.h-for-mode_t.patch
> 0002-make-man-install-relative-to-DESTDIR.patch
> 0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
> 0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
> 0005-Add-support-for-Renesas-SH-sh4-architecture.patch
> 0006-Dont-disable-libreadline.a-when-using-disable-static.patch
> 0007-use-asm-sgidefs.h.patch
> 0008-Use-exorted-definitions-of-SIGRTMIN.patch
> 0009-Change-order-of-CFLAGS.patch
> 0010-resolve-restrict-keyword-conflict.patch
> 0011-avx_mpx.patch
I doubt if they all are merged. Can you check if you can build gdb for musl targets ?
^ permalink raw reply
* [PATCH V3] python3-setuptools: upgrade to 31.0.0
From: Edwin Plauchu @ 2016-12-16 16:49 UTC (permalink / raw)
To: openembedded-core
It is a simultaneous upgrade for python 2 and 3 over setuptools.
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>
---
meta/recipes-devtools/python/python-setuptools.inc | 4 ++--
.../{python-setuptools_29.0.1.bb => python-setuptools_31.0.0.bb} | 0
.../{python3-setuptools_29.0.1.bb => python3-setuptools_31.0.0.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_29.0.1.bb => python-setuptools_31.0.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_29.0.1.bb => python3-setuptools_31.0.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc
index e76484a..858595c 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ SRCNAME = "setuptools"
SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "28ecfd0f2574b489b9a18343879a7324"
-SRC_URI[sha256sum] = "b539118819a4857378398891fa5366e090690e46b3e41421a1e07d6e9fd8feb0"
+SRC_URI[md5sum] = "66da89eeb1f33c2b947f316cfb3d7c7e"
+SRC_URI[sha256sum] = "0818cc0de692c3a5c83ca83aa7ec7ba6bc206f278735f1e0267b8d0e095cfe7a"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools"
diff --git a/meta/recipes-devtools/python/python-setuptools_29.0.1.bb b/meta/recipes-devtools/python/python-setuptools_31.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_29.0.1.bb
rename to meta/recipes-devtools/python/python-setuptools_31.0.0.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_29.0.1.bb b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_29.0.1.bb
rename to meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
--
2.1.4
^ permalink raw reply related
* [PATCH] initscripts: populate-volatile: don't run commands in background
From: Mans Rullgard @ 2016-12-16 16:28 UTC (permalink / raw)
To: openembedded-core
If commands are run asynchronously they may be completed out of
order causing problems if later entries depend on earlier ones.
Signed-off-by: Mans Rullgard <mans@mansr.com>
---
meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 91514bac86fa..cf0d2bf96610 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -36,7 +36,7 @@ create_file() {
[ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
} || {
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC &
+ eval $EXEC
else
# Creating some files at rootfs time may fail and should fail,
# but these failures should not be logged to make sure the do_rootfs
@@ -86,7 +86,7 @@ link_file() {
test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache.build
if [ -z "$ROOT_DIR" ]; then
- eval $EXEC &
+ eval $EXEC
else
# For the same reason with create_file(), failures should
# not be logged.
@@ -187,7 +187,7 @@ apply_cfgfile() {
case "${TTYPE}" in
"f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
- create_file "${TNAME}" &
+ create_file "${TNAME}"
;;
"d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
mk_dir "${TNAME}"
--
2.11.0
^ permalink raw reply related
* [PATCH] ruby: upgrade to 2.3.3
From: Edwin Plauchu @ 2016-12-16 16:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>
---
meta/recipes-devtools/ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} (89%)
diff --git a/meta/recipes-devtools/ruby/ruby_2.3.1.bb b/meta/recipes-devtools/ruby/ruby_2.3.3.bb
similarity index 89%
rename from meta/recipes-devtools/ruby/ruby_2.3.1.bb
rename to meta/recipes-devtools/ruby/ruby_2.3.3.bb
index 299383a..7ba9b46 100644
--- a/meta/recipes-devtools/ruby/ruby_2.3.1.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.3.3.bb
@@ -1,7 +1,7 @@
require ruby.inc
-SRC_URI[md5sum] = "0d896c2e7fd54f722b399f407e48a4c6"
-SRC_URI[sha256sum] = "b87c738cb2032bf4920fef8e3864dc5cf8eae9d89d8d523ce0236945c5797dcd"
+SRC_URI[md5sum] = "e485f3a55649eb24a1e2e1a40bc120df"
+SRC_URI[sha256sum] = "241408c8c555b258846368830a06146e4849a1d58dcaf6b14a3b6a73058115b7"
# it's unknown to configure script, but then passed to extconf.rb
# maybe it's not really needed as we're hardcoding the result with
--
2.1.4
^ permalink raw reply related
* Re: [PATCH V2] python3-setuptools: upgrade to 31.0.0
From: Alexander Kanavin @ 2016-12-16 15:17 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1481828422-15950-1-git-send-email-edwin.plauchu.camacho@linux.intel.com>
On 12/15/2016 09:00 PM, Edwin Plauchu wrote:
> From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
>
> It is a simultaneous upgrade for python 2 and 3 over setuptools.
>
> Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
> ---
> meta/recipes-devtools/python/python-setuptools.inc | 4 +--
> .../python/python-setuptools_29.0.1.bb | 38 ----------------------
> .../python/python-setuptools_31.0.0.bb | 38 ++++++++++++++++++++++
> .../python/python3-setuptools_29.0.1.bb | 37 ---------------------
> .../python/python3-setuptools_31.0.0.bb | 37 +++++++++++++++++++++
Same here - before sending patches, do make sure that rename detection
worked correctly. It's otherwise very difficult to see what has changed
inside the renamed file.
Alex
^ permalink raw reply
* [Patch] arch-mips: Add MIPS 64r6 N32 tune
From: Zubair Lutfullah Kakakhel @ 2016-12-16 15:14 UTC (permalink / raw)
To: openembedded-core, Zubair.Kakakhel
Add MIPS64R6-n32 tuning options.
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
meta/classes/insane.bbclass | 2 ++
meta/classes/siteinfo.bbclass | 2 ++
meta/conf/machine/include/tune-mips64r6.inc | 26 ++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 1a742cf..f8f6e00 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -174,6 +174,8 @@ def package_qa_get_machine_dict(d):
"linux-gnun32" : {
"mips64": ( 8, 0, 0, False, 32),
"mips64el": ( 8, 0, 0, True, 32),
+ "mipsisa64r6": ( 8, 0, 0, False, 32),
+ "mipsisa64r6el":( 8, 0, 0, True, 32),
},
}
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index abb194f..2c33732 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -89,6 +89,8 @@ def siteinfo_data(d):
"mips64el-linux-musl": "mips64el-linux",
"mips64-linux-gnun32": "mips-linux bit-32",
"mips64el-linux-gnun32": "mipsel-linux bit-32",
+ "mipsisa64r6-linux-gnun32": "mipsisa32r6-linux bit-32",
+ "mipsisa64r6el-linux-gnun32": "mipsisa32r6el-linux bit-32",
"powerpc-linux": "powerpc32-linux",
"powerpc-linux-musl": "powerpc-linux powerpc32-linux",
"powerpc-linux-uclibc": "powerpc-linux powerpc32-linux",
diff --git a/meta/conf/machine/include/tune-mips64r6.inc b/meta/conf/machine/include/tune-mips64r6.inc
index f0ad564..2289fb4 100644
--- a/meta/conf/machine/include/tune-mips64r6.inc
+++ b/meta/conf/machine/include/tune-mips64r6.inc
@@ -30,3 +30,29 @@ TUNE_FEATURES_tune-mipsisa64r6el-nf = "r6 n64 mipsisa64r6"
MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-nf = "${TUNE_ARCH}"
BASE_LIB_tune-mipsisa64r6el-nf = "lib64"
PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-nf = "mipsisa64r6el-nf"
+
+# MIPS 64r6 n32
+AVAILTUNES += "mipsisa64r6-n32 mipsisa64r6el-n32"
+
+TUNE_FEATURES_tune-mipsisa64r6-n32 = "bigendian fpu-hard r6 n32 mipsisa64r6"
+BASE_LIB_tune-mipsisa64r6-n32 = "lib32"
+MIPSPKGSFX_VARIANT_tune-mipsisa64r6-n32 = "${TUNE_ARCH}"
+PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-n32 = "mipsisa64r6-n32"
+
+TUNE_FEATURES_tune-mipsisa64r6el-n32 = "fpu-hard r6 n32 mipsisa64r6"
+BASE_LIB_tune-mipsisa64r6el-n32 = "lib32"
+MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-n32 = "${TUNE_ARCH}"
+PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-n32 = "mipsisa64r6el-n32"
+
+# MIPS 64r6 n32 and Soft Float
+AVAILTUNES += "mipsisa64r6-nf-n32 mipsisa64r6el-nf-n32"
+
+TUNE_FEATURES_tune-mipsisa64r6-nf-n32 = "bigendian r6 n32 mipsisa64r6"
+BASE_LIB_tune-mipsisa64r6-nf-n32 = "lib32"
+MIPSPKGSFX_VARIANT_tune-mipsisa64r6-nf-n32 = "${TUNE_ARCH}"
+PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-nf-n32 = "mipsisa64r6-nf-n32"
+
+TUNE_FEATURES_tune-mipsisa64r6el-nf-n32 = "bigendian r6 n32 mipsisa64r6"
+BASE_LIB_tune-mipsisa64r6el-nf-n32 = "lib32"
+MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-nf-n32 = "${TUNE_ARCH}"
+PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6el-nf-n32 = "mipsisa64r6el-nf-n32"
--
2.10.2
^ permalink raw reply related
* [Patch] openssl: Add support for many MIPS configurations
From: Zubair Lutfullah Kakakhel @ 2016-12-16 15:14 UTC (permalink / raw)
To: openembedded-core, Zubair.Kakakhel
Add more case statements to catch MIPS tune configurations
Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f3a2c5a..2ef8b38 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -107,18 +107,24 @@ do_configure () {
linux-gnu64-x86_64)
target=linux-x86_64
;;
- linux-mips)
- target=debian-mips
+ linux-gnun32-mips*el)
+ target=debian-mipsn32el
+ ;;
+ linux-gnun32-mips*)
+ target=debian-mipsn32
+ ;;
+ linux-mips*64*el)
+ target=debian-mips64el
;;
- linux-mipsel)
+ linux-mips*64*)
+ target=debian-mips64
+ ;;
+ linux-mips*el)
target=debian-mipsel
;;
- linux-*-mips64 | linux-mips64)
- target=debian-mips64
- ;;
- linux-*-mips64el | linux-mips64el)
- target=debian-mips64el
- ;;
+ linux-mips*)
+ target=debian-mips
+ ;;
linux-microblaze*|linux-nios2*)
target=linux-generic32
;;
--
2.10.2
^ permalink raw reply related
* [PATCH V2] dpkg: upgrade to 1.18.15
From: Edwin Plauchu @ 2016-12-16 15:11 UTC (permalink / raw)
To: openembedded-core
triplets file is no longer available.
As of now using files data/tupletable and data/ostable
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>
---
...tinsts-expect-D-to-be-set-when-running-in.patch | 30 ++++++++--------
...0006-add-musleabi-to-known-target-tripets.patch | 42 ----------------------
.../0006-add-musleabi-to-known-target-tuples.patch | 40 +++++++++++++++++++++
...let_entry.patch => add_armeb_tuple_entry.patch} | 27 +++++++-------
meta/recipes-devtools/dpkg/dpkg/arch_pm.patch | 12 +++----
meta/recipes-devtools/dpkg/dpkg/noman.patch | 9 ++---
.../dpkg/{dpkg_1.18.7.bb => dpkg_1.18.15.bb} | 10 +++---
7 files changed, 85 insertions(+), 85 deletions(-)
delete mode 100644 meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
create mode 100644 meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tuples.patch
rename meta/recipes-devtools/dpkg/dpkg/{add_armeb_triplet_entry.patch => add_armeb_tuple_entry.patch} (69%)
rename meta/recipes-devtools/dpkg/{dpkg_1.18.7.bb => dpkg_1.18.15.bb} (63%)
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 80504ce..673e3f3 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
@@ -18,26 +18,31 @@ diff --git a/src/script.c b/src/script.c
index 3c88be8..ce66a86 100644
--- a/src/script.c
+++ b/src/script.c
-@@ -97,43 +97,10 @@ setexecute(const char *path, struct stat *stab)
+@@ -97,48 +97,10 @@
static const char *
maintscript_pre_exec(struct command *cmd)
{
- const char *admindir = dpkg_db_get_dir();
-- const char *changedir = fc_script_chrootless ? instdir : "/";
-- size_t instdirl = strlen(instdir);
+- const char *changedir;
+- size_t instdirlen = strlen(instdir);
-
-- if (*instdir && !fc_script_chrootless) {
-- if (strncmp(admindir, instdir, instdirl) != 0)
+- if (instdirlen > 0 && fc_script_chrootless)
+- changedir = instdir;
+- else
+- changedir = "/";
+-
+- if (instdirlen > 0 && !fc_script_chrootless) {
+- if (strncmp(admindir, instdir, instdirlen) != 0)
- ohshit(_("admindir must be inside instdir for dpkg to work properly"));
-- if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0)
+- if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0)
- ohshite(_("unable to setenv for subprocesses"));
- if (setenv("DPKG_ROOT", "", 1) < 0)
- ohshite(_("unable to setenv for subprocesses"));
-
- if (chroot(instdir))
- ohshite(_("failed to chroot to '%.250s'"), instdir);
-+ if (*instdir) {
-+ setenv("D", instdir, 1);
++ if (*instdir) {
++ setenv("D", instdir, 1);
}
- /* Switch to a known good directory to give the maintainer script
- * a saner environment, also needed after the chroot(). */
@@ -56,15 +61,12 @@ index 3c88be8..ce66a86 100644
- args.buf);
- varbuf_destroy(&args);
- }
-- if (!instdirl || fc_script_chrootless)
+- if (instdirlen == 0 || fc_script_chrootless)
- return cmd->filename;
-
-- assert(strlen(cmd->filename) >= instdirl);
-- return cmd->filename + instdirl;
+- assert(strlen(cmd->filename) >= instdirlen);
+- return cmd->filename + instdirlen;
+ return cmd->filename;
}
/**
---
-2.1.4
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
deleted file mode 100644
index a6b0088..0000000
--- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 30 Dec 2015 23:05:41 +0000
-Subject: [PATCH] add musleabi to known target tripets
-
-helps compiling dpkg for musl/arm-softfloat
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- ostable | 1 +
- triplettable | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/ostable b/ostable
-index 3bb6819..d0ffdc7 100644
---- a/ostable
-+++ b/ostable
-@@ -15,6 +15,7 @@
- uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi
- uclibc-linux linux-uclibc linux[^-]*-uclibc
- musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
-+musleabi-linux linux-musleabi linux[^-]*-musleabi
- musl-linux linux-musl linux[^-]*-musl
- gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
- gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
-diff --git a/triplettable b/triplettable
-index 1213584..70d24c1 100644
---- a/triplettable
-+++ b/triplettable
-@@ -6,6 +6,7 @@
- uclibceabi-linux-arm uclibc-linux-armel
- uclibc-linux-<cpu> uclibc-linux-<cpu>
- musleabihf-linux-arm musl-linux-armhf
-+musleabi-linux-arm musl-linux-armel
- musl-linux-<cpu> musl-linux-<cpu>
- gnueabihf-linux-arm armhf
- gnueabi-linux-arm armel
---
-2.6.4
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tuples.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tuples.patch
new file mode 100644
index 0000000..ccf0ca4
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tuples.patch
@@ -0,0 +1,40 @@
+From 6be4743d9a04c27a592acdc3fd3d6f3dd6f4ae9a Mon Sep 17 00:00:00 2001
+From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+Date: Thu, 15 Dec 2016 19:29:25 -0600
+Subject: [PATCH] add musleabi to known target tripets
+
+helps compiling dpkg for musl/arm-softfloat
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ data/ostable | 1 +
+ data/tupletable | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/data/ostable b/data/ostable
+index 09007da..6be797a 100644
+--- a/data/ostable
++++ b/data/ostable
+@@ -17,6 +17,7 @@
+ eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi
+ base-uclibc-linux linux-uclibc linux[^-]*-uclibc
+ eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
++eabi-musl-linux linux-musleabi linux[^-]*-musleabi
+ base-musl-linux linux-musl linux[^-]*-musl
+ eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf
+ eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
+diff --git a/dpkg-1.18.15/data/tupletable b/dpkg-1.18.15/data/tupletable
+index 63cca14..3c215a9 100644
+--- a/data/tupletable
++++ b/data/tupletable
+@@ -8,6 +8,7 @@
+ eabi-uclibc-linux-arm uclibc-linux-armel
+ base-uclibc-linux-<cpu> uclibc-linux-<cpu>
+ eabihf-musl-linux-arm musl-linux-armhf
++eabi-musl-linux-arm musl-linux-armel
+ base-musl-linux-<cpu> musl-linux-<cpu>
+ eabihf-gnu-linux-arm armhf
+ eabi-gnu-linux-arm armel
+--
+2.1.4
+
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_tuple_entry.patch
similarity index 69%
rename from meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
rename to meta/recipes-devtools/dpkg/dpkg/add_armeb_tuple_entry.patch
index dc69eb2..b7d5547 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_tuple_entry.patch
@@ -24,23 +24,22 @@ empty in configure script.
Upstream-Status: Pending
Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
-
---
- triplettable | 1 +
+ data/tupletable | 1 +
1 file changed, 1 insertion(+)
-diff --git a/triplettable b/triplettable
-index abe4726..1e9c247 100644
---- a/triplettable
-+++ b/triplettable
-@@ -11,6 +11,7 @@ gnueabihf-linux-arm armhf
- gnueabi-linux-arm armel
- gnuabin32-linux-mips64r6el mipsn32r6el
- gnuabin32-linux-mips64r6 mipsn32r6
-+gnueabi-linux-armeb armeb
- gnuabin32-linux-mips64el mipsn32el
- gnuabin32-linux-mips64 mipsn32
- gnuabi64-linux-mips64r6el mips64r6el
+diff --git a/data/tupletable b/data/tupletable
+index 2692f2d..63cca14 100644
+--- a/data/tupletable
++++ b/data/tupletable
+@@ -13,6 +13,7 @@ eabihf-gnu-linux-arm armhf
+ eabi-gnu-linux-arm armel
+ abin32-gnu-linux-mips64r6el mipsn32r6el
+ abin32-gnu-linux-mips64r6 mipsn32r6
++eabi-gnu-linux-armeb armeb
+ abin32-gnu-linux-mips64el mipsn32el
+ abin32-gnu-linux-mips64 mipsn32
+ abi64-gnu-linux-mips64r6el mips64r6el
--
2.1.4
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index cad4c0f..922df98 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -10,13 +10,13 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
-@@ -233,9 +233,6 @@ sub read_triplettable()
- (my $dt = $debtriplet) =~ s/<cpu>/$_cpu/;
+@@ -286,9 +286,6 @@
+ (my $dt = $debtuple) =~ s/<cpu>/$_cpu/;
(my $da = $debarch) =~ s/<cpu>/$_cpu/;
-- next if exists $debarch_to_debtriplet{$da}
-- or exists $debtriplet_to_debarch{$dt};
+- next if exists $debarch_to_debtuple{$da}
+- or exists $debtuple_to_debarch{$dt};
-
- $debarch_to_debtriplet{$da} = $dt;
- $debtriplet_to_debarch{$dt} = $da;
+ $debarch_to_debtuple{$da} = $dt;
+ $debtuple_to_debarch{$dt} = $da;
}
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index d30c150..0012401 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,14 +1,15 @@
Upstream-Status: Inappropriate [disable feature]
diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am
---- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800
-+++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800
-@@ -12,8 +12,7 @@
- utils \
+--- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800
++++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800
+@@ -13,8 +13,7 @@
$(MAYBE_DSELECT) \
scripts \
+ t-func \
- po \
- man
+ po
ACLOCAL_AMFLAGS = -I m4
+
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.15.bb
similarity index 63%
rename from meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.18.15.bb
index 28fdc13..2ec9100 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.15.bb
@@ -1,19 +1,19 @@
require dpkg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \
+SRC_URI = "http://ftp.debian.org/debian/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \
file://noman.patch \
file://remove-tar-no-timestamp.patch \
file://arch_pm.patch \
file://dpkg-configure.service \
- file://add_armeb_triplet_entry.patch \
+ file://add_armeb_tuple_entry.patch \
file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \
file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
file://0005-dpkg-compiler.m4-remove-Wvla.patch \
- file://0006-add-musleabi-to-known-target-tripets.patch \
+ file://0006-add-musleabi-to-known-target-tuples.patch \
"
SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "
-SRC_URI[md5sum] = "073dbf2129a54b0fc627464bf8af4a1b"
-SRC_URI[sha256sum] = "ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b"
+SRC_URI[md5sum] = "7aa1b61da5bff4cbc5a1d2cb5a30d546"
+SRC_URI[sha256sum] = "aee936653b9c39403160c0a331ee7934563fbfa4e1f5adbc14a289c803cda371"
--
2.1.4
^ permalink raw reply related
* [PATCH] libfm: fix configure error if native vala is absent
From: Alexander Kanavin @ 2016-12-16 14:57 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...heck-the-stamp-file-that-indicates-if-we-.patch | 28 ++++++++++++++++++++++
meta/recipes-support/libfm/libfm_1.2.5.bb | 3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
diff --git a/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
new file mode 100644
index 0000000..fb91d90
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
@@ -0,0 +1,28 @@
+From 23c6e9df611c86a5e97079e1b88c7a18474bf0bc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 16 Dec 2016 16:52:04 +0200
+Subject: [PATCH] Correctly check the stamp file that indicates if we need to
+ re-build vala code
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d043b3d..0e85590 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,7 @@ AM_COND_IF(EXTRALIB_ONLY,
+ [enable_actions=no])
+ if test x"$enable_actions" = xyes; then
+ dnl no vala compiler required when sources are from dist tarball
+- if test -f src/actions/libfmactions_la_vala.stamp; then
++ if test -f $srcdir/src/actions/libfmactions_la_vala.stamp; then
+ AM_PROG_VALAC
+ else
+ AM_PROG_VALAC([0.13.0])
+--
+2.10.2
+
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index 638c364..aca59e1 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \
SECTION = "x11/libs"
DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native"
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
+ file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch"
SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807"
SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a"
--
2.10.2
^ permalink raw reply related
* [PATCH V2] pcmanfm: upgrading to 1.2.5
From: Edwin Plauchu @ 2016-12-16 14:54 UTC (permalink / raw)
To: openembedded-core; +Cc: Edwin Plauchu
From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
meta/recipes-sato/pcmanfm/{pcmanfm_1.2.4.bb => pcmanfm_1.2.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/pcmanfm/{pcmanfm_1.2.4.bb => pcmanfm_1.2.5.bb} (90%)
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
similarity index 90%
rename from meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb
rename to meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
index a6bf213..aab7911 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_1.2.4.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
@@ -19,8 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \
file://emblem-symbolic-link.png \
file://no-desktop.patch"
-SRC_URI[md5sum] = "19764c2f59653724c8713e0064fa6829"
-SRC_URI[sha256sum] = "38cdbb5f01d24483b41b8e6846e4aa66a5751bb3982a8618899e88a853dbe313"
+SRC_URI[md5sum] = "b4d1f8ce08d87e4f27805a246fc51ac2"
+SRC_URI[sha256sum] = "0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67"
UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/"
--
2.1.4
^ permalink raw reply related
* Re: [PATCH] wic: obey the rootfs size from the metadata
From: Ed Bartosh @ 2016-12-16 14:47 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, openembedded-core
In-Reply-To: <1481830959-24831-1-git-send-email-kergoth@gmail.com>
Hi Christopher,
Thank you for the patch!
+1
On Thu, Dec 15, 2016 at 12:42:39PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> When no --size is specified for the rootfs in the .wks, we want to obey the
> rootfs size from the metadata, otherwise the defined IMAGE_ROOTFS_EXTRA_SPACE
> and IMAGE_OVERHEAD_FACTOR will not be obeyed. In some cases, this can result
> in image construction failure, if the size determined by du was insufficient
> to hold the files without the aforementioned extra space.
>
> This fallback from --size to ROOTFS_SIZE was already implemented when
> --rootfs-dir is specified in the .wks, but it did not occur otherwise, neither
> when --rootfs-dir= was passed to `wic create` nor when IMAGE_ROOTFS was used.
> This made a certain amount of sense, as this fallback logic happened at such
> a level that it wasn't able to identify which partitions were rootfs
> partitions otherwise. Rather than doing it at that level, we can do it in
> prepare_rootfs(), which is run by the rootfs source plugins.
>
> Note that IMAGE_OVERHEAD_FACTOR and a --overhead-factor in the .wks will now
> both be applied when --size isn't specified in the .wks. A warning is added
> about this, though a user won't see it unless wic fails or they examine the
> do_image_wic log.
>
> Fixes [YOCTO #10815]
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> scripts/lib/wic/partition.py | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index ac4c836..b191cde 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -28,7 +28,7 @@ import os
> import tempfile
>
> from wic.utils.oe.misc import msger, parse_sourceparams
> -from wic.utils.oe.misc import exec_cmd, exec_native_cmd
> +from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
> from wic.plugin import pluginmgr
>
> partition_methods = {
> @@ -194,6 +194,17 @@ class Partition():
> msger.error("File system for partition %s not specified in kickstart, " \
> "use --fstype option" % (self.mountpoint))
>
> + # Get rootfs size from bitbake variable if it's not set in .ks file
> + if not self.size:
> + # Bitbake variable ROOTFS_SIZE is calculated in
> + # Image._get_rootfs_size method from meta/lib/oe/image.py
> + # using IMAGE_ROOTFS_SIZE, IMAGE_ROOTFS_ALIGNMENT,
> + # IMAGE_OVERHEAD_FACTOR and IMAGE_ROOTFS_EXTRA_SPACE
> + rsize_bb = get_bitbake_var('ROOTFS_SIZE')
> + if rsize_bb:
> + msger.warning('overhead-factor was specified, but size was not, so bitbake variables will be used for the size. In this case both IMAGE_OVERHEAD_FACTOR and --overhead-factor will be applied')
> + self.size = int(round(float(rsize_bb)))
> +
> for prefix in ("ext", "btrfs", "vfat", "squashfs"):
> if self.fstype.startswith(prefix):
> method = getattr(self, "prepare_rootfs_" + prefix)
> --
> 2.8.0
>
--
--
Regards,
Ed
^ permalink raw reply
* Re: [PATCH v2 3/3] selftest/wic: Add tests for --exclude-dir option.
From: Ed Bartosh @ 2016-12-16 14:44 UTC (permalink / raw)
To: Kristian Amlie; +Cc: openembedded-core
In-Reply-To: <1481732934-5128-4-git-send-email-kristian.amlie@mender.io>
On Wed, Dec 14, 2016 at 05:28:54PM +0100, Kristian Amlie wrote:
> Based partially on an earlier patch by Maciej Borzecki.
>
> Signed-off-by: Kristian Amlie <kristian.amlie@mender.io>
> ---
> meta/lib/oeqa/selftest/wic.py | 106 +++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 105 insertions(+), 1 deletion(-)
>
> diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
> index faac11e..b2b0fe8 100644
> --- a/meta/lib/oeqa/selftest/wic.py
> +++ b/meta/lib/oeqa/selftest/wic.py
> @@ -49,7 +49,8 @@ class Wic(oeSelfTest):
> # setUpClass being unavailable.
> if not Wic.image_is_ready:
> bitbake('syslinux syslinux-native parted-native gptfdisk-native '
> - 'dosfstools-native mtools-native bmap-tools-native')
> + 'dosfstools-native mtools-native bmap-tools-native '
> + 'e2tools-native')
> bitbake('core-image-minimal')
> Wic.image_is_ready = True
>
> @@ -299,3 +300,106 @@ class Wic(oeSelfTest):
> self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
> % image).status)
> self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image)))
> +
> + def test_exclude_path(self):
> + """Test --exclude-path wks option."""
> +
> + # For using 'e2ls'.
> + old_path = os.environ['PATH']
> + os.environ['PATH'] = get_bb_var('PATH', 'core-image-minimal')
> +
> + wks_file = 'temp.wks'
> + ks = open(wks_file, 'w')
I'd use more pythonic 'with open(wks_file, 'w') as wks:' here.
> + rootfs_dir = get_bb_var('IMAGE_ROOTFS', 'core-image-minimal')
> + ks.write("""part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path usr
> +part /usr --source rootfs --ondisk mmcblk0 --fstype=ext4 --rootfs-dir %s/usr
> +part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --rootfs-dir %s/usr"""
> + % (rootfs_dir, rootfs_dir))
> + ks.close()
> + self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \
> + % wks_file).status)
> +
> + os.remove(wks_file)
> + wicout = glob(self.resultdir + "%s-*direct" % 'temp')
> + self.assertEqual(1, len(wicout))
> +
> + wicimg = wicout[0]
> +
> + # verify partition size with wic
> + res = runCmd("parted -m %s unit b p 2>/dev/null" % wicimg)
> + self.assertEqual(0, res.status)
> +
> + # parse parted output which looks like this:
> + # BYT;\n
> + # /var/tmp/wic/build/tmpfwvjjkf_-201611101222-hda.direct:200MiB:file:512:512:msdos::;\n
> + # 1:0.00MiB:200MiB:200MiB:ext4::;\n
> + partlns = res.output.splitlines()[2:]
> +
> + self.assertEqual(3, len(partlns))
> +
> + for part in [1, 2, 3]:
> + part_file = os.path.join(self.resultdir, "selftest_img.part%d" % part)
> + partln = partlns[part-1].split(":")
> + self.assertEqual(7, len(partln))
> + start = int(partln[1].rstrip("B")) / 512
> + length = int(partln[3].rstrip("B")) / 512
> + self.assertEqual(0, runCmd("dd if=%s of=%s skip=%d count=%d" %
> + (wicimg, part_file, start, length)).status)
> +
> + # Test partition 1, should contain the normal root directories, except
> + # /usr.
> + res = runCmd("e2ls %s" % os.path.join(self.resultdir, "selftest_img.part1"))
> + self.assertEqual(0, res.status)
> + files = res.output.split()
> + self.assertIn("etc", files)
> + self.assertNotIn("usr", files)
> +
> + # Partition 2, should contain common directories for /usr, not root
> + # directories.
> + res = runCmd("e2ls %s" % os.path.join(self.resultdir, "selftest_img.part2"))
> + self.assertEqual(0, res.status)
> + files = res.output.split()
> + self.assertNotIn("etc", files)
> + self.assertNotIn("usr", files)
> + self.assertIn("share", files)
> +
> + # Partition 3, should contain the same as partition 2, including the bin
> + # directory, but not the files inside it.
> + res = runCmd("e2ls %s" % os.path.join(self.resultdir, "selftest_img.part3"))
> + self.assertEqual(0, res.status)
> + files = res.output.split()
> + self.assertNotIn("etc", files)
> + self.assertNotIn("usr", files)
> + self.assertIn("share", files)
> + self.assertIn("bin", files)
> + res = runCmd("e2ls %s:bin" % os.path.join(self.resultdir, "selftest_img.part3"))
> + self.assertEqual(0, res.status)
> + self.assertEqual("No files found!", res.output.strip())
> +
> + for part in [1, 2, 3]:
> + part_file = os.path.join(self.resultdir, "selftest_img.part%d" % part)
> + os.remove(part_file)
> +
> + os.environ['PATH'] = old_path
> +
> + def test_exclude_path_errors(self):
> + """Test --exclude-path wks option error handling."""
> + wks_file = 'temp.wks'
> +
> + rootfs_dir = get_bb_var('IMAGE_ROOTFS', 'core-image-minimal')
> +
> + # Absolute argument.
> + ks = open(wks_file, 'w')
and here
> + ks.write("part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path /usr")
> + ks.close()
> + self.assertNotEqual(0, runCmd("wic create %s -e core-image-minimal" \
> + % wks_file, ignore_status=True).status)
> + os.remove(wks_file)
> +
> + # Argument pointing to parent directory.
> + ks = open(wks_file, 'w')
and here
> + ks.write("part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path ././..")
> + ks.close()
> + self.assertNotEqual(0, runCmd("wic create %s -e core-image-minimal" \
> + % wks_file, ignore_status=True).status)
> + os.remove(wks_file)
--
Regards,
Ed
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox