Re: [OE-core] [PATCH 1/2] gcc-5.2: import patch fixing compilation in thumb mode
On Thu, Nov 26, 2015 at 8:40 AM, Dmitry Eremin-Solenikov wrote: > Import patch fixing a bug that caused ICE when compiling some packages > (e.g. ICU) in Thumb-1 model. This is ok > > Signed-off-by: Dmitry Eremin-Solenikov > --- > meta/recipes-devtools/gcc/gcc-5.2.inc | 1 + > .../gcc/gcc-5.2/0043-fix-arm-thumb.patch | 39 > ++ > 2 files changed, 40 insertions(+) > create mode 100644 meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch > > diff --git a/meta/recipes-devtools/gcc/gcc-5.2.inc > b/meta/recipes-devtools/gcc/gcc-5.2.inc > index a6b385a..e5e92e9 100644 > --- a/meta/recipes-devtools/gcc/gcc-5.2.inc > +++ b/meta/recipes-devtools/gcc/gcc-5.2.inc > @@ -74,6 +74,7 @@ SRC_URI = "\ > file://0040-nativesdk-gcc-support.patch \ > file://0041-handle-target-sysroot-multilib.patch \ > file://0042-cxxflags-for-build.patch \ > + file://0043-fix-arm-thumb.patch \ >" > > BACKPORTS = "" > diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch > b/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch > new file mode 100644 > index 000..2f262e3 > --- /dev/null > +++ b/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch > @@ -0,0 +1,39 @@ > +Upstream-Status: Accepted > + > +Signed-off-by: Dmitry Eremin-Solenikov > +--- > + > +2015-11-25 Vladimir Makarov > + > + PR rtl-optimization/67954 > + * lra-constraints.c (curr_insn_transform): Add check on scratch > + pseudo when change class to NO_REGS. Add an assert. > + > + > + > +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230894 > 138bc75d-0d04-0410-961f-82ee72b054a4 > +--- > + > +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c > +index 4670e81..c62bf6a 100644 > +--- a/gcc/lra-constraints.c > b/gcc/lra-constraints.c > +@@ -3725,7 +3725,8 @@ curr_insn_transform (bool check_only_p) > +assigment pass and the scratch pseudo will be > +spilled. Spilled scratch pseudos are transformed > +back to scratches at the LRA end. */ > +-&& lra_former_scratch_operand_p (curr_insn, i)) > ++&& lra_former_scratch_operand_p (curr_insn, i) > ++&& lra_former_scratch_p (REGNO (op))) > + { > + int regno = REGNO (op); > + lra_change_class (regno, NO_REGS, " Change to", true); > +@@ -3734,6 +3735,8 @@ curr_insn_transform (bool check_only_p) > + spilled pseudo as there is only one such insn, the > + current one. */ > + reg_renumber[regno] = -1; > ++lra_assert (bitmap_single_bit_set_p > ++(&lra_reg_info[REGNO (op)].insn_bitmap)); > + } > + /* We can do an optional reload. If the pseudo got a hard > +reg, we might improve the code through inheritance. If > -- > 2.6.2 > > -- > ___ > 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
Re: [OE-core] [PATCH 2/2] gcc-4.9: import patch fixing compilation in thumb mode
On Thu, Nov 26, 2015 at 8:40 AM, Dmitry Eremin-Solenikov wrote: > Import patch fixing a bug that caused ICE when compiling some packages > (e.g. ICU) in Thumb-1 model. > This is ok > Signed-off-by: Dmitry Eremin-Solenikov > --- > meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + > .../gcc/gcc-4.9/0067-fix-arm-thumb.patch | 39 > ++ > 2 files changed, 40 insertions(+) > create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0067-fix-arm-thumb.patch > > diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc > b/meta/recipes-devtools/gcc/gcc-4.9.inc > index 6ac3685..d62e801 100644 > --- a/meta/recipes-devtools/gcc/gcc-4.9.inc > +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc > @@ -82,6 +82,7 @@ SRC_URI = "\ > file://0064-handle-target-sysroot-multilib.patch \ > file://0065-gcc-483-universal-initializer-no-warning.patch \ > file://0066-cxxflags-for-build.patch \ > +file://0067-fix-arm-thumb.patch \ > " > SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" > SRC_URI[sha256sum] = > "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" > diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0067-fix-arm-thumb.patch > b/meta/recipes-devtools/gcc/gcc-4.9/0067-fix-arm-thumb.patch > new file mode 100644 > index 000..2f262e3 > --- /dev/null > +++ b/meta/recipes-devtools/gcc/gcc-4.9/0067-fix-arm-thumb.patch > @@ -0,0 +1,39 @@ > +Upstream-Status: Accepted > + > +Signed-off-by: Dmitry Eremin-Solenikov > +--- > + > +2015-11-25 Vladimir Makarov > + > + PR rtl-optimization/67954 > + * lra-constraints.c (curr_insn_transform): Add check on scratch > + pseudo when change class to NO_REGS. Add an assert. > + > + > + > +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230894 > 138bc75d-0d04-0410-961f-82ee72b054a4 > +--- > + > +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c > +index 4670e81..c62bf6a 100644 > +--- a/gcc/lra-constraints.c > b/gcc/lra-constraints.c > +@@ -3725,7 +3725,8 @@ curr_insn_transform (bool check_only_p) > +assigment pass and the scratch pseudo will be > +spilled. Spilled scratch pseudos are transformed > +back to scratches at the LRA end. */ > +-&& lra_former_scratch_operand_p (curr_insn, i)) > ++&& lra_former_scratch_operand_p (curr_insn, i) > ++&& lra_former_scratch_p (REGNO (op))) > + { > + int regno = REGNO (op); > + lra_change_class (regno, NO_REGS, " Change to", true); > +@@ -3734,6 +3735,8 @@ curr_insn_transform (bool check_only_p) > + spilled pseudo as there is only one such insn, the > + current one. */ > + reg_renumber[regno] = -1; > ++lra_assert (bitmap_single_bit_set_p > ++(&lra_reg_info[REGNO (op)].insn_bitmap)); > + } > + /* We can do an optional reload. If the pseudo got a hard > +reg, we might improve the code through inheritance. If > -- > 2.6.2 > > -- > ___ > 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
Re: [OE-core] [PATCH] matchbox-desktop: sync with gio for the inotify-sub
On 1 December 2015 at 05:47, wrote: > matchbox-desktop builds with included libinotify which > is very old (last sync was in 2008), if we compile glib-2.0 > with -fvisibility=default (the default is hidden for libglib > and libgio), it will crash because of inconsistency of > inotify-sub, so port the related parts to fix the issue. > matchbox-desktop is maintained by the Yocto Project, so this patch should be applied there and then the recipe updated to the latest git revision. There's a big rewrite of matchbox-desktop going on, so dropping that code entirely is probably the best idea: just use GIO instead. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] base: check for existing prefix when expanding names in PACKAGECONFIG
When the DEPENDS are added as part of the PACKAGECONFIG logic the list of packages are expanded so that any required nativesdk-/-native/multilib prefixes and suffixes are added. However the special handling of virtual/foo names doesn't check that the prefix already exists, which breaks under nativesdk as in that situation there's an explicit nativesdk- prefix *and* MLPREFIX is set to nativesdk-. This results in the same prefix being applied twice, and virtual packages such as virtual/libx11 ending up as virtual/nativesdk-nativesdk-libx11. Signed-off-by: Ross Burton --- meta/classes/base.bbclass | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e6d1599..4ea400e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -363,7 +363,10 @@ python () { newappends.append(a) elif a.startswith("virtual/"): subs = a.split("/", 1)[1] -newappends.append("virtual/" + prefix + subs + extension) +if subs.startswith(prefix): +newappends.append(a + extension) +else: +newappends.append("virtual/" + prefix + subs + extension) else: if a.startswith(prefix): newappends.append(a + extension) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] iproute2: enable previously unselected utilities
Hi, Just a couple of questions. * Maxin B. John [151130 17:59]: > Include below listed utilities that are not yet enabled/packaged > in the iproute2 recipe: > lnstat > ifstat > genl > rtacct > nstat > ss When you enable those, how much does the size ofthe iproute2 package increase? Perhaps those extra tools should be placed in e.g. ${PN}-tools, or some package like that? Cheers, Anders > Signed-off-by: Maxin B. John > --- > meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc > b/meta/recipes-connectivity/iproute2/iproute2.inc > index 29f9062..abaff3f 100644 > --- a/meta/recipes-connectivity/iproute2/iproute2.inc > +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > @@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables elfutils" > inherit update-alternatives > -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' > LIBDIR='${libdir}'" > +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip misc genl' > SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > do_configure_append () { > sh configure ${STAGING_INCDIR} -- Anders Darander, Senior System Architect ChargeStorm AB / eStorm AB -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] iproute2: enable previously unselected utilities
On Tue, Dec 1, 2015 at 1:27 AM, Anders Darander wrote: > Hi, > > Just a couple of questions. > > * Maxin B. John [151130 17:59]: >> Include below listed utilities that are not yet enabled/packaged >> in the iproute2 recipe: > >> lnstat >> ifstat >> genl >> rtacct >> nstat >> ss > > When you enable those, how much does the size ofthe iproute2 package > increase? > > Perhaps those extra tools should be placed in e.g. ${PN}-tools, or > some package like that? I think its better to package each one in separate package of its own. > > Cheers, > Anders > >> Signed-off-by: Maxin B. John >> --- >> meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc >> b/meta/recipes-connectivity/iproute2/iproute2.inc >> index 29f9062..abaff3f 100644 >> --- a/meta/recipes-connectivity/iproute2/iproute2.inc >> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc >> @@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables elfutils" > >> inherit update-alternatives > >> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' >> LIBDIR='${libdir}'" >> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip misc genl' >> SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > >> do_configure_append () { >> sh configure ${STAGING_INCDIR} > -- > Anders Darander, Senior System Architect > ChargeStorm AB / eStorm AB > -- > ___ > 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 0/8] [jethro] 8 patches for jethro
Hello, Here are 8 patches for jethro. There are still a few patches that are requested but not included here because they have not been merged by master by now. All these patches have already been merged by master. // Robert The following changes since commit e44ed8c18e395b9c055aefee113b90708e8a8a2f: build-appliance-image: Update to jethro head revision (2015-11-03 14:02:57 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/HEAD Alejandro del Castillo (1): opkg: add cache filename length fixes Armin Kuster (2): libxslt: CVE-2015-7995 libxml2: fix CVE-2015-7942 and CVE-2015-8035 Mark Hatle (1): binutils: Fix octeon3 disassembly patch Maxin B. John (1): libsndfile: fix CVE-2014-9756 Ross Burton (3): libarchive: rename patch to reflect CVE readline: rename patch to contain CVE reference unzip: rename patch to reflect CVE fix meta/recipes-core/libxml/libxml2.inc |2 + .../libxml/libxml2/CVE-2015-7942.patch | 55 + .../libxml/libxml2/CVE-2015-8035.patch | 41 +++ ...ne63-003.patch => readline-cve-2014-2524.patch} |0 meta/recipes-core/readline/readline_6.3.bb |2 +- .../binutils/binutils/binutils-octeon3.patch |2 +- ...ng_util-New-file-with-bin_to_hex-function.patch | 122 .../opkg/0002-md5-Add-md5_to_string-function.patch | 110 ++ ...0003-sha256-Add-sha256_to_string-function.patch | 110 ++ ...4-opkg_download-Use-short-cache-file-name.patch | 85 ++ meta/recipes-devtools/opkg/opkg_0.3.0.bb |4 + ...option.patch => libarchive-CVE-2015-2304.patch} |0 .../libarchive/libarchive_3.1.2.bb |2 +- ...nzip-6.0_overflow3.diff => cve-2014-9636.patch} |0 meta/recipes-extended/unzip/unzip_6.0.bb |2 +- .../files/libsndfile-fix-CVE-2014-9756.patch | 24 .../libsndfile/libsndfile1_1.0.25.bb |1 + .../libxslt/libxslt/CVE-2015-7995.patch| 33 ++ meta/recipes-support/libxslt/libxslt_1.1.28.bb |3 +- 19 files changed, 593 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch rename meta/recipes-core/readline/readline-6.3/{readline63-003.patch => readline-cve-2014-2524.patch} (100%) create mode 100644 meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch rename meta/recipes-extended/libarchive/libarchive/{0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch => libarchive-CVE-2015-2304.patch} (100%) rename meta/recipes-extended/unzip/unzip/{unzip-6.0_overflow3.diff => cve-2014-9636.patch} (100%) create mode 100644 meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch create mode 100644 meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] libxslt: CVE-2015-7995
From: Armin Kuster This is a is being give a High rating so please consider it for all 1.1.28 versions. A type confusion error within the libxslt "xsltStylePreCompute()" function in preproc.c can lead to a DoS. Confirmed in version 1.1.28, other versions may also be affected. (From OE-Core master rev: 0f89bbab6588a1171259801fa879516740030acb) Signed-off-by: Armin Kuster Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- .../libxslt/libxslt/CVE-2015-7995.patch| 33 meta/recipes-support/libxslt/libxslt_1.1.28.bb |3 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch diff --git a/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch b/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch new file mode 100644 index 000..e4d09c2 --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch @@ -0,0 +1,33 @@ +From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 29 Oct 2015 19:33:23 +0800 +Subject: Fix for type confusion in preprocessing attributes + +CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 +We need to check that the parent node is an element before dereferencing +its namespace + +Upstream-Status: Backport + +https://git.gnome.org/browse/libxslt/commit/?id=7ca19df892ca22d9314e95d59ce2abdeff46b617 + +Signed-off-by: Armin Kuster + +--- + libxslt/preproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: libxslt-1.1.28/libxslt/preproc.c +=== +--- libxslt-1.1.28.orig/libxslt/preproc.c libxslt-1.1.28/libxslt/preproc.c +@@ -2245,7 +2245,8 @@ xsltStylePreCompute(xsltStylesheetPtr st + } else if (IS_XSLT_NAME(inst, "attribute")) { + xmlNodePtr parent = inst->parent; + +- if ((parent == NULL) || (parent->ns == NULL) || ++ if ((parent == NULL) || ++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || + ((parent->ns != inst->ns) && +(!xmlStrEqual(parent->ns->href, inst->ns->href))) || + (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { diff --git a/meta/recipes-support/libxslt/libxslt_1.1.28.bb b/meta/recipes-support/libxslt/libxslt_1.1.28.bb index 166bcd8..87fabec 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.28.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.28.bb @@ -10,7 +10,8 @@ DEPENDS = "libxml2" SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch \ - file://pkgconfig.patch" + file://pkgconfig.patch \ + file://CVE-2015-7995.patch" SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7" SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] unzip: rename patch to reflect CVE fix
From: Ross Burton (From OE-Core rev: e3d2974348bd830ec2fcf84ea08cbf38abbc0327) (master rev: 78e05984b1ac48b1f25547ccd9740611cd5890a9) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- ...nzip-6.0_overflow3.diff => cve-2014-9636.patch} |0 meta/recipes-extended/unzip/unzip_6.0.bb |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/unzip/unzip/{unzip-6.0_overflow3.diff => cve-2014-9636.patch} (100%) diff --git a/meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff b/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch similarity index 100% rename from meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff rename to meta/recipes-extended/unzip/unzip/cve-2014-9636.patch diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index 9e63d3a..b386323 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -10,7 +10,7 @@ SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ file://avoid-strip.patch \ file://define-ldflags.patch \ file://06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch \ - file://unzip-6.0_overflow3.diff \ + file://cve-2014-9636.patch \ file://09-cve-2014-8139-crc-overflow.patch \ file://10-cve-2014-8140-test-compr-eb.patch \ file://11-cve-2014-8141-getzip64data.patch \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] opkg: add cache filename length fixes
From: Alejandro del Castillo (From OE-Core master rev: 8e53500a7c05204fc63759f456639545a022e82b) Signed-off-by: Alejandro del Castillo Signed-off-by: Ross Burton Signed-off-by: Nicolas Dechesne Signed-off-by: Robert Yang --- ...ng_util-New-file-with-bin_to_hex-function.patch | 122 .../opkg/0002-md5-Add-md5_to_string-function.patch | 110 ++ ...0003-sha256-Add-sha256_to_string-function.patch | 110 ++ ...4-opkg_download-Use-short-cache-file-name.patch | 85 ++ meta/recipes-devtools/opkg/opkg_0.3.0.bb |4 + 5 files changed, 431 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0002-md5-Add-md5_to_string-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0003-sha256-Add-sha256_to_string-function.patch create mode 100644 meta/recipes-devtools/opkg/opkg/0004-opkg_download-Use-short-cache-file-name.patch diff --git a/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch b/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch new file mode 100644 index 000..fb3ac46 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0001-string_util-New-file-with-bin_to_hex-function.patch @@ -0,0 +1,122 @@ +From 646b80024567a6245c598be3374653fa1fa09a12 Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Sat, 7 Nov 2015 10:23:49 + +Subject: [PATCH 1/4] string_util: New file with bin_to_hex function + +This function does very simple conversion from binary data to a hex string. + +Signed-off-by: Paul Barker +Signed-off-by: Alejandro del Castillo + +Upstream-Status: Accepted +--- + libopkg/Makefile.am | 4 ++-- + libopkg/string_util.c | 42 ++ + libopkg/string_util.h | 24 + 3 files changed, 68 insertions(+), 2 deletions(-) + create mode 100644 libopkg/string_util.c + create mode 100644 libopkg/string_util.h + +diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am +index ee3fbee..3e62c24 100644 +--- a/libopkg/Makefile.am b/libopkg/Makefile.am +@@ -13,7 +13,7 @@ opkg_headers = active_list.h cksum_list.h conffile.h conffile_list.h \ + pkg_depends.h pkg_dest.h pkg_dest_list.h pkg_extract.h pkg_hash.h \ + pkg_parse.h pkg_src.h pkg_src_list.h pkg_vec.h release.h \ + release_parse.h sha256.h sprintf_alloc.h str_list.h void_list.h \ +- xregex.h xsystem.h xfuncs.h opkg_verify.h ++ xregex.h xsystem.h xfuncs.h opkg_verify.h string_util.h + + opkg_sources = opkg_cmd.c opkg_configure.c opkg_download.c \ + opkg_install.c opkg_remove.c opkg_conf.c release.c \ +@@ -23,7 +23,7 @@ opkg_sources = opkg_cmd.c opkg_configure.c opkg_download.c \ + pkg_src.c pkg_src_list.c str_list.c void_list.c active_list.c \ + file_util.c opkg_message.c md5.c parse_util.c cksum_list.c \ + sprintf_alloc.c xregex.c xsystem.c xfuncs.c opkg_archive.c \ +- opkg_verify.c ++ opkg_verify.c string_util.c + + if HAVE_CURL + opkg_sources += opkg_download_curl.c +diff --git a/libopkg/string_util.c b/libopkg/string_util.c +new file mode 100644 +index 000..822cab6 +--- /dev/null b/libopkg/string_util.c +@@ -0,0 +1,42 @@ ++/* vi: set expandtab sw=4 sts=4: */ ++/* string_util.c - convenience routines for common string operations ++ ++ Copyright (C) 2015 Paul Barker ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU General Public License as ++ published by the Free Software Foundation; either version 2, or (at ++ your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ General Public License for more details. ++*/ ++ ++#include "config.h" ++ ++#include "string_util.h" ++#include "xfuncs.h" ++ ++char *bin_to_hex(const void *bin_data, size_t len) ++{ ++const unsigned char *src = (const unsigned char *)bin_data; ++char *buf = xmalloc(2 * len + 1); ++int i; ++ ++static const unsigned char bin2hex[16] = { ++'0', '1', '2', '3', ++'4', '5', '6', '7', ++'8', '9', 'a', 'b', ++'c', 'd', 'e', 'f' ++}; ++ ++for (i = 0; i < len; i++) { ++buf[i * 2] = bin2hex[src[i] >> 4]; ++buf[i * 2 + 1] = bin2hex[src[i] & 0xf]; ++} ++ ++buf[len * 2] = '\0'; ++return buf; ++} +diff --git a/libopkg/string_util.h b/libopkg/string_util.h +new file mode 100644 +index 000..a920e2a +--- /dev/null b/libopkg/string_util.h +@@ -0,0 +1,24 @@ ++/* vi: set expandtab sw=4 sts=4: */ ++/* string_util.h - convenience routines for common file operations ++ ++ Copyright (C) 2015 Paul Barker ++ ++ This program is free softwa
[OE-core] [PATCH 4/8] readline: rename patch to contain CVE reference
From: Ross Burton To help automated scanning of CVEs, put the CVE ID in the filename. (From OE-Core master rev: 211bce4f23230c7898cccdb73b582420f830f977) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- ...ne63-003.patch => readline-cve-2014-2524.patch} |0 meta/recipes-core/readline/readline_6.3.bb |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/readline/readline-6.3/{readline63-003.patch => readline-cve-2014-2524.patch} (100%) diff --git a/meta/recipes-core/readline/readline-6.3/readline63-003.patch b/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch similarity index 100% rename from meta/recipes-core/readline/readline-6.3/readline63-003.patch rename to meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb index 6ba1c18..fc362ae 100644 --- a/meta/recipes-core/readline/readline_6.3.bb +++ b/meta/recipes-core/readline/readline_6.3.bb @@ -1,6 +1,6 @@ require readline.inc -SRC_URI += "file://readline63-003.patch;striplevel=0 \ +SRC_URI += "file://readline-cve-2014-2524.patch;striplevel=0 \ file://readline-dispatch-multikey.patch" SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] libarchive: rename patch to reflect CVE
From: Ross Burton This patch is a CVE fix, so rename it to help CVE detection tools identify it as such. (From OE-Core master rev: 3fd05ce1f709cbbd8fdeb1dbfdffbd39922eca6e) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- ...option.patch => libarchive-CVE-2015-2304.patch} |0 .../libarchive/libarchive_3.1.2.bb |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libarchive/libarchive/{0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch => libarchive-CVE-2015-2304.patch} (100%) diff --git a/meta/recipes-extended/libarchive/libarchive/0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch b/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch similarity index 100% rename from meta/recipes-extended/libarchive/libarchive/0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch rename to meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2015-2304.patch diff --git a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb index aaa3255..716db9a 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb @@ -32,7 +32,7 @@ PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ file://libarchive-CVE-2013-0211.patch \ file://pkgconfig.patch \ - file://0001-Add-ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS-option.patch \ + file://libarchive-CVE-2015-2304.patch \ file://mkdir.patch \ " -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] binutils: Fix octeon3 disassembly patch
From: Mark Hatle The structure has apparently changed, and there was a missing setting. This corrects a segfault when disassembling code. (From OE-Core master rev: 2e8f1ffe3a8d7740b0ac68eefbba3fe28f7ba6d4) Signed-off-by: Mark Hatle Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- .../binutils/binutils/binutils-octeon3.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch b/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch index 6108c0d..4e8c69f 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch @@ -229,7 +229,7 @@ Index: git/opcodes/mips-dis.c + { "octeon3", 1, bfd_mach_mips_octeon3, CPU_OCTEON3, +ISA_MIPS64R2 | INSN_OCTEON3, ASE_VIRT | ASE_VIRT64, +mips_cp0_names_numeric, -+NULL, 0, mips_hwr_names_numeric }, ++NULL, 0, mips_cp1_names_mips3264, mips_hwr_names_numeric }, + { "xlr", 1, bfd_mach_mips_xlr, CPU_XLR, ISA_MIPS64 | INSN_XLR, 0, -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] libxml2: fix CVE-2015-7942 and CVE-2015-8035
From: Armin Kuster CVE-2015-7942 libxml2: heap-based buffer overflow in xmlParseConditionalSections() CVE-2015-8035 libxml2: DoS when parsing specially crafted XML document if XZ support is enabled [YOCTO #8641] (From OE-Core master rev: 27de51f4ad21d9b896e7d48041e7cdf20c564a38) Signed-off-by: Armin Kuster Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta/recipes-core/libxml/libxml2.inc |2 + .../libxml/libxml2/CVE-2015-7942.patch | 55 .../libxml/libxml2/CVE-2015-8035.patch | 41 +++ 3 files changed, 98 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 1c3c37d..6ada401 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -21,6 +21,8 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://libxml-m4-use-pkgconfig.patch \ file://configure.ac-fix-cross-compiling-warning.patch \ file://0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch \ + file://CVE-2015-7942.patch \ + file://CVE-2015-8035.patch \ " BINCONFIG = "${bindir}/xml2-config" diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch new file mode 100644 index 000..a5930ed --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch @@ -0,0 +1,55 @@ +libxml2: CVE-2015-7942 + +From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Mon, 23 Feb 2015 11:29:20 +0800 +Subject: Cleanup conditional section error handling + +For https://bugzilla.gnome.org/show_bug.cgi?id=744980 + +The error handling of Conditional Section also need to be +straightened as the structure of the document can't be +guessed on a failure there and it's better to stop parsing +as further errors are likely to be irrelevant. + +Upstream-Status: Backport +https://git.gnome.org/browse/libxml2/patch/?id=9b8512337d14c8ddf662fcb98b0135f225a1c489 + +[YOCTO #8641] +Signed-off-by: Armin Kuster + +--- + parser.c | 6 ++ + 1 file changed, 6 insertions(+) + +Index: libxml2-2.9.2/parser.c +=== +--- libxml2-2.9.2.orig/parser.c libxml2-2.9.2/parser.c +@@ -6783,6 +6783,8 @@ xmlParseConditionalSections(xmlParserCtx + SKIP_BLANKS; + if (RAW != '[') { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); ++ xmlStopParser(ctxt); ++ return; + } else { + if (ctxt->input->id != id) { + xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, +@@ -6843,6 +6845,8 @@ xmlParseConditionalSections(xmlParserCtx + SKIP_BLANKS; + if (RAW != '[') { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); ++ xmlStopParser(ctxt); ++ return; + } else { + if (ctxt->input->id != id) { + xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, +@@ -6898,6 +6902,8 @@ xmlParseConditionalSections(xmlParserCtx + + } else { + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); ++ xmlStopParser(ctxt); ++ return; + } + + if (RAW == 0) diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch new file mode 100644 index 000..d175f74 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch @@ -0,0 +1,41 @@ +libxml2: CVE-2015-8035 + +From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 3 Nov 2015 15:31:25 +0800 +Subject: CVE-2015-8035 Fix XZ compression support loop + +For https://bugzilla.gnome.org/show_bug.cgi?id=757466 +DoS when parsing specially crafted XML document if XZ support +is compiled in (which wasn't the case for 2.9.2 and master since +Nov 2013, fixed in next commit !) + +Upstream-Status: Backport +https://git.gnome.org/browse/libxml2/patch/?id=f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 + +[YOCTO #8641] + +Signed-off-by: Armin Kuster + +--- + xzlib.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/xzlib.c b/xzlib.c +index 0dcb9f4..1fab546 100644 +--- a/xzlib.c b/xzlib.c +@@ -581,6 +581,10 @@ xz_decomp(xz_statep state) + xz_error(state, LZMA_DATA_ERROR, "compressed data error"); + return -1; + } ++if (ret == LZMA_PROG_ERROR) { ++xz_error(state, LZMA_PROG_ERROR, "compression error"); ++return -1; ++} + } while (strm->avail_out && ret != LZMA_STREAM_END); + + /* update available output and crc check value */ +-- +cgit v0.11.2 + -- 1.7.9.5 -- ___
[OE-core] [PATCH 8/8] libsndfile: fix CVE-2014-9756
From: "Maxin B. John" Fix divide by zero bug (CVE-2014-9756) (From OE-Core master rev: f47cf07ab9d00ed7eddc8e867138481f7bd2bb7d) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- .../files/libsndfile-fix-CVE-2014-9756.patch | 24 .../libsndfile/libsndfile1_1.0.25.bb |1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch diff --git a/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch b/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch new file mode 100644 index 000..b54b3ba --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/files/libsndfile-fix-CVE-2014-9756.patch @@ -0,0 +1,24 @@ +src/file_io.c : Prevent potential divide-by-zero. + +Closes: https://github.com/erikd/libsndfile/issues/92 + +Upstream-Status: Backport + +Fixes CVE-2014-9756 + +Signed-off-by: Erik de Castro Lopo +Signed-off-by: Maxin B. John +--- +diff -Naur libsndfile-1.0.25-orig/src/file_io.c libsndfile-1.0.25/src/file_io.c +--- libsndfile-1.0.25-orig/src/file_io.c 2011-01-19 12:12:28.0 +0200 libsndfile-1.0.25/src/file_io.c2015-11-04 15:02:04.337395618 +0200 +@@ -358,6 +358,9 @@ + { sf_count_t total = 0 ; + ssize_t count ; + ++if (bytes == 0 || items == 0) ++return 0 ; ++ + if (psf->virtual_io) + return psf->vio.write (ptr, bytes*items, psf->vio_user_data) / bytes ; + diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb index 3e02f4e..be875c2 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb @@ -9,6 +9,7 @@ PR = "r2" SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz \ file://0001-src-sd2.c-Fix-segfault-in-SD2-RSRC-parser.patch \ file://0001-src-sd2.c-Fix-two-potential-buffer-read-overflows.patch \ + file://libsndfile-fix-CVE-2014-9756.patch \ " SRC_URI[md5sum] = "e2b7bb637e01022c7d20f95f9c3990a2" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston-init: add a native systemd unit file
Hi, Better use "${systemd_system_unitdir}" instead of "${systemd_unitdir}/system". Pau Espin Pedrol mail/jabber: pespin.s...@gmail.com http://blog.espeweb.net 2015-11-30 18:41 GMT+01:00 Alexander Kanavin < alexander.kana...@linux.intel.com>: > Previously weston was started by systemd via a classic init script > > [YOCTO #5582] > > Signed-off-by: Alexander Kanavin > --- > meta/recipes-graphics/wayland/weston-init.bb | 13 > ++--- > meta/recipes-graphics/wayland/weston-init/weston.service | 15 > +++ > 2 files changed, 25 insertions(+), 3 deletions(-) > create mode 100644 > meta/recipes-graphics/wayland/weston-init/weston.service > > diff --git a/meta/recipes-graphics/wayland/weston-init.bb > b/meta/recipes-graphics/wayland/weston-init.bb > index fc2e4f8..35fd055 100644 > --- a/meta/recipes-graphics/wayland/weston-init.bb > +++ b/meta/recipes-graphics/wayland/weston-init.bb > @@ -1,17 +1,22 @@ > -SUMMARY = "Startup script for the Weston Wayland compositor" > +SUMMARY = "Startup script and systemd unit file for the Weston Wayland > compositor" > LICENSE = "MIT" > LIC_FILES_CHKSUM = > "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" > > -SRC_URI = "file://init" > +SRC_URI = "file://init \ > + file://weston.service" > > S = "${WORKDIR}" > > do_install() { > install -d ${D}/${sysconfdir}/init.d > install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston > + > +install -d ${D}${systemd_unitdir}/system > +install -m0644 ${WORKDIR}/weston.service > ${D}${systemd_unitdir}/system > } > > -inherit allarch update-rc.d distro_features_check > +inherit allarch update-rc.d distro_features_check systemd > + > # rdepends on weston which depends on virtual/egl > REQUIRED_DISTRO_FEATURES = "opengl" > > @@ -19,3 +24,5 @@ RDEPENDS_${PN} = "weston kbd" > > INITSCRIPT_NAME = "weston" > INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." > + > +SYSTEMD_SERVICE_${PN} = "weston.service" > diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service > b/meta/recipes-graphics/wayland/weston-init/weston.service > new file mode 100644 > index 000..4f1f7ff > --- /dev/null > +++ b/meta/recipes-graphics/wayland/weston-init/weston.service > @@ -0,0 +1,15 @@ > +[Unit] > +Description=Weston Wayland compositor startup > +RequiresMountsFor=/run > + > +[Service] > +User=root > +EnvironmentFile=-/etc/default/weston > +Environment="XDG_RUNTIME_DIR=/run/user/root" > +ExecStartPre=/bin/mkdir -p /run/user/root > +ExecStartPre=/bin/chmod 0700 /run/user/root > +ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS > + > +[Install] > +WantedBy=multi-user.target > + > -- > 2.6.2 > > -- > ___ > 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
Re: [OE-core] [PATCH] iproute2: enable previously unselected utilities
Hi, On Tue, Dec 01, 2015 at 01:29:43AM -0800, Khem Raj wrote: > On Tue, Dec 1, 2015 at 1:27 AM, Anders Darander wrote: > > Hi, > > > > Just a couple of questions. > > > > * Maxin B. John [151130 17:59]: > >> Include below listed utilities that are not yet enabled/packaged > >> in the iproute2 recipe: > > > >> lnstat > >> ifstat > >> genl > >> rtacct > >> nstat > >> ss > > > > When you enable those, how much does the size ofthe iproute2 package > > increase? > > The increase in size is around 268K. $ du -sh iproute2 476Kiproute2 $ du -sh iproute2-new 744Kiproute2-new > > Perhaps those extra tools should be placed in e.g. ${PN}-tools, or > > some package like that? > > I think its better to package each one in separate package of its own. > Ok. I will split these binaries in separate packages. > > > > Cheers, > > Anders > > > >> Signed-off-by: Maxin B. John > >> --- > >> meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > >> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc > >> b/meta/recipes-connectivity/iproute2/iproute2.inc > >> index 29f9062..abaff3f 100644 > >> --- a/meta/recipes-connectivity/iproute2/iproute2.inc > >> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc > >> @@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables elfutils" > > > >> inherit update-alternatives > > > >> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' > >> LIBDIR='${libdir}'" > >> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} > >> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip misc genl' > >> SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" > > > >> do_configure_append () { > >> sh configure ${STAGING_INCDIR} > > -- > > Anders Darander, Senior System Architect > > ChargeStorm AB / eStorm AB > > -- Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Patchwork & patch handling improvements
On Tue, Dec 01, 2015 at 07:49:50AM +1300, Paul Eggleton wrote: > Hi Trevor, > > On Mon, 30 Nov 2015 10:19:35 Trevor Woerner wrote: > > On 11/26/15 16:00, Paul Eggleton wrote: > > > I'm also > > > trying to ensure that the patch validation is generic enough so it can > > > live in OE-Core, and thus we can easily update and refine it over time in > > > line with the code itself as well as encourage submitters to use the > > > script on their own changes before sending. > > > > This all sounds like an improvement and is therefore a step in the right > > direction :-) > > > > A while back I had the idea of "porting" the kernel's "checkpatch.pl" to > > The Yocto Project (it was around the same time that I was trying to > > float the whole "Maintainers File" idea too, since I was also trying to > > re-purpose "get-maintainer.pl" as well). About one minute into that > > effort I realized the existing *.bb files were all over the place in > > terms of the order of statements and the order of the blocks of > > statements. At that time I found one recipe style guide from OE, and > > another one from The Yocto Project, each of which described a slightly > > different preference. So I asked on the mailing list and quickly > > discovered that both groups prefer a different style. > > > > I'm not saying this job isn't worth doing, but I am pointing out there's > > the potential for feathers to be ruffled on both sides if someone tries > > to produce a definitive style guide for recipe files and then enforces > > it in an automated way. Since it is the OpenEmbedded Project's job to > > provide the recipes for The Yocto Project, I'm guessing this question > > needs to be decided by them? If that sounds reasonable, then maybe The > > Yocto Project needs to acquiesce to OE's decision? > > I don't think there's that much of a division. I don't recall if it was you > that raised it at the time but the issue of having two style guides did get > rectified - I changed the one on the Yocto Project wiki to simply be a link > to > the OE style guide in June last year. It certainly didn't come about through > a > conscious decision to have a different style. > > However there is a minor disagreement over indentation for shell functions > between OE-Core and other layers - this persists because of the backporting > pain a blanket replacement would potentially lead to. As I recall this did > get > discussed at the OE TSC level. I think that's one thing we could just not > evaluate (or make an option) until such time as we resolve the difference - > and > I do mean to see it resolved at some point in the future. Using consistent indentation (4 spaces) at least for new metadata would be step in right direction. With the amount of changes which are backported to older releases I still don't see this "backporting pain" argument. Doing it just before the release is of course useful, because e.g. now more changes will be backported to Jethro than to Fido or Dizzy. So having consistent indentation in Jethro and master would prevent 95% of "backporting pain". Maybe some Yocto 10.0 will finally get the meaning of "consistent" indentation. Regards, > > Instead of cross-posting, maybe this would be a good email for the new > > architecture list (CC'ed)? > > Perhaps yes; I'm a bit concerned that list still doesn't have that many > subscribers though (currently 28, two of which are the same person). > > Cheers, > Paul > > -- > > Paul Eggleton > Intel Open Source Technology Centre > -- > ___ > 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
[OE-core] [PATCH v2] iproute2: enable previously unselected utilities
Include below listed utilities that are not yet enabled/packaged in the iproute2 recipe: lnstat ifstat genl rtacct nstat ss Signed-off-by: Maxin B. John --- meta/recipes-connectivity/iproute2/iproute2.inc | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 29f9062..ca7ea92 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables elfutils" inherit update-alternatives -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -32,9 +32,15 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc" +PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" +FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat" +FILES_${PN}-ifstat = "${base_sbindir}/ifstat" +FILES_${PN}-genl = "${base_sbindir}/genl" +FILES_${PN}-rtacct = "${base_sbindir}/rtacct" +FILES_${PN}-nstat = "${base_sbindir}/nstat" +FILES_${PN}-ss = "${base_sbindir}/ss" FILES_${PN}-dbg += "${libdir}/tc/.debug" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][RFC] base: don't prefix/suffix packages when expanding PACKAGECONFIG
On 30 November 2015 at 22:54, Ross Burton wrote: > When handling PACKAGECONFIG don't add nativesdk- prefixes or -native > suffixes to > packages, as the classexpand logic will run next and so the same operation > again. > Retracting this, whilst this works for nativesdk the native path is ordered differently and the remapping happens before packageconfig so libsdl-native will depend on libx11 (not libx11-native). Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston-init: add a native systemd unit file
Previously weston was started by systemd via a classic init script [YOCTO #5582] Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston-init.bb | 13 ++--- meta/recipes-graphics/wayland/weston-init/weston.service | 15 +++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index fc2e4f8..5f61c82 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -1,17 +1,22 @@ -SUMMARY = "Startup script for the Weston Wayland compositor" +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" -SRC_URI = "file://init" +SRC_URI = "file://init \ + file://weston.service" S = "${WORKDIR}" do_install() { install -d ${D}/${sysconfdir}/init.d install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + + install -d ${D}${systemd_unitdir}/system + install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir} } -inherit allarch update-rc.d distro_features_check +inherit allarch update-rc.d distro_features_check systemd + # rdepends on weston which depends on virtual/egl REQUIRED_DISTRO_FEATURES = "opengl" @@ -19,3 +24,5 @@ RDEPENDS_${PN} = "weston kbd" INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." + +SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service new file mode 100644 index 000..4f1f7ff --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/weston.service @@ -0,0 +1,15 @@ +[Unit] +Description=Weston Wayland compositor startup +RequiresMountsFor=/run + +[Service] +User=root +EnvironmentFile=-/etc/default/weston +Environment="XDG_RUNTIME_DIR=/run/user/root" +ExecStartPre=/bin/mkdir -p /run/user/root +ExecStartPre=/bin/chmod 0700 /run/user/root +ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS + +[Install] +WantedBy=multi-user.target + -- 2.6.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] weston-init: add a native systemd unit file
2015-12-01 15:00 GMT+01:00 Alexander Kanavin < alexander.kana...@linux.intel.com>: > + install -d ${D}${systemd_unitdir}/system > + install -m0644 ${WORKDIR}/weston.service > ${D}${systemd_system_unitdir} > Sorry to be picky, but you only changed "systemd_unitdir/system"->"systemd_system_unitdir" in one of the two lines containing it! ;) Pau Espin Pedrol mail/jabber: pespin.s...@gmail.com http://blog.espeweb.net -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xvideo-tests: move to the latest release
Updating SRCREV to pick up the latest changes. Signed-off-by: Maxin B. John --- meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb index 9b3c9e0..51839dd 100644 --- a/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb +++ b/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" DEPENDS = "libxv" -SRCREV = "f8f320d0254c09ce483fc1d8ee99ecf5bc940965" +SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092" PV = "0.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/test-xvideo" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sdk.py / OpkgSdk: remove_packaging_data() after install
Run remove_packaging_data() on both host and target sysroots to wipe opkg state after install, similar to what RpmSdk does. Use case: Opkg may download local package indexes (I.e. file:// URLs) by sym-linking them into /var/lib/opkg/lists/ instead of copying [1]. This leaves behind broken symlinks under the lists directory when using opkg to build SDK sysroots. The -h option may be set via SDKTAROPTS in some configurations to create symlink-less SDK archives for Windows file systems. Sysroots containing broken symlinks will fail to archive under this configuration. Testing: Verified /var/lib/opkg/ is empty after running populate_sdk() in a Fido based distribution. [1] http://git.yoctoproject.org/cgit/cgit.cgi/opkg/commit/?h=opkg-0.3.x&id=f9022a8520fcde8f1b71424d26a652c218fce685 Signed-off-by: Haris Okanovic Reviewed-by: Alejandro del Castillo Natinst-ReviewBoard-ID: 119065 --- meta/lib/oe/sdk.py | 4 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index a676741..860e5de 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -197,11 +197,15 @@ class OpkgSdk(Sdk): execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) +self.target_pm.remove_packaging_data() + bb.note("Installing NATIVESDK packages") self._populate_sysroot(self.host_pm, self.host_manifest) execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) +self.host_pm.remove_packaging_data() + target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir) host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir) -- 2.6.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 000/135] Consolidated pull
Hi, Another consolidated pull after testing. All green on the AB. Ross The following changes since commit 03f15e51998a3ef65a5b68cb7cbf724f4388c289: sstate: Ensure siginfo and sig files are also touched (2015-11-25 08:09:00 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ross/mut for you to fetch changes up to 8af29599123b31f07aecc48d975c96c090c9396c: libsdl: remove redundant configure_tweak patch (2015-12-01 14:44:08 +) Alejandro Hernandez (2): python3: Upgrade from 3.4.3 to 3.5 python3: fix building nativesdk-python3 Andre McCurdy (15): directfb.inc: force bfd linker for armv7a libxml2: remove legacy LDFLAGS += "-ldl" workaround sqlite3: update 3.9.0 -> 3.9.2 harfbuzz: update 1.0.6 -> 1.1.0 busybox_git: Enable getopt applet busybox.inc: don't export EXTRA_OEMAKE busybox: move EXTRA_OEMAKE etc into busybox.inc busybox.inc: don't set .config CROSS_COMPILER_PREFIX busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle busybox.inc: set CC=${CC} via make command line busybox.inc: remove '-e MAKEFLAGS=' from EXTRA_OEMAKE busybox: re-order defconfig to align with busybox 1.24.1 busybox: update 1.23.2 -> 1.24.1 busybox: disable support for mounting NFS file systems on Linux < 2.6.23 busybox: enable resize applet Andrew Shadura (1): dbus: merge .bb and .inc AnÃbal Limón (2): dev-manual: Fix errata in new kvm-vhost. classes/sstate.bbclass: checkhashes modify to take into account siginfo. Bhuvanchandra DV (1): linux-firmware: rtl8192cx: Add latest available firmware Bogdan-Alexandru Voiculescu (1): uClibc: enable utmp for shadow compatibility Bruce Ashfield (4): linux-yocto/4.1: update to v4.1.13 linux-yocto/4.1: fsl-mpc8315e-rdb: Enable EEPROM linux-yocto-rt/4.1: update to -rt15 linux-yocto/4.1: Bluetooth:Fix the connection fail of 6lowpan over BT LE Dariusz Pelowski (1): lib/oe/terminal: use C locale when determining version Ed Bartosh (1): wic: exec_native_cmd: implement support for pseudo Fan Xin (1): wpa-supplicant: upgrade to 2.5 George Nita (1): toolchain-shar-extract.sh: Ensure it's ran in clean environment Haris Okanovic (1): populate_sdk_base: Add sysroot symlink check Jean-Francois Dagenais (1): toolchain-shar-relocate: don't assume last state of env_setup_script is good Juro Bystricky (1): psplash: update to latest git version Jussi Kukkonen (4): mesa: Make gl libraries RRECOMMEND mesa-megadriver pulseaudio: Fix HDMI profile selection gcr: Require x11 DISTRO_FEATURE gudev: Add from meta-oe Khem Raj (2): runqemu-internal: Replace wacom-tablet with tablet for usbdevice ruby-native: Depend on openssl-native Leonardo Sandoval (1): oe-selftest: Enable code coverage on unit tests Li Xin (1): glibc: Backported a patch to fix glibc's bug(18589) Li Zhou (1): rpcbind: Security Advisory - rpcbind - CVE-2015-7236 Mariano Lopez (6): license.bbclass: Write recipeinfo file in license folder license.bbclass: Split license create manifest license.bbclass: Added get_boot_dependencies function license.bbclass: Added function get_deployed_dependencies license.bbclass: Add function get_deployed_files license.bbclass: Create image license manifest Mark Hatle (1): populate_sdk_ext.bbclass: Be more permissive on the name of the buildtools Martin Jansa (8): package_manager.py: define info_dir and status_file when OPKGLIBDIR isn't the default meta/conf/machine: use ' inside quoted values icu: force arm mode guile, mailx, gcc, opensp, gstreamer1.0-libav, libunwind: disable thumb where it fails for qemuarm gstreamer1.0-plugins-base: add PACKAGECONFIG for libvisual gst-plugins-bad: improve FILES variables gstreamer1.0-plugins-bad: fix dependencies for uvch264 PACKAGECONFIG gstreamer1.0-plugins-good: fix PACKAGECONFIG for gudev and add one for v4l2 and libv4l2 Maxin B. John (12): iproute2: update to 4.3.0 apr-util: add missing RDEPENDS for ptest libpcap: update to 1.7.4 orc: update to 0.4.24 libpng: update to 1.6.19 libpng12: update to 1.2.54 libtasn1: upgrade to 4.7 libunistring: upgrade to version 0.9.6 ofono: upgrade to version 1.17 pkgconfig: upgrade to version 0.29 ncurses: update SRC_URI iw: upgrade to version 4.3 Mike Crowe (2): image.py: Avoid creating empty .env file in _write_wic_env image.py: avoid mkdir race when building multiple images Ming Liu (1): initscripts: hide the error in case system is not writeable Nathan Lynch (1): lttng-tools: add libgcc to RDEPENDS Ng, Mei Yeen (2): init-install-efi: fix script for gummiboot loader in
[OE-core] [PATCH] libbsd: Upgrade to 0.8.0
Upgrade the library version to recently released 0.8.0 . The COPYING file changed again, but the changes are just new names added to the Copyright (C) John Doe <...> section, no changes to the license itself. Signed-off-by: Marek Vasut Cc: Khem Raj Cc: Saul Wold Cc: Richard Purdie --- meta/recipes-support/libbsd/libbsd_0.7.0.bb | 21 - meta/recipes-support/libbsd/libbsd_0.8.0.bb | 21 + 2 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-support/libbsd/libbsd_0.7.0.bb create mode 100644 meta/recipes-support/libbsd/libbsd_0.8.0.bb diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/meta/recipes-support/libbsd/libbsd_0.7.0.bb deleted file mode 100644 index 902666d..000 --- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2013 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; -LICENSE = "BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" -SECTION = "libs" -DEPENDS = "" - -SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"; - -SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" -SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" - -inherit autotools pkgconfig diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb new file mode 100644 index 000..b9f4464 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.8.0.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2013 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; +LICENSE = "BSD-4-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"; + +SRC_URI[md5sum] = "262bdd1aa3bee6066a8c9cb49bb6c584" +SRC_URI[sha256sum] = "fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c" + +inherit autotools pkgconfig -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libjpeg: Replace libjpeg with libjpeg-turbo
On 30 November 2015 at 09:28, Maxin B. John wrote: > +PACKAGES =+ "jpeg-tools libturbojpeg" > +FILES_libturbojpeg = "${libdir}/libturbojpeg.so" > +INSANE_SKIP_libturbojpeg = "dev-so" I don't understand why there's a libturbojpeg package solely for a development symlink that should be in $PN-dev. Also, Martin pointed out that meta-oe's master-next has a 1.4.2 recipe, can you use that? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston-init: add a native systemd unit file
Previously weston was started by systemd via a classic init script [YOCTO #5582] Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/wayland/weston-init.bb | 13 ++--- meta/recipes-graphics/wayland/weston-init/weston.service | 15 +++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston-init/weston.service diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index fc2e4f8..653541e 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -1,17 +1,22 @@ -SUMMARY = "Startup script for the Weston Wayland compositor" +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" -SRC_URI = "file://init" +SRC_URI = "file://init \ + file://weston.service" S = "${WORKDIR}" do_install() { install -d ${D}/${sysconfdir}/init.d install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + + install -d ${D}${systemd_system_unitdir} + install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir} } -inherit allarch update-rc.d distro_features_check +inherit allarch update-rc.d distro_features_check systemd + # rdepends on weston which depends on virtual/egl REQUIRED_DISTRO_FEATURES = "opengl" @@ -19,3 +24,5 @@ RDEPENDS_${PN} = "weston kbd" INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." + +SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service new file mode 100644 index 000..4f1f7ff --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/weston.service @@ -0,0 +1,15 @@ +[Unit] +Description=Weston Wayland compositor startup +RequiresMountsFor=/run + +[Service] +User=root +EnvironmentFile=-/etc/default/weston +Environment="XDG_RUNTIME_DIR=/run/user/root" +ExecStartPre=/bin/mkdir -p /run/user/root +ExecStartPre=/bin/chmod 0700 /run/user/root +ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS + +[Install] +WantedBy=multi-user.target + -- 2.6.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libbsd: Upgrade to 0.8.0
Hi Marek, On 1 December 2015 at 15:30, Marek Vasut wrote: > Upgrade the library version to recently released 0.8.0 . > Fails to build from a clean sysroot: | In file included from /data/poky-master/tmp/work/corei7-64-poky-linux/libbsd/0.8.0-r0/libbsd-0.8.0/src/getentropy.c:28:0: | /data/poky-master/tmp/work/corei7-64-poky-linux/libbsd/0.8.0-r0/libbsd-0.8.0/src/getentropy_linux.c:50:25: fatal error: openssl/sha.h: No such file or directory | compilation terminated. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libbsd: Upgrade to 0.8.0
On Tuesday, December 01, 2015 at 04:39:47 PM, Burton, Ross wrote: > Hi Marek, Hi Ross, > On 1 December 2015 at 15:30, Marek Vasut wrote: > > Upgrade the library version to recently released 0.8.0 . > > Fails to build from a clean sysroot: > | In file included from > > /data/poky-master/tmp/work/corei7-64-poky-linux/libbsd/0.8.0-r0/libbsd-0.8. > 0/src/getentropy.c:28:0: > > /data/poky-master/tmp/work/corei7-64-poky-linux/libbsd/0.8.0-r0/libbsd-0.8. > 0/src/getentropy_linux.c:50:25: fatal error: openssl/sha.h: No such file or > directory Looks like it depends on OpenSSL, so adding "DEPENDS = "openssl"" to the recipe would be the solution, right ? Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libbsd: Upgrade to 0.8.0
On 1 December 2015 at 15:42, Marek Vasut wrote: > Looks like it depends on OpenSSL, so adding "DEPENDS = "openssl"" to the > recipe would be the solution, right ? > Assuming it's a hard dependency, yes. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libbsd: Upgrade to 0.8.0
On Tuesday, December 01, 2015 at 04:46:57 PM, Burton, Ross wrote: > On 1 December 2015 at 15:42, Marek Vasut wrote: > > Looks like it depends on OpenSSL, so adding "DEPENDS = "openssl"" to the > > recipe would be the solution, right ? > > Assuming it's a hard dependency, yes. I was wrong, I just looked into the upstream git of libbsd and there's the solution: http://cgit.freedesktop.org/libbsd/commit/?id=8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] libbsd: Upgrade to 0.8.0
Upgrade the library version to recently released 0.8.0 . The COPYING file changed again, but the changes are just new names added to the Copyright (C) John Doe <...> section, no changes to the license itself. Signed-off-by: Marek Vasut Cc: Khem Raj Cc: Saul Wold Cc: Richard Purdie --- .../libbsd/0001-Use-local-SHA512-header.patch | 74 ++ meta/recipes-support/libbsd/libbsd_0.7.0.bb| 21 -- meta/recipes-support/libbsd/libbsd_0.8.0.bb| 24 +++ 3 files changed, 98 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch delete mode 100644 meta/recipes-support/libbsd/libbsd_0.7.0.bb create mode 100644 meta/recipes-support/libbsd/libbsd_0.8.0.bb V2: Backport patch from libbsd mainline which removes dependency on the OpenSSL. diff --git a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch new file mode 100644 index 000..068f13b --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch @@ -0,0 +1,74 @@ +From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 1 Dec 2015 03:39:10 +0100 +Subject: [PATCH] Use local SHA512 header + +Actually use the local private SHA512 header instead of relying on the +OpenSSL one for no good reason. Add definition for expected macro +SHA512_DIGEST_LENGTH. + +Upstream-Status: Backport +--- + src/getentropy_aix.c | 2 +- + src/getentropy_hpux.c | 3 ++- + src/getentropy_linux.c | 3 ++- + src/hash/sha512.h | 2 ++ + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c +index cbd4037..d4ccab7 100644 +--- a/src/getentropy_aix.c b/src/getentropy_aix.c +@@ -39,7 +39,7 @@ + #include + #include + +-#include ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c +index 45ac84b..294d83a 100644 +--- a/src/getentropy_hpux.c b/src/getentropy_hpux.c +@@ -41,7 +41,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c +index 0a5d6b8..d7a8ae5 100644 +--- a/src/getentropy_linux.c b/src/getentropy_linux.c +@@ -47,7 +47,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + #include +diff --git a/src/hash/sha512.h b/src/hash/sha512.h +index 43c5aaf..4f368a1 100644 +--- a/src/hash/sha512.h b/src/hash/sha512.h +@@ -31,6 +31,8 @@ + + #include + ++#define SHA512_DIGEST_LENGTH 64 ++ + typedef struct SHA512Context { + uint64_t state[8]; + uint64_t count[2]; +-- +2.6.2 + diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/meta/recipes-support/libbsd/libbsd_0.7.0.bb deleted file mode 100644 index 902666d..000 --- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2013 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; -LICENSE = "BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" -SECTION = "libs" -DEPENDS = "" - -SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"; - -SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" -SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" - -inherit autotools pkgconfig diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb new file mode 100644 index 000..3456968 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.8.0.bb @@ -0,0 +1,24 @@ +# Copyright (C) 2013 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; +LICENSE = "BSD-4-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = " \ + http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://000
Re: [OE-core] [PATCH] libjpeg: Replace libjpeg with libjpeg-turbo
Hi Ross, On Tue, Dec 01, 2015 at 03:36:06PM +, Burton, Ross wrote: On 30 November 2015 at 09:28, Maxin B. John wrote: >> +PACKAGES =+ "jpeg-tools libturbojpeg" >> +FILES_libturbojpeg = "${libdir}/libturbojpeg.so" >> +INSANE_SKIP_libturbojpeg = "dev-so" > >I don't understand why there's a libturbojpeg package solely for a development >symlink that should be in $PN-dev. We can move that to $PN-dev. >Also, Martin pointed out that meta-oe's master-next has a 1.4.2 recipe, can >you use that? Oh, I didn't notice that. Will send a v3 with these changes. >Ross Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 10/10] dropbear: Upgrade 2015.68 -> 2015.70
On 27 November 2015 at 12:10, Jussi Kukkonen wrote: > --- a/meta/recipes-core/dropbear/dropbear_2015.68.bb > +++ /dev/null > @@ -1,4 +0,0 @@ > -require dropbear.inc > - > -SRC_URI[md5sum] = "7664ac10f7cc2301c530eb80c756fc5d" > -SRC_URI[sha256sum] = > "55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446" > diff --git a/meta/recipes-core/dropbear/dropbear_2015.70.bb > b/meta/recipes-core/dropbear/dropbear_2015.70.bb > new file mode 100644 > index 000..3da8d5f > --- /dev/null > +++ b/meta/recipes-core/dropbear/dropbear_2015.70.bb > @@ -0,0 +1,5 @@ > +require dropbear.inc > + > +SRC_URI[md5sum] = "0b0a1d9be6a094710d884209562a626c" > +SRC_URI[sha256sum] = > "62a8cc3df1d0f136d46f50d4f8d92f7ab7ce1addac76b25446b3f6aaf80bf257" > ERROR: Command Error: exit status: 1 Output: Applying patch 0005-dropbear-enable-pam.patch patching file options.h Hunk #1 FAILED at 192. 1 out of 1 hunk FAILED -- rejects in file options.h Patch 0005-dropbear-enable-pam.patch does not apply (enforce with -f) (I do builds with PAM enabled, which isn't the case for plain poky). Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][fido] allarch: Force TARGET_*FLAGS variable values
From: Mike Crowe TARGET_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS and TARGET_LDFLAGS may differ between MACHINEs. Since they are exported they affect task hashes even if unused which leads to multiple variants of allarch packages existing in sstate and bouncing in the sysroot when switching between MACHINEs. allarch packages shouldn't be using these variables anyway, so let's ensure they have a fixed value in order to avoid this problem. (Compare with 05a70ac30b37cab0952f1b9df501993a9dec70da and 14f4d016fef9d660da1e7e91aec4a0e807de59ab.) Signed-off-by: Mike Crowe Signed-off-by: Ross Burton --- meta/classes/allarch.bbclass | 4 1 file changed, 4 insertions(+) diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 4bc9927..6f63f9d 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -27,6 +27,10 @@ python () { d.setVar("PACKAGE_EXTRA_ARCHS", "") d.setVar("SDK_ARCH", "none") d.setVar("SDK_CC_ARCH", "none") +d.setVar("TARGET_CPPFLAGS", "none") +d.setVar("TARGET_CFLAGS", "none") +d.setVar("TARGET_CXXFLAGS", "none") +d.setVar("TARGET_LDFLAGS", "none") # Avoid this being unnecessarily different due to nuances of # the target machine that aren't important for "all" arch -- 2.6.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][jethro] allarch: Force TARGET_*FLAGS variable values
From: Mike Crowe TARGET_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS and TARGET_LDFLAGS may differ between MACHINEs. Since they are exported they affect task hashes even if unused which leads to multiple variants of allarch packages existing in sstate and bouncing in the sysroot when switching between MACHINEs. allarch packages shouldn't be using these variables anyway, so let's ensure they have a fixed value in order to avoid this problem. (Compare with 05a70ac30b37cab0952f1b9df501993a9dec70da and 14f4d016fef9d660da1e7e91aec4a0e807de59ab.) Signed-off-by: Mike Crowe Signed-off-by: Ross Burton --- meta/classes/allarch.bbclass | 4 1 file changed, 4 insertions(+) diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 2fea7c0..4af38d7 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -27,6 +27,10 @@ python () { d.setVar("PACKAGE_EXTRA_ARCHS", "") d.setVar("SDK_ARCH", "none") d.setVar("SDK_CC_ARCH", "none") +d.setVar("TARGET_CPPFLAGS", "none") +d.setVar("TARGET_CFLAGS", "none") +d.setVar("TARGET_CXXFLAGS", "none") +d.setVar("TARGET_LDFLAGS", "none") # Avoid this being unnecessarily different due to nuances of # the target machine that aren't important for "all" arch -- 2.6.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] libbsd: Upgrade to 0.8.0
Upgrade the library version to recently released 0.8.0 . The COPYING file changed again, but the changes are just new names added to the Copyright (C) John Doe <...> section, no changes to the license itself. Signed-off-by: Marek Vasut Cc: Khem Raj Cc: Saul Wold Cc: Richard Purdie --- .../libbsd/0001-Use-local-SHA512-header.patch | 75 ++ meta/recipes-support/libbsd/libbsd_0.7.0.bb| 21 -- meta/recipes-support/libbsd/libbsd_0.8.0.bb| 24 +++ 3 files changed, 99 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch delete mode 100644 meta/recipes-support/libbsd/libbsd_0.7.0.bb create mode 100644 meta/recipes-support/libbsd/libbsd_0.8.0.bb V2: Backport patch from libbsd mainline which removes dependency on the OpenSSL. V3: Add my SoB line on the backported patch. diff --git a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch new file mode 100644 index 000..af47b2b --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch @@ -0,0 +1,75 @@ +From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Tue, 1 Dec 2015 03:39:10 +0100 +Subject: [PATCH] Use local SHA512 header + +Actually use the local private SHA512 header instead of relying on the +OpenSSL one for no good reason. Add definition for expected macro +SHA512_DIGEST_LENGTH. + +Signed-off-by: Marek Vasut +Upstream-Status: Backport +--- + src/getentropy_aix.c | 2 +- + src/getentropy_hpux.c | 3 ++- + src/getentropy_linux.c | 3 ++- + src/hash/sha512.h | 2 ++ + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c +index cbd4037..d4ccab7 100644 +--- a/src/getentropy_aix.c b/src/getentropy_aix.c +@@ -39,7 +39,7 @@ + #include + #include + +-#include ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c +index 45ac84b..294d83a 100644 +--- a/src/getentropy_hpux.c b/src/getentropy_hpux.c +@@ -41,7 +41,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + +diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c +index 0a5d6b8..d7a8ae5 100644 +--- a/src/getentropy_linux.c b/src/getentropy_linux.c +@@ -47,7 +47,8 @@ + #include + #include + #include +-#include ++ ++#include "hash/sha512.h" + + #include + #include +diff --git a/src/hash/sha512.h b/src/hash/sha512.h +index 43c5aaf..4f368a1 100644 +--- a/src/hash/sha512.h b/src/hash/sha512.h +@@ -31,6 +31,8 @@ + + #include + ++#define SHA512_DIGEST_LENGTH 64 ++ + typedef struct SHA512Context { + uint64_t state[8]; + uint64_t count[2]; +-- +2.6.2 + diff --git a/meta/recipes-support/libbsd/libbsd_0.7.0.bb b/meta/recipes-support/libbsd/libbsd_0.7.0.bb deleted file mode 100644 index 902666d..000 --- a/meta/recipes-support/libbsd/libbsd_0.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2013 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Library of utility functions from BSD systems" -DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ - and lacking on others like GNU systems, thus making it easier to port \ - projects with strong BSD origins, without needing to embed the same \ - code over and over again on each project." - -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; -LICENSE = "BSD-4-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1530ea92aeaa1c5e2547cfd43905d8c" -SECTION = "libs" -DEPENDS = "" - -SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"; - -SRC_URI[md5sum] = "fcceb4e66fd448ca4ed42ba22a8babb0" -SRC_URI[sha256sum] = "0f3b0e17e5c34c038126e0a04351b11e23c6101a7d0ce3beeab29bb6415c10bb" - -inherit autotools pkgconfig diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.0.bb new file mode 100644 index 000..3456968 --- /dev/null +++ b/meta/recipes-support/libbsd/libbsd_0.8.0.bb @@ -0,0 +1,24 @@ +# Copyright (C) 2013 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Library of utility functions from BSD systems" +DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ + and lacking on others like GNU systems, thus making it easier to port \ + projects with strong BSD origins, without needing to embed the same \ + code over and over again on each project." + +HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"; +LICENSE = "BSD-4-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78" +SECTION = "libs" +DEPENDS = "" + +SRC_URI = " \ + http:
[OE-core] [PATCH][dizzy] allarch: Force TARGET_*FLAGS variable values
From: Mike Crowe TARGET_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS and TARGET_LDFLAGS may differ between MACHINEs. Since they are exported they affect task hashes even if unused which leads to multiple variants of allarch packages existing in sstate and bouncing in the sysroot when switching between MACHINEs. allarch packages shouldn't be using these variables anyway, so let's ensure they have a fixed value in order to avoid this problem. (Compare with 05a70ac30b37cab0952f1b9df501993a9dec70da and 14f4d016fef9d660da1e7e91aec4a0e807de59ab.) Signed-off-by: Mike Crowe Signed-off-by: Ross Burton --- meta/classes/allarch.bbclass | 4 1 file changed, 4 insertions(+) diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 4bc9927..6f63f9d 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -27,6 +27,10 @@ python () { d.setVar("PACKAGE_EXTRA_ARCHS", "") d.setVar("SDK_ARCH", "none") d.setVar("SDK_CC_ARCH", "none") +d.setVar("TARGET_CPPFLAGS", "none") +d.setVar("TARGET_CFLAGS", "none") +d.setVar("TARGET_CXXFLAGS", "none") +d.setVar("TARGET_LDFLAGS", "none") # Avoid this being unnecessarily different due to nuances of # the target machine that aren't important for "all" arch -- 2.6.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 1/6] wic: Prepare wicboot to allow custom bootloader config
From: Mariano Lopez Currently wic does the bootloader configuration file on the fly. This change introduce a configfile variable for the bootloader; this is to have a user defined configuration file for the bootloaders (grub, syslinux, and gummiboot). This is particular useful when having a multiboot system or scripts embedded in the configuration file. [YOCTO #8728] Signed-off-by: Mariano Lopez --- scripts/lib/wic/kickstart/__init__.py| 7 +++ scripts/lib/wic/kickstart/custom_commands/wicboot.py | 5 + 2 files changed, 12 insertions(+) diff --git a/scripts/lib/wic/kickstart/__init__.py b/scripts/lib/wic/kickstart/__init__.py index c9b0e51..79b39fb 100644 --- a/scripts/lib/wic/kickstart/__init__.py +++ b/scripts/lib/wic/kickstart/__init__.py @@ -97,6 +97,13 @@ def get_timeout(kickstart, default=None): return default return int(kickstart.handler.bootloader.timeout) +def get_bootloader_file(kickstart, default=None): +if not hasattr(kickstart.handler.bootloader, "configfile"): +return default +if kickstart.handler.bootloader.configfile is None: +return default +return kickstart.handler.bootloader.configfile + def get_kernel_args(kickstart, default="ro rd.live.image"): if not hasattr(kickstart.handler.bootloader, "appendLine"): return default diff --git a/scripts/lib/wic/kickstart/custom_commands/wicboot.py b/scripts/lib/wic/kickstart/custom_commands/wicboot.py index a3e1852..eb17dab 100644 --- a/scripts/lib/wic/kickstart/custom_commands/wicboot.py +++ b/scripts/lib/wic/kickstart/custom_commands/wicboot.py @@ -35,6 +35,7 @@ class Wic_Bootloader(F8_Bootloader): self.menus = "" self.ptable = "msdos" self.source = "" +self.configfile = "" def _getArgsAsStr(self): retval = F8_Bootloader._getArgsAsStr(self) @@ -45,6 +46,8 @@ class Wic_Bootloader(F8_Bootloader): retval += " --ptable=\"%s\"" %(self.ptable,) if self.source: retval += " --source=%s" % self.source +if self.configfile: +retval += " --configfile=%s" % self.configfile return retval @@ -56,5 +59,7 @@ class Wic_Bootloader(F8_Bootloader): # use specified source plugin to implement bootloader-specific methods parser.add_option("--source", type="string", action="store", dest="source", default=None) +parser.add_option("--configfile", type="string", action="store", + dest="configfile", default=None) return parser -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 6/6] selftest/wic.py: Add test for custom bootloader config
From: Mariano Lopez This change just add anoher test to the wic module. It will try to create a image with a custom bootloader configuration. This test will use the example image directdisk-bootloader-config to test the configfile option for the bootloaders. [YOCTO #8728] Signed-off-by: Mariano Lopez --- meta/lib/oeqa/selftest/wic.py | 8 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py index ea78e22..f4404bf 100644 --- a/meta/lib/oeqa/selftest/wic.py +++ b/meta/lib/oeqa/selftest/wic.py @@ -256,3 +256,11 @@ 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))) + +#@testcase() +def test_directdisk_bootloader_config(self): +"""Test creation of directdisk-bootloader-config image""" +image = "directdisk-bootloader-config" +self.assertEqual(0, runCmd("wic create %s -e core-image-minimal" \ + % image).status) +self.assertEqual(1, len(glob(self.resultdir + "%s-*direct" % image))) -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 2/6] wic/utils/misc.py: Added function to search for files in canned-wks
From: Mariano Lopez This change add two new function to search for files in the canned-wks folder for all the layers included in bblayers.conf. This will be used to search for custom configuration files for the bootloaders. There are similar functions in the wic engine, but these are focused in wks files only, so it was needed to create new ones. [YOCTO #8728] Signed-off-by: Mariano Lopez --- scripts/lib/wic/utils/misc.py | 39 +++ 1 file changed, 39 insertions(+) diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 9d75069..d886d75 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -17,6 +17,7 @@ import os import time +import wic.engine def build_name(kscfg, release=None, prefix=None, suffix=None): """Construct and return an image name string. @@ -56,3 +57,41 @@ def build_name(kscfg, release=None, prefix=None, suffix=None): ret = prefix + name + suffix return ret + +def find_boot_config(scripts_path, boot_file): +""" +Find a config file with the given name in the canned files dir. + +Return False if not found +""" +if os.path.exists(boot_file): +return boot_file + +layers_canned_wks_dir = wic.engine.build_canned_image_list(scripts_path) +for canned_wks_dir in layers_canned_wks_dir: +for root, dirs, files in os.walk(canned_wks_dir): +for fname in files: +if fname == boot_file: +fullpath = os.path.join(canned_wks_dir, fname) +return fullpath + +return None + +def get_custom_config(boot_file): +""" +Get the custom configuration to be used for the bootloader. + +Return None if the file can't be found. +""" +scripts_path = os.path.abspath(os.path.dirname(__file__)) +# Get the scripts path of poky +for x in range(0, 3): +scripts_path = os.path.dirname(scripts_path) + +cfg_file = find_boot_config(scripts_path, boot_file) +if cfg_file: +with open(cfg_file, "r") as f: +config = f.read() +return config + +return None -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 3/6] wic: Allow to use a custom config for bootloaders
From: Mariano Lopez This change will allow to use a user defined file as the configuration for the bootloaders (grub, gummiboot, syslinux). The config file is defined in the wks file with the "configfile" option in the bootloader line. [YOCTO #8728] Signed-off-by: Mariano Lopez --- scripts/lib/wic/plugins/source/bootimg-efi.py| 67 -- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 72 +++- 2 files changed, 93 insertions(+), 46 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index fa63c6a..5feb79d 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -29,6 +29,7 @@ import shutil from wic import kickstart, msger from wic.pluginbase import SourcePlugin +from wic.utils.misc import get_custom_config from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ BOOTDD_EXTRA_SPACE @@ -45,22 +46,37 @@ class BootimgEFIPlugin(SourcePlugin): """ Create loader-specific (grub-efi) config """ -options = creator.ks.handler.bootloader.appendLine +configfile = kickstart.get_bootloader_file(creator.ks) +custom_cfg = None +if configfile: +custom_cfg = get_custom_config(configfile) +if custom_cfg: +# Use a custom configuration for grub +grubefi_conf = custom_cfg +msger.debug("Using custom configuration file " +"%s for grub.cfg" % configfile) +else: +msger.error("configfile is specified but failed to " +"get it from %s." % configfile) -grubefi_conf = "" -grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" -grubefi_conf += "default=boot\n" -timeout = kickstart.get_timeout(creator.ks) -if not timeout: -timeout = 0 -grubefi_conf += "timeout=%s\n" % timeout -grubefi_conf += "menuentry 'boot'{\n" +if not custom_cfg: +# Create grub configuration using parameters from wks file +options = creator.ks.handler.bootloader.appendLine + +grubefi_conf = "" +grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" +grubefi_conf += "default=boot\n" +timeout = kickstart.get_timeout(creator.ks) +if not timeout: +timeout = 0 +grubefi_conf += "timeout=%s\n" % timeout +grubefi_conf += "menuentry 'boot'{\n" -kernel = "/bzImage" +kernel = "/bzImage" -grubefi_conf += "linux %s root=%s rootwait %s\n" \ -% (kernel, creator.rootdev, options) -grubefi_conf += "}\n" +grubefi_conf += "linux %s root=%s rootwait %s\n" \ +% (kernel, creator.rootdev, options) +grubefi_conf += "}\n" msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ % cr_workdir) @@ -95,12 +111,27 @@ class BootimgEFIPlugin(SourcePlugin): cfg.write(loader_conf) cfg.close() -kernel = "/bzImage" +configfile = kickstart.get_bootloader_file(creator.ks) +custom_cfg = None +if configfile: +custom_cfg = get_custom_config(configfile) +if custom_cfg: +# Use a custom configuration for gummiboot +boot_conf = custom_cfg +msger.debug("Using custom configuration file " +"%s for gummiboots'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 +kernel = "/bzImage" -boot_conf = "" -boot_conf += "title boot\n" -boot_conf += "linux %s\n" % kernel -boot_conf += "options LABEL=Boot root=%s %s\n" % (creator.rootdev, options) +boot_conf = "" +boot_conf += "title boot\n" +boot_conf += "linux %s\n" % kernel +boot_conf += "options LABEL=Boot root=%s %s\n" % (creator.rootdev, options) msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \ % cr_workdir) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 96ed54d..80c7dfb 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -29,6 +29,7 @@ import os from wic.utils.errors import ImageError from wic import kickstart, msger from wic.utils import runner +from wic.utils.misc import get_custo
[OE-core] [PATCHv2 0/6] wic: Allow to user defined files as config for bootloaders
From: Mariano Lopez These patches add a new option for the bootloaders. This new option allows to use a custom configuration file as the bootloader config with the "configfile" variable in the bootloader line. This is very useful when there is need to create a multiboot image or when there is need to use scripting in the bootloader. Changes in v2 - Previous version just allowed the have the complete path for the file. Now it will search for the file in the canned-wks folders for all the layers that are part of the project. - Include an example wks file in canned-wks folder. - Include an example configuration in canned-wks folder. - Include the changes in the documentation. - Include test in self-test. The following changes since commit 03f15e51998a3ef65a5b68cb7cbf724f4388c289: sstate: Ensure siginfo and sig files are also touched (2015-11-25 08:09:00 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mariano/bug8728 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mariano/bug8728 Mariano Lopez (6): wic: Prepare wicboot to allow custom bootloader config wic/utils/misc.py: Added function to search for files in canned-wks wic: Allow to use a custom config for bootloaders wic/help.py: Document the new option "configfile" directdisk-bootloader-config.wks: Add example for custom bootloader config selftest/wic.py: Add test for custom bootloader config meta/lib/oeqa/selftest/wic.py | 8 +++ .../canned-wks/directdisk-bootloader-config.cfg| 11 .../canned-wks/directdisk-bootloader-config.wks| 10 +++ scripts/lib/wic/help.py| 6 ++ scripts/lib/wic/kickstart/__init__.py | 7 +++ .../lib/wic/kickstart/custom_commands/wicboot.py | 5 ++ scripts/lib/wic/plugins/source/bootimg-efi.py | 67 ++-- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 72 +- scripts/lib/wic/utils/misc.py | 39 9 files changed, 179 insertions(+), 46 deletions(-) create mode 100644 scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg create mode 100644 scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 5/6] directdisk-bootloader-config.wks: Add example for custom bootloader config
From: Mariano Lopez Add new wks file as a example for a custom bootloader configuration. This change also includes the configuration that file that will be used. This example is using syslinux with MBR, the configuration file is almost the same as the one generated by wic. As stated before this is just an example. [YOCTO #8728] Signed-off-by: Mariano Lopez --- scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 11 +++ scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks | 10 ++ 2 files changed, 21 insertions(+) create mode 100644 scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg create mode 100644 scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg new file mode 100644 index 000..a16bd6a --- /dev/null +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg @@ -0,0 +1,11 @@ +# This is an example configuration file for syslinux. +PROMPT 0 +TIMEOUT 10 + +ALLOWOPTIONS 1 +SERIAL 0 115200 + +DEFAULT boot +LABEL boot +KERNEL /vmlinuz +APPEND label=boot root=/dev/sda2 rootwait rootfstype=ext4 video=vesafb vga=0x318 console=tty0 diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks new file mode 100644 index 000..4808d04 --- /dev/null +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks @@ -0,0 +1,10 @@ +# short-description: Create a 'pcbios' direct disk image with custom bootloader config +# long-description: Creates a partitioned legacy BIOS disk image that the user +# can directly dd to boot media. The bootloader configuration source is a user file. + + +part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 +part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 + +bootloader --configfile="directdisk-bootloader-config.cfg" + -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 4/6] wic/help.py: Document the new option "configfile"
From: Mariano Lopez This just adds the "configfile" option for the bootloader to wic help. [YOCTO #8728] Signed-off-by: Mariano Lopez --- scripts/lib/wic/help.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 9a778b6..89fb7be 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -740,6 +740,12 @@ DESCRIPTION bootloader command-line - for example, the syslinux APPEND or grub kernel command line. +--configfile: Specifies a user defined configuration file for + the bootloader. This file must be located in the + canned-wks folder or could be the full path to the + file. Using this option will override any other + bootloader option. + Note that bootloader functionality and boot partitions are implemented by the various --source plugins that implement bootloader functionality; the bootloader command essentially -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lib/oe/package_manager: Introducing PACKAGE_FEED_BASE_PATHS/PACKAGE_FEED_ARCHS
Documentation related to this feature is already in the manual but feature is still not present in the code, so requesting it for merge.. On 10/05/2015 08:12 AM, leonardo.sandoval.gonza...@linux.intel.com wrote: From: Leonardo Sandoval The recently introduced PACKAGE_FEED_PREFIX is not flexible enough for constructing URIs, because the same PREFIX is used for all PACKAGE_FEED_URIS. Also, the string 'PREFIX' is confusing because it is not at the beginning of the URI. The variable PACKAGE_FEED_BASE_PATHS replaces PACKAGE_FEED_PREFIX, allowing multiple base paths to be appended on each PACKAGE_FEED_URIS. In the other hand, a new variable called PACKAGE_FEED_ARCHS, similar in concept to PACKAGE_BASE_PATHS, defines package architectures defined by the user. To demonstrate the usage of the PACKAGE_FEED_URIS, PACKAGE_FEED_BASE_PATHS and PACKAGE_FEED_ARCHS, let's assume these variables are set on local.conf PACKAGE_FEED_URIS = "https://example.com/packagerepos/release \ https://example.com/packagerepos/updates"; PACKAGE_FEED_BASE_PATHS = "rpm rpm-dev" PACKAGE_FEED_ARCHS = "all core2-64" the resulting feeds would be https://example.com/packagerepos/release/rpm/all https://example.com/packagerepos/release/rpm/core2-64 https://example.com/packagerepos/release/rpm-dev/all https://example.com/packagerepos/release/rpm-dev/core2-64 https://example.com/packagerepos/updates/rpm/all https://example.com/packagerepos/updates/rpm/core2-64 https://example.com/packagerepos/updates/rpm-dev/all https://example.com/packagerepos/updates/rpm-dev/core2-64 Signed-off-by: Leonardo Sandoval --- meta/lib/oe/package_manager.py | 154 ++--- 1 file changed, 99 insertions(+), 55 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 630b957..e182027 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -8,7 +8,7 @@ import re import bb import tempfile import oe.utils - +import string # this can be used by all PM backends to create the index files in parallel def create_index(arg): @@ -522,7 +522,8 @@ class PackageManager(object): self.deploy_dir = None self.deploy_lock = None self.feed_uris = self.d.getVar('PACKAGE_FEED_URIS', True) or "" -self.feed_prefix = self.d.getVar('PACKAGE_FEED_PREFIX', True) or "" +self.feed_base_paths = self.d.getVar('PACKAGE_FEED_BASE_PATHS', True) or "" +self.feed_archs = self.d.getVar('PACKAGE_FEED_ARCHS', True) """ Update the package manager package database. @@ -629,6 +630,25 @@ class PackageManager(object): self.deploy_lock = None +""" +Construct URIs based on the following pattern: uri/base_path where 'uri' +and 'base_path' correspond to each element of the corresponding array +argument leading to len(uris) x len(base_paths) elements on the returned +array +""" +def construct_uris(self, uris, base_paths): +def _append(arr1, arr2, sep='/'): +res = [] +narr1 = map(lambda a: string.rstrip(a, sep), arr1) +narr2 = map(lambda a: string.lstrip(string.rstrip(a, sep), sep), arr2) +for a1 in narr1: +if arr2: +for a2 in narr2: +res.append("%s%s%s" % (a1, sep, a2)) +else: +res.append(a1) +return res +return _append(uris, base_paths) class RpmPM(PackageManager): def __init__(self, @@ -672,42 +692,55 @@ class RpmPM(PackageManager): if self.feed_uris == "": return -# List must be prefered to least preferred order -default_platform_extra = set() -platform_extra = set() -bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" -for mlib in self.ml_os_list: -for arch in self.ml_prefix_list[mlib]: -plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] -if mlib == bbextendvariant: -default_platform_extra.add(plt) -else: -platform_extra.add(plt) +arch_list = [] +if self.feed_archs is not None: +# User define feed architectures +arch_list = self.feed_archs.split() +else: +# List must be prefered to least preferred order +default_platform_extra = set() +platform_extra = set() +bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" +for mlib in self.ml_os_list: +for arch in self.ml_prefix_list[mlib]: +plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] +if mlib == bbextendvariant: +default_platform_extra.add(plt) +
Re: [OE-core] [PATCH 0/4] extend buildhistory
On Fri, 27 Nov 2015 13:34:27 Paul Eggleton wrote: > One aspect that will probably change in the future is how it picks up the > kernel configuration - for > https://bugzilla.yoctoproject.org/show_bug.cgi?id=5574 (which I hope to get > to for 2.1, but no promises) we will need to write the kernel configuration > to the sysroot so that we have somewhere we can look for it; if that's the > case there'll be no need to copy it specially in > buildhistory-extra.bbclass. Hmm, I really should have checked kernel.bbclass before saying anything - it is already copying the kernel config to ${STAGING_KERNEL_BUILDDIR}/.config, so provided you look there at the right time (i.e. after do_shared_workdir of the kernel has executed) it should be possible to optimise how that's dealt with right now. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Replace busybox for variable.
ping On jue, 2015-11-26 at 18:34 +, Joya Cruz, Alejandro wrote: > Any feedback about this? > > On mar, 2015-11-17 at 16:13 -0600, Alejandro Joya wrote: > > These recipes have a hardcoded dependency to busybox, > > in order to be able to have a flexible selection, > > instead of the hardcoded dependency, now it is point to virtual reference > > base-utils. > > > > The following changes since commit 6f98c39418c60b7c0b25b30983d2e5257158a6a4: > > > > gcc: Drop 4.8 (2015-11-16 14:59:07 +) > > > > are available in the git repository at: > > > > git://github.com/Ajoyacr/openembedded-core base-utils > > https://github.com/Ajoyacr/openembedded-core/tree/base-utils > > > > Alejandro Joya (4): > > base-utils:flexible dependency for command utilities > > core-image-minimal-initramfs: replace base-utils > > initramfs-framework_1.0:replace busybox for variable. > > packagegroup-core-boot:replace busybox to variable > > > > meta/conf/distro/include/default-providers.inc | 3 +++ > > meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +- > > meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- > > meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++-- > > 4 files changed, 7 insertions(+), 4 deletions(-) > > > > -- > > 2.1.0 > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] weston-init: Use weston-launch for XWayland
From: Prabhu Sundararaj When XWayland is configured, Weston must be started using the weston-launch utility. Signed-off-by: Tom Hochstein --- meta/recipes-graphics/wayland/weston-init/init | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init index 2e938f4..d1e902f 100644 --- a/meta/recipes-graphics/wayland/weston-init/init +++ b/meta/recipes-graphics/wayland/weston-init/init @@ -38,7 +38,15 @@ case "$1" in chmod 0700 $XDG_RUNTIME_DIR fi -openvt -s weston -- $OPTARGS +# If weston-launch exists, we're configured for XWayland. +if [ -f /usr/bin/weston-launch ]; then +echo "Starting Weston in XWayland" +export XDG_CONFIG_HOME=/etc +openvt -v -- weston-launch -- --log=/var/log/weston.log $OPTARGS +else +echo "Starting Weston" +openvt -s weston -- --log=/var/log/weston.log $OPTARGS +fi ;; stop) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-libc-headers.inc: remove '-e MAKEFLAGS=' from EXTRA_OEMAKE
These OE default make flags are not required for KBuild packages. Signed-off-by: Andre McCurdy --- meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 566bc1e..ba1bea5 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -49,6 +49,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar S = "${WORKDIR}/linux-${PV}" +# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE. +EXTRA_OEMAKE = "" + do_configure() { oe_runmake allnoconfig } -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cracklib: fix for base_libdir == libdir
Don't try and move the python packages from base_libdir to libdir if they are the same location. Signed-off-by: Joshua Lock --- meta/recipes-extended/cracklib/cracklib_2.9.5.bb | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb index c0ffe33..23f259c 100644 --- a/meta/recipes-extended/cracklib/cracklib_2.9.5.bb +++ b/meta/recipes-extended/cracklib/cracklib_2.9.5.bb @@ -28,10 +28,13 @@ do_install_append() { src_dir="${D}${base_libdir}/${PYTHON_DIR}/site-packages" rm -f $src_dir/*.pyo rm -f $src_dir/test_cracklib.py - # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} - install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ - mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} - rm -fr ${D}${base_libdir}/${PYTHON_DIR} + + if [ "${base_libdir}" != "${libdir}" ] ; then + # Move python files from ${base_libdir} to ${libdir} since used --libdir=${base_libdir} + install -d -m 0755 ${D}${PYTHON_SITEPACKAGES_DIR}/ + mv $src_dir/* ${D}${PYTHON_SITEPACKAGES_DIR} + rm -fr ${D}${base_libdir}/${PYTHON_DIR} + fi } BBCLASSEXTEND = "native nativesdk" -- 2.4.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-libc-headers: update default KORG_ARCHIVE_COMPRESSION bz2 -> xz
Signed-off-by: Andre McCurdy --- meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc| 2 +- meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index ba1bea5..2ba6ed5 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -43,7 +43,7 @@ python __anonymous () { inherit kernel-arch -KORG_ARCHIVE_COMPRESSION ?= "bz2" +KORG_ARCHIVE_COMPRESSION ?= "xz" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb index d816e5e..01037c1 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb @@ -1,7 +1,4 @@ -KORG_ARCHIVE_COMPRESSION = "xz" - require linux-libc-headers.inc SRC_URI[md5sum] = "fe9dc0f6729f36400ea81aa41d614c37" SRC_URI[sha256sum] = "caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f" - -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] weston-init: Use weston-launch for XWayland
> +# If weston-launch exists, we're configured for XWayland. > +if [ -f /usr/bin/weston-launch ]; then > +echo "Starting Weston in XWayland" Nope. XWayland support and weston-launch support are configured separately. One may be present and the other one absent, both ways. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 7/8] libxml2: fix CVE-2015-7942 and CVE-2015-8035
On Tue, Dec 1, 2015 at 1:44 AM, Robert Yang wrote: > From: Armin Kuster > > CVE-2015-7942 libxml2: heap-based buffer overflow in > xmlParseConditionalSections() > CVE-2015-8035 libxml2: DoS when parsing specially crafted XML document if XZ > support is enabled It looks like CVE-2015-7942 requires two separate patches, only one of which made it to oe-core master, plus there were a lot of the other CVE fixes committed upstream in October and November. http://www.xmlsoft.org/news.html https://git.gnome.org/browse/libxml2/log/?h=v2.9.3 > [YOCTO #8641] > > (From OE-Core master rev: 27de51f4ad21d9b896e7d48041e7cdf20c564a38) > > Signed-off-by: Armin Kuster > Signed-off-by: Ross Burton > Signed-off-by: Richard Purdie > Signed-off-by: Robert Yang > --- > meta/recipes-core/libxml/libxml2.inc |2 + > .../libxml/libxml2/CVE-2015-7942.patch | 55 > > .../libxml/libxml2/CVE-2015-8035.patch | 41 +++ > 3 files changed, 98 insertions(+) > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch > create mode 100644 meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch > > diff --git a/meta/recipes-core/libxml/libxml2.inc > b/meta/recipes-core/libxml/libxml2.inc > index 1c3c37d..6ada401 100644 > --- a/meta/recipes-core/libxml/libxml2.inc > +++ b/meta/recipes-core/libxml/libxml2.inc > @@ -21,6 +21,8 @@ SRC_URI = > "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ > file://libxml-m4-use-pkgconfig.patch \ > file://configure.ac-fix-cross-compiling-warning.patch \ > > file://0001-CVE-2015-1819-Enforce-the-reader-to-run-in-constant-.patch \ > + file://CVE-2015-7942.patch \ > + file://CVE-2015-8035.patch \ >" > > BINCONFIG = "${bindir}/xml2-config" > diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch > b/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch > new file mode 100644 > index 000..a5930ed > --- /dev/null > +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-7942.patch > @@ -0,0 +1,55 @@ > +libxml2: CVE-2015-7942 > + > +From 9b8512337d14c8ddf662fcb98b0135f225a1c489 Mon Sep 17 00:00:00 2001 > +From: Daniel Veillard > +Date: Mon, 23 Feb 2015 11:29:20 +0800 > +Subject: Cleanup conditional section error handling > + > +For https://bugzilla.gnome.org/show_bug.cgi?id=744980 > + > +The error handling of Conditional Section also need to be > +straightened as the structure of the document can't be > +guessed on a failure there and it's better to stop parsing > +as further errors are likely to be irrelevant. > + > +Upstream-Status: Backport > +https://git.gnome.org/browse/libxml2/patch/?id=9b8512337d14c8ddf662fcb98b0135f225a1c489 > + > +[YOCTO #8641] > +Signed-off-by: Armin Kuster > + > +--- > + parser.c | 6 ++ > + 1 file changed, 6 insertions(+) > + > +Index: libxml2-2.9.2/parser.c > +=== > +--- libxml2-2.9.2.orig/parser.c > libxml2-2.9.2/parser.c > +@@ -6783,6 +6783,8 @@ xmlParseConditionalSections(xmlParserCtx > + SKIP_BLANKS; > + if (RAW != '[') { > + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); > ++ xmlStopParser(ctxt); > ++ return; > + } else { > + if (ctxt->input->id != id) { > + xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, > +@@ -6843,6 +6845,8 @@ xmlParseConditionalSections(xmlParserCtx > + SKIP_BLANKS; > + if (RAW != '[') { > + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID, NULL); > ++ xmlStopParser(ctxt); > ++ return; > + } else { > + if (ctxt->input->id != id) { > + xmlValidityError(ctxt, XML_ERR_ENTITY_BOUNDARY, > +@@ -6898,6 +6902,8 @@ xmlParseConditionalSections(xmlParserCtx > + > + } else { > + xmlFatalErr(ctxt, XML_ERR_CONDSEC_INVALID_KEYWORD, NULL); > ++ xmlStopParser(ctxt); > ++ return; > + } > + > + if (RAW == 0) > diff --git a/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch > b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch > new file mode 100644 > index 000..d175f74 > --- /dev/null > +++ b/meta/recipes-core/libxml/libxml2/CVE-2015-8035.patch > @@ -0,0 +1,41 @@ > +libxml2: CVE-2015-8035 > + > +From f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 Mon Sep 17 00:00:00 2001 > +From: Daniel Veillard > +Date: Tue, 3 Nov 2015 15:31:25 +0800 > +Subject: CVE-2015-8035 Fix XZ compression support loop > + > +For https://bugzilla.gnome.org/show_bug.cgi?id=757466 > +DoS when parsing specially crafted XML document if XZ support > +is compiled in (which wasn't the case for 2.9.2 and master since > +Nov 2013, fixed in next commit !) > + > +Upstream-Status: Backport > +https://git.gnome.org/browse/libxml2/patch/?id=f0709e3ca8f8947f2d91ed34e92e38a4c23eae63 > + > +[YOCTO #8641] > + > +Signed-off-by: Armin Kuster > + > +--- > + xzlib.c | 4 > + 1 file changed, 4
[OE-core] [PATCH 0/3][jethro] Backport some patches to help meta-intel
Robert / Richard: Please take these changes recently merged into master into Jethro as they affect many platforms. Thanks Sau! Jussi Kukkonen (1): pulseaudio: Fix HDMI profile selection Ng, Mei Yeen (2): init-install-efi: fix script for eMMC installation init-install-efi: fix script for gummiboot loader .../initrdscripts/files/init-install-efi.sh| 9 +- .../0001-card-add-pa_card_profile.ports.patch | 245 ++ ...oth-fail-if-user-requested-profile-doesn-.patch | 60 ...-move-profile-selection-after-pa_card_new.patch | 363 + ...vailability-for-some-unavailable-profiles.patch | 75 + .../pulseaudio/pulseaudio_6.0.bb | 4 + 6 files changed, 752 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] init-install-efi: fix script for eMMC installation
From: "Ng, Mei Yeen" Running the install option from bootloader to install image to eMMC will fail with error: Formatting /dev/mmcblk01 to vfat... mkfs.fat 3.0.28 (2015-05-16) /dev/mmcblk01: No such file or directory This issue impacts both grub and gummiboot install option to eMMC device. The installation failure is due to the following: [1] Unable to partition eMMC as the partition prefix 'p' is not appended The condition checking failed with the additional /dev/ appended with the target device name. [2] The partition uuid for boot, root and swap partition is not captured for eMMC This fix updated the condition checking and changed the variables to reference the boot, root and swap partitions for UUID. [YOCTO #8710] (From OE-Core rev: a7d081c3db776c8b0734942df6bf96f811f15bd3) Signed-off-by: Ng, Mei Yeen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Saul Wold --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index fc4908e..ac26bce 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -134,7 +134,7 @@ swap_start=$((rootfs_end)) # 2) they are detected asynchronously (need rootwait) rootwait="" part_prefix="" -if [ ! "${device#mmcblk}" = "${device}" ]; then +if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then part_prefix="p" rootwait="rootwait" fi @@ -184,8 +184,8 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root echo "Copying rootfs files..." cp -a /src_root/* /tgt_root if [ -d /tgt_root/etc/ ] ; then -boot_uuid=$(blkid -o value -s UUID ${device}1) -swap_part_uuid=$(blkid -o value -s PARTUUID ${device}3) +boot_uuid=$(blkid -o value -s UUID ${bootfs}) +swap_part_uuid=$(blkid -o value -s PARTUUID ${swap}) echo "/dev/disk/by-partuuid/$swap_part_uuidswap swap defaults 0 0" >> /tgt_root/etc/fstab echo "UUID=$boot_uuid /bootvfat defaults 1 2" >> /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... @@ -206,7 +206,7 @@ mkdir -p $EFIDIR cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then -root_part_uuid=$(blkid -o value -s PARTUUID ${device}2) +root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs}) GRUBCFG="$EFIDIR/grub.cfg" cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG # Update grub config for the installed image -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] pulseaudio: Fix HDMI profile selection
From: Jussi Kukkonen On systems with two cards, the correct output profile does not get selected automatically even in the simple case where there is one available profile. This scenario is typical at least with HDMI audio (which is on a separate card). Fixes [YOCTO #8448] (From OE-Core rev: 4bd76b8b292a81ce12d316557ffc9c6a79a7b5c1) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Saul Wold --- .../0001-card-add-pa_card_profile.ports.patch | 245 ++ ...oth-fail-if-user-requested-profile-doesn-.patch | 60 ...-move-profile-selection-after-pa_card_new.patch | 363 + ...vailability-for-some-unavailable-profiles.patch | 75 + .../pulseaudio/pulseaudio_6.0.bb | 4 + 5 files changed, 747 insertions(+) create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0002-alsa-bluetooth-fail-if-user-requested-profile-doesn-.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0003-card-move-profile-selection-after-pa_card_new.patch create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/0004-alsa-set-availability-for-some-unavailable-profiles.patch diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch new file mode 100644 index 000..97b2e40 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-card-add-pa_card_profile.ports.patch @@ -0,0 +1,245 @@ +From 6f814b40a01d03f93b36184c19339033949de472 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Fri, 23 Oct 2015 12:23:13 +0300 +Subject: [PATCH 1/4] card: add pa_card_profile.ports + +Having ports accessible from pa_card_profile allows checking whether all ports +of a profile are unavailable, and therefore helps with managing the profile +availability (implemented in a later patch). + +http://bugzilla.yoctoproject.org/show_bug.cgi?id=8448 + +Upstream-Status: Submitted [http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-October/024614.html] +Signed-off-by: Jussi Kukkonen +--- + src/modules/alsa/alsa-mixer.c| 4 +++- + src/modules/alsa/alsa-ucm.c | 1 + + src/modules/bluetooth/module-bluez4-device.c | 6 ++ + src/modules/bluetooth/module-bluez5-device.c | 6 ++ + src/pulsecore/card.c | 16 + src/pulsecore/card.h | 18 -- + src/pulsecore/device-port.c | 7 ++- + 7 files changed, 50 insertions(+), 8 deletions(-) + +diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +index 47cbd14..c5b82b0 100644 +--- a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c +@@ -4654,8 +4654,10 @@ static pa_device_port* device_port_alsa_init(pa_hashmap *ports, /* card ports */ + path->port = p; + } + +-if (cp) ++if (cp) { + pa_hashmap_put(p->profiles, cp->name, cp); ++pa_card_profile_add_port(cp, p); ++} + + if (extra) { + pa_hashmap_put(extra, p->name, p); +diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c +index aa2d601..c8199d6 100644 +--- a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c +@@ -761,6 +761,7 @@ static void ucm_add_port_combination( + if (cp) { + pa_log_debug("Adding profile %s to port %s.", cp->name, port->name); + pa_hashmap_put(port->profiles, cp->name, cp); ++pa_card_profile_add_port(cp, port); + } + + if (hash) { +diff --git a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c +index db69d34..b40c6a0 100644 +--- a/src/modules/bluetooth/module-bluez4-device.c b/src/modules/bluetooth/module-bluez4-device.c +@@ -2183,6 +2183,7 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid + p->max_sink_channels = 2; + p->max_source_channels = 0; + pa_hashmap_put(output_port->profiles, p->name, p); ++pa_card_profile_add_port(p, output_port); + + d = PA_CARD_PROFILE_DATA(p); + *d = PA_BLUEZ4_PROFILE_A2DP; +@@ -2194,6 +2195,7 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid + p->max_sink_channels = 0; + p->max_source_channels = 2; + pa_hashmap_put(input_port->profiles, p->name, p); ++pa_card_profile_add_port(p, input_port); + + d = PA_CARD_PROFILE_DATA(p); + *d = PA_BLUEZ4_PROFILE_A2DP_SOURCE; +@@ -2206,6 +2208,8 @@ static pa_card_profile *create_card_profile(struct userdata *u, const char *uuid + p->max_source_channels = 1; + pa_hashmap_put(input_port->profiles, p->name, p); + pa_hashmap_put(output_port->pr
[OE-core] [PATCH 3/3] init-install-efi: fix script for gummiboot loader
From: "Ng, Mei Yeen" After running gummiboot loader install option, the installed target storage device boot parameter for root=PARTUUID is empty causing boot failure. This issue is only observed with gummiboot and not with GRUB loader. This fix assign the rootuuid of the rootfs partition for gummiboot loader. [YOCTO #8709] (From OE-Core rev: fd5fa06fe45ca1fdf20df4198ae323967244af5b) Signed-off-by: Ng, Mei Yeen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Saul Wold --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index ac26bce..0443a9d 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -223,6 +223,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then 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 cp -dr /run/media/$1/loader /boot -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Patchwork & patch handling improvements
On Tue, 01 Dec 2015 11:47:20 Martin Jansa wrote: > On Tue, Dec 01, 2015 at 07:49:50AM +1300, Paul Eggleton wrote: > > Hi Trevor, > > > > On Mon, 30 Nov 2015 10:19:35 Trevor Woerner wrote: > > > On 11/26/15 16:00, Paul Eggleton wrote: > > > > I'm also > > > > trying to ensure that the patch validation is generic enough so it can > > > > live in OE-Core, and thus we can easily update and refine it over time > > > > in > > > > line with the code itself as well as encourage submitters to use the > > > > script on their own changes before sending. > > > > > > This all sounds like an improvement and is therefore a step in the right > > > direction :-) > > > > > > A while back I had the idea of "porting" the kernel's "checkpatch.pl" to > > > The Yocto Project (it was around the same time that I was trying to > > > float the whole "Maintainers File" idea too, since I was also trying to > > > re-purpose "get-maintainer.pl" as well). About one minute into that > > > effort I realized the existing *.bb files were all over the place in > > > terms of the order of statements and the order of the blocks of > > > statements. At that time I found one recipe style guide from OE, and > > > another one from The Yocto Project, each of which described a slightly > > > different preference. So I asked on the mailing list and quickly > > > discovered that both groups prefer a different style. > > > > > > I'm not saying this job isn't worth doing, but I am pointing out there's > > > the potential for feathers to be ruffled on both sides if someone tries > > > to produce a definitive style guide for recipe files and then enforces > > > it in an automated way. Since it is the OpenEmbedded Project's job to > > > provide the recipes for The Yocto Project, I'm guessing this question > > > needs to be decided by them? If that sounds reasonable, then maybe The > > > Yocto Project needs to acquiesce to OE's decision? > > > > I don't think there's that much of a division. I don't recall if it was > > you > > that raised it at the time but the issue of having two style guides did > > get > > rectified - I changed the one on the Yocto Project wiki to simply be a > > link to the OE style guide in June last year. It certainly didn't come > > about through a conscious decision to have a different style. > > > > However there is a minor disagreement over indentation for shell functions > > between OE-Core and other layers - this persists because of the > > backporting > > pain a blanket replacement would potentially lead to. As I recall this did > > get discussed at the OE TSC level. I think that's one thing we could just > > not evaluate (or make an option) until such time as we resolve the > > difference - and I do mean to see it resolved at some point in the > > future. > > Using consistent indentation (4 spaces) at least for new metadata would > be step in right direction. > > With the amount of changes which are backported to older releases I > still don't see this "backporting pain" argument. Doing it just before > the release is of course useful, because e.g. now more changes will be > backported to Jethro than to Fido or Dizzy. So having consistent > indentation in Jethro and master would prevent 95% of "backporting > pain". Maybe some Yocto 10.0 will finally get the meaning of > "consistent" indentation. I agree it's not ideal. I said above, I do want to see it resolved. Leaving indentation aside for a moment do you have any comments on my proposal? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] package_ipk: allow to specify OPKG_ARGS in local.conf
If user specific parameters to opkg are set in local.conf, they are rewritten in package_ipk.bbclass and ignored, instead append package_ipk specific arguments to the user defined ones. The change is needed, if a user has to pass an alternative path to a temporary directory for opkg, e.g. OPKG_ARGS = "--tmp-dir=${TOPDIR}/tmp-opkg" The default /tmp directory may be unusable for do_rootfs task, for example if there is no enough space or /tmp is mounted with noexec mount option, then an alternative path allows to complete do_rootfs and fix the problems like this: ERROR: Unable to install packages. ... sh: /tmp/opkg-5jPLag/run-postinsts-UsUtaI/preinst: /bin/sh: bad interpreter: Permission denied sh: /tmp/opkg-5jPLag/base-files-4hFwQS/preinst: /bin/sh: bad interpreter: Permission denied sh: /tmp/opkg-5jPLag/run-postinsts-UsUtaI/preinst: /bin/sh: bad interpreter: Permission denied sh: /tmp/opkg-5jPLag/busybox-syslog-sJmfbw/preinst: /bin/sh: bad interpreter: Permission denied ... Signed-off-by: Vladimir Zapolskiy --- meta/classes/package_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4dd7a7e..51bee28 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -10,7 +10,7 @@ PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" # Program to be used to build opkg packages OPKGBUILDCMD ??= "opkg-build" -OPKG_ARGS = "--force_postinstall --prefer-arch-to-version" +OPKG_ARGS += "--force_postinstall --prefer-arch-to-version" OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS", True) == "1"]}" OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude '.join((d.getVar('PACKAGE_EXCLUDE', True) or "").split())][(d.getVar("PACKAGE_EXCLUDE", True) or "") != ""]}" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] fix python md5/sha checksum incorrect on qemu86-64 with corei7-64 as DEFAULTTUNE
The following changes since commit 698c74c373110ed081a7586e21d4a27b8b44c89b: libsdl: remove redundant configure_tweak patch (2015-12-01 21:32:15 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib hongxu/fix-python http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-python Hongxu Jia (1): python: gcc optimization level 2 ...001-configure.ac-gcc-optimization-level-2.patch | 40 ++ meta/recipes-devtools/python/python_2.7.9.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/python/python/0001-configure.ac-gcc-optimization-level-2.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] python: gcc optimization level 2
The qemu didn't support '-march=corei7 -mtune=corei7' and gcc optimization level 3 '-O3' very well, in which the /usr/lib64/python2.7/test/test_md5.py and /usr/lib64/python2.7/test/test_sha.py failed. So we use gcc optimization level 2 to instead. YOCTO [# 8747] Signed-off-by: Hongxu Jia --- ...001-configure.ac-gcc-optimization-level-2.patch | 40 ++ meta/recipes-devtools/python/python_2.7.9.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-devtools/python/python/0001-configure.ac-gcc-optimization-level-2.patch diff --git a/meta/recipes-devtools/python/python/0001-configure.ac-gcc-optimization-level-2.patch b/meta/recipes-devtools/python/python/0001-configure.ac-gcc-optimization-level-2.patch new file mode 100644 index 000..f760403 --- /dev/null +++ b/meta/recipes-devtools/python/python/0001-configure.ac-gcc-optimization-level-2.patch @@ -0,0 +1,40 @@ +From 55520995fa6c72f6a93a7ccc8503167f359bc63d Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 30 Nov 2015 06:25:08 -0500 +Subject: [PATCH] configure.ac: gcc optimization level 2 + +The qemu didn't support '-march=corei7 -mtune=corei7' and +gcc optimization level 3 '-O3' very well, in which the +/usr/lib64/python2.7/test/test_md5.py and +/usr/lib64/python2.7/test/test_sha.py failed. + +So we use gcc optimization level 2 to instead. + +Upstream-Status: Inappropriate [qemu corei7 specific] + +Signed-off-by: Hongxu Jia +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 87a4f02..d3ad673 100644 +--- a/configure.ac b/configure.ac +@@ -1076,11 +1076,11 @@ then + # debug builds. + OPT="-g -O0 -Wall $STRICT_PROTO" + else +- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" ++ OPT="-g $WRAP -O2 -Wall $STRICT_PROTO" + fi + ;; + *) +- OPT="-O3 -Wall $STRICT_PROTO" ++ OPT="-O2 -Wall $STRICT_PROTO" + ;; + esac + case $ac_sys_system in +-- +1.9.1 + diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index bc20417..12dd7fa 100644 --- a/meta/recipes-devtools/python/python_2.7.9.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -26,6 +26,7 @@ SRC_URI += "\ file://parallel-makeinst-create-bindir.patch \ file://use_sysroot_ncurses_instead_of_host.patch \ file://avoid_parallel_make_races_on_pgen.patch \ + file://0001-configure.ac-gcc-optimization-level-2.patch \ " S = "${WORKDIR}/Python-${PV}" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core