[OE-core] [PATCH v3] grub-core: fix endianness problem
Fix tftp stalls on loading files bigger than ~32k bug by cherry picking
a patch from grub upstream.
Signed-off-by: Shan Hai
---
.../grub/grub-2.00/fix-endianness-problem.patch| 44 ++
meta/recipes-bsp/grub/grub_2.00.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
new file mode 100644
index 000..079992a
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
@@ -0,0 +1,44 @@
+grub-core/net/tftp.c: fix endianness problem.
+
+ * grub-core/net/tftp.c (ack): Fix endianness problem.
+ (tftp_receive): Likewise.
+ Reported by: Michael Davidsaver.
+
+Upstream-Status: Backport
+
+diff --git a/ChangeLog b/ChangeLog
+index 81bdae9..c2f42d5 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,9 @@
++2012-07-02 Vladimir Serbinenko
++
++ * grub-core/net/tftp.c (ack): Fix endianness problem.
++ (tftp_receive): Likewise.
++ Reported by: Michael Davidsaver.
++
+ 2012-06-27 Vladimir Serbinenko
+
+ * configure.ac: Bump version to 2.00.
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index 9c70efb..d0f39ea 100644
+--- a/grub-core/net/tftp.c
b/grub-core/net/tftp.c
+@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block)
+
+ tftph_ack = (struct tftphdr *) nb_ack.data;
+ tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
+- tftph_ack->u.ack.block = block;
++ tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
+
+ err = grub_net_send_udp_packet (data->sock, &nb_ack);
+ if (err)
+@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__
((unused)),
+ grub_priority_queue_pop (data->pq);
+
+ if (file->device->net->packs.count < 50)
+-err = ack (data, tftph->u.data.block);
++err = ack (data, data->block + 1);
+ else
+ {
+ file->device->net->stall = 1;
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb
b/meta/recipes-bsp/grub/grub_2.00.bb
index ce2d680..3c1ec0b 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -22,6 +22,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://check-if-liblzma-is-disabled.patch \
file://fix-issue-with-flex-2.5.37.patch \
file://grub-2.00-add-oe-kernel.patch \
+ file://fix-endianness-problem.patch \
"
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
--
1.8.5.2.233.g932f7e4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] [v4] lz4: update to latest
update to version r119
LICENSE md5sum changed since it was updated in r117 for
copyright date change
Fixes CVE-2014-4611
Signed-off-by: Armin Kuster
---
meta/recipes-support/lz4/lz4_svn.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/lz4/lz4_svn.bb
b/meta/recipes-support/lz4/lz4_svn.bb
index 38e36d8..44160f4 100644
--- a/meta/recipes-support/lz4/lz4_svn.bb
+++ b/meta/recipes-support/lz4/lz4_svn.bb
@@ -2,10 +2,10 @@ SUMMARY = "Extremely Fast Compression algorithm"
DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing
compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also
features an extremely fast decoder, with speed in multiple GB/s per core,
typically reaching RAM speed limits on multi-core systems."
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2008d2325e11691e17fcaa3a6046f850"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd"
# Upstream names releases after SVN revs
-SRCREV = "112"
+SRCREV = "119"
PV = "r${SRCREV}"
SRC_URI = "svn://lz4.googlecode.com/svn/;module=trunk;protocol=http"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] populate_sdk_base: ensure that filenames with empty space character are handled
When extracting toolchain, if the list $executable_files has filenames
with empty space character, the list will created but relocate_sdk.sh
will not handle it well. This will lead to the below erro:
./tmp/deploy/sdk/buildtools-mytools-x86_64-nativesdk-standalone-1.6.1.0.sh
Enter target directory for SDK (default: /opt/mydistro/mytoolset/1.6.1.0):
You are about to install the SDK to "/opt/mydistro/mytoolset/1.6.1.0".
Proceed[Y/n]?
Extracting SDK...done
Setting it up.../opt/mydistro/mytoolset/1.6.1.0/relocate_sdk.sh: line 2:
sintaxe error `token' `('
/opt/mydistro/mytoolset/1.6.1.0/relocate_sdk.sh: line 2: `e
The same occurs with replacement of ${SDKPATH} in configs/scripts/etc files.
We should ensure that full path is protected before relocate_sdk.sh
and ${SDKPATH} replacement calls.
Signed-off-by: João Henrique Ferreira de Freitas
---
meta/classes/populate_sdk_base.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_base.bbclass
b/meta/classes/populate_sdk_base.bbclass
index a12bf11..0df98db 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -252,7 +252,7 @@ if [ "$dl_path" = "" ] ; then
echo "SDK could not be set up. Relocate script unable to find
ld-linux.so. Abort!"
exit 1
fi
-executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111)
+executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111 -printf
"'%h/%f' ")
tdir=`mktemp -d`
if [ x$tdir = x ] ; then
@@ -273,7 +273,7 @@ if [ $relocate = 1 ] ; then
fi
# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc
-$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep
":.*\(ASCII\|script\|source\).*text"|cut -d':' -f1|$SUDO_EXEC xargs sed -i -e
"s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
+$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep
":.*\(ASCII\|script\|source\).*text"|awk -F':' '{printf "%s\0", $1}'|$SUDO_EXEC
xargs -0 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
# change all symlinks pointing to ${SDKPATH}
for l in $($SUDO_EXEC find $native_sysroot -type l); do
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] python-distribute: add nativesdk to BBCLASSEXTEND
Without this, python tools that need python-distribute doesn't install
in SDK generated by OE.
Signed-off-by: João Henrique Ferreira de Freitas
---
meta/recipes-devtools/python/python-distribute_0.6.32.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
index 58bb8b4..7000145 100644
--- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
+++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
@@ -39,6 +39,12 @@ do_install_append() {
echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
}
+do_install_append_class-nativesdk() {
+ sed -i -e '1s|^#!.*|#!/usr/bin/env python|'
${D}${PYTHON_SITEPACKAGES_DIR}/distribute-${PV}-py${PYTHON_BASEVERSION}.egg/setuptools/tests/test_resources.py
+ sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${bindir}/easy_install
+ sed -i -e '1s|^#!.*|#!/usr/bin/env python|'
${D}${bindir}/easy_install-${PYTHON_BASEVERSION}
+}
+
RDEPENDS_${PN} = "\
python-distutils \
python-compression \
@@ -46,4 +52,4 @@ RDEPENDS_${PN} = "\
RPROVIDES_${PN} += "python-setuptools"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/2] add nativesdk to BBCLASSEXTEND to python-distribute and to fix the side effect of it.
Changes in v3: - Use awk and remove two extra forks João Henrique Ferreira de Freitas (2): python-distribute: add nativesdk to BBCLASSEXTEND populate_sdk_base: ensure that filenames with empty space character are handled meta/classes/populate_sdk_base.bbclass | 4 ++-- meta/recipes-devtools/python/python-distribute_0.6.32.bb | 8 +++- 2 files changed, 9 insertions(+), 3 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grub-core: fix endianness problem
On 07/17/2014 12:42 AM, Saul Wold wrote:
On 07/15/2014 11:15 PM, Shan Hai wrote:
Fix tftp stalls on loading files bigger than ~32k bug by cherry picking
a patch from grub upstream.
Upstream-Status: Backport
Signed-off-by: Shan Hai
---
.../grub/grub-2.00/fix-endianness-problem.patch| 46
++
meta/recipes-bsp/grub/grub_2.00.bb | 1 +
2 files changed, 47 insertions(+)
create mode 100644
meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
diff --git
a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
new file mode 100644
index 000..bb5ba9b
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
@@ -0,0 +1,46 @@
+grub-core/net/tftp.c: fix endianness problem.
+
+* grub-core/net/tftp.c (ack): Fix endianness problem.
+(tftp_receive): Likewise.
+Reported by: Michael Davidsaver.
+
+Upstream-Status: Submitted [grub-de...@gnu.org]
+
Is this patch a backport from the upstream or submitted only on the
mailing list?
Hi Saul,
This patch a backport from the upstream.
Thans
Shan Hai
Sau!
+Signed-off-by: Vladimir 'phcoder' Serbinenko
+
+diff --git a/ChangeLog b/ChangeLog
+index 81bdae9..c2f42d5 100644
+--- a/ChangeLog
b/ChangeLog
+@@ -1,3 +1,9 @@
++2012-07-02 Vladimir Serbinenko
++
++* grub-core/net/tftp.c (ack): Fix endianness problem.
++(tftp_receive): Likewise.
++Reported by: Michael Davidsaver.
++
+ 2012-06-27 Vladimir Serbinenko
+
+ * configure.ac: Bump version to 2.00.
+diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
+index 9c70efb..d0f39ea 100644
+--- a/grub-core/net/tftp.c
b/grub-core/net/tftp.c
+@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block)
+
+ tftph_ack = (struct tftphdr *) nb_ack.data;
+ tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
+- tftph_ack->u.ack.block = block;
++ tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
+
+ err = grub_net_send_udp_packet (data->sock, &nb_ack);
+ if (err)
+@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock
__attribute__ ((unused)),
+ grub_priority_queue_pop (data->pq);
+
+ if (file->device->net->packs.count < 50)
+- err = ack (data, tftph->u.data.block);
++ err = ack (data, data->block + 1);
+ else
+ {
+ file->device->net->stall = 1;
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb
b/meta/recipes-bsp/grub/grub_2.00.bb
index 72ed402..36c648e 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -22,6 +22,7 @@ SRC_URI =
"ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://check-if-liblzma-is-disabled.patch \
file://fix-issue-with-flex-2.5.37.patch \
file://grub-2.00-add-oe-kernel.patch \
+ file://fix-endianness-problem.patch \
"
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] libtool: fix different files in sysroot of sdk
ping
On 07/14/2014 04:10 PM, Chong Lu wrote:
The libtool.m4 and ltmain.m4sh are different in target sysroot between sdk and
build
environment. The reason is that we have two patches (fixinstall.patch and
prefix.patch)
for libtool-cross. They change libtool.m4 and ltmain.m4sh and generate files to
sysroot
dir. But we don't need them for libtool target. In sdk environment, We get
libtool.m4
and ltmain.sh that don't apply on two patches.
This patch splits prefix.patch to prefix.patch and rename-libtool.patch. Then,
improves
fixinstall.patch and rename-libtool.patch to apply on conditionally. Apply on
both libtool
target and libtool-cross to fix different issue in sysroot between sdk and
build environment.
Signed-off-by: Chong Lu
---
.../libtool/libtool-cross_2.4.2.bb | 1 +
.../libtool/libtool-native_2.4.2.bb| 1 +
.../libtool/libtool/fixinstall.patch | 139 +
meta/recipes-devtools/libtool/libtool/prefix.patch | 23
.../libtool/libtool/rename-libtool.patch | 40 ++
meta/recipes-devtools/libtool/libtool_2.4.2.bb | 3 +
.../libtool/nativesdk-libtool_2.4.2.bb | 1 +
7 files changed, 131 insertions(+), 77 deletions(-)
create mode 100644 meta/recipes-devtools/libtool/libtool/rename-libtool.patch
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 72fad37..b189413 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -3,6 +3,7 @@ require libtool-${PV}.inc
PR = "${INC_PR}.1"
PACKAGES = ""
SRC_URI += "file://prefix.patch"
+SRC_URI += "file://rename-libtool.patch"
SRC_URI += "file://fixinstall.patch"
datadir = "${STAGING_DIR_TARGET}${target_datadir}"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index f1051d8..d060cb8 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -4,6 +4,7 @@ DEPENDS = ""
PR = "${INC_PR}.1"
SRC_URI += "file://prefix.patch"
+SRC_URI += "file://rename-libtool.patch"
inherit native
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
index 279c07b..1bfd292 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/fixinstall.patch
@@ -14,88 +14,119 @@ which is totally bogus in the sysroot case.
Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
-RP 2011/11/16
+Signed-off-by: Richard Purdie
+Signed-off-by: Chong Lu
+---
+ libltdl/config/ltmain.m4sh | 44
+ 1 file changed, 44 insertions(+)
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===
libtool-2.4.orig/libltdl/config/ltmain.m4sh2011-11-16
14:50:01.070383779 +
-+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-11-16 15:27:13.582310413
+
-@@ -2163,7 +2163,7 @@
+diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
+index eebb56e..9480cb8 100644
+--- a/libltdl/config/ltmain.m4sh
b/libltdl/config/ltmain.m4sh
+@@ -2166,6 +2166,7 @@ func_mode_install ()
dir="$func_dirname_result"
func_append dir "$objdir"
-- if test -n "$relink_command"; then
-+ if test "$fast_install" = no && test -n "$relink_command"; then
++ if test "$buildtarget" == yes; then
+ if test -n "$relink_command"; then
# Strip any trailing slash from the destination.
func_stripname '' '/' "$libdir"
- destlibdir=$func_stripname_result
-@@ -2202,7 +2202,7 @@
+@@ -2197,6 +2198,39 @@ func_mode_install ()
+ func_show_eval "$relink_command" \
+ 'func_fatal_error "error: relink \`$file'\'' with the above command
before installing it"'
+ fi
++ else
++ if test "$fast_install" = no && test -n "$relink_command"; then
++ # Strip any trailing slash from the destination.
++ func_stripname '' '/' "$libdir"
++ destlibdir=$func_stripname_result
++
++ func_stripname '' '/' "$destdir"
++ s_destdir=$func_stripname_result
++
++# Determine the prefix the user has applied to our future dir.
++inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
++
++# Don't allow the user to place us outside of our expected
++# location b/c this prevents finding dependent libraries that
++# are installed to the same prefix.
++# At present, this check doesn't affect windows .dll's that
++# are installed into $libdir/../bin (currently, that works fine)
++# but it's something to keep an eye on.
++test "$inst_prefix_dir" = "$destdir" && \
++
[OE-core] [add patch comments][PATCH 1/1] rpm: compile rpmqv.c instead of rpmqv.cc
Some versions of gcc will put a reference to __gxx_personality_v0 into rpm.o and rpmbuild.o. This means we must link using g++, and Makefile does not. Go back to using rpmqv.c (which is currently identical to rpmqv.cc). Signed-off-by: Joe Slater --- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 32 meta/recipes-devtools/rpm/rpm_5.4.14.bb|1 + 2 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch diff --git a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch new file mode 100644 index 000..f08bd68 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch @@ -0,0 +1,32 @@ +rpm: compile rpmqv.c instead of rpmqv.cc + +Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0 +into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we +generate does not. + +So, go back to using rpmqv.c (which is currently identical to rpmqv.cc). + +Upstream-Status: Inappropriate [other] + + When linking with g++ is really necessary, the upstream package will do that. + +Signed-off-by: Joe Slater + +--- a/Makefile.am b/Makefile.am +@@ -127,13 +127,13 @@ rpm_SOURCES =build.c + rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) + rpm_LDADD = rpm.o $(myLDADD) + rpm.o:$(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c + + rpmbuild_SOURCES =build.c + rpmbuild_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) + rpmbuild_LDADD = rpmbuild.o $(myLDADD) + rpmbuild.o: $(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c + + .PHONY: splint + splint: diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 15c1738..8fec656 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -92,6 +92,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-fix-logio-cp.patch \ file://rpm-db5-or-db6.patch \ file://rpm-disable-Wno-override-init.patch \ + file://rpmqv_cc_b_gone.patch \ " # Uncomment the following line to enable platform score debugging -- 1.7.3.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [dora][PATCHv2] gcc-4.8: backport fix for ICE when building opus
From: Martin Jansa
* backported from 4.8.2, so daisy isn't affected
Signed-off-by: Martin Jansa
---
meta/recipes-devtools/gcc/gcc-4.8.inc | 1 +
.../gcc-4.8/0001-fix-ICE-when-building-opus.patch | 121 +
2 files changed, 122 insertions(+)
create mode 100644
meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index f1260af..ac205de 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -79,6 +79,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0047-repomembug.patch \
file://0048-PR57532.patch \
file://0048-PR58854_fix_arm_apcs_epilogue.patch \
+ file://0001-fix-ICE-when-building-opus.patch \
"
SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
SRC_URI[sha256sum] =
"545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
diff --git
a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
new file mode 100644
index 000..9d3aeaa
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
@@ -0,0 +1,121 @@
+From 8d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
+From: xguo
+Date: Fri, 9 Aug 2013 06:59:01 +
+Subject: [PATCH] gcc/ChangeLog:
+
+Backport from mainline:
+2013-08-09 Zhenqiang Chen
+
+* config/arm/neon.md (vcond): Fix floating-point vector
+comparisons against 0.
+
+gcc/testsuite/ChangeLog:
+
+Backport from mainline:
+2013-08-09 Zhenqiang Chen
+
+* gcc.target/arm/lp1189445.c: New testcase.
+
+Upstream-Status: Backport from 4.8.2
+Signed-off-by: Martin Jansa
+
+More details in:
+http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620
138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog| 8
+ gcc/config/arm/neon.md | 34 +++-
+ gcc/testsuite/ChangeLog | 7 +++
+ gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +
+ 4 files changed, 62 insertions(+), 5 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
+
+diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
+index d8d4202..86a5932 100644
+--- a/gcc/config/arm/neon.md
b/gcc/config/arm/neon.md
+@@ -1732,6 +1732,7 @@
+? 3 : 1;
+ rtx magic_rtx = GEN_INT (magic_word);
+ int inverse = 0;
++ int use_zero_form = 0;
+ int swap_bsl_operands = 0;
+ rtx mask = gen_reg_rtx (mode);
+ rtx tmp = gen_reg_rtx (mode);
+@@ -1742,12 +1743,16 @@
+ switch (GET_CODE (operands[3]))
+ {
+ case GE:
++case GT:
+ case LE:
++case LT:
+ case EQ:
+- if (!REG_P (operands[5])
+-&& (operands[5] != CONST0_RTX (mode)))
+- operands[5] = force_reg (mode, operands[5]);
+- break;
++ if (operands[5] == CONST0_RTX (mode))
++ {
++use_zero_form = 1;
++break;
++ }
++ /* Fall through. */
+ default:
+ if (!REG_P (operands[5]))
+ operands[5] = force_reg (mode, operands[5]);
+@@ -1798,7 +1803,26 @@
+a GT b -> a GT b
+a LE b -> b GE a
+a LT b -> b GT a
+- a EQ b -> a EQ b */
++ a EQ b -> a EQ b
++ Note that there also exist direct comparison against 0 forms,
++ so catch those as a special case. */
++ if (use_zero_form)
++ {
++inverse = 0;
++switch (GET_CODE (operands[3]))
++ {
++ case LT:
++base_comparison = gen_neon_vclt;
++break;
++ case LE:
++base_comparison = gen_neon_vcle;
++break;
++ default:
++/* Do nothing, other zero form cases already have the correct
++ base_comparison. */
++break;
++ }
++ }
+
+ if (!inverse)
+ emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
+diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c
b/gcc/testsuite/gcc.target/arm/lp1189445.c
+new file mode 100644
+index 000..766748e
+--- /dev/null
b/gcc/testsuite/gcc.target/arm/lp1189445.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target arm_neon } */
++/* { dg-add-options arm_neon } */
++/* { dg-options "-O3" } */
++
++int id;
++int
++test (const long int *data)
++{
++ int i, retval;
++ retval = id;
++ for (i = 0; i < id; i++)
++{
++ retval &= (data[i] <= 0);
++}
++
++ return (retval);
++}
+--
+2.0.0
+
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedd
[OE-core] [PATCH] gcc-4.8: backport fix for ICE when building opus
From: Martin Jansa
* backported from 4.8.2, so daisy isn't affected
Signed-off-by: Martin Jansa
---
meta/recipes-devtools/gcc/gcc-4.8.inc | 1 +
.../gcc-4.8/0001-fix-ICE-when-building-opus.patch | 121 +
2 files changed, 122 insertions(+)
create mode 100644
meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index f1260af..ac205de 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -79,6 +79,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0047-repomembug.patch \
file://0048-PR57532.patch \
file://0048-PR58854_fix_arm_apcs_epilogue.patch \
+ file://0001-fix-ICE-when-building-opus.patch \
"
SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304"
SRC_URI[sha256sum] =
"545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813"
diff --git
a/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
new file mode 100644
index 000..9d3aeaa
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0001-fix-ICE-when-building-opus.patch
@@ -0,0 +1,121 @@
+From 8d8ba86c70381f7c34c22ac6994234d0f3e7 Mon Sep 17 00:00:00 2001
+From: xguo
+Date: Fri, 9 Aug 2013 06:59:01 +
+Subject: [PATCH] gcc/ChangeLog:
+
+Backport from mainline:
+2013-08-09 Zhenqiang Chen
+
+* config/arm/neon.md (vcond): Fix floating-point vector
+comparisons against 0.
+
+gcc/testsuite/ChangeLog:
+
+Backport from mainline:
+2013-08-09 Zhenqiang Chen
+
+* gcc.target/arm/lp1189445.c: New testcase.
+
+Upstream-Status: Backport from 4.8.2
+Signed-off-by: Martin Jansa
+
+More details in:
+http://gcc.1065356.n5.nabble.com/PATCH-ARM-Fix-unrecognizable-vector-comparisons-td947064.html
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@201620
138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog| 8
+ gcc/config/arm/neon.md | 34 +++-
+ gcc/testsuite/ChangeLog | 7 +++
+ gcc/testsuite/gcc.target/arm/lp1189445.c | 18 +
+ 4 files changed, 62 insertions(+), 5 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/arm/lp1189445.c
+
+diff --git a/gcc/config/arm/neon.md b/gcc/config/arm/neon.md
+index d8d4202..86a5932 100644
+--- a/gcc/config/arm/neon.md
b/gcc/config/arm/neon.md
+@@ -1732,6 +1732,7 @@
+? 3 : 1;
+ rtx magic_rtx = GEN_INT (magic_word);
+ int inverse = 0;
++ int use_zero_form = 0;
+ int swap_bsl_operands = 0;
+ rtx mask = gen_reg_rtx (mode);
+ rtx tmp = gen_reg_rtx (mode);
+@@ -1742,12 +1743,16 @@
+ switch (GET_CODE (operands[3]))
+ {
+ case GE:
++case GT:
+ case LE:
++case LT:
+ case EQ:
+- if (!REG_P (operands[5])
+-&& (operands[5] != CONST0_RTX (mode)))
+- operands[5] = force_reg (mode, operands[5]);
+- break;
++ if (operands[5] == CONST0_RTX (mode))
++ {
++use_zero_form = 1;
++break;
++ }
++ /* Fall through. */
+ default:
+ if (!REG_P (operands[5]))
+ operands[5] = force_reg (mode, operands[5]);
+@@ -1798,7 +1803,26 @@
+a GT b -> a GT b
+a LE b -> b GE a
+a LT b -> b GT a
+- a EQ b -> a EQ b */
++ a EQ b -> a EQ b
++ Note that there also exist direct comparison against 0 forms,
++ so catch those as a special case. */
++ if (use_zero_form)
++ {
++inverse = 0;
++switch (GET_CODE (operands[3]))
++ {
++ case LT:
++base_comparison = gen_neon_vclt;
++break;
++ case LE:
++base_comparison = gen_neon_vcle;
++break;
++ default:
++/* Do nothing, other zero form cases already have the correct
++ base_comparison. */
++break;
++ }
++ }
+
+ if (!inverse)
+ emit_insn (base_comparison (mask, operands[4], operands[5], magic_rtx));
+diff --git a/gcc/testsuite/gcc.target/arm/lp1189445.c
b/gcc/testsuite/gcc.target/arm/lp1189445.c
+new file mode 100644
+index 000..766748e
+--- /dev/null
b/gcc/testsuite/gcc.target/arm/lp1189445.c
+@@ -0,0 +1,18 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target arm_neon } */
++/* { dg-add-options arm_neon } */
++/* { dg-options "-O3" } */
++
++int id;
++int
++test (const long int *data)
++{
++ int i, retval;
++ retval = id;
++ for (i = 0; i < id; i++)
++{
++ retval &= (data[i] <= 0);
++}
++
++ return (retval);
++}
+--
+2.0.0
+
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedd
[OE-core] [PATCH] libgpg-error: fix pkgconfig.patch
Typo in pkgconfig.patch:
-Libs: -L{libdir} -lgpg-error
vs.
+Libs: -L${libdir} -lgpg-error
This patch fixes failure in libgcrypt-native do_configure.
| ../x86_64-linux-libtool: line 6001: cd: {libdir}: No such file or directory
| x86_64-linux-libtool: link: cannot determine absolute directory name of
`{libdir}'
Signed-off-by: Tim Orling
---
meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
b/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
index 2a2c1e9..89c9d22 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
+++ b/meta/recipes-support/libgpg-error/libgpg-error-1.12/pkgconfig.patch
@@ -52,7 +52,7 @@ Index: libgpg-error-1.12/src/gpg-error.pc.in
+Name: gpg-error
+Description: a library that defines common error values for all GnuPG
components
+Version: @VERSION@
-+Libs: -L{libdir} -lgpg-error
++Libs: -L${libdir} -lgpg-error
+Cflags: -I${includedir}
Index: libgpg-error-1.12/src/gpg-error.m4
===
--
1.9.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] [PATCH 0/7][RFC] Remove enforced --foreign in autoreconf
On Wed, 2014-07-16 at 23:47 +0100, Richard Purdie wrote: > I made a quick test and the failures I spotted from meta-oe likely due > to this patch were: > > re2c > libsdl-iomage > claws-plugin-gtkhtml2-viewer > claws-plugin-rssyl > libsdl-tiff > libol > ode > dejagnu > memcached > rp-pppoe > ipsec-tools > mtr > hplip > onig > > Its probably not a complete list as I have a lot more failures than your > world builds but it gives some idea of number and its not a massive > list. There were more efl ones once I sorted a fetch issue. I've run out of time/energy today but I have about 20 fixes for various build issues in meta-oe in: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/metaoe&id=bfb0ddc8c3d3f7c963c3529efc970b9ba8d8d788 Mentioning so people don't duplicate work. I'll try and split into patches as/when I get time if nobody beats me to it. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/6] initscripts: save /etc/timestamp with seconds accuracy
From: Blair Elliott
Currently, /etc/timestamp is saved with minutes accuracy. To increase
the accuracy, modify the save-rtc.sh and bootmisc.sh scripts to save and
read /etc/timestamp respectively with seconds accuracy.
Signed-off-by: Richard Tollerton
Signed-off-by: Ben Shelton
---
meta/classes/image.bbclass| 2 +-
meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 5 +++--
meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index a03b880..772c3ed 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -359,7 +359,7 @@ set_image_autologin () {
# Can be use to create /etc/timestamp during image construction to give a
reasonably
# sane default time setting
rootfs_update_timestamp () {
- date -u +%4Y%2m%2d%2H%2M >${IMAGE_ROOTFS}/etc/timestamp
+ date -u +%4Y%2m%2d%2H%2M%2S >${IMAGE_ROOTFS}/etc/timestamp
}
# Prevent X from being started
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 5211824..ccc7f9f 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -66,10 +66,11 @@ fi
test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh start
if test -e /etc/timestamp
then
- SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
+ SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M%2S`
read TIMESTAMP < /etc/timestamp
if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
- date -u ${TIMESTAMP#}${TIMESTAMP%}
+ # format the timestamp as date expects it (2m2d2H2M4Y.2S)
+ date -u ${TIMESTAMP:4:8}${TIMESTAMP:0:4}.${TIMESTAMP:(-2)}
test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh stop
fi
fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index 1f804e2..b038fc5 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
@@ -10,4 +10,4 @@
### END INIT INFO
# Update the timestamp
-date -u +%4Y%2m%2d%2H%2M > /etc/timestamp
+date -u +%4Y%2m%2d%2H%2M%2S > /etc/timestamp
--
2.0.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 5/6] initscripts: make hostname.sh coreutils-compatible
From: Richard Tollerton inetutils and busybox hostname utils support `hostname -F`; coreutils hostname doesn't. So just use `cat` instead. Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton --- meta/recipes-core/initscripts/initscripts-1.0/hostname.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh index 78fb91c..95287cc 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh @@ -16,7 +16,7 @@ fi # Busybox hostname doesn't support -b so we need implement it on our own if [ -f /etc/hostname ];then - hostname -F /etc/hostname + hostname `cat /etc/hostname` elif [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" -o ! -z "`echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'`" ] ; then hostname localhost fi -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/6] initscripts: Use current date as an additional source of entropy
From: Ken Sharp If the seed file is empty or does not exist, the date is an extremely poor backup source of entropy, but it is better than nothing. Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton --- meta/recipes-core/initscripts/initscripts-1.0/urandom | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom index a0549de..ec4ef61 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/urandom +++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom @@ -20,12 +20,11 @@ RANDOM_SEED_FILE=/var/lib/urandom/random-seed case "$1" in start|"") test "$VERBOSE" != no && echo "Initializing random number generator..." - # Load and then save 512 bytes, - # which is the size of the entropy pool - if test -f "$RANDOM_SEED_FILE" - then - cat "$RANDOM_SEED_FILE" >/dev/urandom - fi + # Load and then save 512 bytes, which is the size of the entropy + # pool. Also load the current date, in case the seed file is + # empty. + ( date +%s.%N; [ -f "$RANDOM_SEED_FILE" ] && cat "$RANDOM_SEED_FILE" ) \ + >/dev/urandom rm -f "$RANDOM_SEED_FILE" umask 077 dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/6] initscripts: parametrize random seed file location
From: Richard Tollerton Currently, the random seed file location is hardcoded to /var/lib/urandom/random-seed. Refactor it to a parameter (RANDOM_SEED_FILE) so the file location is defined in only one place. Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton --- meta/recipes-core/initscripts/initscripts-1.0/urandom | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom index eb3a7c3..a0549de 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/urandom +++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom @@ -12,6 +12,9 @@ ### END INIT INFO test -c /dev/urandom || exit 0 + +RANDOM_SEED_FILE=/var/lib/urandom/random-seed + . /etc/default/rcS case "$1" in @@ -19,13 +22,13 @@ case "$1" in test "$VERBOSE" != no && echo "Initializing random number generator..." # Load and then save 512 bytes, # which is the size of the entropy pool - if test -f /var/lib/urandom/random-seed + if test -f "$RANDOM_SEED_FILE" then - cat /var/lib/urandom/random-seed >/dev/urandom + cat "$RANDOM_SEED_FILE" >/dev/urandom fi - rm -f /var/lib/urandom/random-seed + rm -f "$RANDOM_SEED_FILE" umask 077 - dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \ + dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ >/dev/null 2>&1 || echo "urandom start: failed." umask 022 ;; @@ -34,7 +37,7 @@ case "$1" in # see documentation in linux/drivers/char/random.c test "$VERBOSE" != no && echo "Saving random seed..." umask 077 - dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \ + dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ >/dev/null 2>&1 || echo "urandom stop: failed." ;; *) -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 6/6] initscripts: Add support for /etc/default/urandom
From: Richard Tollerton Source /etc/default/urandom if present. This allows the rootfs to remain read-only while enabling the user to override the location of the random seed file. Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton --- meta/recipes-core/initscripts/initscripts-1.0/urandom | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom index ec4ef61..af1625b 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/urandom +++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom @@ -16,6 +16,7 @@ test -c /dev/urandom || exit 0 RANDOM_SEED_FILE=/var/lib/urandom/random-seed . /etc/default/rcS +[ -f /etc/default/urandom ] && . /etc/default/urandom case "$1" in start|"") -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/6] initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE
From: Richard Tollerton
busybox sysctl may lack the "-q" setting, so simulate it with redirects.
Signed-off-by: Richard Tollerton
Signed-off-by: Ben Shelton
---
meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 3b5a47f..5211824 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -36,7 +36,12 @@ if [ -f "${SYSCTL_CONF}" ]
then
if [ -x "/sbin/sysctl" ]
then
- /sbin/sysctl -p "${SYSCTL_CONF}"
+ # busybox sysctl does not support -q
+ VERBOSE_REDIR="1>/dev/null"
+ if [ "${VERBOSE}" != "no" ]; then
+ VERBOSE_REDIR="1>&1"
+ fi
+ eval /sbin/sysctl -p "${SYSCTL_CONF}" $VERBOSE_REDIR
else
echo "To have ${SYSCTL_CONF} applied during boot, install
package ."
fi
--
2.0.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/6] Various fixes and improvements to initscripts
This patch series contains fixes and improvements we've made to several init scripts. These changes have been thoroughly tested on Dylan and ported to master. Changes made in v2: - Updated /etc/timestamp generated at build time to use seconds accuracy - Added a patch I missed the first time to source /etc/default/urandom from /etc/init.d/urandom The following changes since commit a449598a839e677e2a094aa4bd9a68003de6e42e: bdwgc: Add PACKAGECONFIG for libatomic-ops (2014-07-17 15:04:07 +0100) are available in the git repository at: git://github.com/ni/openembedded-core dev/bshelton/upstream_initscripts https://github.com/ni/openembedded-core/tree/dev/bshelton/upstream_initscripts Blair Elliott (1): initscripts: save /etc/timestamp with seconds accuracy Ken Sharp (1): initscripts: Use current date as an additional source of entropy Richard Tollerton (4): initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE initscripts: parametrize random seed file location initscripts: make hostname.sh coreutils-compatible initscripts: Add support for /etc/default/urandom meta/classes/image.bbclass | 2 +- .../initscripts/initscripts-1.0/bootmisc.sh | 12 +--- .../initscripts/initscripts-1.0/hostname.sh | 2 +- .../initscripts/initscripts-1.0/save-rtc.sh | 2 +- .../initscripts/initscripts-1.0/urandom | 21 - 5 files changed, 24 insertions(+), 15 deletions(-) -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/8] mkefidisk.sh: Add gummiboot support
On Wednesday, July 16, 2014 02:15:59 PM Darren Hart wrote: > Fixes [YOCTO 6295] > > Add gummiboot support for images built using: > > EFI_PROVIDER="gummiboot" > > Add conditional configuration for GRUB and gummiboot. Provide some > messaging about which is being performed. > > Signed-off-by: Darren Hart > --- > scripts/contrib/mkefidisk.sh | 53 > ++-- 1 file changed, 41 > insertions(+), 12 deletions(-) > > diff --git a/scripts/contrib/mkefidisk.sh > b/scripts/contrib/mkefidisk.sh index 0d0674b..9b13041 100755 > --- a/scripts/contrib/mkefidisk.sh > +++ b/scripts/contrib/mkefidisk.sh > @@ -265,31 +265,60 @@ umount $HDDIMG_ROOTFS_MNT > echo "Preparing boot partition..." > EFIDIR="$BOOTFS_MNT/EFI/BOOT" > mkdir -p $EFIDIR > -GRUBCFG="$EFIDIR/grub.cfg" > > cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT > -# Copy the efi loader and config (booti*.efi and grub.cfg) > +# Copy the efi loader and configs (booti*.efi and grub.cfg if it > exists) cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR > +# Silently ignore a missing gummiboot loader dir (we might just be a > GRUB image) +cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 2> /dev/null > > -# Update grub config for the installed image > -# Delete the install entry > -sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG > -# Delete the initrd lines > -sed -i "/initrd /d" $GRUBCFG > -# Delete any LABEL= strings > -sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG > +# Update the boot loaders configurations for an installed image > # Remove any existing root= kernel parameters and: > # o Add a root= parameter with the target rootfs > # o Specify ro so fsck can be run during boot > # o Specify rootwait in case the target media is an asyncronous block > device # such as MMC or USB disks > # o Specify "quiet" to minimize boot time when using slow serial > consoles -sed -i "s@ root=[^ ]*@ @" $GRUBCFG > -sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait quiet @" > $GRUBCFG + > +# Look for a GRUB installation > +GRUB_CFG="$EFIDIR/grub.cfg" > +if [ -e "$GRUB_CFG" ]; then > + echo "Configuring GRUB" > + # Delete the install entry > + sed -i "/menuentry 'install'/,/^}/d" $GRUB_CFG > + # Delete the initrd lines > + sed -i "/initrd /d" $GRUB_CFG > + # Delete any LABEL= strings > + sed -i "s/ LABEL=[^ ]*/ /" $GRUB_CFG > + > + sed -i "s@ root=[^ ]*@ @" $GRUB_CFG > + sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait quiet @" > $GRUB_CFG +fi > + > +# Look for a gummiboot installation > +GUMMI_ENTRIES="$BOOTFS_MNT/loader/entries" > +GUMMI_CFG="$GUMMI_ENTRIES/boot.conf" > +if [ -d "$GUMMI_ENTRIES" ]; then > + echo "Configuring Gummiboot" > + # remove the install target if it exists > + rm $GUMMI_ENTRIES/install.conf &> /dev/null > + > + if [ ! -e "$GUMMI_CFG" ]; then > + echo "ERROR: $GUMMI_CFG not found" > + fi > + Oops, this is missing: + sed -i "/initrd /d" $GUMMI_CFG I have updated this git branch with this change. -- Darren > + sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG > + sed -i "s@options *LABEL=boot @options LABEL=Boot > root=$TARGET_ROOTFS ro rootwait quiet @" $GUMMI_CFG +fi > + > +# Ensure we have at least one EFI bootloader configured > +if [ ! -e $GRUB_CFG ] && [ ! -e $GUMMI_CFG ]; then > + echo "ERROR: No EFI bootloader configuration found" > +fi > > umount $BOOTFS_MNT > umount $HDDIMG_MNT > rm -rf $TMPDIR > sync > > -echo "Installation complete." > +echo "Installation complete" -- Darren Hart Intel Open Source Technology Center -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rootfs: Remove the extraneous install directory
[YOCTO #6497] Signed-off-by: Saul Wold --- meta/lib/oe/rootfs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index bc2524f..b34856c 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -379,6 +379,7 @@ class RpmRootfs(Rootfs): # __db.00* (Berkeley DB files that hold locks, rpm specific environment # settings, etc.), that should not get into the final rootfs self.pm.unlock_rpm_db() +bb.utils.remove(self.image_rootfs + "/install", True) class DpkgRootfs(Rootfs): -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] libgcrypt workaround
Yeah, I kinda suspected pkgconfig but I guess I was busy/distracted with the biz stuff and didn't dig any deeper than the one recipe... Sounds like this patch won't be needed if the pc stuff is clean. Steve On Thu, Jul 17, 2014 at 10:34 AM, Tim Orling wrote: > Steve, > > That workaround fixes the problem, but I think there is something > fundamentally wrong deeper in. Looks like the culprit is pkgconfig.patch > for libgpg-error. Testing and will send patch. > > > On Wed, Jul 16, 2014 at 6:47 PM, Stephen Arnold < > stephen.arnol...@gmail.com> wrote: > >> OE-devs/Tim: >> >> Here's the basic recipe patch; not sure if I should submit it formally or >> not. Maybe a configure patch is preferred? Feedback welcome. >> >> Thanks, Steve >> >> -- >> ___ >> 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] libgcrypt workaround
Steve, That workaround fixes the problem, but I think there is something fundamentally wrong deeper in. Looks like the culprit is pkgconfig.patch for libgpg-error. Testing and will send patch. On Wed, Jul 16, 2014 at 6:47 PM, Stephen Arnold wrote: > OE-devs/Tim: > > Here's the basic recipe patch; not sure if I should submit it formally or > not. Maybe a configure patch is preferred? Feedback welcome. > > Thanks, Steve > > -- > ___ > 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] grub_git: bump version, remove patch
ping?
On 07/11/14 12:11, Trevor Woerner wrote:
> A previously upstreamed patch has been applied. Bump the version to
> incorporate this upstream update.
>
> Signed-off-by: Trevor Woerner
> ---
> .../grub/grub/asciih-fix-build-warning-error.patch | 34
> --
> meta/recipes-bsp/grub/grub_git.bb | 3 +-
> 2 files changed, 1 insertion(+), 36 deletions(-)
> delete mode 100644
> meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
>
> diff --git a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
> b/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
> deleted file mode 100644
> index 48ace56..000
> --- a/meta/recipes-bsp/grub/grub/asciih-fix-build-warning-error.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -util/grub-gen-asciih.c: fix build warning->error
> -
> -A potential problem is flagged by the compiler and generates a warning. This
> -warning is promoted to an error via -Werror. This patch fixes the original
> -issue, avoids the warning, and therefore avoids the build error.
> -
> -Upstream-Status: Pending
> -
> -Index: git/util/grub-gen-asciih.c
> -===
> git.orig/util/grub-gen-asciih.c
> -+++ git/util/grub-gen-asciih.c
> -@@ -131,6 +131,8 @@ write_font_ascii_bitmap (FILE *file, FT_
> - struct grub_glyph_info glyph;
> - int char_code;
> -
> -+ memset (&glyph, 0, sizeof(glyph));
> -+
> - fprintf (file, "/* THIS CHUNK OF BYTES IS AUTOMATICALLY GENERATED */\n");
> - fprintf (file, "unsigned char ascii_bitmaps[] =\n");
> - fprintf (file, "{\n");
> -@@ -144,6 +146,12 @@ write_font_ascii_bitmap (FILE *file, FT_
> - return;
> - add_glyph (glyph_idx, face, char_code, &glyph);
> -
> -+ if (glyph.bitmap == 0)
> -+{
> -+ fprintf (stderr, "grub-gen-asciih: add_glyph not successful");
> -+ exit (1);
> -+}
> -+
> - if (glyph.width == 8 && glyph.height == 16
> - && glyph.x_ofs == 0 && glyph.y_ofs == 0)
> - {
> diff --git a/meta/recipes-bsp/grub/grub_git.bb
> b/meta/recipes-bsp/grub/grub_git.bb
> index 7f89739..f74bae8 100644
> --- a/meta/recipes-bsp/grub/grub_git.bb
> +++ b/meta/recipes-bsp/grub/grub_git.bb
> @@ -17,11 +17,10 @@ DEFAULT_PREFERENCE = "-1"
> DEFAULT_PREFERENCE_arm = "1"
>
> PV = "2.00+${SRCPV}"
> -SRCREV = "4b8b9135f1676924a8458da528d264bbc7bbb301"
> +SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e"
> SRC_URI = "git://git.savannah.gnu.org/grub.git \
> file://autogen.sh-exclude-pc.patch \
> file://grub-2.00-add-oe-kernel.patch \
> - file://asciih-fix-build-warning-error.patch \
>"
>
> S = "${WORKDIR}/git"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xf86-video-intel: disable non-deterministic tests for libX11
libX11 et al are checked for at confgure time and tests optionally built. As these don't get installed we don't want to add build dependencies, but the non-determinism means that builds can fail. Signed-off-by: Ross Burton --- .../xf86-video-intel/disable-x11-dri3.patch | 17 + .../xorg-driver/xf86-video-intel_2.99.912.bb |3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch new file mode 100644 index 000..dda508d --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch @@ -0,0 +1,17 @@ +These modules are only used for tests that don't get installed, and the +automatic detection without explicit dependencies means that a build can find +e.g. xshmfence at configure time but then it's been removed from the sysroot by +the time compile happens. + +As the tests don't get installed, just disable the checks. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index bd654f3..78a0e0d 100644 +--- a/configure.ac b/configure.ac +@@ -251 +251 @@ fi +-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) ++#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb index 0777690..544de4a 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb @@ -9,7 +9,8 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRC_URI += "file://configure-dri.patch" +SRC_URI += "file://configure-dri.patch \ +file://disable-x11-dri3.patch" SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] _json module arbitrary process memory read vulnerability
On 07/17/2014 03:27 AM, Daniel BORNAZ wrote:
python-native: _json module arbitrary process memory read vulnerability
http://bugs.python.org/issue21529
Python 2 and 3 are susceptible to arbitrary process memory reading by
a user or adversary due to a bug in the _json module caused by
insufficient bounds checking.
The sole prerequisites of this attack are that the attacker is able to
control or influence the two parameters of the default scanstring
function: the string to be decoded and the index.
The bug is caused by allowing the user to supply a negative index
value. The index value is then used directly as an index to an array
in the C code; internally the address of the array and its index are
added to each other in order to yield the address of the value that is
desired. However, by supplying a negative index value and adding this
to the address of the array, the processor's register value wraps
around and the calculated value will point to a position in memory
which isn't within the bounds of the supplied string, causing the
function to access other parts of the process memory.
Signed-off-by: Benjamin Peterson
Applied to python-native recipe in order to fix the above mentioned
vulnerability.
Upstream-Status: Submitted
Signed-off-by: Daniel BORNAZ
---
meta/recipes-devtools/python/python-native_2.7.3.bb | 1 +
.../python/python/python-json-flaw-fix.patch | 20
2 files changed, 21 insertions(+)
create mode 100644
meta/recipes-devtools/python/python/python-json-flaw-fix.patch
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb
b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0571d3a..74f0dfc 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -19,6 +19,7 @@ SRC_URI += "\
file://parallel-makeinst-create-bindir.patch \
file://python-fix-build-error-with-Readline-6.3.patch \
file://gcc-4.8-fix-configure-Wformat.patch \
+ file://python-json-flaw-fix.patch \
"
S = "${WORKDIR}/Python-${PV}"
diff --git a/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
b/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
new file mode 100644
index 000..631713d
--- /dev/null
+++ b/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
@@ -0,0 +1,20 @@
+--- a/Modules/_json.c 2014-07-15 15:37:17.151046356 +0200
b/Modules/_json.c 2014-07-15 15:38:37.335605042 +0200
You need to to have the Upstream-Status in the patch file itself, along
with a Signed-off-by, so that the information in available here.
Thanks
Sau!
+@@ -1491,7 +1491,7 @@ scan_once_str(PyScannerObject *s, PyObje
+ PyObject *res;
+ char *str = PyString_AS_STRING(pystr);
+ Py_ssize_t length = PyString_GET_SIZE(pystr);
+-if (idx >= length) {
++if ( idx < 0 || idx >= length) {
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
+@@ -1578,7 +1578,7 @@ scan_once_unicode(PyScannerObject *s, Py
+ PyObject *res;
+ Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
+ Py_ssize_t length = PyUnicode_GET_SIZE(pystr);
+-if (idx >= length) {
++if ( idx < 0 || idx >= length) {
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] dbus: dbus update to 1.8.6
On 07/17/2014 05:44 AM, Daniel BORNAZ wrote:
dbus: dbus update to 1.8.6
Dbus and dbus-test updated to version 1.8.6, dbus-glib updated to
version 0.102. Removed recipes and files from previous version(s).
Current version fixes two DoS vulnerabilities in dbus-daemon (CVE-2014-3532).
Upstream-Status: Submitted
Signed-off-by: Daniel BORNAZ
renamed:meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
-> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
Please don't version the new directory since these patches seem to be
version generic. The patch directory should be just .../dbus-glib/...
Thanks Sau!
deleted:meta/recipes-core/dbus/dbus-glib_0.100.2.bb
new file: meta/recipes-core/dbus/dbus-glib_0.102.bb
renamed:meta/recipes-core/dbus/dbus-test_1.8.2.bb ->
meta/recipes-core/dbus/dbus-test_1.8.6.bb
deleted:meta/recipes-core/dbus/dbus_1.8.2.bb
new file: meta/recipes-core/dbus/dbus_1.8.6.bb
---
.../dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/no-examples.patch | 0
.../obsolete_automake_macros.patch| 0
.../test-install-makefile.patch | 0
meta/recipes-core/dbus/dbus-glib_0.100.2.bb | 5 -
meta/recipes-core/dbus/dbus-glib_0.102.bb | 8
meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} | 3 +--
meta/recipes-core/dbus/dbus_1.8.2.bb | 4
meta/recipes-core/dbus/dbus_1.8.6.bb | 4
8 files changed, 13 insertions(+), 11 deletions(-)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/no-examples.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/obsolete_automake_macros.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/test-install-makefile.patch (100%)
delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.100.2.bb
create mode 100644 meta/recipes-core/dbus/dbus-glib_0.102.bb
rename meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} (93%)
delete mode 100644 meta/recipes-core/dbus/dbus_1.8.2.bb
create mode 100644 meta/recipes-core/dbus/dbus_1.8.6.bb
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
similarity index 100%
rename from
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
deleted file mode 100644
index c1bb06a..000
--- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dbus-glib.inc
-
-
-SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
-SRC_URI[sha256sum] =
"a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb
b/meta/recipes-core/dbus/dbus-glib_0.102.bb
new file mode 100644
index 000..28e8a72
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
@@ -0,0 +1,8 @@
+require dbus-glib.inc
+
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://no-examples.patch \
+"
+
+SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
+SRC_URI[sha256sum] =
"6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.2.bb
rename to meta/recipes-core/dbus/dbus-test_1.8.6.bb
index e19d2e9..53c5d9a 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
@@ -18,8 +18,7 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_ser
Re: [OE-core] [PATCH 1/5] initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE
On 07/16, Saul Wold wrote:
> On 07/16/2014 01:59 PM, Ben Shelton wrote:
> >From: Richard Tollerton
> >
> >busybox sysctl may lack the "-q" setting, so simulate it with redirects.
> >
> >Signed-off-by: Richard Tollerton
> >Signed-off-by: Ben Shelton
> >---
> > meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 7 ++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> >diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> >b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> >index 3b5a47f..5211824 100755
> >--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> >+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> >@@ -36,7 +36,12 @@ if [ -f "${SYSCTL_CONF}" ]
> > then
> > if [ -x "/sbin/sysctl" ]
> > then
> >-/sbin/sysctl -p "${SYSCTL_CONF}"
> >+# busybox sysctl does not support -q
>
> Will this work if procps's sysctl is used instead, I think it will
> but wanted to verify it.
>
> Sau!
>
Yes, it will work. I just installed the procps package on an ARM target
and verified that the output is as expected for both settings of
VERBOSE.
Best,
Ben
> >+VERBOSE_REDIR="1>/dev/null"
> >+if [ "${VERBOSE}" != "no" ]; then
> >+VERBOSE_REDIR="1>&1"
> >+fi
> >+eval /sbin/sysctl -p "${SYSCTL_CONF}" $VERBOSE_REDIR
> > else
> > echo "To have ${SYSCTL_CONF} applied during boot, install
> > package ."
> > fi
> >
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] initscripts: save /etc/timestamp with seconds accuracy
On 07/16, Saul Wold wrote: > On 07/16/2014 01:59 PM, Ben Shelton wrote: > >From: Blair Elliott > > > >Currently, /etc/timestamp is saved with minutes accuracy. To increase > >the accuracy, modify the save-rtc.sh and bootmisc.sh scripts to save and > >read /etc/timestamp respectively with seconds accuracy. > > > > We also initialize it in the image.bbclass, you may want to tweak that one. > > Since we deal with readonly it's possible it won't get updated after > the image creation. > > Sau! > Good catch -- I'll make the fix and resubmit the patchset. Thanks, Ben -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH v4] libav: set LICENSE according to PACKAGECONFIG options
Hi, One more note. I've tested with 0.8.11 & 9.13 on OE-Core current git (master). The only weak point is the use of python anonymous function which is called twice each time, is there a better solution ? Regards, Matt -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH v4] libav: set LICENSE according to PACKAGECONFIG options
Experienced users can change license with 'gpl' and 'lic3' PACKAGECONFIG
switches.
fix: drop unwanted --enable-libtheora & --enable-libvorbis in EXTRA_OECONF
Reported-by: Andreas Oberritter
Signed-off-by: Matthieu Crapet
---
meta/recipes-multimedia/libav/libav.inc | 35 +
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index 1d617a2..de9770b 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -7,7 +7,7 @@ DESCRIPTION = "Libav is a friendly and community-driven effort
to provide its us
HOMEPAGE = "http://libav.org/";
SECTION = "libs"
-LICENSE = "GPLv2+"
+LICENSE = "LGPLv2.1+"
LICENSE_FLAGS = "commercial"
# Provides ffmpeg compat, see http://libav.org/about.html
@@ -29,7 +29,7 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
EXTRA_FFCONF ?= ""
-PACKAGECONFIG ??= "bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}"
+PACKAGECONFIG ??= "bzip2 gpl x264 theora
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
@@ -44,14 +44,35 @@ PACKAGECONFIG[vpx] =
"--enable-libvpx,--disable-libvpx,libvpx"
PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl"
PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
-# Check codecs that require --enable-nonfree
-USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl'
], 'yes', '', d)}"
+# Licenses flags: allow to switch licence LGPL/GPL and v2/v3
+PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
+PACKAGECONFIG[lic3] = "--enable-version3,--disable-version3"
+
+# Check codecs and license coherency
+python () {
+ pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
+ nonfree = [ 'faac', 'openssl' ]
+ gpl = [ 'x11', 'x264' ]
+
+ if 'gpl' in pkgconfig:
+ if 'lic3' in pkgconfig:
+ d.setVar('LICENSE', 'GPLv3+')
+ else:
+ d.setVar('LICENSE', 'GPLv2+')
+ elif set(pkgconfig) & set(gpl):
+ raise bb.parse.SkipPackage("incompatible license, please add
'gpl' in PACKAGECONFIG")
+ elif 'lic3' in pkgconfig:
+ d.setVar('LICENSE', 'LGPLv3+')
+
+ if set(pkgconfig) & set(nonfree):
+ d.setVar('LICENSE', 'Proprietary')
+ bb.note("Change LICENSE to 'Proprietary'")
+}
EXTRA_OECONF = " \
--enable-shared \
--enable-pthreads \
---enable-gpl \
-${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
+${@bb.utils.contains('LICENSE', 'Proprietary', '--enable-nonfree', '', d)}
\
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -60,8 +81,6 @@ EXTRA_OECONF = " \
--enable-avserver \
--enable-avplay \
--ld="${CCLD}" \
---enable-libtheora \
---enable-libvorbis \
--arch=${TARGET_ARCH} \
--target-os="linux" \
--enable-cross-compile \
--
2.0.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE
If INCOMPATIBLE_LICENSE=GPL-3.0 but the recipe sets LICENSE=GPLv3, the current
code won't trigger because they're different strings.
Fix this by attempting to canonicalise every license name to a SPDX name, so
both names in this example become GPL-3.0.
[ YOCTO #5622 ]
Signed-off-by: Ross Burton
---
meta/classes/base.bbclass|2 ++
meta/classes/license.bbclass | 14 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c0d2c8ec8..8114cf6 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -540,6 +540,8 @@ python () {
check_license = False
if check_license and bad_licenses:
+bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses)
+
whitelist = []
for lic in bad_licenses:
for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_",
"WHITELIST_"]:
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 08f0665..973a95b 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -264,10 +264,18 @@ def return_spdx(d, license):
"""
return d.getVarFlag('SPDXLICENSEMAP', license, True)
+def canonical_license(d, license):
+"""
+Return the canonical (SPDX) form of the license if available (so GPLv3
+becomes GPL-3.0), or the passed license if there is no canonical form.
+"""
+return d.getVarFlag('SPDXLICENSEMAP', license, True) or license
+
def incompatible_license(d, dont_want_licenses, package=None):
"""
-This function checks if a recipe has only incompatible licenses. It also
take into consideration 'or'
-operand.
+This function checks if a recipe has only incompatible licenses. It also
+take into consideration 'or' operand. dont_want_licenses should be passed
+as canonical (SPDX) names.
"""
import re
import oe.license
@@ -298,7 +306,7 @@ def incompatible_license(d, dont_want_licenses,
package=None):
licenses = oe.license.flattened_licenses(license, choose_lic_set)
except oe.license.LicenseError as exc:
bb.fatal('%s: %s' % (d.getVar('P', True), exc))
-return any(not license_ok(l) for l in licenses)
+return any(not license_ok(canonical_license(d, l)) for l in licenses)
def check_license_flags(d):
"""
--
1.7.10.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE
On 17 July 2014 15:28, Paul Eggleton wrote: > On Wednesday 16 July 2014 22:08:13 Ross Burton wrote: >> If INCOMPATIBLE_LICENSE=GPLv3.0 but the recipe sets LICENSE=GPLv3, the > > Pedantic, but INCOMPATIBLE_LICENSE = "GPL-3.0" surely? Yes, sigh. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dbus: dbus update to 1.8.6
On 17 July 2014 13:08, Daniel BORNAZ wrote:
> renamed:
> meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch ->
> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
If there's just a single version of the recipe, please don't version
the directory.
> renamed:
> meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch ->
> meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
> renamed:
> meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch ->
> meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
Your upgraded dbus-glib has a SRC_URI assignment in the .bb which
overrides the assignment in the .inc, so these two patches are not
being used. The obsolete automake macros patch appears to have been
merged upstream but it appears that by not
applying-test-install-makefile you've disabled the dbus-glib-tests
package.
> deleted file mode 100644
> index c1bb06a..000
> --- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -require dbus-glib.inc
> -
> -
> -SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
> -SRC_URI[sha256sum] =
> "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
> diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb
> b/meta/recipes-core/dbus/dbus-glib_0.102.bb
> new file mode 100644
> index 000..28e8a72
> --- /dev/null
> +++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
> @@ -0,0 +1,8 @@
> +require dbus-glib.inc
> +
> +SRC_URI =
> "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
> + file://no-examples.patch \
> +"
> +
> +SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
> +SRC_URI[sha256sum] =
> "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
Please use -M so renames are expressed as a change, instead of a
delete and a creation.
Ross
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE
On Wednesday 16 July 2014 22:08:13 Ross Burton wrote: > If INCOMPATIBLE_LICENSE=GPLv3.0 but the recipe sets LICENSE=GPLv3, the Pedantic, but INCOMPATIBLE_LICENSE = "GPL-3.0" surely? 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
[OE-core] [PATCH] scripts/test-remote-image: use the scriptpath module
Use the scripts/lib/scriptpath module in order to standardize the adding of
bitbake/lib and meta/lib to sys.path.
Signed-off-by: Corneliu Stoicescu
---
scripts/test-remote-image | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/scripts/test-remote-image b/scripts/test-remote-image
index 8120a62..f3a44eb 100755
--- a/scripts/test-remote-image
+++ b/scripts/test-remote-image
@@ -32,8 +32,15 @@ import logging
import shutil
from abc import ABCMeta, abstractmethod
+# Add path to scripts/lib in sys.path;
+scripts_path = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])))
+lib_path = scripts_path + '/lib'
+sys.path = sys.path + [lib_path]
+
+import scriptpath
+
# Add meta/lib to sys.path
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', 'meta/lib')))
+scriptpath.add_oe_lib_path()
import oeqa.utils.ftools as ftools
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
@@ -43,7 +50,10 @@ for path in get_bb_var('BBPATH').split(":"):
sys.path.insert(0, os.path.abspath(os.path.join(path, 'lib')))
# In order to import modules that contain target controllers, we need the
bitbake libraries in sys.path .
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', 'bitbake/lib')))
+bitbakepath = scriptpath.add_bitbake_lib_path()
+if not bitbakepath:
+sys.stderr.write("Unable to find bitbake by searching parent directory of
this script or PATH\n")
+sys.exit(1)
# create a logger
def logger_create():
--
1.8.3.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On Thu, Jul 17, 2014 at 2:58 AM, Chong Lu wrote:
>
> On 07/17/2014 10:13 AM, Bruce Ashfield wrote:
>>
>> On Wed, Jul 16, 2014 at 9:43 PM, Chong Lu wrote:
>>>
>>> On 07/16/2014 09:04 PM, Bruce Ashfield wrote:
On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu
wrote:
>
> Fix incorrect paths to split perf package.
Can you elaborate here ? This commit message doesn't really tell us
much.
Why is the current split incorrect ? What is the symptom and result of
the
incorrect split ? Are the package contents the same after this change ?
Bruce
>>>
>>> Hi Bruce,
>>>
>>> Currently, perf can't split to perf-archive, perf-tests, perf-python and
>>> perf-perl.
>>> All files are included in perf package. For example, like perf-tests
>>> package:
>>> It generates files in '${exec_prefix}/libexec/perf-core/tests', not in
>>> '${libdir}/perf/perf-core/tests'.
>>> So I change the files paths to make split successfully.
>>
>> But that means, whether or not we like it, anything using perf has been
>> using
>> those "non splits" and getting everything when perf is installed.
>>
>> It's also might be in order to make the main perf package RDEPEND on
>> the other three, to keep it consistent. Make it a ?= so it can be
>> overridden,
>> and then we can age it out over time.
>>
>> Bruce
>
> Do you mean we should set RDEPENDS like:
> RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
>
> In perf.bb file, we have RDEPENDS_${PN} += "elfutils", so I think we should
> use
> RDEPENDS_${PN} += "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
> to keep it consistent. Do you agree?
Consistency is one thing, but it won't allow the split package to be
easily dropped,
so I'd still suggest that the ?= would make it easier to override.
Bruce
>
> Or, we can also revert following commit to make all files in perf package.
> commit 36c3e923df85e685b707fe6bd84b053a5e366fe4
> Author: Henning Heinold
> Date: Mon Jun 9 23:21:29 2014 +0200
>
> perf: split packging
>
> Best Regards
> Chong
>
>
>>> I will improve commit message and resend a V2.
>>>
>>> Best Regards
>>> Chong
>>>
> Signed-off-by: Chong Lu
> ---
>meta/recipes-kernel/perf/perf.bb | 8
>1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb
> b/meta/recipes-kernel/perf/perf.bb
> index 20968f9..781a738 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -166,10 +166,10 @@ RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests
> ${RSUGGESTS_SCRIPTING}"
>
>FILES_${PN} += "${libexecdir}/perf-core
> ${exec_prefix}/libexec/perf-core ${libdir}/traceevent"
>FILES_${PN}-dbg += "${libdir}/python*/site-packages/.debug"
> -FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
> -FILES_${PN}-tests = "${libdir}/perf/perf-core/tests"
> -FILES_${PN}-python = "${libdir}/python*/site-packages
> ${libdir}/perf/perf-core/scripts/python"
> -FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl"
> +FILES_${PN}-archive = "${exec_prefix}/libexec/perf-core/perf-archive"
> +FILES_${PN}-tests = "${exec_prefix}/libexec/perf-core/tests"
> +FILES_${PN}-python = "${libdir}/python*/site-packages
> ${exec_prefix}/libexec/perf-core/scripts/python"
> +FILES_${PN}-perl = "${exec_prefix}/libexec/perf-core/scripts/perl"
>
>
>INHIBIT_PACKAGE_DEBUG_SPLIT="1"
> --
> 1.9.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts/oe-selftest: add command-line parsing and options
[YOCTO #6453]
Signed-off-by: Corneliu Stoicescu
---
scripts/oe-selftest | 81 +++--
1 file changed, 53 insertions(+), 28 deletions(-)
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 8c4ea92..2332b22 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -29,6 +29,7 @@ import os
import sys
import unittest
import logging
+import argparse
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', 'meta/lib')))
@@ -58,6 +59,16 @@ def logger_create():
log = logger_create()
+def get_args_parser():
+description = "Script that runs unit tests agains bitbake and other Yocto
related tools. The goal is to validate tools functionality and metadata
integrity. Refer to https://wiki.yoctoproject.org/wiki/Oe-selftest for more
information."
+parser = argparse.ArgumentParser(description=description)
+group = parser.add_mutually_exclusive_group(required=True)
+group.add_argument('--run-tests', required=False, action='store',
nargs='*', dest="run_tests", default=None, help='Select what tests to run
(modules, classes or test methods). Format should be:
..')
+group.add_argument('--run-all-tests', required=False, action="store_true",
dest="run_all_tests", default=False, help='Run all (unhidden) tests')
+group.add_argument('--list-modules', required=False, action="store_true",
dest="list_modules", default=False, help='List all available test modules.')
+return parser
+
+
def preflight_check():
log.info("Checking that everything is in order before running the tests")
@@ -108,13 +119,13 @@ def remove_inc_files():
except OSError as e:
pass
-def get_tests():
+def get_tests(exclusive_modules=[], include_hidden=False):
testslist = []
-for x in sys.argv[1:]:
+for x in exclusive_modules:
testslist.append('oeqa.selftest.' + x)
if not testslist:
testpath = os.path.abspath(os.path.dirname(oeqa.selftest.__file__))
-files = sorted([f for f in os.listdir(testpath) if f.endswith('.py')
and not f.startswith('_') and f != 'base.py'])
+files = sorted([f for f in os.listdir(testpath) if f.endswith('.py')
and not (f.startswith('_') and not include_hidden) and not f.startswith('__')
and f != 'base.py'])
for f in files:
module = 'oeqa.selftest.' + f[:-3]
testslist.append(module)
@@ -122,32 +133,46 @@ def get_tests():
return testslist
def main():
-if not preflight_check():
-return 1
-
-testslist = get_tests()
-suite = unittest.TestSuite()
-loader = unittest.TestLoader()
-loader.sortTestMethodsUsing = None
-runner = unittest.TextTestRunner(verbosity=2)
-# we need to do this here, otherwise just loading the tests
-# will take 2 minutes (bitbake -e calls)
-oeSelfTest.testlayer_path = get_test_layer()
-for test in testslist:
-log.info("Loading tests from: %s" % test)
-try:
-suite.addTests(loader.loadTestsFromName(test))
-except AttributeError as e:
-log.error("Failed to import %s" % test)
-log.error(e)
+parser = get_args_parser()
+args = parser.parse_args()
+
+if args.list_modules:
+log.info('Listing all available test modules:')
+testslist = get_tests(include_hidden=True)
+for test in testslist:
+module = test.split('.')[-1]
+info = ''
+if module.startswith('_'):
+info = ' (hidden)'
+print module + info
+
+if args.run_tests or args.run_all_tests:
+if not preflight_check():
+return 1
+
+testslist = get_tests(exclusive_modules=(args.run_tests or []),
include_hidden=False)
+suite = unittest.TestSuite()
+loader = unittest.TestLoader()
+loader.sortTestMethodsUsing = None
+runner = unittest.TextTestRunner(verbosity=2)
+# we need to do this here, otherwise just loading the tests
+# will take 2 minutes (bitbake -e calls)
+oeSelfTest.testlayer_path = get_test_layer()
+for test in testslist:
+log.info("Loading tests from: %s" % test)
+try:
+suite.addTests(loader.loadTestsFromName(test))
+except AttributeError as e:
+log.error("Failed to import %s" % test)
+log.error(e)
+return 1
+add_include()
+result = runner.run(suite)
+log.info("Finished")
+if result.wasSuccessful():
+return 0
+else:
return 1
-add_include()
-result = runner.run(suite)
-log.info("Finished")
-if result.wasSuccessful():
-return 0
-else:
-return 1
if __name__ == "__main__":
try:
--
1.8.3.2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembe
Re: [OE-core] [PATCH] perl: strip RPATH from libxml-parser-perl Expat.so
On Wed, 2014-07-16 at 22:12 -0300, João Henrique Ferreira de Freitas wrote: > Em 16-07-2014 05:33, Richard Purdie escreveu: > > On Wed, 2014-07-16 at 00:00 -0300, João Henrique Ferreira de Freitas > > wrote: > > I've seen this happen before with a half built perl recipe where you've > > switched machines half way through a build of perl. Stripping out the > > RPATH is not the right fix though. > > > > Cheers, > > > > Richard > > > > > > I agree. And what is the right way to fix it? > > Is an issue from perl recipes ? I want to get an start point. First we need to understand the problem exactly. Do you have a reproducer that always works? I'm not sure how to fix it at this point, we need to work on understanding it first. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
On Thu, 2014-07-17 at 13:39 +0100, Richard Purdie wrote: > On Thu, 2014-07-17 at 12:46 +0100, Jack Mitchell wrote: > > Failed with gnutls config.log: http://ix.io/dr4 > > That is helpful: > > configure:35748: checking for libgnutls > configure:35772: i586-oe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 > -mfpmath=sse > --sysroot=/home/jack/Work/oe-core.git/test-build/tmp-eglibc/sysroots/cbnlcomexpress > -o conftest -O2 -pipe -g -feliminate-unused-debug-types -Wl,-O1 > -Wl,--hash-style=gnu -Wl,--as-needed conftest.c /usr/lib/libgnutls.so -lz >&5 > /usr/lib/libgnutls.so: error adding symbols: File in wrong format > collect2: error: ld returned 1 exit status > configure:35772: $? = 1 > > So why on earth is it looking at /usr/lib/libgnutls.so? Total guess by try adding EXTRA_OECONF += "--without-libgnutls-prefix" Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] dbus: dbus update to 1.8.6
dbus: dbus update to 1.8.6
Dbus and dbus-test updated to version 1.8.6, dbus-glib updated to
version 0.102. Removed recipes and files from previous version(s).
Current version fixes two DoS vulnerabilities in dbus-daemon (CVE-2014-3532).
Upstream-Status: Submitted
Signed-off-by: Daniel BORNAZ
renamed:meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
-> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
deleted:meta/recipes-core/dbus/dbus-glib_0.100.2.bb
new file: meta/recipes-core/dbus/dbus-glib_0.102.bb
renamed:meta/recipes-core/dbus/dbus-test_1.8.2.bb ->
meta/recipes-core/dbus/dbus-test_1.8.6.bb
deleted:meta/recipes-core/dbus/dbus_1.8.2.bb
new file: meta/recipes-core/dbus/dbus_1.8.6.bb
---
.../dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/no-examples.patch | 0
.../obsolete_automake_macros.patch| 0
.../test-install-makefile.patch | 0
meta/recipes-core/dbus/dbus-glib_0.100.2.bb | 5 -
meta/recipes-core/dbus/dbus-glib_0.102.bb | 8
meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} | 3 +--
meta/recipes-core/dbus/dbus_1.8.2.bb | 4
meta/recipes-core/dbus/dbus_1.8.6.bb | 4
8 files changed, 13 insertions(+), 11 deletions(-)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/no-examples.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/obsolete_automake_macros.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/test-install-makefile.patch (100%)
delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.100.2.bb
create mode 100644 meta/recipes-core/dbus/dbus-glib_0.102.bb
rename meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} (93%)
delete mode 100644 meta/recipes-core/dbus/dbus_1.8.2.bb
create mode 100644 meta/recipes-core/dbus/dbus_1.8.6.bb
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
similarity index 100%
rename from
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
deleted file mode 100644
index c1bb06a..000
--- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dbus-glib.inc
-
-
-SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
-SRC_URI[sha256sum] =
"a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb
b/meta/recipes-core/dbus/dbus-glib_0.102.bb
new file mode 100644
index 000..28e8a72
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
@@ -0,0 +1,8 @@
+require dbus-glib.inc
+
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://no-examples.patch \
+"
+
+SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
+SRC_URI[sha256sum] =
"6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.2.bb
rename to meta/recipes-core/dbus/dbus-test_1.8.6.bb
index e19d2e9..53c5d9a 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
@@ -18,8 +18,7 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068"
-SRC_URI[sha256sum] =
"5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08"
+SRC_URI[md5sum] = "6a08
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
On Thu, 2014-07-17 at 12:46 +0100, Jack Mitchell wrote: > Failed with gnutls config.log: http://ix.io/dr4 That is helpful: configure:35748: checking for libgnutls configure:35772: i586-oe-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/home/jack/Work/oe-core.git/test-build/tmp-eglibc/sysroots/cbnlcomexpress -o conftest -O2 -pipe -g -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed conftest.c /usr/lib/libgnutls.so -lz >&5 /usr/lib/libgnutls.so: error adding symbols: File in wrong format collect2: error: ld returned 1 exit status configure:35772: $? = 1 So why on earth is it looking at /usr/lib/libgnutls.so? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu: security patch for CVE-2014-3471
Qemu PCIe bus support is vulnerable to a use-after-free flaw. It could
occur via guest, when it tries to hotplug/hotunplug devices on the
guest.
A user able to add & delete Virtio block devices on a guest could use
this flaw to crash the Qemu instance resulting in DoS.
Originated-by: Marcel Apfelbaum
Updated the qemu recipe to include the security patch.
Upstream-Status: Submitted
Signed-off-by: Daniel BORNAZ
---
.../qemu/files/pcie_better_hotplug_support.patch | 74 ++
meta/recipes-devtools/qemu/qemu_2.0.0.bb | 6 +-
2 files changed, 79 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/qemu/files/pcie_better_hotplug_support.patch
diff --git a/meta/recipes-devtools/qemu/files/pcie_better_hotplug_support.patch
b/meta/recipes-devtools/qemu/files/pcie_better_hotplug_support.patch
new file mode 100644
index 000..c7035b2
--- /dev/null
+++ b/meta/recipes-devtools/qemu/files/pcie_better_hotplug_support.patch
@@ -0,0 +1,74 @@
+The current code is broken: it does surprise removal which crashes guests.
+
+Reimplemented the steps:
+ - Hotplug triggers both 'present detect change' and
+ 'attention button pressed'.
+
+ - Hotunplug starts by triggering 'attention button pressed',
+ then waits for the OS to power off the device and only
+ then detaches it.
+
+Fixes CVE-2014-3471.
+
+Originated-by: Marcel Apfelbaum
+Updated-by: Daniel BORNAZ
+
+--- a/hw/pci/pcie.c2014-04-17 15:44:44.0 +0200
b/hw/pci/pcie.c2014-07-15 13:03:16.905070562 +0200
+@@ -258,7 +258,8 @@ void pcie_cap_slot_hotplug_cb(HotplugHan
+
+ pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
+PCI_EXP_SLTSTA_PDS);
+-pcie_cap_slot_event(PCI_DEVICE(hotplug_dev), PCI_EXP_HP_EV_PDC);
++pcie_cap_slot_event(PCI_DEVICE(hotplug_dev),
++PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP);
+ }
+
+ void pcie_cap_slot_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState
*dev,
+@@ -268,10 +269,7 @@ void pcie_cap_slot_hot_unplug_cb(Hotplug
+
+ pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap,
errp);
+
+-object_unparent(OBJECT(dev));
+-pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTSTA,
+- PCI_EXP_SLTSTA_PDS);
+-pcie_cap_slot_event(PCI_DEVICE(hotplug_dev), PCI_EXP_HP_EV_PDC);
++pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev));
+ }
+
+ /* pci express slot for pci express root/downstream port
+@@ -352,6 +350,11 @@ void pcie_cap_slot_reset(PCIDevice *dev)
+ hotplug_event_update_event_status(dev);
+ }
+
++static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
++{
++object_unparent(OBJECT(dev));
++}
++
+ void pcie_cap_slot_write_config(PCIDevice *dev,
+ uint32_t addr, uint32_t val, int len)
+ {
+@@ -376,6 +379,22 @@ void pcie_cap_slot_write_config(PCIDevic
+ sltsta);
+ }
+
++/*
++ * If the slot is polulated, power indicator is off and power
++ * controller is off, it is safe to detach the devices.
++ */
++if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) &&
++((val & PCI_EXP_SLTCTL_PIC_OFF) == PCI_EXP_SLTCTL_PIC_OFF)) {
++PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(dev));
++pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
++pcie_unplug_device, NULL);
++
++pci_word_test_and_clear_mask(exp_cap + PCI_EXP_SLTSTA,
++ PCI_EXP_SLTSTA_PDS);
++pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
++ PCI_EXP_SLTSTA_PDC);
++}
++
+ hotplug_event_notify(dev);
+
+ /*
diff --git a/meta/recipes-devtools/qemu/qemu_2.0.0.bb
b/meta/recipes-devtools/qemu/qemu_2.0.0.bb
index b8ce624..9a530a6 100644
--- a/meta/recipes-devtools/qemu/qemu_2.0.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.0.0.bb
@@ -4,7 +4,11 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
SRC_URI += "file://qemu-enlarge-env-entry-size.patch \
-file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch"
+file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
+file://pcie_better_hotplug_support.patch \
+"
+
+
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2";
SRC_URI[md5sum] = "2790f44fd76da5de5024b4aafeb594c2"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dbus: dbus update to 1.8.6
dbus: dbus update to 1.8.6
Dbus and dbus-test updated to version 1.8.6, dbus-glib updated to
version 0.102. Removed recipes and files from previous version(s).
Current version fixes two DoS vulnerabilities in dbus-daemon (CVE-2014-3532).
Signed-off-by: Daniel BORNAZ
renamed:meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
-> meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
renamed:
meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch ->
meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
deleted:meta/recipes-core/dbus/dbus-glib_0.100.2.bb
new file: meta/recipes-core/dbus/dbus-glib_0.102.bb
renamed:meta/recipes-core/dbus/dbus-test_1.8.2.bb ->
meta/recipes-core/dbus/dbus-test_1.8.6.bb
deleted:meta/recipes-core/dbus/dbus_1.8.2.bb
new file: meta/recipes-core/dbus/dbus_1.8.6.bb
---
.../dbus/{dbus-glib-0.100.2 => dbus-glib-0.102}/no-examples.patch | 0
.../obsolete_automake_macros.patch| 0
.../test-install-makefile.patch | 0
meta/recipes-core/dbus/dbus-glib_0.100.2.bb | 5 -
meta/recipes-core/dbus/dbus-glib_0.102.bb | 8
meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} | 3 +--
meta/recipes-core/dbus/dbus_1.8.2.bb | 4
meta/recipes-core/dbus/dbus_1.8.6.bb | 4
8 files changed, 13 insertions(+), 11 deletions(-)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/no-examples.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/obsolete_automake_macros.patch (100%)
rename meta/recipes-core/dbus/{dbus-glib-0.100.2 =>
dbus-glib-0.102}/test-install-makefile.patch (100%)
delete mode 100644 meta/recipes-core/dbus/dbus-glib_0.100.2.bb
create mode 100644 meta/recipes-core/dbus/dbus-glib_0.102.bb
rename meta/recipes-core/dbus/{dbus-test_1.8.2.bb => dbus-test_1.8.6.bb} (93%)
delete mode 100644 meta/recipes-core/dbus/dbus_1.8.2.bb
create mode 100644 meta/recipes-core/dbus/dbus_1.8.6.bb
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/no-examples.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
similarity index 100%
rename from
meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/obsolete_automake_macros.patch
diff --git
a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
b/meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
similarity index 100%
rename from meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
rename to meta/recipes-core/dbus/dbus-glib-0.102/test-install-makefile.patch
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
deleted file mode 100644
index c1bb06a..000
--- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require dbus-glib.inc
-
-
-SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
-SRC_URI[sha256sum] =
"a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb
b/meta/recipes-core/dbus/dbus-glib_0.102.bb
new file mode 100644
index 000..28e8a72
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
@@ -0,0 +1,8 @@
+require dbus-glib.inc
+
+SRC_URI =
"http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://no-examples.patch \
+"
+
+SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
+SRC_URI[sha256sum] =
"6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.2.bb
rename to meta/recipes-core/dbus/dbus-test_1.8.6.bb
index e19d2e9..53c5d9a 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.2.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.8.6.bb
@@ -18,8 +18,7 @@ SRC_URI =
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
-SRC_URI[md5sum] = "d6f709bbec0a022a1847c7caec9d6068"
-SRC_URI[sha256sum] =
"5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08"
+SRC_URI[md5sum] = "6a08ba555d340e9dfe2d623b83c0eea8
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
Failed with gnutls config.log: http://ix.io/dr4 On 17/07/14 12:39, Jack Mitchell wrote: > config.log: http://ix.io/dr3 > > and yes, gnutls is being built, or at least it's in the work dir. > > [jack@jackArch gnutls]$ pwd > /home/jack/Work/oe-core.git/test-build/tmp-eglibc/work/core2-32-oe-linux/gnutls > [jack@jackArch gnutls]$ ls > 2.12.23-r8.4 3.2.13-r0 3.2.15-r0 3.3.5-r0 > [jack@jackArch gnutls]$ > > On 17/07/14 12:33, Richard Purdie wrote: >> On Thu, 2014-07-17 at 12:06 +0100, Jack Mitchell wrote: >>> So this error is still blocking my master build, any ideas? >> Share the config.log so we can see how the configure test is failing? Is >> gnutls actually built and in the sysroot or not? >> >> Cheers, >> >> Richard >> > > -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
Wait, that config.log is bad. It's from my build with the patch reverted. Hold up I'll get the proper one out. On 17/07/14 12:39, Jack Mitchell wrote: > config.log: http://ix.io/dr3 > > and yes, gnutls is being built, or at least it's in the work dir. > > [jack@jackArch gnutls]$ pwd > /home/jack/Work/oe-core.git/test-build/tmp-eglibc/work/core2-32-oe-linux/gnutls > [jack@jackArch gnutls]$ ls > 2.12.23-r8.4 3.2.13-r0 3.2.15-r0 3.3.5-r0 > [jack@jackArch gnutls]$ > > On 17/07/14 12:33, Richard Purdie wrote: >> On Thu, 2014-07-17 at 12:06 +0100, Jack Mitchell wrote: >>> So this error is still blocking my master build, any ideas? >> Share the config.log so we can see how the configure test is failing? Is >> gnutls actually built and in the sysroot or not? >> >> Cheers, >> >> Richard >> > > -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
config.log: http://ix.io/dr3 and yes, gnutls is being built, or at least it's in the work dir. [jack@jackArch gnutls]$ pwd /home/jack/Work/oe-core.git/test-build/tmp-eglibc/work/core2-32-oe-linux/gnutls [jack@jackArch gnutls]$ ls 2.12.23-r8.4 3.2.13-r0 3.2.15-r0 3.3.5-r0 [jack@jackArch gnutls]$ On 17/07/14 12:33, Richard Purdie wrote: > On Thu, 2014-07-17 at 12:06 +0100, Jack Mitchell wrote: >> So this error is still blocking my master build, any ideas? > Share the config.log so we can see how the configure test is failing? Is > gnutls actually built and in the sysroot or not? > > Cheers, > > Richard > -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer Cambridgeshire, UK http://www.embed.me.uk -- -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
On Thu, 2014-07-17 at 12:06 +0100, Jack Mitchell wrote: > So this error is still blocking my master build, any ideas? Share the config.log so we can see how the configure test is failing? Is gnutls actually built and in the sysroot or not? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/2] python-distribute: add nativesdk to BBCLASSEXTEND
On Wed, Jul 16, 2014 at 9:50 PM, João Henrique Ferreira de Freitas
wrote:
> Em 15-07-2014 10:35, Otavio Salvador escreveu:
>> On Mon, Jul 14, 2014 at 7:55 PM, João Henrique Ferreira de Freitas
>> wrote:
>>>
>>> Without this, python tools that need python-distribute doesn't install
>>> in SDK generated by OE.
>>>
>>> Signed-off-by: João Henrique Ferreira de Freitas
>>> ---
>>> meta/recipes-devtools/python/python-distribute_0.6.32.bb | 8 +++-
>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
>>> b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
>>> index 58bb8b4..7000145 100644
>>> --- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb
>>> +++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb
>>> @@ -39,6 +39,12 @@ do_install_append() {
>>> echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
>>> ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
>>> }
>>>
>>> +do_install_append_class-nativesdk() {
>>> + sed -i -e '1s|^#!.*|#!/usr/bin/env python|'
>>> ${D}${PYTHON_SITEPACKAGES_DIR}/distribute-${PV}-py${PYTHON_BASEVERSION}.egg/setuptools/tests/test_resources.py
>>> + sed -i -e '1s|^#!.*|#!/usr/bin/env python|'
>>> ${D}${bindir}/easy_install
>>> + sed -i -e '1s|^#!.*|#!/usr/bin/env python|'
>>> ${D}${bindir}/easy_install-${PYTHON_BASEVERSION}
>>> +}
>>
>> Couldn't this be done unconditionally for all target types?
>> "/usr/bin/env python" should work fine in target as well, no?
>>
> I don't know if I fully understood your question...
>
>
> Do you mean by 'all target types' like native, nativesdk ?
Yes. To do it in do_install_append and change it for all targets ...
> In some recipes (gnome-doc-utils.inc, createrepo_0.4.11.bb) , this pattern
> was used:
>
>
> # Wrap the python script since the native python is
> # ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't
> # find it since it is not in PATH.
> do_install_append_class-native () {
> ...
> sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' $i
> ...
> }
>
>
> Sometimes I feel really lost when need to fixes things like that. What is
> the correct way?
I think the above answer my question, it need to be nativepython for
native so it indeed must to be different.
> Without do_install_append_class-nativesdk() I got:
>
> Computing transaction...error: Can't install
> nativesdk-python-distribute-0.6.32-ml5@x86_64_nativesdk: no package provides
> /usr/bin/python
Your fix is fine than. Sorry for the noise :-)
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] State of bitbake world, test-dependencies 2014-06-27
On Thu, 2014-07-17 at 10:47 +0200, Martin Jansa wrote: > ttf-arphic-uming-20080216: ttf-arphic-uming rdepends on fontconfig-utils but > its not a build dependency? > ttf-bitstream-vera-1.10: ttf-bitstream-vera rdepends on fontconfig-utils but > its not a build dependency? > ttf-dejavu-2.23: ttf-dejavu-sans rdepends on fontconfig-utils but its not a > build dependency? > ttf-dejavu-2.23: ttf-dejavu-sans-condensed rdepends on fontconfig-utils but > its not a build dependency? > ttf-dejavu-2.23: ttf-dejavu-sans-mono rdepends on fontconfig-utils but its > not a build dependency? > ttf-dejavu-2.23: ttf-dejavu-serif rdepends on fontconfig-utils but its not a > build dependency? > ttf-dejavu-2.23: ttf-dejavu-serif-condensed rdepends on fontconfig-utils but > its not a build dependency? > ttf-droid-0.1+gitrAUTOINC+21e6e2de1f: ttf-droid-sans rdepends on > fontconfig-utils but its not a build dependency? > ttf-droid-0.1+gitrAUTOINC+21e6e2de1f: ttf-droid-sans-fallback rdepends on > fontconfig-utils but its not a build dependency? > ttf-droid-0.1+gitrAUTOINC+21e6e2de1f: ttf-droid-sans-japanese rdepends on > fontconfig-utils but its not a build dependency? > ttf-droid-0.1+gitrAUTOINC+21e6e2de1f: ttf-droid-sans-mono rdepends on > fontconfig-utils but its not a build dependency? > ttf-droid-0.1+gitrAUTOINC+21e6e2de1f: ttf-droid-serif rdepends on > fontconfig-utils but its not a build dependency? > ttf-gentium-1.02: ttf-gentium rdepends on fontconfig-utils but its not a > build dependency? > ttf-gentium-1.02: ttf-gentium-alt rdepends on fontconfig-utils but its not a > build dependency? > ttf-hunkyfonts-0.3.0: ttf-hunky-sans rdepends on fontconfig-utils but its not > a build dependency? > ttf-hunkyfonts-0.3.0: ttf-hunky-serif rdepends on fontconfig-utils but its > not a build dependency? > ttf-inconsolata-20100526: ttf-inconsolata rdepends on fontconfig-utils but > its not a build dependency? > ttf-liberation-0.2: ttf-liberation-mono rdepends on fontconfig-utils but its > not a build dependency? > ttf-liberation-0.2: ttf-liberation-sans rdepends on fontconfig-utils but its > not a build dependency? > ttf-liberation-0.2: ttf-liberation-serif rdepends on fontconfig-utils but its > not a build dependency? > ttf-mplus-027: ttf-mplus-1c-black rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-black rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1c-bold rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-bold rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1c-heavy rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-heavy rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1c-light rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-light rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1c-medium rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-medium rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1c-regular rdepends on fontconfig-utils but its not > a build dependency? > ttf-mplus-027: ttf-mplus-1c-regular rdepends on ttf-common but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-thin rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1c-thin rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1m-bold rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1m-bold rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1m-light rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1m-light rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1m-medium rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1m-medium rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1m-regular rdepends on fontconfig-utils but its not > a build dependency? > ttf-mplus-027: ttf-mplus-1m-regular rdepends on ttf-common but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1m-thin rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1m-thin rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1mn-bold rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1mn-bold rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1mn-light rdepends on fontconfig-utils but its not a > build dependency? > ttf-mplus-027: ttf-mplus-1mn-light rdepends on ttf-common but its not a build > dependency? > ttf-mplus-027: ttf-mplus-1mn-
Re: [OE-core] [PATCH] wget: use GnuTLS instead of OpenSSL
So this error is still blocking my master build, any ideas?
On 04/07/14 10:08, Jack Mitchell wrote:
> Ross,
>
> I've just pulled this in today after being on holiday for a while and it
> causes a breakage on my system.
>
> | checking for libgnutls... no
> | configure: error: --with-ssl=gnutls was given, but GNUTLS is not
> available.
> | Configure failed. The contents of all config.log files follows to aid
> debugging
>
> log: http://ix.io/dfO
>
> I would have expected gnutls to have been pulled in through the depends
> but it obviously hasn't, or the system hasn't managed to find it...
>
> Any ideas?
>
> Cheers,
> On 16/06/14 11:52, Ross Burton wrote:
>> OpenSSL has license complications and GnuTLS is preferred, so although the
>> license complications don't impact wget use GnuTLS for consistency.
>>
>> Also add a recommendation on ca-certificates so that https: URLs work.
>>
>> Signed-off-by: Ross Burton
>> ---
>> meta/recipes-extended/wget/wget.inc |7 ---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/wget/wget.inc
>> b/meta/recipes-extended/wget/wget.inc
>> index a778bca..642d502 100644
>> --- a/meta/recipes-extended/wget/wget.inc
>> +++ b/meta/recipes-extended/wget/wget.inc
>> @@ -3,15 +3,16 @@ HOMEPAGE = "https://www.gnu.org/software/wget/";
>> SECTION = "console/network"
>> LICENSE = "GPLv3"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>> -DEPENDS = "openssl zlib libpcre"
>> +DEPENDS = "gnutls zlib libpcre"
>>
>> INC_PR = "r16"
>>
>> inherit autotools gettext texinfo update-alternatives
>>
>> -EXTRA_OECONF = "--enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \
>> ---with-ssl=openssl --disable-rpath --disable-iri \
>> +EXTRA_OECONF = "--enable-ipv6 --with-ssl=gnutls --disable-rpath
>> --disable-iri \
>> ac_cv_header_uuid_uuid_h=no"
>>
>> ALTERNATIVE_${PN} = "wget"
>> ALTERNATIVE_PRIORITY = "100"
>> +
>> +RRECOMMENDS_${PN} += "ca-certificates"
>>
>
>
--
Jack Mitchell (j...@embed.me.uk)
Embedded Systems Engineer
Cambridgeshire, UK
http://www.embed.me.uk
--
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqs/selftest: Added test case decorators for toaster
Signed-off-by: Lucian Musat
---
meta/lib/oeqa/selftest/_toaster.py | 94 ++
1 file changed, 64 insertions(+), 30 deletions(-)
diff --git a/meta/lib/oeqa/selftest/_toaster.py
b/meta/lib/oeqa/selftest/_toaster.py
index 5a42e93..1cf28a0 100644
--- a/meta/lib/oeqa/selftest/_toaster.py
+++ b/meta/lib/oeqa/selftest/_toaster.py
@@ -14,6 +14,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE",
"toastermain.settings")
import toastermain.settings
from django.db.models import Q
from orm.models import *
+from oeqa.utils.decorators import testcase
class ToasterSetup(oeSelfTest):
@@ -31,19 +32,22 @@ class ToasterSetup(oeSelfTest):
class Toaster_DB_Tests(ToasterSetup):
# Check if build name is unique - tc_id=795
-def test_Build_Unique_Name_TC795(self):
+@testcase(795)
+def test_Build_Unique_Name(self):
all_builds = Build.objects.all().count()
distinct_builds = Build.objects.values('id').distinct().count()
self.assertEqual(distinct_builds, all_builds, msg = 'Build name is not
unique')
# Check if build coocker log path is unique - tc_id=819
-def test_Build_Unique_Cooker_Log_Path_TC819(self):
+@testcase(819)
+def test_Build_Unique_Cooker_Log_Path(self):
distinct_path =
Build.objects.values('cooker_log_path').distinct().count()
total_builds = Build.objects.values('id').count()
self.assertEqual(distinct_path, total_builds, msg = 'Build coocker log
path is not unique')
# Check if the number of errors matches the number of orm_logmessage.level
entries with value 2 - tc_id=820
-def test_Build_Errors_No_TC820(self):
+@testcase(820)
+def test_Build_Errors_No(self):
builds = Build.objects.values('id', 'errors_no')
cnt_err = []
for build in builds:
@@ -53,7 +57,8 @@ class Toaster_DB_Tests(ToasterSetup):
self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' %
cnt_err)
# Check if the number of warnings matches the number of
orm_logmessage.level entries with value 1 - tc=821
-def test_Build_Warnings_No_TC821(self):
+@testcase(821)
+def test_Build_Warnings_No(self):
builds = Build.objects.values('id', 'warnings_no')
cnt_err = []
for build in builds:
@@ -63,7 +68,8 @@ class Toaster_DB_Tests(ToasterSetup):
self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' %
cnt_err)
# Check if the build succeeded then the errors_no is 0 - tc_id=822
-def test_Build_Suceeded_Errors_No_TC822(self):
+@testcase(822)
+def test_Build_Suceeded_Errors_No(self):
builds = Build.objects.filter(outcome = 0).values('id', 'errors_no')
cnt_err = []
for build in builds:
@@ -71,8 +77,9 @@ class Toaster_DB_Tests(ToasterSetup):
cnt_err.append(build['id'])
self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' %
cnt_err)
-# Check if task order is unique for one build - tc=824
-def test_Task_Unique_Order_TC824(self):
+# Check if task order is unique for one build - tc=824
+@testcase(824)
+def test_Task_Unique_Order(self):
builds = Build.objects.values('id')
cnt_err = []
for build in builds:
@@ -83,7 +90,8 @@ class Toaster_DB_Tests(ToasterSetup):
self.assertEqual(len(cnt_err), 0, msg = 'Errors for build id: %s' %
cnt_err)
# Check task order sequence for one build - tc=825
-def test_Task_Order_Sequence_TC825(self):
+@testcase(825)
+def test_Task_Order_Sequence(self):
builds = builds = Build.objects.values('id')
cnt_err = []
for build in builds:
@@ -100,7 +108,8 @@ class Toaster_DB_Tests(ToasterSetup):
#def test_Task_Disk_IO_TC828(self):
# Check if outcome = 2 (SSTATE) then sstate_result must be 3 (RESTORED) -
tc=832
-def test_Task_If_Outcome_2_Sstate_Result_Must_Be_3_TC832(self):
+@testcase(832)
+def test_Task_If_Outcome_2_Sstate_Result_Must_Be_3(self):
tasks = Task.objects.filter(outcome = 2).values('id', 'sstate_result')
cnt_err = []
for task in tasks:
@@ -109,7 +118,8 @@ class Toaster_DB_Tests(ToasterSetup):
self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' %
cnt_err)
# Check if outcome = 1 (COVERED) or 3 (EXISTING) then sstate_result must
be 0 (SSTATE_NA) - tc=833
-def test_Task_If_Outcome_1_3_Sstate_Result_Must_Be_0_TC833(self):
+@testcase(833)
+def test_Task_If_Outcome_1_3_Sstate_Result_Must_Be_0(self):
tasks = Task.objects.filter(outcome__in = (1, 3)).values('id',
'sstate_result')
cnt_err = []
for task in tasks:
@@ -118,7 +128,8 @@ class Toaster_DB_Tests(ToasterSetup):
self.assertEqual(len(cnt_err), 0, msg = 'Errors for task id: %s' %
cnt_err)
# Check if outcome is 0 (SUCCESS) or 4 (FAILED) then sstate_result must be
0 (NA), 1 (MISS) or 2 (FAILED) - tc=834
-def test_Task_If_Outcome_0_
[OE-core] [PATCH] _json module arbitrary process memory read vulnerability
python-native: _json module arbitrary process memory read vulnerability
http://bugs.python.org/issue21529
Python 2 and 3 are susceptible to arbitrary process memory reading by
a user or adversary due to a bug in the _json module caused by
insufficient bounds checking.
The sole prerequisites of this attack are that the attacker is able to
control or influence the two parameters of the default scanstring
function: the string to be decoded and the index.
The bug is caused by allowing the user to supply a negative index
value. The index value is then used directly as an index to an array
in the C code; internally the address of the array and its index are
added to each other in order to yield the address of the value that is
desired. However, by supplying a negative index value and adding this
to the address of the array, the processor's register value wraps
around and the calculated value will point to a position in memory
which isn't within the bounds of the supplied string, causing the
function to access other parts of the process memory.
Signed-off-by: Benjamin Peterson
Applied to python-native recipe in order to fix the above mentioned
vulnerability.
Upstream-Status: Submitted
Signed-off-by: Daniel BORNAZ
---
meta/recipes-devtools/python/python-native_2.7.3.bb | 1 +
.../python/python/python-json-flaw-fix.patch | 20
2 files changed, 21 insertions(+)
create mode 100644
meta/recipes-devtools/python/python/python-json-flaw-fix.patch
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb
b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0571d3a..74f0dfc 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -19,6 +19,7 @@ SRC_URI += "\
file://parallel-makeinst-create-bindir.patch \
file://python-fix-build-error-with-Readline-6.3.patch \
file://gcc-4.8-fix-configure-Wformat.patch \
+ file://python-json-flaw-fix.patch \
"
S = "${WORKDIR}/Python-${PV}"
diff --git a/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
b/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
new file mode 100644
index 000..631713d
--- /dev/null
+++ b/meta/recipes-devtools/python/python/python-json-flaw-fix.patch
@@ -0,0 +1,20 @@
+--- a/Modules/_json.c 2014-07-15 15:37:17.151046356 +0200
b/Modules/_json.c 2014-07-15 15:38:37.335605042 +0200
+@@ -1491,7 +1491,7 @@ scan_once_str(PyScannerObject *s, PyObje
+ PyObject *res;
+ char *str = PyString_AS_STRING(pystr);
+ Py_ssize_t length = PyString_GET_SIZE(pystr);
+-if (idx >= length) {
++if ( idx < 0 || idx >= length) {
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
+@@ -1578,7 +1578,7 @@ scan_once_unicode(PyScannerObject *s, Py
+ PyObject *res;
+ Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
+ Py_ssize_t length = PyUnicode_GET_SIZE(pystr);
+-if (idx >= length) {
++if ( idx < 0 || idx >= length) {
+ PyErr_SetNone(PyExc_StopIteration);
+ return NULL;
+ }
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] gettext: fix implicit build result
On 07/17/2014 05:21 PM, Burton, Ross wrote: On 17 July 2014 08:58, Ming Liu wrote: Some "once only" variants are being defined instead of standard autoconf macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The advantage is that the check for each of the headers will be put only once into the 'configure' file, therefore it keeps the size down. But there is also a drawback that the checks then will turn to be statically inserted to the configure and cannot be conditionalized any more. It will definitely break the dependencies chosen as internally included. I'm confused as to why this breaks anything, and if it does break gettext then it's not embedded-specific but an upstream bug in the configure script, surely. Can you explain what the problem is? Yes, I'd like to explain it a little more. AC_CHECK_HEADERS_ONCE will statically add some code to 'configure' file to force checking headers no matter it's in a condition or not. For example: .. if test "$gl_cv_libxml_use_included" != yes; then .. AC_CHECK_HEADERS_ONCE([somehead.h]) .. fi will always check somehead.h even gl_cv_libxml_use_included equal to 'yes', then there will be a problem if we want to choose some dependency, for instance, libxml2, to be internally included, that means not refer to any headers or libraries in system, but oppositely, AC_CHECK_HEADERS_ONCE will pull in the header that it's supposed to check, and that would break the dependency we intended to set. //Ming Liu Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] gettext: fix implicit build result
On 17 July 2014 08:58, Ming Liu wrote: > Some "once only" variants are being defined instead of standard autoconf > macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The > advantage is that the check for each of the headers will be put only once > into the 'configure' file, therefore it keeps the size down. But there > is also a drawback that the checks then will turn to be statically inserted > to the configure and cannot be conditionalized any more. It will > definitely break the dependencies chosen as internally included. I'm confused as to why this breaks anything, and if it does break gettext then it's not embedded-specific but an upstream bug in the configure script, surely. Can you explain what the problem is? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Missing or unbuildable dependency chain was: ['console-image', 'eglibc-gconv']
Hello, I'm trying minimal image but I see this error Please give me advice NOTE: Runtime target 'eglibc-gconv' is unbuildable, removing... Missing or unbuildable dependency chain was: ['eglibc-gconv'] ERROR: Required build target 'console-image' has no buildable providers. Missing or unbuildable dependency chain was: ['console-image', 'eglibc-gconv'] Thanks -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] State of bitbake world, test-dependencies 2014-06-27
On Wed, Jul 16, 2014 at 03:05:03PM +0200, Martin Jansa wrote: > This was incremental build. > > I've sent fix for xfconf which was causing many issues, but there is > still too many of them. This is list of wrong dependencies detected by RP's improved insane_qa patch, it probably still isn't complete: ccid-1.4.8: ccid rdepends on flex but its not a build dependency? dconf-0.18.0: dconf-editor rdepends on libxml2 but its not a build dependency? directfb-1.7.4: directfb rdepends on libdrm but its not a build dependency? directfb-1.7.4: directfb rdepends on libdrm-kms but its not a build dependency? directfb-1.7.4: directfb rdepends on liblzma but its not a build dependency? directfb-1.7.4: directfb rdepends on tiff but its not a build dependency? engrave-0.0.0+svnr82070: engrave rdepends on flex but its not a build dependency? epiphany-2.30.6: epiphany rdepends on libavahi-client but its not a build dependency? epiphany-2.30.6: epiphany rdepends on libavahi-common but its not a build dependency? epiphany-2.30.6: epiphany rdepends on libavahi-gobject but its not a build dependency? epiphany-2.30.6: epiphany rdepends on libnotify but its not a build dependency? evopedia-0.4.2+gitrAUTOINC+36ca70acb4: evopedia rdepends on libbz2 but its not a build dependency? expedite-1.7.9: expedite rdepends on evas-engine-fb but its not a build dependency? expedite-1.7.9: expedite rdepends on evas-engine-software-generic but its not a build dependency? expedite-1.7.9: expedite rdepends on evas-loader-png but its not a build dependency? expedite-1.7.9: expedite rdepends on libsdl but its not a build dependency? gammu-1.32.0: gammu rdepends on glib-2.0 but its not a build dependency? gammu-1.32.0: gammu rdepends on libgudev-1.0 but its not a build dependency? gammu-1.32.0: libgammu rdepends on glib-2.0 but its not a build dependency? gd-2.1.0: gd rdepends on liblzma but its not a build dependency? gd-2.1.0: gd rdepends on tiff but its not a build dependency? gimp-2.8.10: gimp rdepends on libbz2 but its not a build dependency? glade3-3.8.2: glade3 rdepends on dbus-glib but its not a build dependency? glade3-3.8.2: glade3 rdepends on dbus-lib but its not a build dependency? glade3-3.8.2: glade3 rdepends on gconf but its not a build dependency? glade3-3.8.2: glade3 rdepends on gnome-vfs but its not a build dependency? glade3-3.8.2: glade3 rdepends on libart-lgpl but its not a build dependency? glade3-3.8.2: glade3 rdepends on libavahi-client but its not a build dependency? glade3-3.8.2: glade3 rdepends on libavahi-common but its not a build dependency? glade3-3.8.2: glade3 rdepends on libavahi-glib but its not a build dependency? glade3-3.8.2: glade3 rdepends on libbonobo but its not a build dependency? glade3-3.8.2: glade3 rdepends on libbonoboui but its not a build dependency? glade3-3.8.2: glade3 rdepends on libcanberra but its not a build dependency? glade3-3.8.2: glade3 rdepends on libcap but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgcrypt but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgnome but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgnome-keyring but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgnomecanvas but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgnomeui but its not a build dependency? glade3-3.8.2: glade3 rdepends on libgpg-error but its not a build dependency? glade3-3.8.2: glade3 rdepends on libltdl but its not a build dependency? glade3-3.8.2: glade3 rdepends on libogg but its not a build dependency? glade3-3.8.2: glade3 rdepends on libvorbis but its not a build dependency? glade3-3.8.2: glade3 rdepends on orbit2 but its not a build dependency? glade3-3.8.2: glade3 rdepends on popt but its not a build dependency? gmtk-1.0.5: gmtk rdepends on gtk+3 but its not a build dependency? gmtk-1.0.5: gmtk rdepends on json-c but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libcap but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libpulse but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libpulse-mainloop-glib but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libsndfile1 but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libxi but its not a build dependency? gmtk-1.0.5: gmtk rdepends on libxtst but its not a build dependency? gnokii-0.6.31: gnokii rdepends on readline but its not a build dependency? gnokii-0.6.31: libgnokii rdepends on bluez4 but its not a build dependency? gnokii-0.6.31: libgnokii rdepends on libical but its not a build dependency? gnokii-0.6.31: libgnokii rdepends on libusb-compat but its not a build dependency? gnokii-0.6.31: libgnokii rdepends on libusb1 but its not a build dependency? gnokii-0.6.31: libgnokii rdepends on pcsc-lite-lib but its not a build dependency? gnome-disk-utility-2.32.0: gnome-disk-utility-libs rdepends on libgnome-keyring but its not a build dependency? gtksourceview2-2.10.5: gtksourceview2 rdepends on lib
[OE-core] [PATCH 3/3] gettext: fix implicit build result
Some "once only" variants are being defined instead of standard autoconf
macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The
advantage is that the check for each of the headers will be put only once
into the 'configure' file, therefore it keeps the size down. But there
is also a drawback that the checks then will turn to be statically inserted
to the configure and cannot be conditionalized any more. It will
definitely break the dependencies chosen as internally included.
Turns AC_CHECK_HEADERS_ONCE back to AC_CHECK_HEADERS for those cases.
Signed-off-by: Ming Liu
---
.../fix-absolute-header-macro.patch| 28 ++
meta/recipes-core/gettext/gettext_0.18.3.2.bb | 3 ++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
diff --git
a/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
b/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
new file mode 100644
index 000..7b6935f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.3.2/fix-absolute-header-macro.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Some "once only" variants are being defined instead of standard autoconf
+macros, for instance, AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS. The
+advantage is that the check for each of the headers will be put only once
+into the 'configure' file, therefore it keeps the size down. But there is
+also a drawback that the checks then will turn to be statically inserted
+to the configure and cannot be conditionalized any more. It will
+definitely break the dependencies chosen as internally included.
+
+Turns AC_CHECK_HEADERS_ONCE back to AC_CHECK_HEADERS for those cases.
+
+Signed-off-by: Ming Liu
+---
+ absolute-header.m4 |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/gettext-tools/gnulib-m4/absolute-header.m4
b/gettext-tools/gnulib-m4/absolute-header.m4
+@@ -29,7 +29,7 @@ m4_foreach_w([gl_HEADER_NAME], [$1],
+ m4_defn([gl_absolute_header]),
+ [AS_VAR_PUSHDEF([ac_header_exists],
+ [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
+-AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
++AC_CHECK_HEADERS(m4_defn([gl_HEADER_NAME]))dnl
+ if test AS_VAR_GET(ac_header_exists) = yes; then
+ gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
+ fi
diff --git a/meta/recipes-core/gettext/gettext_0.18.3.2.bb
b/meta/recipes-core/gettext/gettext_0.18.3.2.bb
index 65d4103..9375e86 100644
--- a/meta/recipes-core/gettext/gettext_0.18.3.2.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.3.2.bb
@@ -11,7 +11,8 @@ PROVIDES = "virtual/libintl virtual/gettext"
PROVIDES_class-native = "virtual/gettext-native"
RCONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
- file://parallel.patch \
+ file://parallel.patch \
+ file://fix-absolute-header-macro.patch \
"
PACKAGECONFIG[msgcat-curses] =
"--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
--
1.8.4.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] gmp: use PACKAGECONFIG to address readline dependency
To avoid automatically detecting readline dependency, which will lead to
a implicit build result.
Signed-off-by: Ming Liu
---
meta/recipes-support/gmp/gmp.inc | 3 +++
meta/recipes-support/gmp/gmp_4.2.1.bb | 3 +++
2 files changed, 6 insertions(+)
diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
index d025e07..6aedc85 100644
--- a/meta/recipes-support/gmp/gmp.inc
+++ b/meta/recipes-support/gmp/gmp.inc
@@ -18,6 +18,9 @@ acpaths = ""
BBCLASSEXTEND = "native nativesdk"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
+
EXTRA_OECONF += " --enable-cxx=detect"
PACKAGES =+ "libgmpxx"
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb
b/meta/recipes-support/gmp/gmp_4.2.1.bb
index 5c93925..69ad0ca 100644
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
@@ -17,4 +17,7 @@ SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
SRC_URI[sha256sum] =
"d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline"
+
inherit autotools texinfo
--
1.8.4.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] flac: explicitly disable checking for nasm
Automatical checking for nasm program will lead flac to a implicit build
result depending on nasm is built before or after it.
Signed-off-by: Ming Liu
---
meta/recipes-multimedia/flac/flac_1.3.0.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-multimedia/flac/flac_1.3.0.bb
b/meta/recipes-multimedia/flac/flac_1.3.0.bb
index ab37cbe..fdf38e9 100644
--- a/meta/recipes-multimedia/flac/flac_1.3.0.bb
+++ b/meta/recipes-multimedia/flac/flac_1.3.0.bb
@@ -28,6 +28,7 @@ EXTRA_OECONF = "--disable-oggtest \
--with-ogg-includes=${STAGING_INCDIR} \
--disable-xmms-plugin \
--without-libiconv-prefix \
+ac_cv_prog_NASM="" \
"
EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "altivec", "
--enable-altivec", " --disable-altivec", d)}"
--
1.8.4.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V5 0/2] shadow: upgrade from 4.1.4.3 to 4.2.1
The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3:
ltp: use "foreign" automake strictness (2014-07-16 10:27:16 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/shadow-4.2.1
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/shadow-4.2.1
Chen Qi (2):
shadow: upgrade from 4.1.4.3 to 4.2.1
oeqa: fix return status in pam.py to match shadow-4.2.1
meta/lib/oeqa/runtime/pam.py |6 +-
...-create-parent-directories-when-necessary.patch | 109 ++
.../shadow/files/add_root_cmd_groupmems.patch | 75 --
.../shadow/files/add_root_cmd_options.patch| 1384
.../allow-for-setting-password-in-clear-text.patch | 215 ++-
...fix-unexpected-open-failure-in-chroot-env.patch | 46 +
.../shadow/files/fix-etc-gshadow-reading.patch | 36 -
...installation-failure-with-subids-disabled.patch | 28 +
.../shadow-4.1.4.2-env-reset-keep-locale.patch | 31 -
.../files/shadow-4.1.4.2-groupmod-pam-check.patch | 36 -
.../files/shadow-4.1.4.2-su_no_sanitize_env.patch | 31 -
.../shadow/files/shadow.automake-1.11.patch| 106 --
.../files/shadow_fix_for_automake-1.12.patch | 23 -
.../files/slackware_fix_for_glib-2.17_crypt.patch | 63 -
meta/recipes-extended/shadow/files/useradd.patch | 17 -
...-compilation-failure-with-subids-disabled.patch | 33 +
...uretty_4.1.4.3.bb => shadow-securetty_4.2.1.bb} |0
...-sysroot_4.1.4.3.bb => shadow-sysroot_4.2.1.bb} |0
meta/recipes-extended/shadow/shadow.inc| 36 +-
.../shadow/{shadow_4.1.4.3.bb => shadow_4.2.1.bb} |0
20 files changed, 336 insertions(+), 1939 deletions(-)
create mode 100644
meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
delete mode 100644
meta/recipes-extended/shadow/files/add_root_cmd_groupmems.patch
delete mode 100644
meta/recipes-extended/shadow/files/add_root_cmd_options.patch
create mode 100644
meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
delete mode 100644
meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
create mode 100644
meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
delete mode 100644
meta/recipes-extended/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch
delete mode 100644
meta/recipes-extended/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch
delete mode 100644
meta/recipes-extended/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch
delete mode 100644
meta/recipes-extended/shadow/files/shadow.automake-1.11.patch
delete mode 100644
meta/recipes-extended/shadow/files/shadow_fix_for_automake-1.12.patch
delete mode 100644
meta/recipes-extended/shadow/files/slackware_fix_for_glib-2.17_crypt.patch
delete mode 100644 meta/recipes-extended/shadow/files/useradd.patch
create mode 100644
meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
rename meta/recipes-extended/shadow/{shadow-securetty_4.1.4.3.bb =>
shadow-securetty_4.2.1.bb} (100%)
rename meta/recipes-extended/shadow/{shadow-sysroot_4.1.4.3.bb =>
shadow-sysroot_4.2.1.bb} (100%)
rename meta/recipes-extended/shadow/{shadow_4.1.4.3.bb => shadow_4.2.1.bb}
(100%)
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V5 2/2] oeqa: fix return status in pam.py to match shadow-4.2.1
The return statuses of commands like `su --help' or `passwd --help'
in shadow 4.2.1 version are different from those in shadow 4.1.4.3
version.
Now that we've upgraded shadow to 4.2.1, we need to fix these statuses
in the pam.py to make things work as expected.
Signed-off-by: Chen Qi
---
meta/lib/oeqa/runtime/pam.py |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oeqa/runtime/pam.py b/meta/lib/oeqa/runtime/pam.py
index 52e1eb8..cc5c1bd 100644
--- a/meta/lib/oeqa/runtime/pam.py
+++ b/meta/lib/oeqa/runtime/pam.py
@@ -17,8 +17,8 @@ class PamBasicTest(oeRuntimeTest):
(status, output) = self.target.run('login --help')
self.assertEqual(status, 1, msg = "login command does not work as
expected. Status and output:%s and %s" %(status, output))
(status, output) = self.target.run('passwd --help')
-self.assertEqual(status, 6, msg = "passwd command does not work as
expected. Status and output:%s and %s" %(status, output))
+self.assertEqual(status, 0, msg = "passwd command does not work as
expected. Status and output:%s and %s" %(status, output))
(status, output) = self.target.run('su --help')
-self.assertEqual(status, 2, msg = "su command does not work as
expected. Status and output:%s and %s" %(status, output))
+self.assertEqual(status, 0, msg = "su command does not work as
expected. Status and output:%s and %s" %(status, output))
(status, output) = self.target.run('useradd --help')
-self.assertEqual(status, 2, msg = "useradd command does not work as
expected. Status and output:%s and %s" %(status, output))
+self.assertEqual(status, 0, msg = "useradd command does not work as
expected. Status and output:%s and %s" %(status, output))
--
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 1/1] perf: split package
On 07/17/2014 03:04 PM, Henning Heinold wrote:
On Thu, Jul 17, 2014 at 02:58:46PM +0800, Chong Lu wrote:
On 07/17/2014 10:13 AM, Bruce Ashfield wrote:
On Wed, Jul 16, 2014 at 9:43 PM, Chong Lu wrote:
On 07/16/2014 09:04 PM, Bruce Ashfield wrote:
On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu wrote:
Fix incorrect paths to split perf package.
Can you elaborate here ? This commit message doesn't really tell us much.
Why is the current split incorrect ? What is the symptom and result of the
incorrect split ? Are the package contents the same after this change ?
Bruce
Hi Bruce,
Currently, perf can't split to perf-archive, perf-tests, perf-python and
perf-perl.
All files are included in perf package. For example, like perf-tests
package:
It generates files in '${exec_prefix}/libexec/perf-core/tests', not in
'${libdir}/perf/perf-core/tests'.
So I change the files paths to make split successfully.
But that means, whether or not we like it, anything using perf has been using
those "non splits" and getting everything when perf is installed.
It's also might be in order to make the main perf package RDEPEND on
the other three, to keep it consistent. Make it a ?= so it can be overridden,
and then we can age it out over time.
Bruce
Do you mean we should set RDEPENDS like:
RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
In perf.bb file, we have RDEPENDS_${PN} += "elfutils", so I think we
should use
RDEPENDS_${PN} += "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
to keep it consistent. Do you agree?
Or, we can also revert following commit to make all files in perf package.
commit 36c3e923df85e685b707fe6bd84b053a5e366fe4
Author: Henning Heinold
Date: Mon Jun 9 23:21:29 2014 +0200
perf: split packging
Best Regards
Chong
Please do not destroy the following use case, which is using perf top
WIHTOUT installing perl or python.
Bye Henning
Hi Henning,
perf can't split to perf-archive, perf-tests, perf-python and perf-perl
from your patch.
Currently, all files are in perf package.
BR
Chong
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On Thu, Jul 17, 2014 at 02:58:46PM +0800, Chong Lu wrote:
>
> On 07/17/2014 10:13 AM, Bruce Ashfield wrote:
> >On Wed, Jul 16, 2014 at 9:43 PM, Chong Lu wrote:
> >>On 07/16/2014 09:04 PM, Bruce Ashfield wrote:
> >>>On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu wrote:
> Fix incorrect paths to split perf package.
> >>>Can you elaborate here ? This commit message doesn't really tell us much.
> >>>Why is the current split incorrect ? What is the symptom and result of the
> >>>incorrect split ? Are the package contents the same after this change ?
> >>>
> >>>Bruce
> >>Hi Bruce,
> >>
> >>Currently, perf can't split to perf-archive, perf-tests, perf-python and
> >>perf-perl.
> >>All files are included in perf package. For example, like perf-tests
> >>package:
> >>It generates files in '${exec_prefix}/libexec/perf-core/tests', not in
> >>'${libdir}/perf/perf-core/tests'.
> >>So I change the files paths to make split successfully.
> >But that means, whether or not we like it, anything using perf has been using
> >those "non splits" and getting everything when perf is installed.
> >
> >It's also might be in order to make the main perf package RDEPEND on
> >the other three, to keep it consistent. Make it a ?= so it can be overridden,
> >and then we can age it out over time.
> >
> >Bruce
> Do you mean we should set RDEPENDS like:
> RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
>
> In perf.bb file, we have RDEPENDS_${PN} += "elfutils", so I think we
> should use
> RDEPENDS_${PN} += "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
> to keep it consistent. Do you agree?
>
> Or, we can also revert following commit to make all files in perf package.
> commit 36c3e923df85e685b707fe6bd84b053a5e366fe4
> Author: Henning Heinold
> Date: Mon Jun 9 23:21:29 2014 +0200
>
> perf: split packging
>
> Best Regards
> Chong
Please do not destroy the following use case, which is using perf top
WIHTOUT installing perl or python.
Bye Henning
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On 07/17/2014 10:13 AM, Bruce Ashfield wrote:
On Wed, Jul 16, 2014 at 9:43 PM, Chong Lu wrote:
On 07/16/2014 09:04 PM, Bruce Ashfield wrote:
On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu wrote:
Fix incorrect paths to split perf package.
Can you elaborate here ? This commit message doesn't really tell us much.
Why is the current split incorrect ? What is the symptom and result of the
incorrect split ? Are the package contents the same after this change ?
Bruce
Hi Bruce,
Currently, perf can't split to perf-archive, perf-tests, perf-python and
perf-perl.
All files are included in perf package. For example, like perf-tests
package:
It generates files in '${exec_prefix}/libexec/perf-core/tests', not in
'${libdir}/perf/perf-core/tests'.
So I change the files paths to make split successfully.
But that means, whether or not we like it, anything using perf has been using
those "non splits" and getting everything when perf is installed.
It's also might be in order to make the main perf package RDEPEND on
the other three, to keep it consistent. Make it a ?= so it can be overridden,
and then we can age it out over time.
Bruce
Do you mean we should set RDEPENDS like:
RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
In perf.bb file, we have RDEPENDS_${PN} += "elfutils", so I think we
should use
RDEPENDS_${PN} += "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
to keep it consistent. Do you agree?
Or, we can also revert following commit to make all files in perf package.
commit 36c3e923df85e685b707fe6bd84b053a5e366fe4
Author: Henning Heinold
Date: Mon Jun 9 23:21:29 2014 +0200
perf: split packging
Best Regards
Chong
I will improve commit message and resend a V2.
Best Regards
Chong
Signed-off-by: Chong Lu
---
meta/recipes-kernel/perf/perf.bb | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/perf/perf.bb
b/meta/recipes-kernel/perf/perf.bb
index 20968f9..781a738 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -166,10 +166,10 @@ RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests
${RSUGGESTS_SCRIPTING}"
FILES_${PN} += "${libexecdir}/perf-core
${exec_prefix}/libexec/perf-core ${libdir}/traceevent"
FILES_${PN}-dbg += "${libdir}/python*/site-packages/.debug"
-FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
-FILES_${PN}-tests = "${libdir}/perf/perf-core/tests"
-FILES_${PN}-python = "${libdir}/python*/site-packages
${libdir}/perf/perf-core/scripts/python"
-FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl"
+FILES_${PN}-archive = "${exec_prefix}/libexec/perf-core/perf-archive"
+FILES_${PN}-tests = "${exec_prefix}/libexec/perf-core/tests"
+FILES_${PN}-python = "${libdir}/python*/site-packages
${exec_prefix}/libexec/perf-core/scripts/python"
+FILES_${PN}-perl = "${exec_prefix}/libexec/perf-core/scripts/perl"
INHIBIT_PACKAGE_DEBUG_SPLIT="1"
--
1.9.1
--
___
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
