[OE-core] [PATCH] libcap: fix the libcap-native building failure on CentOS 6.7
From: Roy Li
Signed-off-by: Roy Li
---
...XATTR_NAME_CAPS-is-defined-when-it-is-use.patch | 32 ++
meta/recipes-support/libcap/libcap_2.25.bb | 5 ++--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
diff --git
a/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
b/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
new file mode 100644
index 000..a43017c
--- /dev/null
+++
b/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
@@ -0,0 +1,32 @@
+ensure the XATTR_NAME_CAPS is defined when it is used
+
+Upstream-status: Pending
+
+VFS_CAP_U32 can not ensure that XATTR_NAME_CAPS is defined, and failed to build
+libcap-native in old release, like CentOS release 6.7 (Final), with the blow
+error:
+ cap_file.c: In function ‘cap_get_fd’:
+ cap_file.c:199: error: ‘XATTR_NAME_CAPS’ undeclared (first use in this
function)
+ cap_file.c:199: error: (Each undeclared identifier is reported only once
+
+Signed-off-by: Roy Li
+---
+ libcap/cap_file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcap/cap_file.c b/libcap/cap_file.c
+index 40756ea..e27ca80 100644
+--- a/libcap/cap_file.c
b/libcap/cap_file.c
+@@ -25,7 +25,7 @@ extern int fremovexattr(int, const char *);
+
+ #include "libcap.h"
+
+-#ifdef VFS_CAP_U32
++#if defined (VFS_CAP_U32) && defined (XATTR_NAME_CAPS)
+
+ #if VFS_CAP_U32 != __CAP_BLKS
+ # error VFS representation of capabilities is not the same size as kernel
+--
+2.8.1
+
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb
b/meta/recipes-support/libcap/libcap_2.25.bb
index 865ebb8..8f3f11e 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -7,8 +7,9 @@ LIC_FILES_CHKSUM =
"file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
DEPENDS = "hostperl-runtime-native"
-SRC_URI =
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
-
+SRC_URI =
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz
\
+
file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
+"
SRC_URI[md5sum] = "b839e5d46c2ad33fc8aa2ceb5f77"
SRC_URI[sha256sum] =
"693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162"
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xmlto: xmlto needs tail to run
From: Roy Li
Signed-off-by: Roy Li
---
meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
index 71f873f..14d1009 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
@@ -14,16 +14,18 @@ SRC_URI[sha256sum] =
"2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51f
inherit autotools
-# xmlto needs getopt/xmllint/xsltproc/bash at runtime
+# xmlto needs getopt/xmllint/xsltproc/bash/tail at runtime
RDEPENDS_${PN} = "docbook-xml-dtd4 \
docbook-xsl-stylesheets \
util-linux \
libxml2 \
bash \
+ coreutils \
"
RDEPENDS_${PN}_append_class-target = " \
libxslt-bin \
"
+CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=${bindir}/tail"
BBCLASSEXTEND = "native"
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: re-enable mount propagation for udevd
From: Roy Li With MountFlags=slave, those mounts then become private to the systemd-udevd namespace and are no longer accessible from outside the namespace, which is not expected Signed-off-by: Roy Li --- ...dev-re-enable-mount-propagation-for-udevd.patch | 31 ++ meta/recipes-core/systemd/systemd_229.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch diff --git a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch new file mode 100644 index 000..23e22d4 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch @@ -0,0 +1,31 @@ +From: Michael Biebl +Date: Sat, 27 Sep 2014 04:19:24 +0200 +Subject: udev: re-enable mount propagation for udevd + +Upstream-Status: Backport [http://http.debian.net/debian/pool/main/s/systemd/systemd_215-17+deb8u4.debian.tar.xz] + +laptop-mode-tools remounts file systems from within a udev rule to apply +certain mount options. With MountFlags=slave, those mounts then become private +to the systemd-udevd namespace and are no longer accessible from outside the +namespace. +While the root cause is the broken behaviour of laptop-mode-tools, with mount +propagation turned off, this can result in a read-only root file system. +Therefore revert the relevant parts from commit +c2c13f2df42e0691aecabe3979ea81cd7faa35c7 to re-enable mount propagation for +udevd. + +Once affected packages have been fixed, this patch should be dropped +again. + +Closes: #762018 +diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in +index e7216d6..1e9a600 100644 +--- a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in +@@ -21,6 +21,5 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket + Restart=always + RestartSec=0 + ExecStart=@rootlibexecdir@/systemd-udevd +-MountFlags=slave + KillMode=mixed + WatchdogSec=1min diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb index c23c749..78692c4 100644 --- a/meta/recipes-core/systemd/systemd_229.bb +++ b/meta/recipes-core/systemd/systemd_229.bb @@ -54,6 +54,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \ file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \ + file://udev-re-enable-mount-propagation-for-udevd.patch \ " SRC_URI_append_libc-uclibc = "\ file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: add krb5 to PACKAGECONFIG
From: Roy Li
krb5 is needed to enables GSS-Negotiate authentication
Signed-off-by: Roy Li
---
.../0001-replace-krb5-config-with-pkg-config.patch | 43 ++
meta/recipes-support/curl/curl_7.47.1.bb | 5 ++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff --git
a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
new file mode 100644
index 000..74e5d99
--- /dev/null
+++
b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
@@ -0,0 +1,43 @@
+[PATCH] replace krb5-config with pkg-config
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e99b303..dc93f39 100644
+--- a/configure.ac
b/configure.ac
+@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
+ fi
+ ])
+
+-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
++KRB5CONFIG=`which pkg-config`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ AC_MSG_CHECKING([if GSS-API support is requested])
+@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
+ if test -n "$host_alias" -a -f
"$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+ elif test -f "$KRB5CONFIG"; then
+-GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
+ elif test -f "$KRB5CONFIG"; then
+dnl krb5-config doesn't have --libs-only-L or similar, put
everything
+dnl into LIBS
+- gss_libs=`$KRB5CONFIG --libs gssapi`
++ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
+LIBS="$gss_libs $LIBS"
+ else
+case $host in
+--
+1.9.1
+
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb
b/meta/recipes-support/curl/curl_7.47.1.bb
index c2173d8..b237b4e 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -5,7 +5,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2";
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+ file://0001-replace-krb5-config-with-pkg-config.patch \
+"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
@@ -40,6 +42,7 @@ PACKAGECONFIG[ssl] = "--with-ssl
--with-random=/dev/urandom,--without-ssl,openss
PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5"
EXTRA_OECONF = " \
--enable-crypto-auth \
--
2.8.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: add krb5 to PACKAGECONFIG
From: Roy Li
krb5 is needed to enables GSS-Negotiate authentication
Signed-off-by: Roy Li
---
.../0001-replace-krb5-config-with-pkg-config.patch | 43 ++
meta/recipes-support/curl/curl_7.47.1.bb | 6 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff --git
a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
new file mode 100644
index 000..74e5d99
--- /dev/null
+++
b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
@@ -0,0 +1,43 @@
+[PATCH] replace krb5-config with pkg-config
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e99b303..dc93f39 100644
+--- a/configure.ac
b/configure.ac
+@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
+ fi
+ ])
+
+-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
++KRB5CONFIG=`which pkg-config`
+
+ save_CPPFLAGS="$CPPFLAGS"
+ AC_MSG_CHECKING([if GSS-API support is requested])
+@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
+ if test -n "$host_alias" -a -f
"$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+ elif test -f "$KRB5CONFIG"; then
+-GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
+ elif test -f "$KRB5CONFIG"; then
+dnl krb5-config doesn't have --libs-only-L or similar, put
everything
+dnl into LIBS
+- gss_libs=`$KRB5CONFIG --libs gssapi`
++ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
+LIBS="$gss_libs $LIBS"
+ else
+case $host in
+--
+1.9.1
+
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb
b/meta/recipes-support/curl/curl_7.47.1.bb
index 7e2664c..85d291c 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -5,7 +5,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2";
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+ file://0001-replace-krb5-config-with-pkg-config.patch \
+"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
@@ -40,6 +42,8 @@ PACKAGECONFIG[ssl] = "--with-ssl
--with-random=/dev/urandom,--without-ssl,openss
PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
+PACKAGECONFIG[krb5] = "--with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
+ --without-gssapi,krb5"
EXTRA_OECONF = " \
--enable-crypto-auth \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: add krb5 to PACKAGECONFIG
From: Roy Li
Signed-off-by: Roy Li
---
meta/recipes-support/curl/curl_7.44.0.bb | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-support/curl/curl_7.44.0.bb
b/meta/recipes-support/curl/curl_7.44.0.bb
index 84894eb..856f002 100644
--- a/meta/recipes-support/curl/curl_7.44.0.bb
+++ b/meta/recipes-support/curl/curl_7.44.0.bb
@@ -32,6 +32,11 @@ PACKAGECONFIG[zlib] =
"--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
+PACKAGECONFIG[krb5] = "--with-gssapi-libdir=${STAGING_LIBDIR}/ \
+ --with-gssapi-includes=${STAGING_INCDIR}/gssapi/, \
+ --without-gssapi,krb5"
+
+export KRB5CONFIG="${STAGING_BINDIR_CROSS}/krb5-config"
EXTRA_OECONF = "--without-libidn \
--enable-crypto-auth \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd-serialgetty: fix a typo
From: Roy Li
it should be SERIAL_CONSOLES, not SERIAL_CONSOLE
Signed-off-by: Roy Li
---
meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb
b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 768b130..265dc6a 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
PR = "r5"
-SERIAL_CONSOLE ?= "115200 ttyS0"
+SERIAL_CONSOLES ?= "115200 ttyS0"
SRC_URI = "file://serial-getty@.service"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kexec: package kdump init script/configuration file correctly
From: Roy Li
kdump init script/configuration files are under ${sysconfdir}, not ${sysconfig}
and should be packaged into kdump sub-package
Signed-off-by: Roy Li
---
meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
b/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
index 8ca6f27..c1c97af 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
@@ -18,9 +18,9 @@ PACKAGES =+ "kexec kdump vmcore-dmesg"
ALLOW_EMPTY_${PN} = "1"
RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg"
-FILES_${PN} =+ "${sysconfig}/init.d/kdump ${sysconfig}/sysconfig/kdump.conf"
FILES_kexec = "${sbindir}/kexec"
-FILES_kdump = "${sbindir}/kdump"
+FILES_kdump = "${sbindir}/kdump ${sysconfdir}/init.d/kdump \
+ ${sysconfdir}/sysconfig/kdump.conf"
FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
inherit update-rc.d
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] netbase: add ipv6 host to /etc/hosts
From: Roy Li There is a script in netbase, debian/netbase.postinst, which create /etc/hosts, but it is not called, so ipv6 host is missing. now copy them from Ubuntu; and add localhost as alias of ::1 Signed-off-by: Roy Li --- meta/recipes-core/netbase/netbase/hosts | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-core/netbase/netbase/hosts b/meta/recipes-core/netbase/netbase/hosts index 2f33245..b94f414 100644 --- a/meta/recipes-core/netbase/netbase/hosts +++ b/meta/recipes-core/netbase/netbase/hosts @@ -1,2 +1,8 @@ 127.0.0.1 localhost.localdomain localhost +# The following lines are desirable for IPv6 capable hosts +::1 localhost ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: make TEST_DIR configurable
From: Roy Li
1. make TEST_DIR configurable, and configure it to ptest dir, since
the *.service for test are installed into ptest dir.
2. always follow symbolic links in SOURCE when copy test files
to install dir, since some *.service under test dir are linked to
../unit/*.service which are not installed into ptest dir
Signed-off-by: Roy Li
---
.../systemd/0001-make-test-dir-configurable.patch | 64 ++
meta/recipes-core/systemd/systemd_228.bb | 4 +-
2 files changed, 67 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch
diff --git
a/meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch
b/meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch
new file mode 100644
index 000..7d06371
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-make-test-dir-configurable.patch
@@ -0,0 +1,64 @@
+From 3eeec270d3af166e3bc09537626850562487742b Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Fri, 22 Jan 2016 16:44:11 +0800
+Subject: [PATCH] make test dir configurable
+
+Upstream-Status: Pending
+
+test maybe be run on target in cross-compile environment, and test dir
+is not the compilation dir, so make it configurable
+
+Signed-off-by: Roy Li
+---
+ Makefile.am | 2 +-
+ configure.ac | 7 +++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 931d13f..7155ec7 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -209,7 +209,7 @@ AM_CPPFLAGS = \
+ -DROOTLIBDIR=\"$(rootlibdir)\" \
+ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
+ -DROOTHOMEDIR=\"$(roothomedir)\" \
+- -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
++ -DTEST_DIR=\"$(testdir)/test\" \
+ -I $(top_srcdir)/src \
+ -I $(top_builddir)/src/basic \
+ -I $(top_srcdir)/src/basic \
+diff --git a/configure.ac b/configure.ac
+index 76090a1..b02968d 100644
+--- a/configure.ac
b/configure.ac
+@@ -1411,6 +1411,11 @@ AC_ARG_WITH([roothomedir],
+ [],
+ [with_roothomedir=/root])
+
++AC_ARG_WITH([testdir],
++AS_HELP_STRING([--with-testdir=DIR], [test file directory]),
++[],
++[with_testdir=${abs_top_srcdir}])
++
+ AC_ARG_WITH([pamlibdir],
+ AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
+ [],
+@@ -1503,6 +1508,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
+ AC_SUBST([rootprefix], [$with_rootprefix])
+ AC_SUBST([rootlibdir], [$with_rootlibdir])
+ AC_SUBST([roothomedir], [$with_roothomedir])
++AC_SUBST([testdir], [$with_testdir])
+
+ AC_CONFIG_FILES([
+ Makefile
+@@ -1593,6 +1599,7 @@ AC_MSG_RESULT([
+ lib dir: ${libdir}
+ rootlib dir: ${with_rootlibdir}
+ root home dir: ${with_roothomedir}
++test dir:${with_testdir}
+ SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
+ SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
+ Build Python:${PYTHON}
+--
+1.9.1
+
diff --git a/meta/recipes-core/systemd/systemd_228.bb
b/meta/recipes-core/systemd/systemd_228.bb
index 0e1bd8b..a110f0c 100644
--- a/meta/recipes-core/systemd/systemd_228.bb
+++ b/meta/recipes-core/systemd/systemd_228.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
file://00-create-volatile.conf \
file://init \
file://run-ptest \
+ file://0001-make-test-dir-configurable.patch \
"
SRC_URI_append_libc-uclibc = "\
file://0001-define-exp10-if-missing.patch \
@@ -127,6 +128,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--without-python \
--with-sysvrcnd-path=${sysconfdir} \
--with-firmware-path=/lib/firmware \
+ --with-testdir=${PTEST_PATH} \
"
# uclibc does not have NSS
EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname --disable-sysusers"
@@ -215,7 +217,7 @@ do_install() {
do_install_ptest () {
install -d ${D}${PTEST_PATH}/test
- cp -rf ${S}/test/* ${D}${PTEST_PATH}/test
+ cp -rfL ${S}/test/* ${D}${PTEST_PATH}/test
install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/
install -d ${D}${PTEST_PATH}/build-aux
cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [v2] watchdog: enable systemd support
From: Roy Li
1. inherit systemd, and add two unit files which are from Fedora 23
2. auto load soft dog kernel module
Signed-off-by: Roy Li
---
.../watchdog/watchdog/watchdog-ping.service | 12
.../recipes-extended/watchdog/watchdog/watchdog.service | 12
meta/recipes-extended/watchdog/watchdog_5.14.bb | 17 -
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog.service
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
new file mode 100644
index 000..fce6e12
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon for use with ping test / network dependency
+After=network.target
+Conflicts=watchdog.service
+
+[Service]
+Type=forking
+ExecStart=@SBINDIR@/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service
b/meta/recipes-extended/watchdog/watchdog/watchdog.service
new file mode 100644
index 000..f945bc9
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon
+# man systemd.special
+# auto added After=basic.target
+
+[Service]
+Type=forking
+ExecStart=@SBINDIR@/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb
b/meta/recipes-extended/watchdog/watchdog_5.14.bb
index fc717bc..9e21075 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
@@ -14,6 +14,8 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://watchdog-init.patch \
file://watchdog-conf.patch \
file://0001-Fix-build-issues-found-with-non-glibc-C-libraries.patch \
+ file://watchdog-ping.service \
+ file://watchdog.service \
"
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
@@ -23,7 +25,7 @@ UPSTREAM_CHECK_URI =
"http://sourceforge.net/projects/watchdog/files/watchdog/";
UPSTREAM_CHECK_REGEX = "/watchdog/(?P(\d+[\.\-_]*)+)/"
inherit autotools
-inherit update-rc.d
+inherit update-rc.d systemd
DEPENDS_append_libc-musl = " libtirpc "
CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc "
@@ -34,6 +36,19 @@ INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ."
RRECOMMENDS_${PN} = "kernel-module-softdog"
+
+SYSTEMD_SERVICE_${PN} = "watchdog.service"
+
do_install_append() {
install -D ${S}/redhat/watchdog.init
${D}/${sysconfdir}/init.d/watchdog.sh
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/watchdog*.service
${D}${systemd_unitdir}/system
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}${sysconfdir}/modules-load.d
+ echo "softdog" > ${D}${sysconfdir}/modules-load.d/softdog.conf
+ sed -i -e 's,@SBINDIR@,${sbindir},g'
${D}${systemd_unitdir}/system/*.service
+ fi
}
+
+FILES_${PN} += "${systemd_unitdir}/system/*"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kexec-tools: inherit update-rc.d
From: Roy Li
init script kdump is added, so inherit update-rc.d
Signed-off-by: Roy Li
---
meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
b/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
index 7173767..866441b 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
@@ -22,6 +22,12 @@ FILES_kexec = "${sbindir}/kexec"
FILES_kdump = "${sbindir}/kdump"
FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg"
+inherit update-rc.d
+
+INITSCRIPT_PACKAGES = "kdump"
+INITSCRIPT_NAME_kdump = "kdump"
+INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
+
do_install_append () {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/kdump ${D}${sysconfdir}/init.d/kdump
--
2.5.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: fix the ptest
From: Roy Li
1. the ptest should not be run by root user, otherwise test_stdio_wrappers
will failure since root can enter any dir without exec permission, but the
ptest expect the failure
1_2.44.1-r0/glib-2.44.1/glib/tests/fileutils.c:864:test_stdio_wrappers:
assertion failed: (errno == EACCES)
2. if X11 DISTRO_FEATURE is not enabled, not run gdbus-serialization.test
#dbus-launch --autolaunch=7df84bc5a72041a581d2f44505e7e882 --binary-syntax
--close-stderr
Autolaunch requested, but X11 support not compiled in
Signed-off-by: Roy Li
Signed-off-by: Robert Yang
---
meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 4 +++-
meta/recipes-core/glib-2.0/glib.inc | 6 ++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index 130ae09..5b85e8f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -1,3 +1,5 @@
#! /bin/sh
-gnome-desktop-testing-runner glib
+useradd glib2-test
+su glib2-test -c gnome-desktop-testing-runner glib
+userdel glib2-test
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index 785d4d7..06e6825 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -71,6 +71,12 @@ do_install_append () {
if [ -f ${D}${bindir}/glib-mkenums ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
${D}${bindir}/glib-mkenums
fi
+
+ if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ];
then
+ if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false",
"true", d)}; then
+ rm
${D}${datadir}/installed-tests/glib/gdbus-serialization.test
+ fi
+ fi
}
RDEPENDS_${PN}-ptest += "\
--
2.5.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] watchdog: enable systemd support
From: Roy Li
1. inherit systemd, and add two unit files which are from Fedora 23
2. auto load soft dog kernel module
Signed-off-by: Roy Li
---
.../watchdog/watchdog/watchdog-ping.service| 12
.../watchdog/watchdog/watchdog.service | 12
meta/recipes-extended/watchdog/watchdog_5.14.bb| 18 --
3 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog.service
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
new file mode 100644
index 000..da403c9
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon for use with ping test / network dependency
+After=network.target
+Conflicts=watchdog.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service
b/meta/recipes-extended/watchdog/watchdog/watchdog.service
new file mode 100644
index 000..3c36a08
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon
+# man systemd.special
+# auto added After=basic.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb
b/meta/recipes-extended/watchdog/watchdog_5.14.bb
index 9cb89d5..55cbbb4 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
@@ -12,7 +12,10 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://fixsepbuild.patch \
file://fix-ping-failure.patch \
file://watchdog-init.patch \
- file://watchdog-conf.patch"
+ file://watchdog-conf.patch \
+ file://watchdog-ping.service \
+ file://watchdog.service \
+"
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
SRC_URI[sha256sum] =
"620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
@@ -21,13 +24,24 @@ UPSTREAM_CHECK_URI =
"http://sourceforge.net/projects/watchdog/files/watchdog/";
UPSTREAM_CHECK_REGEX = "/watchdog/(?P(\d+[\.\-_]*)+)/"
inherit autotools
-inherit update-rc.d
+inherit update-rc.d systemd
INITSCRIPT_NAME = "watchdog.sh"
INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ."
RRECOMMENDS_${PN} = "kernel-module-softdog"
+SYSTEMD_SERVICE_${PN} = "watchdog.service"
+
do_install_append() {
install -D ${S}/redhat/watchdog.init
${D}/${sysconfdir}/init.d/watchdog.sh
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/watchdog*.service
${D}${systemd_unitdir}/system
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}${sysconfdir}/modules-load.d
+ echo "softdog" > ${D}${sysconfdir}/modules-load.d/softdog.conf
+ fi
}
+
+FILES_${PN} += "${systemd_unitdir}/system/*"
--
2.5.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perl: install Config_heavy-target.pl correctly
From: Roy Li
Config_heavy-target.pl is needed by perl-native, not perl; since
perl-configpm-switch.patch, which uses Config_heavy-target.pl, is
applied into native package, and Config_heavy-target.pl is used
when PERLCONFIGTARGET is yes in cpan.bbclass
This fixed a building failure when autoloader is used:
Can't locate Config_heavy-target.pl in @INC (@INC contains: ...) at
tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.22.0/Config.pm line 88
Signed-off-by: Roy Li
---
meta/recipes-devtools/perl/perl-native_5.22.0.bb | 2 ++
meta/recipes-devtools/perl/perl_5.22.0.bb| 6 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index b4dda31..09d399c 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -94,6 +94,8 @@ do_install () {
install $i ${D}${libdir}/perl/${PV}/CORE
done
+ ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl
+
# Those wrappers mean that perl installed from sstate (which may change
# path location) works and that in the nativesdk case, the SDK can be
# installed to a different location from the one it was built for.
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb
b/meta/recipes-devtools/perl/perl_5.22.0.bb
index 55ce73f..84cc651 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -241,10 +241,7 @@ do_install() {
# target config, used by cpan.bbclass to extract version information
install config.sh ${D}${libdir}/perl
-
-ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl
}
-
do_install_append_class-nativesdk () {
create_wrapper ${D}${bindir}/perl \
PERL5LIB='$PERL5LIB:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/site_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/vendor_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/${PV}'
@@ -298,8 +295,7 @@ FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE"
FILES_${PN}-lib = "${libdir}/libperl.so* \
${libdir}/perl5 \
${libdir}/perl/config.sh \
- ${libdir}/perl/${PV}/Config_heavy.pl \
- ${libdir}/perl/${PV}/Config_heavy-target.pl"
+ ${libdir}/perl/${PV}/Config_heavy.pl"
FILES_${PN}-pod = "${libdir}/perl/${PV}/pod \
${libdir}/perl/${PV}/*.pod \
${libdir}/perl/${PV}/*/*.pod \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] watchdog: enable systemd support
From: Roy Li
1. inherit systemd, and add two unit files
2. auto load soft dog kernel module
Signed-off-by: Roy Li
---
.../watchdog/watchdog/watchdog-ping.service| 12
.../watchdog/watchdog/watchdog.service | 12
meta/recipes-extended/watchdog/watchdog_5.14.bb| 18 --
3 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
create mode 100644 meta/recipes-extended/watchdog/watchdog/watchdog.service
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
new file mode 100644
index 000..da403c9
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog-ping.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon for use with ping test / network dependency
+After=network.target
+Conflicts=watchdog.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog/watchdog.service
b/meta/recipes-extended/watchdog/watchdog/watchdog.service
new file mode 100644
index 000..3c36a08
--- /dev/null
+++ b/meta/recipes-extended/watchdog/watchdog/watchdog.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=watchdog daemon
+# man systemd.special
+# auto added After=basic.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/watchdog
+ControlGroup=cpu:/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/watchdog/watchdog_5.14.bb
b/meta/recipes-extended/watchdog/watchdog_5.14.bb
index 9ec0a8e..743a36a 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.14.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.14.bb
@@ -12,19 +12,33 @@ SRC_URI =
"${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \
file://fixsepbuild.patch \
file://fix-ping-failure.patch \
file://watchdog-init.patch \
- file://watchdog-conf.patch"
+ file://watchdog-conf.patch \
+ file://watchdog-ping.service \
+ file://watchdog.service \
+"
SRC_URI[md5sum] = "5b2dba0c593942f4acc100bca0d560c4"
SRC_URI[sha256sum] =
"620b2f49e9879f2e85c73d4c1f422f9101e6b38e824fea2414befd8bb6866ad1"
inherit autotools
-inherit update-rc.d
+inherit update-rc.d systemd
INITSCRIPT_NAME = "watchdog.sh"
INITSCRIPT_PARAMS = "start 15 1 2 3 4 5 . stop 85 0 6 ."
RRECOMMENDS_${PN} = "kernel-module-softdog"
+SYSTEMD_SERVICE_${PN} = "watchdog.service"
+
do_install_append() {
install -D ${S}/redhat/watchdog.init
${D}/${sysconfdir}/init.d/watchdog.sh
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/watchdog*.service
${D}${systemd_unitdir}/system
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ install -d ${D}${sysconfdir}/modules-load.d
+ echo "softdog" > ${D}${sysconfdir}/modules-load.d/softdog.conf
+ fi
}
+
+FILES_${PN} += "${systemd_unitdir}/system/*"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: redesign ssh-agent.sh regression test case
From: Roy Li
ssh-agent regression test case should be run by non-root user,
but non-root user will has issue to run other testcase, so
rewrite it on run-ptest
Signed-off-by: Roy Li
---
.../recipes-connectivity/openssh/openssh/run-ptest | 37 ++
1 file changed, 37 insertions(+)
diff --git a/meta/recipes-connectivity/openssh/openssh/run-ptest
b/meta/recipes-connectivity/openssh/openssh/run-ptest
index 564c0c8..769162e 100755
--- a/meta/recipes-connectivity/openssh/openssh/run-ptest
+++ b/meta/recipes-connectivity/openssh/openssh/run-ptest
@@ -3,5 +3,42 @@
export TEST_SHELL=sh
cd regress
+sed -i "/\t\tagent-ptrace /d" Makefile
make -k .OBJDIR=`pwd` .CURDIR=`pwd` SUDO="sudo" tests \
| sed -e 's/^skipped/SKIP: /g' -e 's/^ok /PASS: /g' -e
's/^failed/FAIL: /g'
+
+
+SSHAGENT=`which ssh-agent`
+GDB=`which gdb`
+
+if [ -z "${SSHAGENT}" -o -z "${GDB}" ]; then
+ echo "SKIP: agent-ptrace"
+fi
+
+useradd openssh-test
+
+eval `su -c "${SSHAGENT} -s" openssh-test` > /dev/null
+r=$?
+if [ $r -ne 0 ]; then
+ echo "FAIL: could not start ssh-agent: exit code $r"
+else
+ su -c "gdb -p ${SSH_AGENT_PID}" openssh-test > /tmp/gdb.out 2>&1 << EOF
+ quit
+EOF
+ r=$?
+ if [ $r -ne 0 ]; then
+ echo "gdb failed: exit code $r"
+ fi
+ egrep 'ptrace: Operation not permitted.|procfs:.*Permission
denied.|ttrace.*Permission denied.|procfs:.*: Invalid argument.|Unable to
access task ' >/dev/null /tmp/gdb.out
+ r=$?
+ rm -f /tmp/gdb.out
+ if [ $r -ne 0 ]; then
+ echo "FAIL: ptrace agant"
+ else
+ echo "PASS: ptrace agant"
+ fi
+
+ ${SSHAGENT} -k > /dev/null
+fi
+userdel openssh-test
+
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] iproute2: install bridge tool by default
From: Roy Li
bridge is a tool used frequently, so install it
Signed-off-by: Roy Li
---
meta/recipes-connectivity/iproute2/iproute2.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc
b/meta/recipes-connectivity/iproute2/iproute2.inc
index 29f9062..6a08114 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables elfutils"
inherit update-alternatives
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}'
LIBDIR='${libdir}'"
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge' SBINDIR='${base_sbindir}'
LIBDIR='${libdir}'"
do_configure_append () {
sh configure ${STAGING_INCDIR}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] e2fsprogs: fix the ptest
From: Roy Li
1. a hard-coded path in ptest is used, fix it.
2. fix the m_bigjournal ptest failure by resetting cache goal properly
3. fix the removal test.log error by adding the correct path before
test.log
Signed-off-by: Roy Li
---
.../e2fsprogs/e2fsprogs/0001-reset-last_goal.patch | 51 ++
.../recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 2 +-
.../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 +
3 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
diff --git
a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
new file mode 100644
index 000..864e01e
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-reset-last_goal.patch
@@ -0,0 +1,51 @@
+reset last_goal when ext2fs_extent_node_split is called.
+
+Upstream-Status: Inappropriate
+
+cache_inode.patch speeds up the making ext* filesystem, but it leads
+to the m_bigjournal ptest failure; In fact, when ext2fs_extent_node_split
+is called, the cache goal should be reset
+
+the patch fixes the m_bigjournal ptest failure, and does not lost the
+speed.
+
+Signed-off-by: Roy Li
+---
+ lib/ext2fs/alloc.c | 2 +-
+ lib/ext2fs/extent.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c
+index 830fc22..5bab9db 100644
+--- a/lib/ext2fs/alloc.c
b/lib/ext2fs/alloc.c
+@@ -160,7 +160,7 @@ errcode_t ext2fs_new_inode(ext2_filsys fs, ext2_ino_t dir,
+ return 0;
+ }
+
+-static blk64_t last_goal = 0;
++blk64_t last_goal = 0;
+
+ /*
+ * Stupid algorithm --- we now just search forward starting from the
+diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
+index 5cdc2e4..044a17a 100644
+--- a/lib/ext2fs/extent.c
b/lib/ext2fs/extent.c
+@@ -819,6 +819,8 @@ errcode_t ext2fs_extent_replace(ext2_extent_handle_t
handle,
+ *
+ * handle will be left pointing at original record.
+ */
++extern blk64_t last_goal;
++
+ errcode_t ext2fs_extent_node_split(ext2_extent_handle_t handle)
+ {
+ errcode_t retval = 0;
+@@ -936,6 +938,7 @@ errcode_t ext2fs_extent_node_split(ext2_extent_handle_t
handle)
+ group = group & ~((1 << (log_flex)) - 1);
+ goal_blk = ext2fs_group_first_block2(handle->fs, group);
+ }
++ last_goal = goal_blk;
+ retval = ext2fs_alloc_block2(handle->fs, goal_blk, block_buf,
+ &new_node_pblk);
+ if (retval)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
index 1ac2513..e02fc7f 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
@@ -5,7 +5,7 @@ cd ./test
if [ $? -eq 0 ]
then
echo "PASS: e2fsprogs"
- rm test.log
+ rm ../test.log
else
echo "FAIL: e2fsprogs"
fi
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index ce7d2e8..c021306 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -24,6 +24,7 @@ SRC_URI += "file://acinclude.m4 \
file://CVE-2015-0247.patch \
file://0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch \
file://copy-in-create-hardlinks-with-the-correct-directory-.patch \
+file://0001-reset-last_goal.patch \
"
SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7"
@@ -114,4 +115,5 @@ do_install_ptest() {
cp -a ${B}/tests ${D}${PTEST_PATH}/test
cp -a ${S}/tests/* ${D}${PTEST_PATH}/test
sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
+ sed -e 's!/usr/lib/e2fsprogs/ptest!${PTEST_PATH}!g' -i
${D}${PTEST_PATH}/test/test_*
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] e2fsprogs: fix the ptest
From: Roy Li
1. a hard-coded path in ptest is used, fix it.
2. fix the cache_inode.patch, the m_bigjournal test case show it has
a off-by-one issue
/usr/lib64/e2fsprogs/ptest/test# ./test_one m_big
m_bigjournal: journal over 4GB in size: failed
/usr/lib64/e2fsprogs/ptest/test#
/usr/lib64/e2fsprogs/ptest/test# cat m_bigjournal
m_bigjournal.1.log m_bigjournal.failed
.failed _Gaming_Socketed_GT3-1:/usr/lib64/e2fsprogs/ptest/test# cat
m_bigjournal.
--- m_bigjournal/expect.1 2015-11-09 08:33:14.0 +
+++ m_bigjournal.1.log2015-11-10 02:42:08.337571000 +
@@ -52,8 +52,8 @@
Reserved GDT blocks at 2-672
Block bitmap at 673 (+673), Inode bitmap at 1185 (+1185)
Inode table at 1697-1697 (+1697)
- 31836 free blocks, 5 free inodes, 2 directories, 5 unused inodes
- Free blocks: 764-1184, 1269-1696, 1781-32767
+ 31837 free blocks, 5 free inodes, 2 directories, 5 unused inodes
+ Free blocks: 763-1184, 1269-1696, 1781-32767
Free inodes: 12-16
Group 1: (Blocks 32768-65535) [INODE_UNINIT]
Backup superblock at 32768, Group descriptors at 32769-32769
@@ -542,8 +542,8 @@
Group 79: (Blocks 2588672-2621439) [INODE_UNINIT]
Block bitmap at 752 (bg #0 + 752), Inode bitmap at 1264 (bg #0 + 1264)
Inode table at 1776-1776 (bg #0 + 1776)
- 30047 free blocks, 16 free inodes, 0 directories, 16 unused inodes
- Free blocks: 2591393-2621439
+ 30046 free blocks, 16 free inodes, 0 directories, 16 unused inodes
+ Free blocks: 2591394-2621439
Free inodes: 1265-1280
Group 80: (Blocks 2621440-2654207) [INODE_UNINIT, BLOCK_UNINIT]
Block bitmap at 753 (bg #0 + 753), Inode bitmap at 1265 (bg #0 + 1265)
/usr/lib64/e2fsprogs/ptest/test#
Signed-off-by: Roy Li
---
meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch | 2 +-
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
index f9ef8e5..4de78e5 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
@@ -37,7 +37,7 @@ Index: e2fsprogs-1.42.9/lib/ext2fs/alloc.c
int c_ratio;
+if (!goal)
-+goal = last_goal;
++goal = last_goal - 1 >= 0; last_goal - 1, 0;
+
EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index ce7d2e8..a7b9816 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -114,4 +114,5 @@ do_install_ptest() {
cp -a ${B}/tests ${D}${PTEST_PATH}/test
cp -a ${S}/tests/* ${D}${PTEST_PATH}/test
sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
+ sed -e 's!/usr/lib/e2fsprogs/ptest!${PTEST_PATH}!g' -i
${D}${PTEST_PATH}/test/test_*
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm: define EM_AARCH64 for debugedit
From: Roy Li EM_AARCH64 maybe not be defined due to old version elf.h when compile rpm-native, and lead to that debugedit can not work on aarch64 elf object files, since there is no other dependence, except these two macro, define them to make debugedit work on aarch64 elf files. debugedit: /bitbake_build/tmp/work/aarch64-wrs-linux/libvirt/1.2.19-r0/ package/usr/lib64/libvirt/ptest/daemon/libvirtd_admin_la-admin_server.o: Unhandled relocation 258 in .debug_info section Signed-off-by: Roy Li --- .../rpm/rpm/0001-define-EM_AARCH64.patch | 35 ++ meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch diff --git a/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch new file mode 100644 index 000..f5fcfec --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-define-EM_AARCH64.patch @@ -0,0 +1,35 @@ +[PATCH] define EM_AARCH64 + +Upstream-Status: pending + +EM_AARCH64 maybe not be defined due to old version elf.h, and lead to +that debugedit can not work on aarch64 elf object files, since there is +no other dependence, except these two macro, define them to make +debugedit work on aarch64 elf files. + +Signed-off-by: Roy Li +--- + tools/debugedit.c | 7 +++ + 1 file changed, 7 insertions(+) + +diff --git a/tools/debugedit.c b/tools/debugedit.c +index de693ed..d16a641 100644 +--- a/tools/debugedit.c b/tools/debugedit.c +@@ -35,6 +35,13 @@ + + #include + ++#ifndef EM_AARCH64 ++#define EM_AARCH64 183 /* ARM AARCH64 */ ++#endif ++#ifndef R_AARCH64_ABS32 ++#define R_AARCH64_ABS32 258 ++#endif ++ + /* some defines taken from the dwarf standard */ + + #define DW_TAG_compile_unit 0x11 +-- +1.9.1 + diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index b450c6f..4b1b623 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -99,6 +99,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-macros.in-disable-external-key-server.patch \ file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \ file://configure.ac-check-for-both-gpg2-and-gpg.patch \ + file://0001-define-EM_AARCH64.patch \ " # Uncomment the following line to enable platform score debugging -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xinetd: install xinetd supported services configuration
From: "yadi...@windriver.com"
install xinetd supported services configuration, then these services
are able to work
Signed-off-by: Hu
Signed-off-by: Roy Li
---
meta/recipes-extended/xinetd/xinetd_2.3.15.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index ffc03e5..9af45a5 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -56,6 +56,7 @@ do_install() {
install -m 644 "${WORKDIR}/xinetd.default"
"${D}${sysconfdir}/default/xinetd"
install -m 755 "${B}/xinetd/xinetd" "${D}${sbindir}"
install -m 755 "${B}/xinetd/itox" "${D}${sbindir}"
+ install -m 664 ${S}/contrib/xinetd.d/* ${D}${sysconfdir}/xinetd.d
# Install systemd unit files
install -d ${D}${systemd_unitdir}/system
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: fix a ash memory leak
From: Roy Li
Signed-off-by: Roy Li
---
.../busybox/0001-ash-fix-memory-leak-in-ash.patch | 54 ++
meta/recipes-core/busybox/busybox_1.23.2.bb| 1 +
meta/recipes-core/busybox/busybox_git.bb | 1 +
3 files changed, 56 insertions(+)
create mode 100644
meta/recipes-core/busybox/busybox/0001-ash-fix-memory-leak-in-ash.patch
diff --git
a/meta/recipes-core/busybox/busybox/0001-ash-fix-memory-leak-in-ash.patch
b/meta/recipes-core/busybox/busybox/0001-ash-fix-memory-leak-in-ash.patch
new file mode 100644
index 000..87c7ffa
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/0001-ash-fix-memory-leak-in-ash.patch
@@ -0,0 +1,54 @@
+From 8dc9fef3ba088604527b067310c6da64221b3570 Mon Sep 17 00:00:00 2001
+From: Signed-off-by: Hu
+Date: Fri, 25 Sep 2015 12:36:07 +0800
+Subject: [PATCH] ash: fix memory leak in ash
+
+Upstream-Status: Submitted: https://bugs.busybox.net/show_bug.cgi?id=7748
+
+The script triggers the memory leak:
+ while true
+ do
+ while true
+ do
+ break;
+ done
+---
+ shell/ash.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/shell/ash.c b/shell/ash.c
+index 42c9125..f5e7153 100644
+--- a/shell/ash.c
b/shell/ash.c
+@@ -8336,6 +8336,7 @@ evaltree(union node *n, int flags)
+ void (*evalfn)(union node *, int);
+ int status;
+ int int_level;
++ struct stackmark smark;
+
+ SAVE_INT(int_level);
+
+@@ -8375,6 +8376,7 @@ evaltree(union node *n, int flags)
+ status = !exitstatus;
+ goto setstatus;
+ case NREDIR:
++ setstackmark(&smark);
+ expredir(n->nredir.redirect);
+ status = redirectsafe(n->nredir.redirect, REDIR_PUSH);
+ if (!status) {
+@@ -8382,6 +8384,7 @@ evaltree(union node *n, int flags)
+ status = exitstatus;
+ }
+ popredir(/*drop:*/ 0, /*restore:*/ 0 /* not sure */);
++ popstackmark(&smark);
+ goto setstatus;
+ case NCMD:
+ evalfn = evalcommand;
+--
+1.9.1
+
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb
b/meta/recipes-core/busybox/busybox_1.23.2.bb
index e4d9f97..54f3314 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.2.bb
@@ -36,6 +36,7 @@ SRC_URI =
"http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://sha1sum.cfg \
file://sha256sum.cfg \
file://getopts.cfg \
+ file://0001-ash-fix-memory-leak-in-ash.patch \
"
SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73"
diff --git a/meta/recipes-core/busybox/busybox_git.bb
b/meta/recipes-core/busybox/busybox_git.bb
index ade72f4..71b725f 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -41,6 +41,7 @@ SRC_URI = "git://busybox.net/busybox.git \
file://mount-via-label.cfg \
file://sha1sum.cfg \
file://sha256sum.cfg \
+ file://0001-ash-fix-memory-leak-in-ash.patch \
"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}
SKIP_STRIP=y"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perf: fix the install-python_ext on upstream kernel
From: Roy Li
The Perf source code between Yocto and upstream are different, like below
commit is not in upstream, so broaden the "--root" replacement to Makefile*
commit 33e96fb1e2d77541e81eb341ccd3fbe9419e4c9a
Author: Tom Zanussi
Date: Tue Jul 3 13:07:23 2012 -0500
perf: change --root to --prefix for python install
Otherwise we get the sysroot path appended to the build path, not what
we want.
Signed-off-by: Tom Zanussi
Signed-off-by: Roy Li
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index adb3a2c..241cca9 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -148,7 +148,7 @@ do_configure_prepend () {
${S}/tools/perf/Makefile.perf
fi
sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr'
--install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
-${S}/tools/perf/Makefile
+${S}/tools/perf/Makefile*
if [ -e "${S}/tools/build/Makefile.build" ]; then
sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] squashfs-tools: make it be able to be compiled by gcc5 with "-O0"
From: Roy Li
Signed-off-by: Roy Li
---
...shfs.c-get-inline-functions-work-with-C99.patch | 154 +
.../squashfs-tools/squashfs-tools_git.bb | 1 +
2 files changed, 155 insertions(+)
create mode 100644
meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
diff --git
a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
new file mode 100644
index 000..fefe9f6
--- /dev/null
+++
b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
@@ -0,0 +1,154 @@
+From ac6268e843c43286eebff2a1052182c2393cdb2e Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Mon, 14 Sep 2015 12:31:42 +0800
+Subject: [PATCH] mksquashfs.c: get inline functions work with both gnu11 and
gnu89
+
+Upstream-status: pending
+
+After gcc upgraded to gcc5, and if the codes is compiled without
optimization(-O0),
+and the below error will happen:
+
+| mksquashfs.o: In function `create_inode':
+| git/squashfs-tools/mksquashfs.c:897: undefined reference to `get_inode_no'
+| git/squashfs-tools/mksquashfs.c:960: undefined reference to `get_parent_no'
+| git/squashfs-tools/mksquashfs.c:983: undefined reference to `get_parent_no'
+| mksquashfs.o: In function `reader_read_process':
+| git/squashfs-tools/mksquashfs.c:2132: undefined reference to `is_fragment'
+| mksquashfs.o: In function `reader_read_file':
+| git/squashfs-tools/mksquashfs.c:2228: undefined reference to `is_fragment'
+| mksquashfs.o: In function `dir_scan':
+| git/squashfs-tools/mksquashfs.c:3101: undefined reference to
`create_dir_entry'
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that
exactly one C
+source file has the callable copy of the inline function. Consider the
following
+program:
+
+ inline int
+ foo (void)
+ {
+return 42;
+ }
+
+ int
+ main (void)
+ {
+return foo ();
+ }
+
+The program above will not link with the C99 inline semantics, because no
out-of-line
+function foo is generated. To fix this, either mark the function foo as
static, or
+add the following declaration:
+ static inline int foo (void);
+
+more information refer to: https://gcc.gnu.org/gcc-5/porting_to.html;
+
+but the use of "extern inline" will lead to the compilation issue if gcc is not
+gcc5, as the commit in oe-core d0af30c92fde [alsa-lib: Change function type to
+"static __inline__"]
+"extern __inline__ function()" is the inlined version that
+can be used in this compilation unit, but there will be another
+definition of this function somewhere, so compiler will not emit
+any code for the function body. This causes problem in -O0,
+where functions are never inlined, the function call is preserved,
+but linker can't find the symbol, thus the error happens.
+
+so replace "inline" with "static inline" to make it work with both gnu11 and
gnu89
+
+Signed-off-by: Roy Li
+---
+ squashfs-tools/mksquashfs.c | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d221c35..6bba1d2 100644
+--- a/squashfs-tools/mksquashfs.c
b/squashfs-tools/mksquashfs.c
+@@ -828,13 +828,13 @@ char *subpathname(struct dir_ent *dir_ent)
+ }
+
+
+-inline unsigned int get_inode_no(struct inode_info *inode)
++static inline unsigned int get_inode_no(struct inode_info *inode)
+ {
+ return inode->inode_number;
+ }
+
+
+-inline unsigned int get_parent_no(struct dir_info *dir)
++static inline unsigned int get_parent_no(struct dir_info *dir)
+ {
+ return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no;
+ }
+@@ -2027,7 +2027,7 @@ struct file_info *duplicate(long long file_size, long
long bytes,
+ }
+
+
+-inline int is_fragment(struct inode_info *inode)
++static inline int is_fragment(struct inode_info *inode)
+ {
+ off_t file_size = inode->buf.st_size;
+
+@@ -2996,13 +2996,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int
pseudo, int id)
+ }
+
+
+-inline struct inode_info *lookup_inode(struct stat *buf)
++static inline struct inode_info *lookup_inode(struct stat *buf)
+ {
+ return lookup_inode2(buf, 0, 0);
+ }
+
+
+-inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
++static inline void alloc_inode_no(struct inode_info *inode, unsigned int
use_this)
+ {
+ if (inode->inode_number == 0) {
+ inode->inode_number = use_this ? : inode_no ++;
+@@ -3013,7 +3013,7 @@ inline void alloc_inode_no(struct inode_info *inode,
unsigned int use_this)
+ }
+
+
+-inline struct dir_ent *create_dir_entry(char *name, char *source_name,
++static inline struct dir_ent *create_dir_entry(char *name, char *source_name,
+ char *nonstandard_pathname, struct dir_i
[OE-core] [PATCH] quashfs-tools: make it be able to be compiled by gcc5 with "-O0"
From: Roy Li
Signed-off-by: Roy Li
---
...shfs.c-get-inline-functions-work-with-C99.patch | 154 +
.../squashfs-tools/squashfs-tools_git.bb | 1 +
2 files changed, 155 insertions(+)
create mode 100644
meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
diff --git
a/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
new file mode 100644
index 000..fefe9f6
--- /dev/null
+++
b/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
@@ -0,0 +1,154 @@
+From ac6268e843c43286eebff2a1052182c2393cdb2e Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Mon, 14 Sep 2015 12:31:42 +0800
+Subject: [PATCH] mksquashfs.c: get inline functions work with both gnu11 and
gnu89
+
+Upstream-status: pending
+
+After gcc upgraded to gcc5, and if the codes is compiled without
optimization(-O0),
+and the below error will happen:
+
+| mksquashfs.o: In function `create_inode':
+| git/squashfs-tools/mksquashfs.c:897: undefined reference to `get_inode_no'
+| git/squashfs-tools/mksquashfs.c:960: undefined reference to `get_parent_no'
+| git/squashfs-tools/mksquashfs.c:983: undefined reference to `get_parent_no'
+| mksquashfs.o: In function `reader_read_process':
+| git/squashfs-tools/mksquashfs.c:2132: undefined reference to `is_fragment'
+| mksquashfs.o: In function `reader_read_file':
+| git/squashfs-tools/mksquashfs.c:2228: undefined reference to `is_fragment'
+| mksquashfs.o: In function `dir_scan':
+| git/squashfs-tools/mksquashfs.c:3101: undefined reference to
`create_dir_entry'
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that
exactly one C
+source file has the callable copy of the inline function. Consider the
following
+program:
+
+ inline int
+ foo (void)
+ {
+return 42;
+ }
+
+ int
+ main (void)
+ {
+return foo ();
+ }
+
+The program above will not link with the C99 inline semantics, because no
out-of-line
+function foo is generated. To fix this, either mark the function foo as
static, or
+add the following declaration:
+ static inline int foo (void);
+
+more information refer to: https://gcc.gnu.org/gcc-5/porting_to.html;
+
+but the use of "extern inline" will lead to the compilation issue if gcc is not
+gcc5, as the commit in oe-core d0af30c92fde [alsa-lib: Change function type to
+"static __inline__"]
+"static __inline__ function()" is the inlined version that
+can be used in this compilation unit, but there will be another
+definition of this function somewhere, so compiler will not emit
+any code for the function body. This causes problem in -O0,
+where functions are never inlined, the function call is preserved,
+but linker can't find the symbol, thus the error happens.
+
+so replace "inline" with "static inline" to make it work with both gnu11 and
gnu89
+
+Signed-off-by: Roy Li
+---
+ squashfs-tools/mksquashfs.c | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d221c35..6bba1d2 100644
+--- a/squashfs-tools/mksquashfs.c
b/squashfs-tools/mksquashfs.c
+@@ -828,13 +828,13 @@ char *subpathname(struct dir_ent *dir_ent)
+ }
+
+
+-inline unsigned int get_inode_no(struct inode_info *inode)
++static inline unsigned int get_inode_no(struct inode_info *inode)
+ {
+ return inode->inode_number;
+ }
+
+
+-inline unsigned int get_parent_no(struct dir_info *dir)
++static inline unsigned int get_parent_no(struct dir_info *dir)
+ {
+ return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no;
+ }
+@@ -2027,7 +2027,7 @@ struct file_info *duplicate(long long file_size, long
long bytes,
+ }
+
+
+-inline int is_fragment(struct inode_info *inode)
++static inline int is_fragment(struct inode_info *inode)
+ {
+ off_t file_size = inode->buf.st_size;
+
+@@ -2996,13 +2996,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int
pseudo, int id)
+ }
+
+
+-inline struct inode_info *lookup_inode(struct stat *buf)
++static inline struct inode_info *lookup_inode(struct stat *buf)
+ {
+ return lookup_inode2(buf, 0, 0);
+ }
+
+
+-inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
++static inline void alloc_inode_no(struct inode_info *inode, unsigned int
use_this)
+ {
+ if (inode->inode_number == 0) {
+ inode->inode_number = use_this ? : inode_no ++;
+@@ -3013,7 +3013,7 @@ inline void alloc_inode_no(struct inode_info *inode,
unsigned int use_this)
+ }
+
+
+-inline struct dir_ent *create_dir_entry(char *name, char *source_name,
++static inline struct dir_ent *create_dir_entry(char *name, char *source_name,
+ char *nonstandard_pathname, struct dir_i
[OE-core] [PATCH] packagegroup-core-nfs: provide the nfs-client IMAGE_FEATURES
From: Roy Li
provide the nfs-client IMAGE_FEATURES, to ease a user to only
install nfs client related files to image
Signed-off-by: Roy Li
---
meta/classes/core-image.bbclass | 2 ++
meta/recipes-core/glibc/glibc-testing.inc| 2 +-
meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | 6 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 501456d..8e340d9 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -21,6 +21,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
# - tools-testapps - tools usable to make some device tests
# - tools-sdk - SDK (C/C++ compiler, autotools, etc.)
# - nfs-server - NFS server
+# - nfs-client - NFS client
# - ssh-server-dropbear - SSH server (dropbear)
# - ssh-server-openssh - SSH server (openssh)
# - qt4-pkgs- Qt4/X11 and demo applications
@@ -42,6 +43,7 @@ FEATURE_PACKAGES_tools-profile =
"packagegroup-core-tools-profile"
FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps"
FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk
packagegroup-core-standalone-sdk-target"
FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server"
+FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client"
FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh"
FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps"
diff --git a/meta/recipes-core/glibc/glibc-testing.inc
b/meta/recipes-core/glibc/glibc-testing.inc
index fd1af39..a9bbf37 100644
--- a/meta/recipes-core/glibc/glibc-testing.inc
+++ b/meta/recipes-core/glibc/glibc-testing.inc
@@ -54,7 +54,7 @@ then
echo "1. You dont have passwordless ssh setup to access \$target"
echo "2. NFS share on \$target is not mounted or if mounted then not
matching the build tree layout."
echo " The tree should be accessible at same location on build host
and target"
- echo " You can add nfs-server to IMAGE_FEATURES to get the nfs client
on target"
+ echo " You can add nfs-client to IMAGE_FEATURES to get the nfs client
on target"
echo "3. nfs server on build host is not running."
echo " Please make sure that you have 'no_root_squash' added in
/etc/exports if you want"
echo " to test as root user on target (usually its recommended to
create a non"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 247a30e..1882d3a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -8,7 +8,11 @@ PR = "r2"
inherit packagegroup
-PACKAGES = "${PN}-server"
+PROVIDES = "${PACKAGES}"
+PACKAGES = "${PN}-server ${PN}-client"
+
+SUMMARY_${PN}-client = "NFS client"
+RDEPENDS_${PN}-client = "nfs-utils-client"
SUMMARY_${PN}-server = "NFS server"
RDEPENDS_${PN}-server = "\
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][meta-oe] lvm2: enable lvmetad
From: Roy Li
the systemd unit file of lvm2-monitor requires lvm2-lvmetad.socket which
asks to enable lvmetad, lvmetad is a metadata caching daemon for LVM. so
this fixed the below error:
# systemctl start lvm2-monitor
Failed to start lvm2-monitor.service: Unit lvm2-lvmetad.socket failed to
load: No such file or directory.
#
replace the installation of system unit file by make install_systemd_units
Signed-off-by: Roy Li
---
meta-oe/recipes-support/lvm2/lvm2.inc | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc
b/meta-oe/recipes-support/lvm2/lvm2.inc
index 099164c..2b2d8ed 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -24,6 +24,7 @@ EXTRA_OECONF = "--with-user= \
--enable-udev_rules \
--enable-pkgconfig \
--enable-dmeventd \
+--enable-lvmetad \
--with-udev-prefix= \
--with-usrlibdir=${libdir} \
"
@@ -38,14 +39,13 @@ do_install_append() {
# Install machine specific configuration file
install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
-install -d ${D}${systemd_unitdir}/system
-install -m 0644 ${B}/scripts/lvm2_monitoring_systemd_red_hat.service
${D}${systemd_unitdir}/system/lvm2-monitor.service
-install -m 0644 ${B}/scripts/dm_event_systemd_red_hat.socket
${D}${systemd_unitdir}/system/dm-event.socket
-install -m 0644 ${B}/scripts/dm_event_systemd_red_hat.service
${D}${systemd_unitdir}/system/dm-event.service
+oe_runmake 'DESTDIR=${D}' install install_systemd_units
+sed -i -e 's:/usr/bin/true:${base_bindir}/true:g'
${D}${systemd_unitdir}/system/blk-availability.service
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service"
+SYSTEMD_SERVICE_${PN} = "lvm2-monitor.service dm-event.socket dm-event.service
lvm2-lvmetad.socket \
+ lvm2-pvscan@.service blk-availability.service"
SYSTEMD_AUTO_ENABLE = "disable"
TARGET_CC_ARCH += "${LDFLAGS}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] asciidoc: create recipe
From: Roy Li
To fix [YOCTO #3388], asciidoc is needed
AsciiDoc is a text document format for writing short documents, articles,
books and UNIX man pages.
get recipe from openembedded, update the download url, remove the vim magic
since it becomes useless, enable native, and upgrade to 8.6.9
Signed-off-by: Roy Li
---
meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 21 +
1 file changed, 21 insertions(+)
create mode 100644 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
new file mode 100644
index 000..79747ae
--- /dev/null
+++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "AsciiDoc is a text document format for writing short documents,
\
+articles, books and UNIX man pages."
+
+HOMEPAGE = "http://www.methods.co.nz/asciidoc/";
+LICENSE = "GPLv2"
+
+SRC_URI = "
http://downloads.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz";
+
+inherit distutils-base autotools-brokensep
+
+export DESTDIR = "${D}"
+
+FILES_${PN} += "${sysconfdir}"
+
+RDEPENDS_${PN} += "python"
+
+SRC_URI[md5sum] = "c59018f105be8d022714b826b0be130a"
+SRC_URI[sha256sum] =
"78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
+
+BBCLASSEXTEND = "native"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] perf: fix the install-python_ext
From: Roy Li
1. $(grep xxx xxx) never returns 0, it maybe return empty or string, and
can not compare with 0, this fixes that python module never are installed.
2. python library is installed into /usr/lib/ by default, but we expect
it is installed into ${libdir}, so add --install-lib parameter for python
setup.py to set the library dir;
this fixes not shipped warning, since python modules are installed into
/usr/lib/, but FILE_${PN}-python expects it is under ${libdir}, which is
/usr/lib64/ for 64bit machine
3. the makefile target install-python_ext is moved from Makefile to
Makefile.perf from linux v3.13, so match install-python_ext in Makefile.*
and --root='/\$(DESTDIR_SQ)' before linux v3.13 will install the target
python library to native sysroot, so replace it with --prefix as after linux
3.13;
this fixes not shipped warning, and install target files to native dir, like
below:
ERROR: QA Issue: perf: Files/directories were installed but not shipped in any
package:
/home
/home/pokybuild
/home/pokybuild/yocto-autobuilder
/home/pokybuild/yocto-autobuilder/yocto-worker
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr/lib
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr/lib/python2.7
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages/perf.so
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-fsl-ppc-lsb/build/build/tmp/sysroots/x86_64-linux/usr/lib/python2.7/site-packages/perf-0.1-py2.7.egg-info
Signed-off-by: Roy Li
---
meta/recipes-kernel/perf/perf.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index b18e474..adb3a2c 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -44,6 +44,7 @@ export STAGING_INCDIR
export STAGING_LIBDIR
export BUILD_SYS
export HOST_SYS
+export PYTHON_SITEPACKAGES_DIR
#kernel 3.1+ supports WERROR to disable warnings as errors
export WERROR = "0"
@@ -111,7 +112,7 @@ do_install() {
unset CFLAGS
oe_runmake DESTDIR=${D} install
# we are checking for this make target to be compatible with older perf
versions
- if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a
$(grep install-python_ext ${S}/tools/perf/Makefile) = "0" ]; then
+ if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ] &&
grep -q install-python_ext ${S}/tools/perf/Makefile*; then
oe_runmake DESTDIR=${D} install-python_ext
fi
}
@@ -143,7 +144,12 @@ do_configure_prepend () {
if [ -e "${S}/tools/perf/Makefile.perf" ]; then
sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/perf/Makefile.perf
+sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr'
--install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
+${S}/tools/perf/Makefile.perf
fi
+sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr'
--install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
+${S}/tools/perf/Makefile
+
if [ -e "${S}/tools/build/Makefile.build" ]; then
sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
${S}/tools/build/Makefile.build
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] xmlto: xsltproc is required by both native and target
From: Roy Li
xsltproc is used to perform the XSL-T transformation by xmlto by default,
so it is required by both native and target, and target has the dependence
on libxslt-bin, so add libxslt to native RDEPENDS
Signed-off-by: Roy Li
---
meta/recipes-devtools/xmlto/xmlto_0.0.26.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
index a7a0183..688be74 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
@@ -24,6 +24,9 @@ RDEPENDS_${PN} = "docbook-xml-dtd4 \
RDEPENDS_${PN}_append_class-target = " \
libxslt-bin \
"
+RDEPENDS_${PN}_append_class-native = " \
+ libxslt \
+"
BBCLASSEXTEND = "native"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autotools.bbclass: Allow dependency tracking option to be overridden
From: Roy Li
CONFIGUREOPT_DEPTRACK can not be overridden since it is set by =
Signed-off-by: Roy Li
---
meta/classes/autotools.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 6f51429..9ccd7d2 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -75,7 +75,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
--disable-silent-rules \
${CONFIGUREOPT_DEPTRACK} \
${@append_libtool_sysroot(d)}"
-CONFIGUREOPT_DEPTRACK = "--disable-dependency-tracking"
+CONFIGUREOPT_DEPTRACK ?= "--disable-dependency-tracking"
oe_runconf () {
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xmlto: xsltproc is required by both native and target
From: Roy Li
xsltproc is required by both native and target, so add libxslt to
RDEPENDS unconditionally
Signed-off-by: Roy Li
---
meta/recipes-devtools/xmlto/xmlto_0.0.26.bb | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
index a7a0183..767d258 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
@@ -20,9 +20,7 @@ RDEPENDS_${PN} = "docbook-xml-dtd4 \
util-linux \
libxml2 \
bash \
-"
-RDEPENDS_${PN}_append_class-target = " \
- libxslt-bin \
+ libxslt \
"
BBCLASSEXTEND = "native"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perf: fix the check
From: Roy Li
$(grep xxx xxx) never returns 0, it maybe return empty or a string, and
can not compare with 0
Signed-off-by: Roy Li
---
meta/recipes-kernel/perf/perf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 246f1b4..0aff9fb 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -111,7 +111,7 @@ do_install() {
unset CFLAGS
oe_runmake DESTDIR=${D} install
# we are checking for this make target to be compatible with older perf
versions
- if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a
$(grep install-python_ext ${S}/tools/perf/Makefile) = "0" ]; then
+ if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ] &&
grep -q install-python_ext ${S}/tools/perf/Makefile; then
oe_runmake DESTDIR=${D} install-python_ext
fi
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] glibc: package nscd related files
From: Roy Li
install nscd related configuration file, startup files, and package them,
make nscd easy to startup
Signed-off-by: Roy Li
---
meta/recipes-core/glibc/glibc-package.inc | 40 ++-
meta/recipes-core/glibc/glibc.inc | 2 +-
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index def0e0c..9bded67 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -49,7 +49,8 @@ FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a
${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
-FILES_nscd = "${sbindir}/nscd*"
+FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd
${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
+ ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd
${localstatedir}/db/nscd"
FILES_${PN}-mtrace = "${bindir}/mtrace"
FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
@@ -105,6 +106,29 @@ do_install_append () {
rmdir ${D}${sysconfdir}
fi
fi
+
+ if echo ${PN}|grep -q "glibc-initial"; then
+ return
+ fi
+
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${localstatedir}/db/nscd
+ install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd
+ install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf
+ sed -i "s%daemon%start-stop-daemon --start --exec%g"
${D}${sysconfdir}/init.d/nscd
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+ install -d ${D}${sysconfdir}/tmpfiles.d
+ echo "d /run/nscd 755 root root -" \
+ > ${D}${sysconfdir}/tmpfiles.d/nscd.conf
+ else
+ install -d ${D}${sysconfdir}/default/volatiles
+ echo "d root root 0755 /var/run/nscd none" \
+ > ${D}${sysconfdir}/default/volatiles/98_nscd
+ fi
}
do_install_append_aarch64 () {
@@ -174,3 +198,17 @@ glibc_package_preprocess () {
rm -rf ${PKGD}${exec_prefix}/lib
fi
}
+
+pkg_postinst_nscd () {
+ if [ -z "$D" ]; then
+ if command -v systemd-tmpfiles >/dev/null; then
+ systemd-tmpfiles --create
${sysconfdir}/tmpfiles.d/nscd.conf
+ elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+ ${sysconfdir}/init.d/populate-volatile.sh update
+ fi
+ fi
+}
+CONFFILES_nscd="${sysconfdir}/nscd.conf"
+
+SYSTEMD_PACKAGES = "nscd"
+SYSTEMD_SERVICE_nscd = "nscd.service"
diff --git a/meta/recipes-core/glibc/glibc.inc
b/meta/recipes-core/glibc/glibc.inc
index 74ad0b5..03ffb2f 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -41,7 +41,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial
linux-libc-headers
#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
-inherit autotools texinfo distro_features_check
+inherit autotools texinfo distro_features_check systemd
require glibc-options.inc
# The main purpose of setting this variable is to prevent users from accidently
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: Upgrade 6.9p1 -> 7.0p1
From: Roy Li
7.0p1 includes the fix for CVE-2015-5600, and release note is in:
http://www.openssh.com/txt/release-7.0
Signed-off-by: Roy Li
---
.../openssh/{openssh_6.9p1.bb => openssh_7.0p1.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/openssh/{openssh_6.9p1.bb =>
openssh_7.0p1.bb} (97%)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.9p1.bb
b/meta/recipes-connectivity/openssh/openssh_7.0p1.bb
similarity index 97%
rename from meta/recipes-connectivity/openssh/openssh_6.9p1.bb
rename to meta/recipes-connectivity/openssh/openssh_7.0p1.bb
index 3529c86..105875a 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.0p1.bb
@@ -24,8 +24,8 @@ SRC_URI =
"ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
PAM_SRC_URI = "file://sshd"
-SRC_URI[md5sum] = "0b161c44fc31fbc6b76a6f8ae639f16f"
-SRC_URI[sha256sum] =
"6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe"
+SRC_URI[md5sum] = "831883f251ac34f0ab9c812acc24ee69"
+SRC_URI[sha256sum] =
"fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5"
inherit useradd update-rc.d update-alternatives systemd
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glibc: package nscd related files
From: Roy Li
install nscd related configuration file, startup files, and package them,
make nscd easy to startup
Signed-off-by: Roy Li
---
meta/recipes-core/glibc/glibc-package.inc | 37 ++-
meta/recipes-core/glibc/glibc.inc | 2 +-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index 8ea5915..5f7c8a9 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -49,7 +49,8 @@ FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a
${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
-FILES_nscd = "${sbindir}/nscd*"
+FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd
${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
+ ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd
${localstatedir}/db/nscd"
FILES_${PN}-mtrace = "${bindir}/mtrace"
FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump"
FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
@@ -105,6 +106,29 @@ do_install_append () {
rmdir ${D}${sysconfdir}
fi
fi
+
+ if echo ${PN}|grep -q "glibc-initial"; then
+ return
+ fi
+
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${localstatedir}/db/nscd
+ install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd
+ install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf
+ sed -i "s%daemon%start-stop-daemon --start --exec%g"
${D}${sysconfdir}/init.d/nscd
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/
+
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
+ install -d ${D}${sysconfdir}/tmpfiles.d
+ echo "d /run/nscd 755 root root -" \
+ > ${D}${sysconfdir}/tmpfiles.d/nscd.conf
+ else
+ install -d ${D}${sysconfdir}/default/volatiles
+ echo "d root root 0755 /var/run/nscd none" \
+ > ${D}${sysconfdir}/default/volatiles/98_nscd
+ fi
}
do_install_append_aarch64 () {
@@ -174,3 +198,14 @@ glibc_package_preprocess () {
rm -rf ${PKGD}${exec_prefix}/lib
fi
}
+
+pkg_postinst_nscd () {
+ if [ -z "$D" ]; then
+ if command -v systemd-tmpfiles >/dev/null; then
+ systemd-tmpfiles --create
${sysconfdir}/tmpfiles.d/nscd.conf
+ elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+ ${sysconfdir}/init.d/populate-volatile.sh update
+ fi
+ fi
+}
+CONFFILES_nscd="${sysconfdir}/nscd.conf"
diff --git a/meta/recipes-core/glibc/glibc.inc
b/meta/recipes-core/glibc/glibc.inc
index 74ad0b5..03ffb2f 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -41,7 +41,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial
linux-libc-headers
#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
-inherit autotools texinfo distro_features_check
+inherit autotools texinfo distro_features_check systemd
require glibc-options.inc
# The main purpose of setting this variable is to prevent users from accidently
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] attr: narrow fix_symlink to populate_sysroot
From: Roy Li
fix_symlink will be called many times, like populate_sysroot and populate_lic;
which maybe lead to rpm-native building failure, due to the below error:
".../usr/lib/libacl.so: No such file or directory"
since after acl/attr finished populate_sysroot task, rpm start to be compiled
but acl/attr populate_lic, which run fix_symlink, maybe remove the
.../usr/lib/libacl.so
In fact, fix_symlink only needs to be called after populate_sysroot
Signed-off-by: Roy Li
---
meta/recipes-support/attr/ea-acl.inc | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-support/attr/ea-acl.inc
b/meta/recipes-support/attr/ea-acl.inc
index 474291a..370e16f 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -27,6 +27,11 @@ LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl
'][(d.getVar('USE_NL
EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext
'][(d.getVar('USE_NLS', True) == 'no')]}"
fix_symlink () {
+ if [ "${BB_CURRENTTASK}" != "populate_sysroot" -a "${BB_CURRENTTASK}"
!= "populate_sysroot_setscene" ]
+ then
+ return
+ fi
+
if test "${libdir}" = "${base_libdir}" ; then
return
fi
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston: backport a patches to fix the building failure
From: Roy Li
Signed-off-by: Roy Li
---
...-target-weston.ini-directories-before-wri.patch | 42 ++
meta/recipes-graphics/wayland/weston_1.8.0.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644
meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
diff --git
a/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
b/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
new file mode 100644
index 000..a8fd846
--- /dev/null
+++
b/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
@@ -0,0 +1,42 @@
+From 2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc Mon Sep 17 00:00:00 2001
+From: Ross Burton
+Date: Fri, 17 Jul 2015 12:33:45 +0100
+Subject: [PATCH] build: mkdir target weston.ini directories before writing
+
+Upstream-Status: Backport
+
+In parallel out-of-tree builds it is possible for e.g. ivi-shell/weston.ini to
+be written before ivi-shell/ exists. Solve this by creating the target
+directory first.
+
+Signed-off-by: Ross Burton
+Reviewed-by: Quentin Glidic
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a3590c0..76ab546 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
+ $< > $@
+
+ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
+- $(AM_V_GEN)$(SED) \
++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
+ -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
+@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
+ $< > $@
+
+ tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
+- $(AM_V_GEN)$(SED) \
++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
+ -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
+--
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb
b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index 342c604..515c712 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -12,6 +12,7 @@ SRC_URI =
"http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://make-libwebp-explicitly-configurable.patch \
file://0001-make-error-portable.patch \
file://parallelmake.patch \
+
file://0001-build-mkdir-target-weston.ini-directories-before-wri.patch \
"
SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
SRC_URI[sha256sum] =
"8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] gcc: reformat 0063-nativesdk-gcc-support.patch
From: Roy Li
0063-nativesdk-gcc-support.patch can not be applied to source code due to
the buggy patch command on sled11, so reformat it, nothing is changed.
Signed-off-by: Roy Li
---
.../gcc/gcc-4.9/0063-nativesdk-gcc-support.patch | 44 ++
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
index ba7360c..f9efa45 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
@@ -15,15 +15,13 @@ a) Add %r into spec file markup which can be used for
injected paths
b) Add other paths which need relocation into a .gccrelocprefix section
which the relocation code will notice and adjust automatically.
-
Upstream-Status: Inappropriate
RP 2015/7/28
-
-Index: gcc-4.9.2/gcc/gcc.c
-===
gcc-4.9.2.orig/gcc/gcc.c
-+++ gcc-4.9.2/gcc/gcc.c
-@@ -120,6 +120,8 @@ static const char *target_system_root =
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 5fd3d0a..2de29aa 100644
+--- a/gcc/gcc.c
b/gcc/gcc.c
+@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT;
#else
static const char *target_system_root = 0;
#endif
@@ -32,7 +30,7 @@ Index: gcc-4.9.2/gcc/gcc.c
/* Nonzero means pass the updated target_system_root to the compiler. */
-@@ -384,6 +386,7 @@ or with constant text in a single argume
+@@ -384,6 +386,7 @@ or with constant text in a single argument.
%G process LIBGCC_SPEC as a spec.
%R Output the concatenation of target_system_root and
target_sysroot_suffix.
@@ -55,7 +53,7 @@ Index: gcc-4.9.2/gcc/gcc.c
/* For native compilers, these are well-known paths containing
components that may be provided by the system. For cross
-@@ -1229,9 +1232,9 @@ static const char *const standard_startf
+@@ -1229,9 +1232,9 @@ static const char *const standard_startfile_prefix =
STANDARD_STARTFILE_PREFIX;
static const char *md_exec_prefix = MD_EXEC_PREFIX;
static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -67,7 +65,7 @@ Index: gcc-4.9.2/gcc/gcc.c
= STANDARD_STARTFILE_PREFIX_2;
/* A relative path to be used in finding the location of tools
-@@ -5305,6 +5310,11 @@ do_spec_1 (const char *spec, int inswitc
+@@ -5305,6 +5308,11 @@ do_spec_1 (const char *spec, int inswitch, const char
*soft_matched_part)
}
break;
@@ -79,10 +77,11 @@ Index: gcc-4.9.2/gcc/gcc.c
case 'S':
value = do_spec_1 (startfile_spec, 0, NULL);
if (value != 0)
-Index: gcc-4.9.2/gcc/cppdefault.c
-===
gcc-4.9.2.orig/gcc/cppdefault.c
-+++ gcc-4.9.2/gcc/cppdefault.c
+
+diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
+index dad69e6..cf43f28 100644
+--- a/gcc/cppdefault.c
b/gcc/cppdefault.c
@@ -35,6 +35,30 @@
# undef CROSS_INCLUDE_DIR
#endif
@@ -114,7 +113,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
const struct default_include cpp_include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
-@@ -42,38 +66,38 @@ const struct default_include cpp_include
+@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[]
= {
#ifdef GPLUSPLUS_INCLUDE_DIR
/* Pick up GNU C++ generic include files. */
@@ -162,7 +161,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
/* A multilib suffix needs adding if different multilibs use
different headers. */
#ifdef SYSROOT_HEADERS_SUFFIX_SPEC
-@@ -85,21 +109,21 @@ const struct default_include cpp_include
+@@ -85,16 +109,16 @@ const struct default_include cpp_include_defaults[]
#endif
#ifdef CROSS_INCLUDE_DIR
/* One place the target system's headers might be. */
@@ -183,15 +182,10 @@ Index: gcc-4.9.2/gcc/cppdefault.c
#endif
{ 0, 0, 0, 0, 0, 0 }
};
- #endif /* no INCLUDE_DEFAULTS */
-
- #ifdef GCC_INCLUDE_DIR
- const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR;
- const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8;
-Index: gcc-4.9.2/gcc/cppdefault.h
-===
gcc-4.9.2.orig/gcc/cppdefault.h
-+++ gcc-4.9.2/gcc/cppdefault.h
+diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
+index 30b6fed..2ef96b7 100644
+--- a/gcc/cppdefault.h
b/gcc/cppdefault.h
@@ -33,7 +33,8 @@
struct default_include
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc: reformat 0063-nativesdk-gcc-support.patch
From: Roy Li
0063-nativesdk-gcc-support.patch can be applied due to the buggy
patch command on sled11, so reformat it, nothing is changed.
Signed-off-by: Roy Li
---
.../gcc/gcc-4.9/0063-nativesdk-gcc-support.patch | 44 ++
1 file changed, 19 insertions(+), 25 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
index ba7360c..f9efa45 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.9/0063-nativesdk-gcc-support.patch
@@ -15,15 +15,13 @@ a) Add %r into spec file markup which can be used for
injected paths
b) Add other paths which need relocation into a .gccrelocprefix section
which the relocation code will notice and adjust automatically.
-
Upstream-Status: Inappropriate
RP 2015/7/28
-
-Index: gcc-4.9.2/gcc/gcc.c
-===
gcc-4.9.2.orig/gcc/gcc.c
-+++ gcc-4.9.2/gcc/gcc.c
-@@ -120,6 +120,8 @@ static const char *target_system_root =
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 5fd3d0a..2de29aa 100644
+--- a/gcc/gcc.c
b/gcc/gcc.c
+@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT;
#else
static const char *target_system_root = 0;
#endif
@@ -32,7 +30,7 @@ Index: gcc-4.9.2/gcc/gcc.c
/* Nonzero means pass the updated target_system_root to the compiler. */
-@@ -384,6 +386,7 @@ or with constant text in a single argume
+@@ -384,6 +386,7 @@ or with constant text in a single argument.
%G process LIBGCC_SPEC as a spec.
%R Output the concatenation of target_system_root and
target_sysroot_suffix.
@@ -55,7 +53,7 @@ Index: gcc-4.9.2/gcc/gcc.c
/* For native compilers, these are well-known paths containing
components that may be provided by the system. For cross
-@@ -1229,9 +1232,9 @@ static const char *const standard_startf
+@@ -1229,9 +1232,9 @@ static const char *const standard_startfile_prefix =
STANDARD_STARTFILE_PREFIX;
static const char *md_exec_prefix = MD_EXEC_PREFIX;
static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
@@ -67,7 +65,7 @@ Index: gcc-4.9.2/gcc/gcc.c
= STANDARD_STARTFILE_PREFIX_2;
/* A relative path to be used in finding the location of tools
-@@ -5305,6 +5310,11 @@ do_spec_1 (const char *spec, int inswitc
+@@ -5305,6 +5308,11 @@ do_spec_1 (const char *spec, int inswitch, const char
*soft_matched_part)
}
break;
@@ -79,10 +77,11 @@ Index: gcc-4.9.2/gcc/gcc.c
case 'S':
value = do_spec_1 (startfile_spec, 0, NULL);
if (value != 0)
-Index: gcc-4.9.2/gcc/cppdefault.c
-===
gcc-4.9.2.orig/gcc/cppdefault.c
-+++ gcc-4.9.2/gcc/cppdefault.c
+
+diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
+index dad69e6..cf43f28 100644
+--- a/gcc/cppdefault.c
b/gcc/cppdefault.c
@@ -35,6 +35,30 @@
# undef CROSS_INCLUDE_DIR
#endif
@@ -114,7 +113,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
const struct default_include cpp_include_defaults[]
#ifdef INCLUDE_DEFAULTS
= INCLUDE_DEFAULTS;
-@@ -42,38 +66,38 @@ const struct default_include cpp_include
+@@ -42,38 +66,38 @@ const struct default_include cpp_include_defaults[]
= {
#ifdef GPLUSPLUS_INCLUDE_DIR
/* Pick up GNU C++ generic include files. */
@@ -162,7 +161,7 @@ Index: gcc-4.9.2/gcc/cppdefault.c
/* A multilib suffix needs adding if different multilibs use
different headers. */
#ifdef SYSROOT_HEADERS_SUFFIX_SPEC
-@@ -85,21 +109,21 @@ const struct default_include cpp_include
+@@ -85,16 +109,16 @@ const struct default_include cpp_include_defaults[]
#endif
#ifdef CROSS_INCLUDE_DIR
/* One place the target system's headers might be. */
@@ -183,15 +182,10 @@ Index: gcc-4.9.2/gcc/cppdefault.c
#endif
{ 0, 0, 0, 0, 0, 0 }
};
- #endif /* no INCLUDE_DEFAULTS */
-
- #ifdef GCC_INCLUDE_DIR
- const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR;
- const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8;
-Index: gcc-4.9.2/gcc/cppdefault.h
-===
gcc-4.9.2.orig/gcc/cppdefault.h
-+++ gcc-4.9.2/gcc/cppdefault.h
+diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
+index 30b6fed..2ef96b7 100644
+--- a/gcc/cppdefault.h
b/gcc/cppdefault.h
@@ -33,7 +33,8 @@
struct default_include
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bind: upgrade to 9.10.2-p3
From: Roy Li
9.10.2-p3 includes the fix for CVE-2015-5477:
BIND 9.x before 9.9.7-P2 and 9.10.x before 9.10.2-P3 allows remote
attackers to cause a denial of service (REQUIRE assertion failure
and daemon exit) via TKEY queries.
Signed-off-by: Roy Li
---
.../bind/{bind_9.10.2-P2.bb => bind_9.10.2-P3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/bind/{bind_9.10.2-P2.bb => bind_9.10.2-P3.bb}
(96%)
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
b/meta/recipes-connectivity/bind/bind_9.10.2-P3.bb
similarity index 96%
rename from meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
rename to meta/recipes-connectivity/bind/bind_9.10.2-P3.bb
index 3a8959e..52244b0 100644
--- a/meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
+++ b/meta/recipes-connectivity/bind/bind_9.10.2-P3.bb
@@ -21,8 +21,8 @@ SRC_URI =
"ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
"
-SRC_URI[md5sum] = "55d8f094bc10baae0e23e5e9100ba320"
-SRC_URI[sha256sum] =
"b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f"
+SRC_URI[md5sum] = "a810d5d65fbdcf28dcda80d646913c3a"
+SRC_URI[sha256sum] =
"78079a66dda455ffecfe93ef72d1ffc947f17b1c453d55ec06b860b49a5e1d4a"
# --enable-exportlib is necessary for building dhcp
ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
'yes', 'no', d)}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] attr: drop sstate fix and narrow relative-libdir.patch to target
From: Roy Li
The relative-libdir.patch is no longer needed for native since fix_symlink
for native has been added to revert what it done, Also this patch and
fix_symlink add a race condition since both libacl.so and libattr.so were
created, then removed, and then recreated.
So Only keep relative-libdir.patch for the target.
Signed-off-by: Roy Li
---
meta/recipes-support/attr/ea-acl.inc | 23 ++-
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-support/attr/ea-acl.inc
b/meta/recipes-support/attr/ea-acl.inc
index 474291a..64df16e 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -1,6 +1,7 @@
# this build system is mostly shared by attr and acl
-SRC_URI += "file://relative-libdir.patch;striplevel=0 \
+SRC_URI_append_class-target = " \
+ file://relative-libdir.patch;striplevel=0 \
"
inherit autotools-brokensep gettext
@@ -25,23 +26,3 @@ BBCLASSEXTEND = "native"
# Only append ldflags for target recipe and if USE_NLS is enabled
LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl
'][(d.getVar('USE_NLS', True) == 'yes')]}"
EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext
'][(d.getVar('USE_NLS', True) == 'no')]}"
-
-fix_symlink () {
- if test "${libdir}" = "${base_libdir}" ; then
- return
- fi
- # Remove bad symlinks & create the correct symlinks
- if test -L ${libdir}/lib${BPN}.so ; then
- rm -rf ${libdir}/lib${BPN}.so
- ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
- fi
- if test -L ${base_libdir}/lib${BPN}.a ; then
- rm -rf ${base_libdir}/lib${BPN}.a
- ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
- fi
- if test -L ${base_libdir}/lib${BPN}.la ; then
- rm -rf ${base_libdir}/lib${BPN}.la
- ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
- fi
-}
-SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] alsa-utils: assume the alsa storing is success if machine has no sound card
From: Roy Li
Signed-off-by: Roy Li
---
...oring-is-success-if-not-sound-card-device.patch | 34 ++
meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb | 1 +
2 files changed, 35 insertions(+)
create mode 100644
meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
diff --git
a/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
b/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
new file mode 100644
index 000..f67283d
--- /dev/null
+++
b/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
@@ -0,0 +1,34 @@
+[PATCH] assume storing is success if not sound card device
+
+Upstream-Statue: Pending
+
+Systemd will report failure when run alsa-*, if the machine has not the
+sound card. To void this annoyed message, alsa-restore/alsa-state ignore
+all the exit codes by prefixing "-" in ExecStart, like:
+
+ alsa-utils-1.0.29$ grep "=-" ./ -r|grep service.in
+ ./alsactl/alsa-restore.service.in:ExecStart=-@sbindir@/alsactl restore
+ ./alsactl/alsa-state.service.in:ExecStart=-@sbindir@/alsactl -s -n 19 -c
rdaemon
+ ./alsactl/alsa-state.service.in:ExecStop=-@sbindir@/alsactl -s kill
save_and_quit
+ lsa-utils-1.0.29$
+
+But alsa-store.service.in is missing, and better solution is to ignore
+the exit code 19 which means not sound card device, not all exit code
+
+Signed-off-by: Roy Li
+---
+ alsactl/alsa-store.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in
+index f1a56bb..68ca529 100644
+--- a/alsactl/alsa-store.service.in
b/alsactl/alsa-store.service.in
+@@ -13,3 +13,4 @@ Before=shutdown.target
+ Type=oneshot
+ ExecStart=@sbindir@/alsactl store
+ StandardOutput=syslog
++SuccessExitStatus=0 19
+--
+1.9.1
+
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
index 65cae0b..263f38a 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb
@@ -14,6 +14,7 @@ PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto,
xmlto-native docbook-xm
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
file://alsa-utils-aplay-interrupt-signal-handling.patch \
+ file://assume-storing-is-success-if-not-sound-card-device.patch \
"
SRC_URI[md5sum] = "6b289bf874c4c9a63f4b3973093dd404"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] attr: remove some meaningless codes
From: Roy Li
what relative-libdir.patch done is reverted by fix_symlink for native,
and add a race since libacl.so/libattr.so are created, then removed, and
recreated it.
relative-libdir.patch say it fixed udev issue, but can not reproduce
current, and if udev has issue, the fix should be in udev
Cc: Saul Wold
Signed-off-by: Roy Li
---
meta/recipes-support/attr/ea-acl.inc | 23
.../attr/files/relative-libdir.patch | 25 --
2 files changed, 48 deletions(-)
delete mode 100644 meta/recipes-support/attr/files/relative-libdir.patch
diff --git a/meta/recipes-support/attr/ea-acl.inc
b/meta/recipes-support/attr/ea-acl.inc
index 474291a..088f058 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -1,8 +1,5 @@
# this build system is mostly shared by attr and acl
-SRC_URI += "file://relative-libdir.patch;striplevel=0 \
- "
-
inherit autotools-brokensep gettext
# the package comes with a custom config.h.in, it cannot be
@@ -25,23 +22,3 @@ BBCLASSEXTEND = "native"
# Only append ldflags for target recipe and if USE_NLS is enabled
LDFLAGS_append_libc-uclibc_class-target = "${@['', ' -lintl
'][(d.getVar('USE_NLS', True) == 'yes')]}"
EXTRA_OECONF_append_libc-uclibc_class-target = "${@['', ' --disable-gettext
'][(d.getVar('USE_NLS', True) == 'no')]}"
-
-fix_symlink () {
- if test "${libdir}" = "${base_libdir}" ; then
- return
- fi
- # Remove bad symlinks & create the correct symlinks
- if test -L ${libdir}/lib${BPN}.so ; then
- rm -rf ${libdir}/lib${BPN}.so
- ln -sf ${base_libdir}/lib${BPN}.so ${libdir}/lib${BPN}.so
- fi
- if test -L ${base_libdir}/lib${BPN}.a ; then
- rm -rf ${base_libdir}/lib${BPN}.a
- ln -sf ${libdir}/lib${BPN}.a ${base_libdir}/lib${BPN}.a
- fi
- if test -L ${base_libdir}/lib${BPN}.la ; then
- rm -rf ${base_libdir}/lib${BPN}.la
- ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
- fi
-}
-SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
diff --git a/meta/recipes-support/attr/files/relative-libdir.patch
b/meta/recipes-support/attr/files/relative-libdir.patch
deleted file mode 100644
index b72bf18..000
--- a/meta/recipes-support/attr/files/relative-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-use relative path in symbolic links, or it fails in staging
-sed expression from udev
-
-7/29/2010 - created by Qing He
-
-diff -u include.orig/buildmacros include/buildmacros
include.orig/buildmacros 2010-07-29 17:39:48.0 +0800
-+++ include/buildmacros2010-07-29 18:20:34.0 +0800
-@@ -88,9 +88,11 @@
- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
- if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a
$(PKG_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la
$(PKG_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so
$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-+ rel_lib_prefix=$$(echo $(PKG_LIB_DIR) | sed
's,\(^/\|\)[^/][^/]*,..,g'); \
-+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).a
$(PKG_LIB_DIR)/$(LIBNAME).a; \
-+ ../$(INSTALL) -S $$rel_lib_prefix$(PKG_DEVLIB_DIR)/$(LIBNAME).la
$(PKG_LIB_DIR)/$(LIBNAME).la; \
-+ rel_devlib_prefix=$$(echo $(PKG_DEVLIB_DIR) | sed
's,\(^/\|\)[^/][^/]*,..,g'); \
-+ ../$(INSTALL) -S $$rel_devlib_prefix$(PKG_LIB_DIR)/$(LIBNAME).so
$(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
- fi
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] u-boot-mkimage: fix a building failure on OpenSus
From: Roy Li
Signed-off-by: Roy Li
---
...-the-creation-of-include-config-auto.conf.patch | 54 ++
meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb | 1 +
2 files changed, 55 insertions(+)
create mode 100644
meta/recipes-bsp/u-boot/u-boot-mkimage/0001-delay-the-creation-of-include-config-auto.conf.patch
diff --git
a/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-delay-the-creation-of-include-config-auto.conf.patch
b/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-delay-the-creation-of-include-config-auto.conf.patch
new file mode 100644
index 000..071aa67
--- /dev/null
+++
b/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-delay-the-creation-of-include-config-auto.conf.patch
@@ -0,0 +1,54 @@
+[PATCH] delay the creation of include/config/auto.conf
+
+Upstream-Statue: Pending
+
+config.mk will be included only if auto.conf is newer than .config
+but in some system, the HPET is not enabled, the smallest unit of
+time is second, and can not decise which file is newer, even if
+the correct dependency has been created.
+
+The below shows unit of time:
+
+under SUSE Linux Enterprise Desktop 11 SP2 (i586):
+$ls --full-time include/config/auto.conf .config
+2015-07-27 03:46:20.0 -0400 .config
+2015-07-27 03:46:20.0 -0400 include/config/auto.conf
+$
+
+under Ubuntu 14.04 LTS:
+$ ls --full-time include/config/auto.conf .config
+2015-07-27 13:40:14.008703027 +0800 .config
+2015-07-27 13:40:15.020703054 +0800 include/config/auto.conf
+$
+
+The rule of including config.mk in Makefile as below
+autoconf_is_current := $(if $(wildcard $(KCONFIG_CONFIG)),$(shell find . \
+-path ./include/config/auto.conf -newer $(KCONFIG_CONFIG)))
+ifneq ($(autoconf_is_current),)
+include $(srctree)/config.mk
+include $(srctree)/arch/$(ARCH)/Makefile
+endif
+
+The compilation will be failed if config.mk is not included
+so delay 1 second to create auto.conf after creating of .config
+
+Signed-off-by: Roy Li
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
+index 36a9a28..5f085ad 100644
+--- a/Makefile
b/Makefile
+@@ -490,6 +490,7 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
+ # if auto.conf.cmd is missing then we are probably in a cleaned tree so
+ # we execute the config step to be sure to catch updated Kconfig files
+ include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
++ sleep 1; \
+ $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
+
+ -include include/autoconf.mk
+--
+1.9.1
+
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
index 7735288..c0007c9 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
@@ -14,6 +14,7 @@ PV = "v2015.01+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
file://gcc5.patch \
+ file://0001-delay-the-creation-of-include-config-auto.conf.patch \
"
S = "${WORKDIR}/git"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bind: upgrade to 9.10.2-P2
From: Roy Li
upgrade to fix CVE-2015-4620:
name.c in named in ISC BIND 9.7.x through 9.9.x before 9.9.7-P1 and 9.10.x
before 9.10.2-P2, when configured as a recursive resolver with DNSSEC
validation, allows remote attackers to cause a denial of service (REQUIRE
assertion failure and daemon exit) by constructing crafted zone data and
then making a query for a name in that zone.
Signed-off-by: Roy Li
---
meta/recipes-connectivity/bind/bind_9.10.2-P2.bb | 103 +++
meta/recipes-connectivity/bind/bind_9.10.2.bb| 103 ---
2 files changed, 103 insertions(+), 103 deletions(-)
create mode 100644 meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
delete mode 100644 meta/recipes-connectivity/bind/bind_9.10.2.bb
diff --git a/meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
b/meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
new file mode 100644
index 000..0d2af55
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind_9.10.2-P2.bb
@@ -0,0 +1,103 @@
+SUMMARY = "ISC Internet Domain Name Server"
+HOMEPAGE = "http://www.isc.org/sw/bind/";
+SECTION = "console/network"
+
+LICENSE = "ISC & BSD"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0a95f52a0ab6c5f52dedc9a45e7abb3f"
+
+DEPENDS = "openssl libcap"
+
+SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
+ file://conf.patch \
+ file://make-etc-initd-bind-stop-work.patch \
+ file://mips1-not-support-opcode.diff \
+ file://dont-test-on-host.patch \
+ file://generate-rndc-key.sh \
+ file://named.service \
+ file://bind9 \
+ file://init.d-add-support-for-read-only-rootfs.patch \
+ file://bind-confgen-build-unix.o-once.patch \
+ file://0001-build-use-pkg-config-to-find-libxml2.patch \
+ file://bind-ensure-searching-for-json-headers-searches-sysr.patch \
+ "
+
+SRC_URI[md5sum] = "55d8f094bc10baae0e23e5e9100ba320"
+SRC_URI[sha256sum] =
"b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f"
+
+# --enable-exportlib is necessary for building dhcp
+ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
'yes', 'no', d)}"
+EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads
\
+ --disable-devpoll --disable-epoll --with-gost=no \
+ --with-gssapi=no --with-ecdsa=yes \
+ --sysconfdir=${sysconfdir}/bind \
+ --with-openssl=${STAGING_LIBDIR}/.. \
+ "
+inherit autotools update-rc.d systemd useradd pkgconfig
+
+PR = "r1"
+
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2"
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --home /var/cache/bind --no-create-home \
+ --user-group bind"
+
+INITSCRIPT_NAME = "bind"
+INITSCRIPT_PARAMS = "defaults"
+
+SYSTEMD_SERVICE_${PN} = "named.service"
+
+PARALLEL_MAKE = ""
+
+RDEPENDS_${PN} = "python-core"
+
+PACKAGE_BEFORE_PN += "${PN}-utils"
+FILES_${PN}-utils = "${bindir}/host ${bindir}/dig"
+FILES_${PN}-dev += "${bindir}/isc-config.h"
+FILES_${PN} += "${sbindir}/generate-rndc-key.sh"
+
+do_install_prepend() {
+ # clean host path in isc-config.sh before the hardlink created
+ # by "make install":
+ # bind9-config -> isc-config.sh
+ sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh
+}
+
+do_install_append() {
+ rm "${D}${bindir}/nslookup"
+ rm "${D}${mandir}/man1/nslookup.1"
+ rmdir "${D}${localstatedir}/run"
+ rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
+ install -d "${D}${localstatedir}/cache/bind"
+ install -d "${D}${sysconfdir}/bind"
+ install -d "${D}${sysconfdir}/init.d"
+ install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
+ install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
+ sed -i -e '1s,#!.*python,#! /usr/bin/env python,'
${D}${sbindir}/dnssec-coverage ${D}${sbindir}/dnssec-checkds
+
+ # Install systemd related files
+ install -d ${D}${localstatedir}/cache/bind
+ install -d ${D}${sbindir}
+ install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system
+ sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ -e 's,@SBINDIR@,${sbindir},g' \
+ ${D}${systemd_unitdir}/system/named.service
+
+ install -d ${D}${sysconfdir}/default
+ install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
+}
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bind/named.conf \
+ ${sysconfdir}/bind/named.conf.local \
+ ${sysconfdir}/bind/named.conf.options \
+ ${sysconfdir}/bind/db.0 \
+ ${sysconfdir}/bind/db.127 \
+ ${sysconfdir}/bind/db.empty \
+ ${sysconfdir}/bind/db.local \
+ ${sysconfdir}/bind/db.root \
+
[OE-core] [PATCH] mklibs-native: Remove dependency on dpkg
From: Roy Li
b18618a8[mklibs-native: two fixes] should remove the dependency
on dpkg, but it is missed, so fix it.
Signed-off-by: Roy Li
---
meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
b/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
index d6905ac..59fec29 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://launchpad.net/mklibs";
SECTION = "devel"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM =
"file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
-DEPENDS = "python-native dpkg-native"
+DEPENDS = "python-native"
SRC_URI =
"http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.xz \
file://ac_init_fix.patch\
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][resend][v2] dhcp: make dhclient to get configuration for other programs
From: Li Wang
Make dhclient to run /etc/dhcp/dhclient.d/*.sh, and get the configuration
for ntp, nis or other programes
These codes are from redhat rpm package.
Signed-off-by: Li Wang
Signed-off-by: Roy Li
---
.../dhcp/dhcp/dhcp-add-exec-script-function.patch | 101 +
meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 +
meta/recipes-connectivity/dhcp/files/dhclient.conf | 1 +
3 files changed, 103 insertions(+)
create mode 100644
meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
diff --git
a/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
b/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
new file mode 100644
index 000..73b3ce4
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
@@ -0,0 +1,101 @@
+[PATCH] dhcp: add exec script function
+
+Upstream-Statue: Pending
+
+Make dhclient to run /etc/dhcp/dhclient.d/*.sh, and get the configuration
+for ntp, nis or other programes
+
+These codes are from redhat rpm packages.
+
+Signed-off-by: Li Wang
+Signed-off-by: Roy Li
+---
+ client/scripts/linux | 25 -
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 232a0aa..bdb5e22 100755
+--- a/client/scripts/linux
b/client/scripts/linux
+@@ -24,6 +24,8 @@
+
+ # 'ip' just looks too weird. /sbin/ip looks less weird.
+ ip=/sbin/ip
++ETCDIR="/etc/dhcp"
++export SAVEDIR=/var/lib/dhclient
+
+ make_resolv_conf() {
+ if [ x"$new_domain_name_servers" != x ]; then
+@@ -80,6 +82,20 @@ exit_with_hooks() {
+ exit $exit_status
+ }
+
++execute_client_side_configuration_scripts() {
++# execute any additional client side configuration scripts we have
++if [ "${1}" == "config" ] || [ "${1}" == "restore" ]; then
++for f in ${ETCDIR}/dhclient.d/*.sh ; do
++if [ -x ${f} ]; then
++subsystem="${f%.sh}"
++subsystem="${subsystem##*/}"
++. ${f}
++"${subsystem}_${1}"
++fi
++done
++fi
++}
++
+ # Invoke the local dhcp client enter hooks, if they exist.
+ if [ -f /etc/dhclient-enter-hooks ]; then
+ exit_status=0
+@@ -198,11 +214,14 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+ ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
+ fi
+ make_resolv_conf
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+|| [ x$reason = xSTOP ]; then
++ execute_client_side_configuration_scripts "restore"
++
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+ ${ip} -4 addr flush dev ${interface} label ${interface}:0
+@@ -281,7 +300,7 @@ if [ x$reason = xBOUND6 ] ; then
+
+ # Check for nameserver options.
+ make_resolv_conf
+-
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -299,6 +318,7 @@ if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
+ make_resolv_conf
+ fi
+
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -310,6 +330,7 @@ if [ x$reason = xDEPREF6 ] ; then
+ ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+dev ${interface} scope global preferred_lft 0
+
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -318,6 +339,8 @@ if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o
x$reason = xSTOP6 ] ; then
+ exit_with_hooks 2;
+ fi
+
++ execute_client_side_configuration_scripts "restore"
++
+ ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+ dev ${interface}
+
+--
+1.9.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
index b4a05fc..a73d31f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://fixsepbuild.patch \
file://dhclient-script-drop-resolv.conf.dhclient.patch \
file://replace-ifconfig-route.patch \
+file://dhcp-add-exec-script-function.patch \
"
SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67"
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf
b/meta/recipes-connectivity/dhcp/files/dhclient.conf
index 0e6dcf9..0f7d42f 100644
--- a/meta/recipes-connectivity/dhcp/files/dhclient.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhclient.conf
@@ -17,6 +17,7 @@
#supersede domain-name "fugue.com home.vix.com";
#prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers,
+ nis-domain, nis-servers, domain-search, ntp-servers,
domain-name, domain-name-servers, host-name,
[OE-core] [PATCH] weston: fix two building issue
From: Roy Li
1. duplicate makefile rule leads to race, so remove one:
"/usr/bin/install: cannot create regular file `bitbake_build/tmp/work/
core2-64-wrs-linux/weston/1.8.0-r0/image/usr/share/wayland-sessions/
weston.desktop': File exists"
2. create tests dir and ivi-shell to fix the building rule dependency issue.
sed "..." ivi-shell/weston.ini.in > ivi-shell/weston.ini
ivi-shell/weston.ini: No such file or directory
Signed-off-by: Roy Li
Signed-off-by: Robert Yang
---
.../wayland/weston/0001-remove-duplicate.patch | 33 ++
meta/recipes-graphics/wayland/weston_1.8.0.bb | 5
2 files changed, 38 insertions(+)
create mode 100644
meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
b/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
new file mode 100644
index 000..a6eaf85
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
@@ -0,0 +1,33 @@
+From 5cbb8b06e88ebcbf3669a51b8dae955c58a0ca1d Mon Sep 17 00:00:00 2001
+From: Roy Li
+Date: Wed, 15 Jul 2015 15:44:25 +0800
+Subject: [PATCH] remove the unnecessory rule from Makefile.am
+
+Upstream-Statue: Pending
+
+dist_wayland_session_DATA will distributes and installs src/weston.desktop,
+and the definition of wayland_session_DATA, which installs src/weston.desktop
+too, is duplicated, and lead to race issue, remove it to fix the problem.
+
+Signed-off-by: Roy Li
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5819b19..ee5fbbb 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = src/weston.pc
+
+ wayland_sessiondir = $(datadir)/wayland-sessions
+-wayland_session_DATA = src/weston.desktop
+-dist_wayland_session_DATA = $(wayland_session_DATA)
++dist_wayland_session_DATA = src/weston.desktop
+
+ westonincludedir = $(includedir)/weston
+ westoninclude_HEADERS = \
+--
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb
b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index ac6bd97..3bba03f 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -11,6 +11,7 @@ SRC_URI =
"http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
file://make-lcms-explicitly-configurable.patch \
file://make-libwebp-explicitly-configurable.patch \
file://0001-make-error-portable.patch \
+ file://0001-remove-duplicate.patch \
"
SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
SRC_URI[sha256sum] =
"8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
@@ -67,6 +68,10 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
# Weston with unwinding support
PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
+do_compile_prepend() {
+ mkdir ${B}/tests ${B}/ivi-shell
+}
+
do_install_append() {
# Weston doesn't need the .la files to load modules, so wipe them
rm -f ${D}/${libdir}/weston/*.la
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] piglit: Fix cmake floating dependency on freeglut
From: Roy Li
71158fa1a623125[fix floating dependence on freeglut] is incomplete,
so continue by removing glut.h header file when not enable freeglut
Signed-off-by: Roy Li
Signed-off-by: Robert Yang
---
meta/recipes-graphics/piglit/piglit_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index 3a8b0ac..0d825c9 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -24,6 +24,7 @@ PACKAGECONFIG[freeglut] =
"-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
do_configure_prepend() {
if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" =
"no" ]; then
sed -i -e "/^#.*include $/d"
${S}/src/piglit/glut_wrap.h
+sed -i -e "/^#.*include.*$/d" ${S}/src/piglit/glut_wrap.h
fi
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][resend] elfutils: fix stack usage warning
From: Roy Li Signed-off-by: Roy Li --- .../0001-fix-a-stack-usage-warning.patch | 28 ++ meta/recipes-devtools/elfutils/elfutils_0.163.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch new file mode 100644 index 000..6923bf7 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.163/0001-fix-a-stack-usage-warning.patch @@ -0,0 +1,28 @@ +[PATCH] fix a stack-usage warning + +Upstream-Status: Pending + +not use a variable to as a array size, otherwise the warning to error that +stack usage might be unbounded [-Werror=stack-usage=] will happen + +Signed-off-by: Roy Li +--- + backends/ppc_initreg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c +index 64f5379..52dde3e 100644 +--- a/backends/ppc_initreg.c b/backends/ppc_initreg.c +@@ -93,7 +93,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), + return false; + } + const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr); +- Dwarf_Word dwarf_regs[gprs]; ++ Dwarf_Word dwarf_regs[sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr)]; + for (unsigned gpr = 0; gpr < gprs; gpr++) + dwarf_regs[gpr] = user_regs.r.gpr[gpr]; + if (! setfunc (0, gprs, dwarf_regs, arg)) +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.163.bb b/meta/recipes-devtools/elfutils/elfutils_0.163.bb index c4fdabd..e391813 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.163.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.163.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://fixheadercheck.patch \ file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ file://0001-remove-the-unneed-checking.patch \ +file://0001-fix-a-stack-usage-warning.patch \ " # pick the patch from debian -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][resend] perl: fix build failure if building dir has the "blib" string
From: Wenzong Fan
If build dir includes the string "blib", filter it out from @INC may empty
the @INC and cause build errors like:
Can't locate ExtUtils/MakeMaker.pm in @INC \
(you may need to install the ExtUtils::MakeMaker module) \
(@INC contains: .) at Makefile.PL
Signed-off-by: Roy Li
Signed-off-by: Wenzong Fan
---
meta/recipes-devtools/perl/perl-native_5.22.0.bb | 1 +
...-PathTools-don-t-filter-out-blib-from-INC.patch | 33 ++
meta/recipes-devtools/perl/perl_5.22.0.bb | 1 +
3 files changed, 35 insertions(+)
create mode 100644
meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index dbcf2a6..a9a1cab 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -8,6 +8,7 @@ SRC_URI += "\
file://MM_Unix.pm.patch \
file://debian/errno_ver.diff \
file://dynaloaderhack.patch \
+ file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
"
SRC_URI[md5sum] = "ff0f09b17de426eff323426cb140ee79"
diff --git
a/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
b/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
new file mode 100644
index 000..7dd9041
--- /dev/null
+++
b/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
@@ -0,0 +1,33 @@
+From 90c252cecc38aed5d5faedb30485dd6eee2e54eb Mon Sep 17 00:00:00 2001
+From: Wenzong Fan
+Date: Wed, 11 Feb 2015 15:14:40 +0800
+Subject: [PATCH] perl / PathTools: don't filter out blib from @INC
+
+If $TOPDIR includes the string "blib", filter it out from @INC may empty
+the @INC and cause build errors like:
+
+ Can't locate ExtUtils/MakeMaker.pm in @INC \
+ (you may need to install the ExtUtils::MakeMaker module) \
+ (@INC contains: .) at Makefile.PL
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan
+---
+ dist/PathTools/Makefile.PL | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/dist/PathTools/Makefile.PL b/dist/PathTools/Makefile.PL
+index 1b21de4..f562cb2 100644
+--- a/dist/PathTools/Makefile.PL
b/dist/PathTools/Makefile.PL
+@@ -1,6 +1,3 @@
+-
+-BEGIN { @INC = grep {!/blib/} @INC }
+-
+ require 5.005;
+ use ExtUtils::MakeMaker;
+ WriteMakefile
+--
+1.9.1
+
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb
b/meta/recipes-devtools/perl/perl_5.22.0.bb
index 050a98c..7f78998 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -61,6 +61,7 @@ SRC_URI += " \
file://t-run-switches.t-perl5-perl.patch \
file://ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch \
file://ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch \
+file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
"
# Fix test case issues
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] rpm: disable external key server
From: yzhu1
When RPM experiences a signed package, with a signature that it does NOT know.
By default it will send the -fingerprint- (and only the 16 digit fingerprint)
to an external HKP server, trying to get the key down.
This is probably not a reasonable default behavior for the system to do,
instead it should simply fail the key lookup. If someone wants to enable the
HKP server it's easy enough to do by enabling the necessary macros.
Signed-off-by: yzhu1
Signed-off-by: Roy Li
---
...rpm-macros.in-disable-external-key-server.patch | 27 ++
meta/recipes-devtools/rpm/rpm_5.4.14.bb| 1 +
2 files changed, 28 insertions(+)
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
diff --git
a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
new file mode 100644
index 000..07a0cfa
--- /dev/null
+++
b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
@@ -0,0 +1,27 @@
+disable external key server
+
+Upstream-Status: Pending
+
+When RPM experiences a signed package, with a signature that it does NOT know.
+By default it will send the -fingerprint- (and only the 16 digit fingerprint)
to
+an external HKP server, trying to get the key down.
+
+This is probably not a reasonable default behavior for the system to do,
instead
+it should simply fail the key lookup. If someone wants to enable the HKP
server
+it's easy enough to do by enabling the necessary macros.
+
+Signed-off-by: yzhu1
+Signed-off-by: Mark Hatle
+--- a/macros/macros.in
b/macros/macros.in
+@@ -546,8 +546,8 @@ $_arbitrary_tags_tests Foo:Bar
+ # Horowitz Key Protocol server configuration
+ #
+ #%_hkp_keyserver hkp://keys.n3npq.net
+-%_hkp_keyserver hkp://pool.sks-keyservers.net
+-%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
++#%_hkp_keyserver hkp://pool.sks-keyservers.net
++#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
+
+
+ %_nssdb_path /etc/pki/nssdb
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 2e17a91..bff0687 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
@@ -94,6 +94,7 @@ SRC_URI =
"http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
file://no-ldflags-in-pkgconfig.patch \
file://rpm-lua-fix-print.patch \
file://rpm-check-rootpath-reasonableness.patch \
+ file://rpm-macros.in-disable-external-key-server.patch \
"
# Uncomment the following line to enable platform score debugging
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dhcp: add exec script when dhclient run
From: Li Wang
make dhclient-script to call ntp/nis script to get the extra data from server
Signed-off-by: Li Wang
Signed-off-by: Roy Li
---
.../dhcp/dhcp/dhcp-add-exec-script-function.patch | 93 ++
meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb | 1 +
meta/recipes-connectivity/dhcp/files/dhclient.conf | 1 +
3 files changed, 95 insertions(+)
create mode 100644
meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
diff --git
a/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
b/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
new file mode 100644
index 000..40faba3
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/dhcp-add-exec-script-function.patch
@@ -0,0 +1,93 @@
+dhclient: add exec script function
+
+Upstream-Status: Pending
+
+make dhclient to call /etc/dhcp/dhclient.d/*.sh
+
+Signed-off-by: Li Wang
+---
+ client/scripts/linux | 23 ++-
+ 1 file changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/client/scripts/linux b/client/scripts/linux
+index 3c3575e..4ea1e4f 100755
+--- a/client/scripts/linux
b/client/scripts/linux
+@@ -24,6 +24,7 @@
+
+ # 'ip' just looks too weird. /sbin/ip looks less weird.
+ ip=/sbin/ip
++ETCDIR="/etc/dhcp"
+
+ make_resolv_conf() {
+ if [ x"$new_domain_name_servers" != x ]; then
+@@ -84,6 +85,20 @@ exit_with_hooks() {
+ exit $exit_status
+ }
+
++execute_client_side_configuration_scripts() {
++# execute any additional client side configuration scripts we have
++if [ "${1}" == "config" ] || [ "${1}" == "restore" ]; then
++for f in ${ETCDIR}/dhclient.d/*.sh ; do
++if [ -x ${f} ]; then
++subsystem="${f%.sh}"
++subsystem="${subsystem##*/}"
++. ${f}
++"${subsystem}_${1}"
++fi
++done
++fi
++}
++
+ # Invoke the local dhcp client enter hooks, if they exist.
+ if [ -f /etc/dhclient-enter-hooks ]; then
+ exit_status=0
+@@ -201,11 +216,14 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+ route add -host $alias_ip_address $interface:0
+ fi
+ make_resolv_conf
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+ if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+|| [ x$reason = xSTOP ]; then
++ execute_client_side_configuration_scripts "restore"
++
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+ ifconfig $interface:0- inet 0
+@@ -277,7 +295,7 @@ if [ x$reason = xBOUND6 ] ; then
+
+ # Check for nameserver options.
+ make_resolv_conf
+-
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -297,6 +315,7 @@ if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
+ make_resolv_conf
+ fi
+
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -308,6 +327,7 @@ if [ x$reason = xDEPREF6 ] ; then
+ ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+dev ${interface} scope global preferred_lft 0
+
++ execute_client_side_configuration_scripts "config"
+ exit_with_hooks 0
+ fi
+
+@@ -316,6 +336,8 @@ if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o
x$reason = xSTOP6 ] ; then
+ exit_with_hooks 2;
+ fi
+
++ execute_client_side_configuration_scripts "restore"
++
+ ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+ dev ${interface}
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
index b4a05fc..a73d31f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.2.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://fixsepbuild.patch \
file://dhclient-script-drop-resolv.conf.dhclient.patch \
file://replace-ifconfig-route.patch \
+file://dhcp-add-exec-script-function.patch \
"
SRC_URI[md5sum] = "5a284875dd2c12ddd388416d69156a67"
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf
b/meta/recipes-connectivity/dhcp/files/dhclient.conf
index 0e6dcf9..0f7d42f 100644
--- a/meta/recipes-connectivity/dhcp/files/dhclient.conf
+++ b/meta/recipes-connectivity/dhcp/files/dhclient.conf
@@ -17,6 +17,7 @@
#supersede domain-name "fugue.com home.vix.com";
#prepend domain-name-servers 127.0.0.1;
request subnet-mask, broadcast-address, time-offset, routers,
+ nis-domain, nis-servers, domain-search, ntp-servers,
domain-name, domain-name-servers, host-name,
netbios-name-servers, netbios-scope;
#require subnet-mask, domain-name-servers;
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] elfutils: fix stack usage warning
From: Roy Li Signed-off-by: Roy Li --- .../0001-fix-a-stack-usage-warning.patch | 28 ++ meta/recipes-devtools/elfutils/elfutils_0.162.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.162/0001-fix-a-stack-usage-warning.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.162/0001-fix-a-stack-usage-warning.patch b/meta/recipes-devtools/elfutils/elfutils-0.162/0001-fix-a-stack-usage-warning.patch new file mode 100644 index 000..6923bf7 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.162/0001-fix-a-stack-usage-warning.patch @@ -0,0 +1,28 @@ +[PATCH] fix a stack-usage warning + +Upstream-Status: Pending + +not use a variable to as a array size, otherwise the warning to error that +stack usage might be unbounded [-Werror=stack-usage=] will happen + +Signed-off-by: Roy Li +--- + backends/ppc_initreg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c +index 64f5379..52dde3e 100644 +--- a/backends/ppc_initreg.c b/backends/ppc_initreg.c +@@ -93,7 +93,7 @@ ppc_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), + return false; + } + const size_t gprs = sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr); +- Dwarf_Word dwarf_regs[gprs]; ++ Dwarf_Word dwarf_regs[sizeof (user_regs.r.gpr) / sizeof (*user_regs.r.gpr)]; + for (unsigned gpr = 0; gpr < gprs; gpr++) + dwarf_regs[gpr] = user_regs.r.gpr[gpr]; + if (! setfunc (0, gprs, dwarf_regs, arg)) +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.162.bb b/meta/recipes-devtools/elfutils/elfutils_0.162.bb index f6ace7e..7ebfc4f 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.162.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.162.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://fixheadercheck.patch \ file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ file://0001-remove-the-unneed-checking.patch \ +file://0001-fix-a-stack-usage-warning.patch \ " # pick the patch from debian -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mklibs-native: two fixes
From: Yuanjie Huang
1. Show GNU unique symbols as provided symbols
2. Remove dependency on dpkg
Both have been submitted to mklibs maillist:
https://lists.debian.org/debian-boot/2015/07/msg00018.html
https://lists.debian.org/debian-boot/2015/07/msg4.html
Signed-off-by: Yuanjie Huang
Signed-off-by: Roy Li
---
.../mklibs/files/fix_cross_compile.patch | 81 ++
...ow-GNU-unique-symbols-as-provided-symbols.patch | 34 +
.../mklibs/mklibs-native_0.1.40.bb | 2 +
3 files changed, 117 insertions(+)
create mode 100644 meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
create mode 100644
meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
diff --git a/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
b/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
new file mode 100644
index 000..7eb8659
--- /dev/null
+++ b/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
@@ -0,0 +1,81 @@
+Remove dependency on dpkg
+
+Upstream-Status Submitted
+
+Asking the host OS whether it supports multiarch is not useful
+in a cross-compilation environment, or if the user has specified
+a libdir explicitly. So this patch, based on the work of Mentor
+Graphics, removes mklibs's dependency on dpkg package.
+
+Signed-off-by: Yuanjie Huang
+ src/mklibs | 30 +++---
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/mklibs b/src/mklibs
+index d9b784b..c5614ea 100755
+--- a/src/mklibs
b/src/mklibs
+@@ -261,6 +261,11 @@ def extract_soname(so_file):
+ return ""
+
+ def multiarch(paths):
++# Asking the host OS whether it supports multiarch is not useful
++# in a cross-compilation environment, or if the user has specified
++# a libdir explicitly.
++if sysroot != "" or libdir != "":
++return paths
+ devnull = open('/dev/null', 'w')
+ dpkg_architecture = subprocess.Popen(
+ ['dpkg-architecture', '-qDEB_HOST_MULTIARCH'],
+@@ -340,7 +345,7 @@ lib_path = []
+ dest_path = "DEST"
+ ldlib = "LDLIB"
+ include_default_lib_path = "yes"
+-default_lib_path = multiarch(["/lib/", "/usr/lib/", "/usr/X11R6/lib/"])
++default_lib_path = ["/lib/", "/usr/lib/", "/usr/X11R6/lib/"]
+ libc_extras_dir = "/usr/lib/libc_pic"
+ libc_extras_dir_default = True
+ libdir = "lib"
+@@ -386,7 +391,7 @@ for opt, arg in optlist:
+ elif opt == "--libdir":
+ libdir = arg
+ elif opt in ("--help", "-h"):
+- usage(0)
++usage(0)
+ sys.exit(0)
+ elif opt in ("--version", "-V"):
+ version(vers)
+@@ -395,6 +400,7 @@ for opt, arg in optlist:
+ print "WARNING: unknown option: " + opt + "\targ: " + arg
+
+ if include_default_lib_path == "yes":
++default_lib_path = multiarch(default_lib_path)
+ lib_path.extend([a.replace("/lib/", "/" + libdir + "/") for a in
default_lib_path])
+
+ if libc_extras_dir_default:
+@@ -661,16 +669,16 @@ ld_path_name = os.path.dirname(ldlib)
+ ld_full_path = "../" + ldlib
+ ld_file = find_lib(ld_file_name)
+
+-if ld_path_name != "/lib":
+-if os.access(dest_path + "/" + ld_file_name, os.F_OK):
+-os.remove(dest_path + "/" + ld_file_name)
++#if ld_path_name != "/lib":
++#if os.access(dest_path + "/" + ld_file_name, os.F_OK):
++#os.remove(dest_path + "/" + ld_file_name)
+
+-if not os.path.exists(dest_path + "/../" + ld_path_name):
+-os.mkdir(dest_path + "/../" + ld_path_name)
++#if not os.path.exists(dest_path + "/../" + ld_path_name):
++#os.mkdir(dest_path + "/../" + ld_path_name)
+
+-if not os.access(dest_path + "/" + ld_full_path, os.F_OK):
+-debug(DEBUG_NORMAL, "I: stripping and copying dynamic linker to " +
ld_full_path)
++if not os.access(dest_path + "/" + ld_file_name, os.F_OK):
++debug(DEBUG_NORMAL, "I: stripping and copying dynamic linker to " +
ld_file_name)
+ command(target + "objcopy", "--strip-unneeded -R .note -R .comment",
+-ld_file, dest_path + "/" + ld_full_path)
++ld_file, dest_path + "/" + ld_file_name)
+
+-os.chmod(dest_path + "/" + ld_full_path, 0755)
++os.chmod(dest_path + "/" + ld_file_name, 0755)
diff --git
a/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
b/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
new file mode 100644
index 000..3f14ca1
--- /dev/null
+++
b/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
@@ -0,0 +1,34 @@
+From eddf04c7f8312e9c29cdb24e431b7e4fb2cc70ed Mon Sep 17 00:00:00 2001
+From: Yuanjie Huang
+Date: Wed, 15 Apr 2015 14:00:06 +0800
+Subject: [PATCH] Show GNU unique symbols as provided symbols
+
+Upstream-Status Submitted
+
+GNU Unique symbol is a GNU extension employed by new version of GCC
+by default. Even Standard C++ library in GCC 4.9 provides some symbols,
+such as _ZNSs4_Rep20_S_empty_rep_storageE in this binding type instead
+of EL
[OE-core] [PATCH] image_types_uboot: remove the middle file
From: Yue Tao
The .gz, .bz2 or .lzma are middle files for making gz.u-boot,
bz2.u-boot, or lzma.u-boot. It should be removed once the final
image is generated. Otherwise, even RM_OLD_IMAGE = 1, it can't
be removed, moreover more and more middle files are genrated via
'bitbake *-image'
Signed-off-by: Yue Tao
Signed-off-by: Roy Li
---
meta/classes/image_types_uboot.bbclass | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/classes/image_types_uboot.bbclass
b/meta/classes/image_types_uboot.bbclass
index 07837b5..081bca2 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -3,6 +3,9 @@ inherit image_types kernel-arch
oe_mkimage () {
mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
-d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+if [ x$3 = x"clean" ]; then
+rm $1
+fi
}
COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
@@ -11,13 +14,13 @@ COMPRESS_DEPENDS_u-boot = "u-boot-mkimage-native"
COMPRESS_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
COMPRESS_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_gz.u-boot = "${COMPRESS_CMD_gz}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.gz gzip"
+COMPRESS_CMD_gz.u-boot = "${COMPRESS_CMD_gz}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.gz gzip clean"
COMPRESS_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_bz2.u-boot = "${COMPRESS_CMD_bz2}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
+COMPRESS_CMD_bz2.u-boot = "${COMPRESS_CMD_bz2}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean"
COMPRESS_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
-COMPRESS_CMD_lzma.u-boot = "${COMPRESS_CMD_lzma}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.lzma lzma"
+COMPRESS_CMD_lzma.u-boot = "${COMPRESS_CMD_lzma}; oe_mkimage
${IMAGE_NAME}.rootfs.${type}.lzma lzma clean"
IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot
ext3.gz.u-boot ext4.gz.u-boot"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image_types_uboot: remove the middle file
From: Yue Tao
The .gz, .bz2 or .lzma are middle files for making gz.u-boot,
bz2.u-boot, or lzma.u-boot. It should be removed once the final
image is generated. Otherwise, even you --enable-rm-oldimgs=yes,
it can't be removed, moreover more and more middle files are
genrated via 'make fs
Signed-off-by: Yue Tao
---
meta/classes/image_types_uboot.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/image_types_uboot.bbclass
b/meta/classes/image_types_uboot.bbclass
index 07837b5..dba9293 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -3,6 +3,7 @@ inherit image_types kernel-arch
oe_mkimage () {
mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
-d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+rm $1
}
COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] archiver: set permissions for backup files of patch
From: Jian Liu
For the program patch with version before 2.6, backup files
for nonexisting files are created with mode 0. During making
tarball for these files, this will cause permission error.
Signed-off-by: Hongxu Jia
Signed-off-by: Jian Liu
---
meta/classes/archiver.bbclass | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 7b5274d..f5cdb77 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -224,7 +224,7 @@ def create_tarball(d, srcdir, suffix, ar_outdir, pf=None):
"""
create the tarball from srcdir
"""
-import tarfile
+import tarfile, subprocess, errno
bb.utils.mkdirhier(ar_outdir)
if pf:
@@ -239,7 +239,21 @@ def create_tarball(d, srcdir, suffix, ar_outdir, pf=None):
os.chdir(dirname)
bb.note('Creating %s' % tarname)
tar = tarfile.open(tarname, 'w:gz')
-tar.add(basename)
+# For patch before 2.6 backup files for
+# nonexisting files are created with mode 0.
+# Change the permission of backup files.
+# In future, this can be deleted if patch-2.6 and above
+# is used widely.
+try:
+tar.add(basename)
+except IOError as exc:
+if exc.errno == errno.EACCES:
+# Make sure the probable back up patches have read permission
+subprocess.call('chmod a+r -R %s/.pc* >/dev/null 2>&1 | true' %
+basename, shell=True)
+tar.add(basename)
+else:
+raise IOError("I/O error({0}): {1}".format(exc.errno,
exc.strerror))
tar.close()
# creating .diff.gz between source.orig and source
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] bootchart2: add runtime dependency
From: Roy Li
Bootchartd needs the command lsb_release and pidof to run, pidof maybe
provided by sysvinit or procpus;
To native bootchart2, only pybootchartgui is used, and which is not needed
both pidof and lsb_release
Signed-off-by: Roy Li
---
meta/recipes-devtools/bootchart2/bootchart2_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_git.bb
b/meta/recipes-devtools/bootchart2/bootchart2_git.bb
index 5fc7211..ea9f179 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_git.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_git.bb
@@ -143,6 +143,8 @@ do_install () {
PACKAGES =+ "pybootchartgui"
FILES_pybootchartgui += "${libdir}/python*/site-packages/pybootchartgui
${bindir}/pybootchartgui"
RDEPENDS_pybootchartgui = "python-pycairo python-compression python-image
python-textutils python-shell python-compression python-codecs"
+RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', 'sysvinit-pidof', 'procps', d)}"
+RDEPENDS_${PN}_class-target += "lsb"
DEPENDS_append_class-native = " python-pycairo-native"
PACKAGES =+ "bootchartd-stop-initscript"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] unzip: drop unzip-6.0_overflow3.diff
From: Roy Li 12-cve-2014-9636-test-compr-eb.patch is same as unzip-6.0_overflow3.diff, is to fix CVE-2014-9636, so drop unzip-6.0_overflow3.diff; and update 12-cve-2014-9636-test-compr-eb.patch to fix the patch conflict Signed-off-by: Roy Li --- .../unzip/12-cve-2014-9636-test-compr-eb.patch | 40 +-- .../unzip/unzip/unzip-6.0_overflow3.diff | 45 -- meta/recipes-extended/unzip/unzip_6.0.bb | 1 - 3 files changed, 20 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff diff --git a/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch b/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch index b64dd99..0a0bfbb 100644 --- a/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch +++ b/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch @@ -1,7 +1,9 @@ +From 190040ebfcf5395a6ccedede2cc9343d34f0a108 Mon Sep 17 00:00:00 2001 From: mancha -Date: Mon, 3 Nov 2014 +Date: Wed, 11 Feb 2015 Subject: Info-ZIP UnZip buffer overflow -Bug-Debian: http://bugs.debian.org/776589 + +Upstream-Status: Backport By carefully crafting a corrupt ZIP archive with "extra fields" that purport to have compressed blocks larger than the corresponding @@ -12,33 +14,31 @@ possibly have other unspecified impact. This patch ensures that when extra fields use STORED mode, the "compressed" and uncompressed block sizes match. -The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz - -Upstream-Status: Backport - -Signed-off-by: Roy Li +Signed-off-by: mancha +--- + extract.c |8 + 1 file changed, 8 insertions(+) --- a/extract.c +++ b/extract.c -@@ -2229,6 +2229,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) +@@ -2217,6 +2217,7 @@ static int test_compr_eb(__G__ eb, eb_si + ulg eb_ucsize; uch *eb_ucptr; int r; - ush method; -+ush eb_compr_method; ++ush method; if (compr_offset < 4)/* field is not compressed: */ return PK_OK;/* do nothing and signal OK */ -@@ -2244,6 +2245,14 @@ - ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN - return IZ_EF_TRUNC; /* no/bad compressed data! */ +@@ -2226,6 +2227,13 @@ static int test_compr_eb(__G__ eb, eb_si + eb_size <= (compr_offset + EB_CMPRHEADLEN))) + return IZ_EF_TRUNC; /* no compressed data! */ -+/* 2014-11-03 Michal Zalewski, SMS. -+ * For STORE method, compressed and uncompressed sizes must agree. -+ * http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=450 -+ */ -+eb_compr_method = makeword( eb + (EB_HEADSIZE + compr_offset)); -+if ((eb_compr_method == STORED) && (eb_size - compr_offset != eb_ucsize)) -+return PK_ERR; ++method = makeword(eb + (EB_HEADSIZE + compr_offset)); ++if ((method == STORED) && ++(eb_size - compr_offset - EB_CMPRHEADLEN != eb_ucsize)) ++ return PK_ERR;/* compressed & uncompressed ++ * should match in STORED ++ * method */ + if ( #ifdef INT_16BIT diff --git a/meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff b/meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff deleted file mode 100644 index 0a0bfbb..000 --- a/meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff +++ /dev/null @@ -1,45 +0,0 @@ -From 190040ebfcf5395a6ccedede2cc9343d34f0a108 Mon Sep 17 00:00:00 2001 -From: mancha -Date: Wed, 11 Feb 2015 -Subject: Info-ZIP UnZip buffer overflow - -Upstream-Status: Backport - -By carefully crafting a corrupt ZIP archive with "extra fields" that -purport to have compressed blocks larger than the corresponding -uncompressed blocks in STORED no-compression mode, an attacker can -trigger a heap overflow that can result in application crash or -possibly have other unspecified impact. - -This patch ensures that when extra fields use STORED mode, the -"compressed" and uncompressed block sizes match. - -Signed-off-by: mancha - extract.c |8 - 1 file changed, 8 insertions(+) - a/extract.c -+++ b/extract.c -@@ -2217,6 +2217,7 @@ static int test_compr_eb(__G__ eb, eb_si - ulg eb_ucsize; - uch *eb_ucptr; - int r; -+ush method; - - if (compr_offset < 4)/* field is not compressed: */ - return PK_OK;/* do nothing and signal OK */ -@@ -2226,6 +2227,13 @@ static int test_compr_eb(__G__ eb, eb_si - eb_size <= (compr_offset + EB_CMPRHEADLEN))) - return IZ_EF_TRUNC; /* no compressed data! */ - -+method = makeword(eb + (EB_HEADSIZE + compr_offset)); -+if ((method == STORED) && -+(eb_size - compr_offset - EB_CMPRHEADLEN != eb_ucsize)) -+ return PK_ERR;/*
[OE-core] [PATCH] systemd: fix systemd-udev-hwdb-update service
From: Chen Qi
The new version of systemd has implemented the following feature.
Opointer.de/blog/projects/stateless.html
As a result, the systemd-udev-hwdb-update.service would always run
at first boot. This will cause failure if the target device doesn't
have enough storage space. Besides, as we run `udevadm hwdb --update' as
a postinst of udev-hwdb at rootfs time, there's no need to run this
again at system start-up.
The purpose of this patch is as follows.
If `udev hwdb --update' fails at rootfs time, systemd-udev-hwdb-update.service
is executed at first boot; otherwise, the service is not executed.
This patch achieves the above goal by setting CondistonNeedsUpdate to
"/etc/udev" in the service file, and creating /etc/udev/.updated file if the
postinst succeeds.
Signed-off-by: Chen Qi
Signed-off-by: Robert Yang
---
meta/recipes-core/systemd/systemd_219.bb | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_219.bb
b/meta/recipes-core/systemd/systemd_219.bb
index 6ed4fe0..dc5c7b3 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -180,6 +180,10 @@ do_install() {
if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then
${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i
-e "\$ad /run/systemd/netif/links 0755 root root -"
${D}${libdir}/tmpfiles.d/systemd.conf', d)}
fi
+
+ # Make systemd-udev-hwdb-update to check /etc/udev
+ cp ${D}${systemd_unitdir}/system/systemd-udev-hwdb-update.service
${D}${sysconfdir}/systemd/system
+ sed -i -e
's#ConditionNeedsUpdate=/etc#ConditionNeedsUpdate=/etc/udev#g'
${D}${sysconfdir}/systemd/system/systemd-udev-hwdb-update.service
}
do_install_ptest () {
@@ -381,10 +385,18 @@ ALTERNATIVE_PRIORITY[runlevel] ?= "300"
pkg_postinst_udev-hwdb () {
if test -n "$D"; then
- ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb
--update \
- --root $D
+ if ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb
--update \
+ --root $D; then
+ touch $D/etc/udev/.updated
+ else
+ exit 1
+ fi
else
- udevadm hwdb --update
+ if udevadm hwdb --update; then
+ touch $D/etc/udev/.updated
+ else
+ exit 1
+ fi
fi
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] mklibs-native: avoid failure on symbol provided by application
From: Yuanjie Huang
Undefined symbols in a library can be provided by the application
that links to the library, such as `logsink' in libmultipath.so.0.
This fix checks the type of object in which the symbol is needed
and the existence of the symbol in application, when a symbol
cannot be provided by libraries. It prevents false alarm on absence
of symbols.
Signed-off-by: Yuanjie Huang
---
...failure-on-symbol-provided-by-application.patch | 102 +
.../mklibs/mklibs-native_0.1.40.bb | 1 +
2 files changed, 103 insertions(+)
create mode 100644
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
diff --git
a/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
b/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
new file mode 100644
index 000..7d6d62e
--- /dev/null
+++
b/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
@@ -0,0 +1,102 @@
+From f172101130604e4a9efa5746f4d8d30de99a0fdc Mon Sep 17 00:00:00 2001
+From: Yuanjie Huang
+Date: Fri, 17 Apr 2015 14:48:20 +0800
+Subject: [PATCH] avoid failure on symbol provided by application
+
+Upstream-Status: Pending
+
+Undefined symbols in a library can be provided by the application
+that links to the library, such as `logsink' in libmultipath.so.0.
+This fix checks the type of object in which the symbol is needed
+and the existence of the symbol in application, when a symbol
+cannot be provided by libraries. It prevents false alarm on absence
+of symbols.
+
+Signed-off-by: Yuanjie Huang
+---
+ src/mklibs | 28
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/src/mklibs b/src/mklibs
+index c5614ea..b0d9034 100755
+--- a/src/mklibs
b/src/mklibs
+@@ -133,9 +133,9 @@ class Symbol(object):
+ return '@'.join(ret)
+
+ class UndefinedSymbol(Symbol):
+-def __init__(self, name, weak, version, library):
++def __init__(self, name, weak, version, library, object):
+ super(UndefinedSymbol, self).__init__(name, version, library)
+-self.weak, self.library = weak, library
++self.weak, self.library, self.object = weak, library, object
+
+ # Return undefined symbols in an object as a set of tuples (name, weakness)
+ def undefined_symbols(obj):
+@@ -144,6 +144,11 @@ def undefined_symbols(obj):
+
+ output = command("mklibs-readelf", "--print-symbols-undefined", obj)
+
++if len(obj) > len(dest_path) and obj[:len(dest_path)] == dest_path:
++object = obj[len(dest_path) + 1:-len('-so-stripped')]
++else:
++object = obj
++
+ result = []
+ for line in output:
+ name, weak_string, version_string, library_string = line.split()[:4]
+@@ -160,7 +165,7 @@ def undefined_symbols(obj):
+ if library_string.lower() != 'none':
+ library = library_string
+
+-result.append(UndefinedSymbol(name, weak, version, library))
++result.append(UndefinedSymbol(name, weak, version, library, object))
+
+ return result
+
+@@ -495,12 +500,13 @@ while 1:
+ and re.search("^ps_", str(symbol)))
+ and not (re.search("ld-linux.so.3$", str(symbol)))
+ and not (re.search("^__gnu_local_gp", str(symbol:
+-debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s" %
(symbol, symbol.weak))
++debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s, for
%s" % (symbol, symbol.weak, obj))
+ needed_symbols[str(symbol)] = symbol
+ libraries.update(library_depends(obj))
+
+ # calculate what symbols are present in small_libs and available_libs
+ present_symbols = {}
++present_symbol_progs = {}
+ checked_libs = small_libs
+ checked_libs.extend(available_libs)
+ checked_libs.append(ldlib)
+@@ -510,6 +516,12 @@ while 1:
+ names = symbol.base_names()
+ for name in names:
+ present_symbols[name] = symbol
++if not so_pattern.match(lib):
++debug(DEBUG_SPAM, "present_symbol_progs adding %s, from
executable %s" % (' '.join(names), lib))
++for name in names:
++progs = present_symbol_progs.get(name, set())
++progs.add(lib)
++present_symbol_progs[name] = progs
+
+ # are we finished?
+ num_unresolved = 0
+@@ -565,6 +577,14 @@ while 1:
+ for name in needed_symbols:
+ if not name in symbol_provider:
+ if not needed_symbols[name].weak:
++# WORKAROUND: Undefined symbols in a library can be provided
by the application
++# that links to the library. So if the object which requires
the symbol is a library
++# and some application can provide the symbol, the undefined
symbol is skipped.
++symbol = needed_s
[OE-core] [PATCH] unzip: drop 12-cve-2014-9636-test-compr-eb.patch
From: Roy Li 12-cve-2014-9636-test-compr-eb.patch is same as unzip-6.0_overflow3.diff, is to fix CVE-2014-9636 Signed-off-by: Roy Li --- .../unzip/12-cve-2014-9636-test-compr-eb.patch | 45 -- meta/recipes-extended/unzip/unzip_6.0.bb | 1 - 2 files changed, 46 deletions(-) delete mode 100644 meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch diff --git a/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch b/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch deleted file mode 100644 index b64dd99..000 --- a/meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: mancha -Date: Mon, 3 Nov 2014 -Subject: Info-ZIP UnZip buffer overflow -Bug-Debian: http://bugs.debian.org/776589 - -By carefully crafting a corrupt ZIP archive with "extra fields" that -purport to have compressed blocks larger than the corresponding -uncompressed blocks in STORED no-compression mode, an attacker can -trigger a heap overflow that can result in application crash or -possibly have other unspecified impact. - -This patch ensures that when extra fields use STORED mode, the -"compressed" and uncompressed block sizes match. - -The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz - -Upstream-Status: Backport - -Signed-off-by: Roy Li - a/extract.c -+++ b/extract.c -@@ -2229,6 +2229,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) - uch *eb_ucptr; - int r; - ush method; -+ush eb_compr_method; - - if (compr_offset < 4)/* field is not compressed: */ - return PK_OK;/* do nothing and signal OK */ -@@ -2244,6 +2245,14 @@ - ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN - return IZ_EF_TRUNC; /* no/bad compressed data! */ - -+/* 2014-11-03 Michal Zalewski, SMS. -+ * For STORE method, compressed and uncompressed sizes must agree. -+ * http://www.info-zip.org/phpBB3/viewtopic.php?f=7&t=450 -+ */ -+eb_compr_method = makeword( eb + (EB_HEADSIZE + compr_offset)); -+if ((eb_compr_method == STORED) && (eb_size - compr_offset != eb_ucsize)) -+return PK_ERR; -+ - if ( - #ifdef INT_16BIT - (((ulg)(extent)eb_ucsize) != eb_ucsize) || diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index b022f21..4a0a713 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -14,7 +14,6 @@ SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ file://09-cve-2014-8139-crc-overflow.patch \ file://10-cve-2014-8140-test-compr-eb.patch \ file://11-cve-2014-8141-getzip64data.patch \ - file://12-cve-2014-9636-test-compr-eb.patch \ " SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perl: fix build failure if building dir has the "blib" string
From: Wenzong Fan
If build dir includes the string "blib", filter it out from @INC may empty
the @INC and cause build errors like:
Can't locate ExtUtils/MakeMaker.pm in @INC \
(you may need to install the ExtUtils::MakeMaker module) \
(@INC contains: .) at Makefile.PL
Signed-off-by: Wenzong Fan
---
...-PathTools-don-t-filter-out-blib-from-INC.patch | 30 ++
meta/recipes-devtools/perl/perl-native_5.20.0.bb | 4 ++-
meta/recipes-devtools/perl/perl_5.20.0.bb | 1 +
3 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/perl/perl-5.20.0/perl-PathTools-don-t-filter-out-blib-from-INC.patch
diff --git
a/meta/recipes-devtools/perl/perl-5.20.0/perl-PathTools-don-t-filter-out-blib-from-INC.patch
b/meta/recipes-devtools/perl/perl-5.20.0/perl-PathTools-don-t-filter-out-blib-from-INC.patch
new file mode 100644
index 000..e72cc0b
--- /dev/null
+++
b/meta/recipes-devtools/perl/perl-5.20.0/perl-PathTools-don-t-filter-out-blib-from-INC.patch
@@ -0,0 +1,30 @@
+[PATCH] perl / PathTools: don't filter out blib from @INC
+
+If $TOPDIR includes the string "blib", filter it out from @INC may empty
+the @INC and cause build errors like:
+
+ Can't locate ExtUtils/MakeMaker.pm in @INC \
+ (you may need to install the ExtUtils::MakeMaker module) \
+ (@INC contains: .) at Makefile.PL
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan
+---
+ dist/PathTools/Makefile.PL | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/dist/PathTools/Makefile.PL b/dist/PathTools/Makefile.PL
+index 1b21de4..f562cb2 100644
+--- a/dist/PathTools/Makefile.PL
b/dist/PathTools/Makefile.PL
+@@ -1,6 +1,3 @@
+-
+-BEGIN { @INC = grep {!/blib/} @INC }
+-
+ require 5.005;
+ use ExtUtils::MakeMaker;
+ WriteMakefile
+--
+1.9.1
+
diff --git a/meta/recipes-devtools/perl/perl-native_5.20.0.bb
b/meta/recipes-devtools/perl/perl-native_5.20.0.bb
index 586a347..44dd43c 100644
--- a/meta/recipes-devtools/perl/perl-native_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.20.0.bb
@@ -17,7 +17,9 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://MM_Unix.pm.patch \
file://debian/errno_ver.diff \
file://dynaloaderhack.patch \
- file://perl-5.14.3-fix-CVE-2010-4777.patch "
+ file://perl-5.14.3-fix-CVE-2010-4777.patch \
+ file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
+"
SRC_URI[md5sum] = "406ec049ebe3afcc80d9c76ec78ca4f8"
SRC_URI[sha256sum] =
"4e8c28ad6ecc89902f9cb2e76f2815bb1a8287ded278e15f7a36ca45f8bbcd02"
diff --git a/meta/recipes-devtools/perl/perl_5.20.0.bb
b/meta/recipes-devtools/perl/perl_5.20.0.bb
index d100ff9..8c1b53f 100644
--- a/meta/recipes-devtools/perl/perl_5.20.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.20.0.bb
@@ -47,6 +47,7 @@ SRC_URI += " \
file://debian/cpan-missing-site-dirs.diff \
file://debian/fixes/memoize_storable_nstore.diff \
file://debian/regen-skip.diff \
+file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
"
SRC_URI += " \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bootchart2: add runtime dependency
From: Roy Li
bootchartd needs the command lsb_release and pidof to run, pidof maybe
provided by sysvinit or procpus
Signed-off-by: Roy Li
---
meta/recipes-devtools/bootchart2/bootchart2_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_git.bb
b/meta/recipes-devtools/bootchart2/bootchart2_git.bb
index 5fc7211..586417e 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_git.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_git.bb
@@ -143,6 +143,8 @@ do_install () {
PACKAGES =+ "pybootchartgui"
FILES_pybootchartgui += "${libdir}/python*/site-packages/pybootchartgui
${bindir}/pybootchartgui"
RDEPENDS_pybootchartgui = "python-pycairo python-compression python-image
python-textutils python-shell python-compression python-codecs"
+RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit',
'sysvinit-pidof', 'procps', d)}"
+RDEPENDS_${PN} += "lsb"
DEPENDS_append_class-native = " python-pycairo-native"
PACKAGES =+ "bootchartd-stop-initscript"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mklibs-native: avoid failure on symbol provided by application
From: Yuanjie Huang
Undefined symbols in a library can be provided by the application
that links to the library, such as `logsink' in libmultipath.so.0.
This fix checks the type of object in which the symbol is needed
and the existence of the symbol in application, when a symbol
cannot be provided by libraries. It prevents false alarm on absence
of symbols.
Signed-off-by: Yuanjie Huang
---
...failure-on-symbol-provided-by-application.patch | 100 +
.../mklibs/mklibs-native_0.1.40.bb | 1 +
2 files changed, 101 insertions(+)
create mode 100644
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
diff --git
a/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
b/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
new file mode 100644
index 000..798212a
--- /dev/null
+++
b/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
@@ -0,0 +1,100 @@
+From f172101130604e4a9efa5746f4d8d30de99a0fdc Mon Sep 17 00:00:00 2001
+From: Yuanjie Huang
+Date: Fri, 17 Apr 2015 14:48:20 +0800
+Subject: [PATCH] avoid failure on symbol provided by application
+
+Undefined symbols in a library can be provided by the application
+that links to the library, such as `logsink' in libmultipath.so.0.
+This fix checks the type of object in which the symbol is needed
+and the existence of the symbol in application, when a symbol
+cannot be provided by libraries. It prevents false alarm on absence
+of symbols.
+
+Signed-off-by: Yuanjie Huang
+---
+ src/mklibs | 28
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/src/mklibs b/src/mklibs
+index c5614ea..b0d9034 100755
+--- a/src/mklibs
b/src/mklibs
+@@ -133,9 +133,9 @@ class Symbol(object):
+ return '@'.join(ret)
+
+ class UndefinedSymbol(Symbol):
+-def __init__(self, name, weak, version, library):
++def __init__(self, name, weak, version, library, object):
+ super(UndefinedSymbol, self).__init__(name, version, library)
+-self.weak, self.library = weak, library
++self.weak, self.library, self.object = weak, library, object
+
+ # Return undefined symbols in an object as a set of tuples (name, weakness)
+ def undefined_symbols(obj):
+@@ -144,6 +144,11 @@ def undefined_symbols(obj):
+
+ output = command("mklibs-readelf", "--print-symbols-undefined", obj)
+
++if len(obj) > len(dest_path) and obj[:len(dest_path)] == dest_path:
++object = obj[len(dest_path) + 1:-len('-so-stripped')]
++else:
++object = obj
++
+ result = []
+ for line in output:
+ name, weak_string, version_string, library_string = line.split()[:4]
+@@ -160,7 +165,7 @@ def undefined_symbols(obj):
+ if library_string.lower() != 'none':
+ library = library_string
+
+-result.append(UndefinedSymbol(name, weak, version, library))
++result.append(UndefinedSymbol(name, weak, version, library, object))
+
+ return result
+
+@@ -495,12 +500,13 @@ while 1:
+ and re.search("^ps_", str(symbol)))
+ and not (re.search("ld-linux.so.3$", str(symbol)))
+ and not (re.search("^__gnu_local_gp", str(symbol:
+-debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s" %
(symbol, symbol.weak))
++debug(DEBUG_SPAM, "needed_symbols adding %s, weak: %s, for
%s" % (symbol, symbol.weak, obj))
+ needed_symbols[str(symbol)] = symbol
+ libraries.update(library_depends(obj))
+
+ # calculate what symbols are present in small_libs and available_libs
+ present_symbols = {}
++present_symbol_progs = {}
+ checked_libs = small_libs
+ checked_libs.extend(available_libs)
+ checked_libs.append(ldlib)
+@@ -510,6 +516,12 @@ while 1:
+ names = symbol.base_names()
+ for name in names:
+ present_symbols[name] = symbol
++if not so_pattern.match(lib):
++debug(DEBUG_SPAM, "present_symbol_progs adding %s, from
executable %s" % (' '.join(names), lib))
++for name in names:
++progs = present_symbol_progs.get(name, set())
++progs.add(lib)
++present_symbol_progs[name] = progs
+
+ # are we finished?
+ num_unresolved = 0
+@@ -565,6 +577,14 @@ while 1:
+ for name in needed_symbols:
+ if not name in symbol_provider:
+ if not needed_symbols[name].weak:
++# WORKAROUND: Undefined symbols in a library can be provided
by the application
++# that links to the library. So if the object which requires
the symbol is a library
++# and some application can provide the symbol, the undefined
symbol is skipped.
++symbol = needed_symbols[name]
++
[OE-core] [PATCH] nfs-utils: Reexport all directories when start
From: Li Wang
call "exportfs -r" to reexport all directories when start the nfsserver.
This change does follow debian and nfs-utils stardard.
Signed-off-by: Li Wang
---
meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 6e0df7e..7ed93a5 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -107,6 +107,7 @@ stop_nfsd(){
#FIXME: need to create the /var/lib/nfs/... directories
case "$1" in
start)
+ exportfs -r
start_nfsd "$NFS_SERVERS"
start_mountd
test -r /etc/exports && exportfs -a;;
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] quota: fix quota do_install errors
From: Roy Li
ROOTDIR should be defined, otherwise man files will be installed
to host root dir.
Signed-off-by: Roy Li
---
meta/recipes-extended/quota/quota_4.02.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/quota/quota_4.02.bb
b/meta/recipes-extended/quota/quota_4.02.bb
index 96ff4b5..124b0a3 100644
--- a/meta/recipes-extended/quota/quota_4.02.bb
+++ b/meta/recipes-extended/quota/quota_4.02.bb
@@ -36,5 +36,5 @@ PACKAGECONFIG[rpc] =
"--enable-rpc=yes,--enable-rpc=no,libtirpc"
PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no,"
do_install() {
- oe_runmake prefix=${D}${prefix} install
+ oe_runmake ROOTDIR=${D} install
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rpm-5.4.14: disable external key server
From: yzhu1
When rpm makes header verification, rpm will send request to the
extern server, this is a potential risk.
Signed-off-by: yzhu1
---
.../rpm-macros.in-disable-external-key-server.patch | 21 +
meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 +
2 files changed, 22 insertions(+)
create mode 100644
meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
diff --git
a/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
new file mode 100644
index 000..206f258
--- /dev/null
+++
b/meta/recipes-devtools/rpm/rpm/rpm-macros.in-disable-external-key-server.patch
@@ -0,0 +1,21 @@
+disable external key server
+
+Upstream-Status: Pending
+
+When rpm makes header verification, rpm will send request to the
+extern server, this is a potential risk.
+
+Signed-off-by: yzhu1
+--- a/macros/macros.in
b/macros/macros.in
+@@ -546,8 +546,8 @@ $_arbitrary_tags_tests Foo:Bar
+ # Horowitz Key Protocol server configuration
+ #
+ #%_hkp_keyserver hkp://keys.n3npq.net
+-%_hkp_keyserver hkp://pool.sks-keyservers.net
+-%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
++#%_hkp_keyserver hkp://pool.sks-keyservers.net
++#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
+
+
+ %_nssdb_path /etc/pki/nssdb
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb
b/meta/recipes-devtools/rpm/rpm_5.4.14.bb
index 75b1ae2..666a68e 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-realpath.patch \
file://0001-using-poptParseArgvString-to-parse-the-_gpg_check_pa.patch \
file://no-ldflags-in-pkgconfig.patch \
+ file://rpm-macros.in-disable-external-key-server.patch \
"
# Uncomment the following line to enable platform score debugging
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v5] mmc-utils: fix the building failure when DEBUG_BUILD is 1
From: Roy Li
Remove -Werror, since it is suitable to develop only; otherwise when
gcc adds -O0 option to compile codes, the error will be generated
since the warning:
//# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
Signed-off-by: Roy Li
---
meta/recipes-devtools/mmc/mmc-utils_git.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb
b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index bdb4fed..8950360 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -13,6 +13,10 @@ SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branc
S = "${WORKDIR}/git"
+do_configure_prepend() {
+sed -i "s:-Werror::g" ${S}/Makefile
+}
+
do_install() {
install -d ${D}${bindir}
install -m 0755 mmc ${D}${bindir}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][v2] openssl: upgrade to 1.0.2c
From: Roy Li
upgrade to fix the CVE: CVE-2015-1788..CVE-2015-1792 and CVE-2014-8176
remove a backport patch
update the c_rehash-compat.patch
Signed-off-by: Roy Li
---
...lcl.h-fix-MIPS-specific-gcc-version-check.patch | 30 --
.../openssl/openssl/debian/c_rehash-compat.patch | 22 +++-
.../{openssl_1.0.2a.bb => openssl_1.0.2c.bb} | 5 ++--
3 files changed, 11 insertions(+), 46 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
rename meta/recipes-connectivity/openssl/{openssl_1.0.2a.bb =>
openssl_1.0.2c.bb} (89%)
diff --git
a/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
b/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
deleted file mode 100644
index 7308f8f..000
---
a/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 60c268b21ac81cc6b1af5c5470282a613b96f6fd Mon Sep 17 00:00:00 2001
-From: Andy Polyakov
-Date: Mon, 25 May 2015 10:17:14 +0200
-Subject: [PATCH] bn/bn_lcl.h: fix MIPS-specific gcc version check.
-
-RT#3859
-
-Reviewed-by: Tim Hudson
-Upstream-Status: Backport
-
- crypto/bn/bn_lcl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
-index 196df7e..b9d124a 100644
a/crypto/bn/bn_lcl.h
-+++ b/crypto/bn/bn_lcl.h
-@@ -443,7 +443,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned
__int64 b,
- # endif
- # elif defined(__mips) && (defined(SIXTY_FOUR_BIT) ||
defined(SIXTY_FOUR_BIT_LONG))
- # if defined(__GNUC__) && __GNUC__>=2
--#if __GNUC__>=4 && __GNUC_MINOR__>=4
-+#if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
- /* "h" constraint is no more since 4.4 */
- # define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64)
- # define BN_UMULT_LOHI(low,high,a,b) ({ \
---
-2.1.4
-
diff --git
a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
index 3943e2c..68e54d5 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
@@ -5,14 +5,10 @@ Subject: [PATCH] also create old hash for compatibility
Upstream-Status: Backport [debian]
- tools/c_rehash.in |8 +++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-Index: openssl-1.0.2~beta3/tools/c_rehash.in
-===
openssl-1.0.2~beta3.orig/tools/c_rehash.in
-+++ openssl-1.0.2~beta3/tools/c_rehash.in
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index b086ff9..b777d79 100644
+--- a/tools/c_rehash.in
b/tools/c_rehash.in
@@ -8,8 +8,6 @@ my $prefix;
my $openssl = $ENV{OPENSSL} || "openssl";
@@ -23,14 +19,14 @@ Index: openssl-1.0.2~beta3/tools/c_rehash.in
my $symlink_exists=eval {symlink("",""); 1};
my $removelinks = 1;
@@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ '-.*' ) {
+ while ( $ARGV[0] =~ /^-/ ) {
my $flag = shift @ARGV;
last if ( $flag eq '--');
--if ( $flag =~ /-old/) {
+-if ( $flag eq '-old') {
- $x509hash = "-subject_hash_old";
- $crlhash = "-hash_old";
--} elsif ( $flag =~ /-h/) {
-+if ( $flag =~ /-h/) {
+-} elsif ( $flag eq '-h') {
++if ( $flag eq '-h') {
help();
} elsif ( $flag eq '-n' ) {
$removelinks = 0;
@@ -52,7 +48,7 @@ Index: openssl-1.0.2~beta3/tools/c_rehash.in
$fname =~ s/'/'\\''/g;
my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint
-noout -in "$fname"`;
chomp $hash;
-@@ -177,10 +175,20 @@ sub link_hash_cert {
+@@ -176,11 +174,21 @@ sub link_hash_cert {
$hashlist{$hash} = $fprint;
}
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
similarity index 89%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
index d7f0259..fd4ba6c 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
@@ -36,12 +36,11 @@ SRC_URI += "file://configure-targets.patch \
file://ptest-deps.patch \
file://run-ptest \
file://crypto_use_bigint_in_x86-64_perl.patch \
-file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \
file://openssl-1.0.2a-x32-asm.patch \
"
-SRC_URI[md5sum] = "a06c547dac9044161a477211049f60ef"
-SRC_URI[sha256sum] =
"15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a"
+SRC_URI[md5s
[OE-core] [PATCH][v2] unzip: fix three CVE defects
From: Roy Li
Port four patches from unzip_6.0-8+deb7u2.debian.tar.gz to fix:
cve-2014-8139
cve-2014-8140
cve-2014-8141
Signed-off-by: Roy Li
---
.../unzip/09-cve-2014-8139-crc-overflow.patch | 52
.../unzip/10-cve-2014-8140-test-compr-eb.patch | 33 +
.../unzip/11-cve-2014-8141-getzip64data.patch | 144 +
meta/recipes-extended/unzip/unzip_6.0.bb | 3 +
4 files changed, 232 insertions(+)
create mode 100644
meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
create mode 100644
meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
create mode 100644
meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
diff --git
a/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
b/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
new file mode 100644
index 000..e137f0d
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
@@ -0,0 +1,52 @@
+From: sms
+Subject: Fix CVE-2014-8139: CRC32 verification heap-based overflow
+Bug-Debian: http://bugs.debian.org/773722
+
+The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
+
+Upstream-Status: Backport
+
+Signed-off-by: Roy Li
+
+--- a/extract.c
b/extract.c
+@@ -298,6 +298,8 @@
+ #ifndef SFX
+static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
+ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
++ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
++ EF block length (%u bytes) invalid (< %d)\n";
+static ZCONST char Far InvalidComprDataEAs[] =
+ " invalid compressed data for EAs\n";
+ # if (defined(WIN32) && defined(NTSD_EAS))
+@@ -2023,7 +2025,8 @@
+ ebID = makeword(ef);
+ ebLen = (unsigned)makeword(ef+EB_LEN);
+
+-if (ebLen > (ef_len - EB_HEADSIZE)) {
++if (ebLen > (ef_len - EB_HEADSIZE))
++{
+/* Discovered some extra field inconsistency! */
+ if (uO.qflag)
+ Info(slide, 1, ((char *)slide, "%-22s ",
+@@ -2158,11 +2161,19 @@
+ }
+ break;
+ case EF_PKVMS:
+-if (makelong(ef+EB_HEADSIZE) !=
++if (ebLen < 4)
++{
++Info(slide, 1,
++ ((char *)slide, LoadFarString(TooSmallEBlength),
++ ebLen, 4));
++}
++else if (makelong(ef+EB_HEADSIZE) !=
+ crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
+ (extent)(ebLen-4)))
++{
+ Info(slide, 1, ((char *)slide,
+ LoadFarString(BadCRC_EAs)));
++}
+ break;
+ case EF_PKW32:
+ case EF_PKUNIX:
diff --git
a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
new file mode 100644
index 000..edc7d51
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
@@ -0,0 +1,33 @@
+From: sms
+Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
+Bug-Debian: http://bugs.debian.org/773722
+
+The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
+
+Upstream-Status: Backport
+
+Signed-off-by: Roy Li
+
+--- a/extract.c
b/extract.c
+@@ -2232,10 +2232,17 @@
+ if (compr_offset < 4)/* field is not compressed: */
+ return PK_OK;/* do nothing and signal OK */
+
++/* Return no/bad-data error status if any problem is found:
++ *1. eb_size is too small to hold the uncompressed size
++ * (eb_ucsize). (Else extract eb_ucsize.)
++ *2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
++ *3. eb_ucsize is positive, but eb_size is too small to hold
++ * the compressed data header.
++ */
+ if ((eb_size < (EB_UCSIZE_P + 4)) ||
+-((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
+- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+-return IZ_EF_TRUNC; /* no compressed data! */
++ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
++ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN
++return IZ_EF_TRUNC; /* no/bad compressed data! */
+
+ if (
+ #ifdef INT_16BIT
diff --git
a/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
b/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
new file mode 100644
index 000..d0c1db3
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
@@ -0,0 +1,144 @@
+From: sms
+Subject: Fix CVE-2014-8141: out-of-bounds read issues in getZip64Data()
+Bug-Debian: http://bugs.debian.org/773722
+
+The patch comes from
[OE-core] [PATCH] unzip: fix four CVE defects
From: Roy Li
Port four patches from unzip_6.0-8+deb7u2.debian.tar.gz to fix:
cve-2014-8139
cve-2014-8140
cve-2014-8141
cve-2014-9636
Signed-off-by: Roy Li
---
.../unzip/09-cve-2014-8139-crc-overflow.patch | 52
.../unzip/10-cve-2014-8140-test-compr-eb.patch | 33 +
.../unzip/11-cve-2014-8141-getzip64data.patch | 144 +
.../unzip/12-cve-2014-9636-test-compr-eb.patch | 45 +++
meta/recipes-extended/unzip/unzip_6.0.bb | 4 +
5 files changed, 278 insertions(+)
create mode 100644
meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
create mode 100644
meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
create mode 100644
meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
create mode 100644
meta/recipes-extended/unzip/unzip/12-cve-2014-9636-test-compr-eb.patch
diff --git
a/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
b/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
new file mode 100644
index 000..e137f0d
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
@@ -0,0 +1,52 @@
+From: sms
+Subject: Fix CVE-2014-8139: CRC32 verification heap-based overflow
+Bug-Debian: http://bugs.debian.org/773722
+
+The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
+
+Upstream-Status: Backport
+
+Signed-off-by: Roy Li
+
+--- a/extract.c
b/extract.c
+@@ -298,6 +298,8 @@
+ #ifndef SFX
+static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
+ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
++ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
++ EF block length (%u bytes) invalid (< %d)\n";
+static ZCONST char Far InvalidComprDataEAs[] =
+ " invalid compressed data for EAs\n";
+ # if (defined(WIN32) && defined(NTSD_EAS))
+@@ -2023,7 +2025,8 @@
+ ebID = makeword(ef);
+ ebLen = (unsigned)makeword(ef+EB_LEN);
+
+-if (ebLen > (ef_len - EB_HEADSIZE)) {
++if (ebLen > (ef_len - EB_HEADSIZE))
++{
+/* Discovered some extra field inconsistency! */
+ if (uO.qflag)
+ Info(slide, 1, ((char *)slide, "%-22s ",
+@@ -2158,11 +2161,19 @@
+ }
+ break;
+ case EF_PKVMS:
+-if (makelong(ef+EB_HEADSIZE) !=
++if (ebLen < 4)
++{
++Info(slide, 1,
++ ((char *)slide, LoadFarString(TooSmallEBlength),
++ ebLen, 4));
++}
++else if (makelong(ef+EB_HEADSIZE) !=
+ crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
+ (extent)(ebLen-4)))
++{
+ Info(slide, 1, ((char *)slide,
+ LoadFarString(BadCRC_EAs)));
++}
+ break;
+ case EF_PKW32:
+ case EF_PKUNIX:
diff --git
a/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
new file mode 100644
index 000..edc7d51
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
@@ -0,0 +1,33 @@
+From: sms
+Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
+Bug-Debian: http://bugs.debian.org/773722
+
+The patch comes from unzip_6.0-8+deb7u2.debian.tar.gz
+
+Upstream-Status: Backport
+
+Signed-off-by: Roy Li
+
+--- a/extract.c
b/extract.c
+@@ -2232,10 +2232,17 @@
+ if (compr_offset < 4)/* field is not compressed: */
+ return PK_OK;/* do nothing and signal OK */
+
++/* Return no/bad-data error status if any problem is found:
++ *1. eb_size is too small to hold the uncompressed size
++ * (eb_ucsize). (Else extract eb_ucsize.)
++ *2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
++ *3. eb_ucsize is positive, but eb_size is too small to hold
++ * the compressed data header.
++ */
+ if ((eb_size < (EB_UCSIZE_P + 4)) ||
+-((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
+- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+-return IZ_EF_TRUNC; /* no compressed data! */
++ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
++ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN
++return IZ_EF_TRUNC; /* no/bad compressed data! */
+
+ if (
+ #ifdef INT_16BIT
diff --git
a/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
b/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
new file mode 100644
index 000..d0c1db3
--- /dev/null
+++ b/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64dat
[OE-core] [PATCH] piglit: fix floating dependence on freeglut
From: Roy Li
cmake can not handle "ifdef" and make floating dependence on freeglut_ext.h
when make_depend, so remove to include freeglut_ext.h from header file if
freegult is not in PACKAGECONFIG to fix this issue
Signed-off-by: Roy Li
---
meta/recipes-graphics/piglit/piglit_git.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index 75e41fe..840fe3d 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -20,6 +20,12 @@ REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= ""
PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
+do_configure_prepend() {
+ if [ "${@bb.utils.contains('PACKAGECONFIG', 'freeglut', 'yes', 'no', d)}" =
"no" ]; then
+sed -i -e "/^#.*include $/d"
${S}/src/piglit/glut_wrap.h
+ fi
+}
+
FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: upgrade to 1.0.2c
From: Roy Li
upgrade to fix the CVE: CVE-2015-1788..CVE-2015-1792 and CVE-2014-8176
remove a backport patch
update the c_rehash-compat.patch
Signed-off-by: Roy Li
---
...lcl.h-fix-MIPS-specific-gcc-version-check.patch | 30 --
.../openssl/openssl/debian/c_rehash-compat.patch | 22 +++-
.../{openssl_1.0.2a.bb => openssl_1.0.2c.bb} | 5 ++--
3 files changed, 11 insertions(+), 46 deletions(-)
delete mode 100644
meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
rename meta/recipes-connectivity/openssl/{openssl_1.0.2a.bb =>
openssl_1.0.2c.bb} (89%)
diff --git
a/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
b/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
deleted file mode 100644
index 7308f8f..000
---
a/meta/recipes-connectivity/openssl/openssl/0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 60c268b21ac81cc6b1af5c5470282a613b96f6fd Mon Sep 17 00:00:00 2001
-From: Andy Polyakov
-Date: Mon, 25 May 2015 10:17:14 +0200
-Subject: [PATCH] bn/bn_lcl.h: fix MIPS-specific gcc version check.
-
-RT#3859
-
-Reviewed-by: Tim Hudson
-Upstream-Status: Backport
-
- crypto/bn/bn_lcl.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
-index 196df7e..b9d124a 100644
a/crypto/bn/bn_lcl.h
-+++ b/crypto/bn/bn_lcl.h
-@@ -443,7 +443,7 @@ unsigned __int64 _umul128(unsigned __int64 a, unsigned
__int64 b,
- # endif
- # elif defined(__mips) && (defined(SIXTY_FOUR_BIT) ||
defined(SIXTY_FOUR_BIT_LONG))
- # if defined(__GNUC__) && __GNUC__>=2
--#if __GNUC__>=4 && __GNUC_MINOR__>=4
-+#if __GNUC__>4 || (__GNUC__>=4 && __GNUC_MINOR__>=4)
- /* "h" constraint is no more since 4.4 */
- # define BN_UMULT_HIGH(a,b) (((__uint128_t)(a)*(b))>>64)
- # define BN_UMULT_LOHI(low,high,a,b) ({ \
---
-2.1.4
-
diff --git
a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
index 3943e2c..68e54d5 100644
--- a/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl/debian/c_rehash-compat.patch
@@ -5,14 +5,10 @@ Subject: [PATCH] also create old hash for compatibility
Upstream-Status: Backport [debian]
- tools/c_rehash.in |8 +++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-Index: openssl-1.0.2~beta3/tools/c_rehash.in
-===
openssl-1.0.2~beta3.orig/tools/c_rehash.in
-+++ openssl-1.0.2~beta3/tools/c_rehash.in
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index b086ff9..b777d79 100644
+--- a/tools/c_rehash.in
b/tools/c_rehash.in
@@ -8,8 +8,6 @@ my $prefix;
my $openssl = $ENV{OPENSSL} || "openssl";
@@ -23,14 +19,14 @@ Index: openssl-1.0.2~beta3/tools/c_rehash.in
my $symlink_exists=eval {symlink("",""); 1};
my $removelinks = 1;
@@ -18,10 +16,7 @@ my $removelinks = 1;
- while ( $ARGV[0] =~ '-.*' ) {
+ while ( $ARGV[0] =~ /^-/ ) {
my $flag = shift @ARGV;
last if ( $flag eq '--');
--if ( $flag =~ /-old/) {
+-if ( $flag eq '-old') {
- $x509hash = "-subject_hash_old";
- $crlhash = "-hash_old";
--} elsif ( $flag =~ /-h/) {
-+if ( $flag =~ /-h/) {
+-} elsif ( $flag eq '-h') {
++if ( $flag eq '-h') {
help();
} elsif ( $flag eq '-n' ) {
$removelinks = 0;
@@ -52,7 +48,7 @@ Index: openssl-1.0.2~beta3/tools/c_rehash.in
$fname =~ s/'/'\\''/g;
my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint
-noout -in "$fname"`;
chomp $hash;
-@@ -177,10 +175,20 @@ sub link_hash_cert {
+@@ -176,11 +174,21 @@ sub link_hash_cert {
$hashlist{$hash} = $fprint;
}
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
similarity index 89%
rename from meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
index f4006f6..74319ff 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2c.bb
@@ -36,11 +36,10 @@ SRC_URI += "file://configure-targets.patch \
file://ptest-deps.patch \
file://run-ptest \
file://crypto_use_bigint_in_x86-64_perl.patch \
-file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \
"
-SRC_URI[md5sum] = "a06c547dac9044161a477211049f60ef"
-SRC_URI[sha256sum] =
"15b6393c20030aab02c8e2fe0243cb1d1d18062f6c095d67bca91871dc7f324a"
+SRC_URI[md5sum] = "8c8d81a9ae7005276e486702edbcd4b6"
+SRC_URI[s
[OE-core] [PATCH] babeltrace: Fix invalid pointer free with trace collection
From: Roy Li
This fixed the bug https://bugs.lttng.org/issues/790
Signed-off-by: Roy Li
---
...nvalid-pointer-free-with-trace-collection.patch | 44 ++
meta/recipes-kernel/lttng/babeltrace_1.2.4.bb | 4 +-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
diff --git
a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
new file mode 100644
index 000..3e2c4e1
--- /dev/null
+++
b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch
@@ -0,0 +1,44 @@
+From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001
+From: Francis Giraldeau
+Date: Mon, 15 Jun 2015 11:43:02 -0400
+Subject: [PATCH] Fix invalid pointer free with trace collection
+
+Upstream-Status: Submitted
+
+Patch proposed by Li RongQing related to bug# 790
+
+Signed-off-by: Mikael Beckius
+Signed-off-by: Francis Giraldeau
+---
+ lib/context.c | 8 +++-
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/lib/context.c b/lib/context.c
+index 45aab34..8d3770f 100644
+--- a/lib/context.c
b/lib/context.c
+@@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char
*path,
+ struct bt_trace_descriptor *td;
+ struct bt_format *fmt;
+ struct bt_trace_handle *handle;
+- int ret, closeret;
++ int ret;
+
+ if (!ctx || !format_name || (!path && !stream_list))
+ return -EINVAL;
+@@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const
char *path,
+ return handle->id;
+
+ error:
+- closeret = fmt->close_trace(td);
+- if (closeret) {
+- fprintf(stderr, "Error in close_trace callback\n");
+- }
++ if (handle)
++ bt_context_remove_trace(ctx, handle->id);
+ end:
+ return ret;
+ }
+--
+1.9.1
+
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
index f616146..536be41 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb
@@ -13,7 +13,9 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
SRCREV = "90395824efc007de88787a6b8e400a07c980be1c"
PV = "1.2.4+git${SRCPV}"
-SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2"
+SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.2 \
+ file://0001-Fix-invalid-pointer-free-with-trace-collection.patch \
+"
S = "${WORKDIR}/git"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autogen: redirect the log file to build dir
From: Roy Li
Signed-off-by: Roy Li
---
.../autogen/autogen-native_5.18.4.bb | 4 +++-
.../autogen/autogen/redirect-output-dir.patch | 28 ++
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
index 302ba79..5fd6b7e 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
file://guile.patch \
file://increase-timeout-limit.patch \
- file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch"
+ file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch \
+ file://redirect-output-dir.patch \
+"
SRC_URI[md5sum] = "6f48029cc839303d28496e1609868938"
SRC_URI[sha256sum] =
"3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d"
diff --git a/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
new file mode 100644
index 000..de126ed
--- /dev/null
+++ b/meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch
@@ -0,0 +1,28 @@
+[PATCH] redirect the dir of mklibsrc-log.tx
+
+Upstream-Statue: Pending
+
+redirect mklibsrc-log.tx to builddir, not /tmp; otherwise mklibsrc-log.tx
+maybe unable to be written if other users is building autogen at the same time.
+
+Signed-off-by: Roy Li
+---
+ pkg/libopts/mklibsrc.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/libopts/mklibsrc.sh b/pkg/libopts/mklibsrc.sh
+index 416b402..d612fbc 100644
+--- a/pkg/libopts/mklibsrc.sh
b/pkg/libopts/mklibsrc.sh
+@@ -19,7 +19,7 @@
+ ## with this program. If not, see
[OE-core] [PATCH][v4] mmc-utils: fix the building failure when DEBUG_BUILD is 1
From: Roy Li
AM_CFLAGS in Makefile includes -D_FORTIFY_SOURCE=2 which will lead
to building failure when DEBUG_BUILD is 1.
Cancel the definition of _FORTIFY_SOURCE by passing -U_FORTIFY_SOURCE
via CFLAGS
Signed-off-by: Roy Li
---
meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb
b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index bdb4fed..dfe8902 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -13,6 +13,8 @@ SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branc
S = "${WORKDIR}/git"
+CFLAGS += "-U_FORTIFY_SOURCE"
+
do_install() {
install -d ${D}${bindir}
install -m 0755 mmc ${D}${bindir}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rsync: backport a patch to fix CVE-2014-8242
From: Roy Li
Signed-off-by: Roy Li
---
.../rsync/rsync-3.1.1/rsync.git-eac858085.patch| 101 +
meta/recipes-devtools/rsync/rsync_3.1.1.bb | 1 +
2 files changed, 102 insertions(+)
create mode 100644
meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
diff --git a/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
b/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
new file mode 100644
index 000..1fcac49
--- /dev/null
+++ b/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
@@ -0,0 +1,101 @@
+From eac858085e3ac94ec0ab5061d11f52652c90a869 Mon Sep 17 00:00:00 2001
+From: Wayne Davison
+Date: Mon, 11 May 2015 12:36:20 -0700
+Subject: [PATCH 1/1] Add compat flag to allow proper seed checksum order.
+ Fixes the equivalent of librsync's CVE-2014-8242 issue.
+
+Upstream-Status: Backport
+
+Signed-off-by: Roy Li
+---
+ checksum.c | 17 +
+ compat.c | 5 +
+ options.c | 1 +
+ 3 files changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/checksum.c b/checksum.c
+index a1c2aa2..933b514 100644
+--- a/checksum.c
b/checksum.c
+@@ -23,6 +23,7 @@
+
+ extern int checksum_seed;
+ extern int protocol_version;
++extern int proper_seed_order;
+
+ /*
+ a simple 32 bit checksum that can be upadted from either end
+@@ -54,10 +55,18 @@ void get_checksum2(char *buf, int32 len, char *sum)
+ if (protocol_version >= 30) {
+ uchar seedbuf[4];
+ md5_begin(&m);
+- md5_update(&m, (uchar *)buf, len);
+- if (checksum_seed) {
+- SIVALu(seedbuf, 0, checksum_seed);
+- md5_update(&m, seedbuf, 4);
++ if (proper_seed_order) {
++ if (checksum_seed) {
++ SIVALu(seedbuf, 0, checksum_seed);
++ md5_update(&m, seedbuf, 4);
++ }
++ md5_update(&m, (uchar *)buf, len);
++ } else {
++ md5_update(&m, (uchar *)buf, len);
++ if (checksum_seed) {
++ SIVALu(seedbuf, 0, checksum_seed);
++ md5_update(&m, seedbuf, 4);
++ }
+ }
+ md5_result(&m, (uchar *)sum);
+ } else {
+diff --git a/compat.c b/compat.c
+index 2454937..f89d466 100644
+--- a/compat.c
b/compat.c
+@@ -27,6 +27,7 @@ int inc_recurse = 0;
+ int compat_flags = 0;
+ int use_safe_inc_flist = 0;
+ int want_xattr_optim = 0;
++int proper_seed_order = 0;
+
+ extern int am_server;
+ extern int am_sender;
+@@ -78,6 +79,7 @@ int filesfrom_convert = 0;
+ #define CF_SYMLINK_ICONV (1<<2)
+ #define CF_SAFE_FLIST (1<<3)
+ #define CF_AVOID_XATTR_OPTIM (1<<4)
++#define CF_CHKSUM_SEED_FIX (1<<5)
+
+ static const char *client_info;
+
+@@ -271,12 +273,15 @@ void setup_protocol(int f_out,int f_in)
+ compat_flags |= CF_SAFE_FLIST;
+ if (local_server || strchr(client_info, 'x') != NULL)
+ compat_flags |= CF_AVOID_XATTR_OPTIM;
++ if (local_server || strchr(client_info, 'C') != NULL)
++ compat_flags |= CF_CHKSUM_SEED_FIX;
+ write_byte(f_out, compat_flags);
+ } else
+ compat_flags = read_byte(f_in);
+ /* The inc_recurse var MUST be set to 0 or 1. */
+ inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
+ want_xattr_optim = protocol_version >= 31 && !(compat_flags &
CF_AVOID_XATTR_OPTIM);
++ proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
+ if (am_sender) {
+ receiver_symlink_times = am_server
+ ? strchr(client_info, 'L') != NULL
+diff --git a/options.c b/options.c
+index 19c2b7d..4128b59 100644
+--- a/options.c
b/options.c
+@@ -2503,6 +2503,7 @@ void server_options(char **args, int *argc_p)
+ #endif
+ argstr[x++] = 'f'; /* flist I/O-error safety support */
+ argstr[x++] = 'x'; /* xattr hardlink optimization not desired */
++ argstr[x++] = 'C'; /* support checksum seed order fix */
+ }
+
+ if (x >= (int)sizeof argstr) { /* Not possible... */
+--
+1.9.1
+
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.1.bb
b/meta/recipes-devtools/rsync/rsync_3.1.1.bb
index 3a79154..c74cdda 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.1.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.1.bb
@@ -3,6 +3,7 @@ require rsync.inc
SRC_URI += "file://acinclude.m4 \
file://0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch \
+file://rsync.git-eac858085.patch \
"
SRC_URI[md5sum] = "43bd6676f0b404326eee2d63be3cdcfe"
--
1.9.1
--
___
Openembe
[OE-core] [PATCH][V4] apt: upgrade to 1.0.9.9
From: Roy Li
1. Upgrade to fix the several CVEs: CVE-2014-0488, CVE-2014-0490
2. Remove apt-0.9.9.4-CVE-2014-0478.patch, which was backport.
3. Romve no-ko-translation.patch, apt-1.0.9.9 has ko translation
4. Update use-host.patch no-curl.patch db_linking_hack.patch and
noconfigure.patch
5. Not build the test cases since it requires gtest
6. install libapt-private.so.* to libdir, otherwise this file is
not installed into sysroot for native, and apt-get will use host's,
and lead to fail
7. Revert apt commit[a2a75ff45]"always run 'dpkg --configure -a'
at the end of our dpkg callings" for native package, otherwise
the postscript for these installed packages will be run, and fail
since the rootfs dir is not considered
8. Add lzma dependency by PACKAGECONFIG for target, and add xz
dependency for native
9. Support to compile apt-native on centos6
Signed-off-by: Roy Li
Acked-by: Aníbal Limón
---
.../apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch| 193 ---
.../apt/apt-0.9.9.4/no-ko-translation.patch| 11 -
...ys-run-dpkg-configure-a-at-the-end-of-our.patch | 378 +
.../0001-fix-the-gcc-version-check.patch | 160 +
...001-remove-Wsuggest-attribute-from-CFLAGS.patch | 43 +++
.../disable-configure-in-makefile.patch| 0
.../apt/apt-1.0.9.9/disable-test.patch | 58
.../fix-gcc-4.6-null-not-defined.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/no-nls-dpkg.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/noconfigure.patch | 17 +-
.../apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch | 0
.../truncate-filename.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch| 6 +-
meta/recipes-devtools/apt/apt-native.inc | 10 +-
...apt-native_0.9.9.4.bb => apt-native_1.0.9.9.bb} | 4 +-
meta/recipes-devtools/apt/apt.inc | 5 +-
.../apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} | 8 +-
.../apt/files/db_linking_hack.patch| 6 +-
meta/recipes-devtools/apt/files/no-curl.patch | 8 +-
20 files changed, 676 insertions(+), 231 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch
create mode 100644
meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
create mode 100644
meta/recipes-devtools/apt/apt-1.0.9.9/0001-fix-the-gcc-version-check.patch
create mode 100644
meta/recipes-devtools/apt/apt-1.0.9.9/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/disable-configure-in-makefile.patch (100%)
create mode 100644 meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/fix-gcc-4.6-null-not-defined.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/no-nls-dpkg.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch
(84%)
rename meta/recipes-devtools/apt/{apt-native_0.9.9.4.bb =>
apt-native_1.0.9.9.bb} (55%)
rename meta/recipes-devtools/apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} (56%)
diff --git
a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
b/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
deleted file mode 100644
index 79a6897..000
--- a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-This patch comes from:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=73;filename=apt_0.9.7.9%2Bdeb7u2.debdiff;att=1;bug=749795
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenlin Kang
-Signed-off-by: Chong Lu
-
-diff -uarN apt-0.9.9.4-org/cmdline/apt-get.cc apt-0.9.9.4/cmdline/apt-get.cc
apt-0.9.9.4-org/cmdline/apt-get.cc 2014-08-29 15:37:42.587156134 +0800
-+++ apt-0.9.9.4/cmdline/apt-get.cc 2014-08-29 15:51:16.672334086 +0800
-@@ -1046,25 +1046,8 @@
-return true;
- }
- /*}}}*/
--// CheckAuth - check if each download comes form a trusted source /*{{{*/
--// -
--/* */
--static bool CheckAuth(pkgAcquire& Fetcher)
-+static bool AuthPrompt(std::string UntrustedList, bool const PromptUser)
- {
-- string UntrustedList;
-- for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I <
Fetcher.ItemsEnd(); ++I)
-- {
-- if (
[OE-core] [PATCH][V2] ppp: Security Advisory - CVE-2015-3310
From: Roy Li
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3310
Buffer overflow in the rc_mksid function in plugins/radius/util.c in
Paul's PPP Package (ppp) 2.4.6 and earlier, when the PID for pppd is
greater than 65535, allows remote attackers to cause a denial of
service (crash) via a start accounting message to the RADIUS server.
oe-core is using ppp 2.4.7, and this CVE say ppp 2.4.7 was not
effected, but I found this buggy codes are same between 2.4.6 and
2.4.7, and 2.4.7 should have this issue.
Signed-off-by: Roy Li
---
.../ppp/ppp/fix-CVE-2015-3310.patch| 29 ++
meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
new file mode 100644
index 000..b8ca204
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
@@ -0,0 +1,29 @@
+ppp: Buffer overflow in radius plugin
+
+From: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=782450
+
+Upstream-Status: Backport
+
+On systems with more than 65535 processes running, pppd aborts when
+sending a "start" accounting message to the RADIUS server because of a
+buffer overflow in rc_mksid.
+
+The process id is used in rc_mksid to generate a pseudo-unique string,
+assuming that the hex representation of the pid will be at most 4
+characters (). __sprintf_chk(), used when compiling with
+optimization levels greater than 0 and FORTIFY_SOURCE, detects the
+buffer overflow and makes pppd crash.
+
+The following patch fixes the problem.
+
+--- ppp-2.4.6.orig/pppd/plugins/radius/util.c
ppp-2.4.6/pppd/plugins/radius/util.c
+@@ -77,7 +77,7 @@ rc_mksid (void)
+ static unsigned short int cnt = 0;
+ sprintf (buf, "%08lX%04X%02hX",
+ (unsigned long int) time (NULL),
+- (unsigned int) getpid (),
++ (unsigned int) getpid () % 65535,
+ cnt & 0xFF);
+ cnt++;
+ return buf;
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index 4219d45..adc38e1 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://provider \
file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
file://ppp@.service \
+ file://fix-CVE-2015-3310.patch \
"
SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ppp: Security Advisory - CVE-2015-3310
From: Roy Li
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-3310
Buffer overflow in the rc_mksid function in plugins/radius/util.c in
Paul's PPP Package (ppp) 2.4.6 and earlier, when the PID for pppd is
greater than 65535, allows remote attackers to cause a denial of
service (crash) via a start accounting message to the RADIUS server.
oe-core is using ppp 2.4.7, and this CVE say ppp 2.4.7 was not
effected, but I found this buggy codes are same between 2.4.6 and
2.4.7, and 2.4.7 should have this issue.
Signed-off-by: Roy Li
---
.../ppp/ppp/fix-CVE-2015-3310.patch| 29 ++
meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644 meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
diff --git a/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
new file mode 100644
index 000..b8ca204
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
@@ -0,0 +1,29 @@
+ppp: Buffer overflow in radius plugin
+
+From: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=782450
+
+Upstream-Statue: Backport
+
+On systems with more than 65535 processes running, pppd aborts when
+sending a "start" accounting message to the RADIUS server because of a
+buffer overflow in rc_mksid.
+
+The process id is used in rc_mksid to generate a pseudo-unique string,
+assuming that the hex representation of the pid will be at most 4
+characters (). __sprintf_chk(), used when compiling with
+optimization levels greater than 0 and FORTIFY_SOURCE, detects the
+buffer overflow and makes pppd crash.
+
+The following patch fixes the problem.
+
+--- ppp-2.4.6.orig/pppd/plugins/radius/util.c
ppp-2.4.6/pppd/plugins/radius/util.c
+@@ -77,7 +77,7 @@ rc_mksid (void)
+ static unsigned short int cnt = 0;
+ sprintf (buf, "%08lX%04X%02hX",
+ (unsigned long int) time (NULL),
+- (unsigned int) getpid (),
++ (unsigned int) getpid () % 65535,
+ cnt & 0xFF);
+ cnt++;
+ return buf;
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index 4219d45..adc38e1 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://provider \
file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
file://ppp@.service \
+ file://fix-CVE-2015-3310.patch \
"
SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wpa-supplicant: upgrade to 2.4
From: Yue Tao
1. upgrade to 2.4
2. update the checksum, and license checksum since date in it is changed
3. Backport a patch to fix CVE-2015-1863
4. remove two deprecated patches
Signed-off-by: Roy Li
---
...e-SSID-element-length-before-copying-it-C.patch | 47 ++
.../0001-linux_wext-Fix-types-for-musl.patch | 38 -
.../fix-libnl3-host-contamination.patch| 42 ---
.../wpa-supplicant/wpa-supplicant_2.3.bb | 2 -
.../{wpa-supplicant.inc => wpa-supplicant_2.4.bb} | 13 +++---
5 files changed, 53 insertions(+), 89 deletions(-)
create mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
delete mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
delete mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch
delete mode 100644
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.3.bb
rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant.inc =>
wpa-supplicant_2.4.bb} (88%)
diff --git
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
new file mode 100644
index 000..e108a93
--- /dev/null
+++
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -0,0 +1,47 @@
+From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
+From: Jouni Malinen
+Date: Tue, 7 Apr 2015 11:32:11 +0300
+Subject: [PATCH] P2P: Validate SSID element length before copying it
+ (CVE-2015-1863)
+
+This fixes a possible memcpy overflow for P2P dev->oper_ssid in
+p2p_add_device(). The length provided by the peer device (0..255 bytes)
+was used without proper bounds checking and that could have resulted in
+arbitrary data of up to 223 bytes being written beyond the end of the
+dev->oper_ssid[] array (of which about 150 bytes would be beyond the
+heap allocation) when processing a corrupted management frame for P2P
+peer discovery purposes.
+
+This could result in corrupted state in heap, unexpected program
+behavior due to corrupted P2P peer device information, denial of service
+due to process crash, exposure of memory contents during GO Negotiation,
+and potentially arbitrary code execution.
+
+Thanks to Google security team for reporting this issue and smart
+hardware research group of Alibaba security team for discovering it.
+
+Signed-off-by: Jouni Malinen
+
+Upstream-Status: Backport
+
+Signed-off-by: Yue Tao
+
+---
+ src/p2p/p2p.c |1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index f584fae..a45fe73 100644
+--- a/src/p2p/p2p.c
b/src/p2p/p2p.c
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr,
int freq,
+ if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
+ os_memcpy(dev->interface_addr, addr, ETH_ALEN);
+ if (msg.ssid &&
++ msg.ssid[1] <= sizeof(dev->oper_ssid) &&
+ (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
+os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
+!= 0)) {
+--
+1.7.9.5
+
diff --git
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
deleted file mode 100644
index 49a988b..000
---
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-linux_wext-Fix-types-for-musl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 159db445dc4cb0af5f6ad85f3a146ad137db5057 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 3 Apr 2015 20:38:21 -0700
-Subject: [PATCH] linux_wext: Fix types for musl
-
-| ../src/drivers/linux_wext.h:24:9: error: unknown type name '__uint32_t'
-| typedef __uint32_t __u32;
-
-Signed-off-by: Khem Raj
-Upstream-Status: Pending
- src/drivers/linux_wext.h | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/drivers/linux_wext.h b/src/drivers/linux_wext.h
-index 55cf955..e66df91 100644
a/src/drivers/linux_wext.h
-+++ b/src/drivers/linux_wext.h
-@@ -21,11 +21,11 @@
-
- #include
- #include
--typedef __uint32_t __u32;
--typedef __int32_t __s32;
--typedef __uint16_t __u16;
--typedef __int16_t __s16;
--typedef __uint8_t __u8;
-+typedef u_int32_t __u32;
-+typedef int32_t __s32;
-+typedef u_int16_t __u16;
-+typedef int16_t __s16;
-+typedef u_int8_t __u8;
- #ifndef __user
- #define __user
- #endif /* __user */
---
-2.1.4
-
diff --git
a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contamination.patch
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/fix-libnl3-host-contam
[OE-core] [PATCH v3] apt: upgrade to 1.0.9.9
From: Roy Li
1. Upgrade to fix the several CVEs: CVE-2014-0488, CVE-2014-0490
2. Remove apt-0.9.9.4-CVE-2014-0478.patch, which was backport.
3. Romve no-ko-translation.patch, apt-1.0.9.9 has ko translation
4. Update use-host.patch no-curl.patch db_linking_hack.patch and
noconfigure.patch
5. Not build the test cases since it requires gtest
6. install libapt-private.so.* to libdir, otherwise this file is
not installed into sysroot for native, and apt-get will use host's,
and lead to fail
7. Revert apt commit[a2a75ff45]"always run 'dpkg --configure -a'
at the end of our dpkg callings" for native package, otherwise
the postscript for these installed packages will be run, and fail
since the rootfs dir is not considered
8. Add lzma dependency by PACKAGECONFIG for target, and add xz
dependency for native
Signed-off-by: Roy Li
---
.../apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch| 193 ---
.../apt/apt-0.9.9.4/no-ko-translation.patch| 11 -
...ys-run-dpkg-configure-a-at-the-end-of-our.patch | 378 +
.../disable-configure-in-makefile.patch| 0
.../apt/apt-1.0.9.9/disable-test.patch | 58
.../fix-gcc-4.6-null-not-defined.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/no-nls-dpkg.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/noconfigure.patch | 17 +-
.../apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch | 0
.../truncate-filename.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch| 6 +-
meta/recipes-devtools/apt/apt-native.inc | 8 +-
...apt-native_0.9.9.4.bb => apt-native_1.0.9.9.bb} | 4 +-
meta/recipes-devtools/apt/apt.inc | 7 +-
.../apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} | 5 +-
.../apt/files/db_linking_hack.patch| 6 +-
meta/recipes-devtools/apt/files/no-curl.patch | 8 +-
18 files changed, 470 insertions(+), 231 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch
create mode 100644
meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/disable-configure-in-makefile.patch (100%)
create mode 100644 meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/fix-gcc-4.6-null-not-defined.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/no-nls-dpkg.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch
(84%)
rename meta/recipes-devtools/apt/{apt-native_0.9.9.4.bb =>
apt-native_1.0.9.9.bb} (55%)
rename meta/recipes-devtools/apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} (67%)
diff --git
a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
b/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
deleted file mode 100644
index 79a6897..000
--- a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-This patch comes from:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=73;filename=apt_0.9.7.9%2Bdeb7u2.debdiff;att=1;bug=749795
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenlin Kang
-Signed-off-by: Chong Lu
-
-diff -uarN apt-0.9.9.4-org/cmdline/apt-get.cc apt-0.9.9.4/cmdline/apt-get.cc
apt-0.9.9.4-org/cmdline/apt-get.cc 2014-08-29 15:37:42.587156134 +0800
-+++ apt-0.9.9.4/cmdline/apt-get.cc 2014-08-29 15:51:16.672334086 +0800
-@@ -1046,25 +1046,8 @@
-return true;
- }
- /*}}}*/
--// CheckAuth - check if each download comes form a trusted source /*{{{*/
--// -
--/* */
--static bool CheckAuth(pkgAcquire& Fetcher)
-+static bool AuthPrompt(std::string UntrustedList, bool const PromptUser)
- {
-- string UntrustedList;
-- for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I <
Fetcher.ItemsEnd(); ++I)
-- {
-- if (!(*I)->IsTrusted())
-- {
-- UntrustedList += string((*I)->ShortDesc()) + " ";
-- }
-- }
--
-- if (UntrustedList == "")
-- {
-- return true;
-- }
--
-ShowList(c2out,_("WARNING: The following packages cannot be
authenticated!"),UntrustedList,"");
-
-if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
-@@ -1073,6 +1056,9 @@
- return
[OE-core] [PATCH] gettext-minimal-native: Disable the unnecessary check in iconv.m4
From: Roy Li
Disable the test "Test against HP-UX 11.11 bug: No converter from EUC-JP
to UTF-8 is provided" since we don't support HP-UX and if the euc-jp is
not installed on the host, the dependence will be built without iconv
support and will cause guile-native building fail.
The patch is similar as 0470bd7a9658d3[libunistring: remove the test to
convert euc-jp in configure]
Signed-off-by: Roy Li
---
...-PATCH-Disable-the-test-to-convert-euc-jp.patch | 38 ++
.../gettext/gettext-minimal-native_0.19.4.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644
meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
diff --git
a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
b/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
new file mode 100644
index 000..29ef2a5
--- /dev/null
+++
b/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
@@ -0,0 +1,38 @@
+[PATCH] Disable the test to convert euc-jp
+
+Remove the test "Test against HP-UX 11.11 bug:
+No converter from EUC-JP to UTF-8 is provided"
+since we don't support HP-UX and if the euc-jp is not
+installed on the host, the dependence will be built without
+iconv support and will cause guile-native building fail.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Roy Li
+---
+ iconv.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/iconv.m4 b/iconv.m4
+index 4e37363..35f54bd 100644
+--- a/iconv.m4
b/iconv.m4
+@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ }
+ }
+ #endif
++#if 0
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ result |= 16;
++#endif
+ return result;
+ ]])],
+ [am_cv_func_iconv_works=yes], ,
+--
+2.0.1
+
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
index ca97315..1d4a443 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
@@ -8,6 +8,7 @@ SRC_URI = "file://aclocal.tgz \
file://Makefile.in.in \
file://remove-potcdate.sin \
file://COPYING \
+ file://0001-PATCH-Disable-the-test-to-convert-euc-jp.patch \
"
INHIBIT_DEFAULT_DEPS = "1"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: drop the padlock_conf.patch
From: Roy Li padlock_conf.patch will enable the padlock engine by default, but this engine does not work on some 32bit machine, and lead to openssl unable to work Signed-off-by: Roy Li --- .../openssl/openssl/debian1.0.2/padlock_conf.patch | 31 -- .../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch diff --git a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch b/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch deleted file mode 100644 index 61dcf45..000 --- a/meta/recipes-connectivity/openssl/openssl/debian1.0.2/padlock_conf.patch +++ /dev/null @@ -1,31 +0,0 @@ - -Upstream-Status: Backport [debian] - openssl/apps/openssl.cnf.orig 2012-06-06 00:45:56.0 +0200 -+++ openssl/apps/openssl.cnf 2012-06-06 00:46:46.0 +0200 -@@ -19,6 +19,8 @@ - # (Alternatively, use a configuration file that has only - # X.509v3 extensions in its main [= default] section.) - -+openssl_conf = openssl_def -+ - [ new_oids ] - - # We can add new OIDs in here for use by 'ca', 'req' and 'ts'. -@@ -348,3 +350,16 @@ - # (optional, default: no) - ess_cert_id_chain = no# Must the ESS cert id chain be included? - # (optional, default: no) -+ -+[openssl_def] -+engines = engine_section -+ -+[engine_section] -+padlock = padlock_section -+ -+[padlock_section] -+soft_load=1 -+init=1 -+default_algorithms = ALL -+dynamic_path=padlock -+ diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index 6cf8049..dd97ea8 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -18,7 +18,6 @@ SRC_URI += "file://configure-targets.patch \ file://openssl-fix-link.patch \ file://debian1.0.2/block_diginotar.patch \ file://debian1.0.2/block_digicert_malaysia.patch \ -file://debian1.0.2/padlock_conf.patch \ file://debian/ca.patch \ file://debian/c_rehash-compat.patch \ file://debian/debian-targets.patch \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] apt: upgrade to 1.0.9.9
From: Roy Li
1. Upgrade to fix the several CVEs: CVE-2014-0488, CVE-2014-0490
2. Remove apt-0.9.9.4-CVE-2014-0478.patch, which was backport.
3. Romve no-ko-translation.patch, apt-1.0.9.9 has ko translation
4. Update use-host.patch no-curl.patch db_linking_hack.patch and
noconfigure.patch
5. Not build the test cases since it requires gtest
6. install libapt-private.so.* to libdir, otherwise this file is
not installed into sysroot for native, and apt-get will use host's,
and lead to fail
7. Revert apt commit[a2a75ff45]"always run 'dpkg --configure -a'
at the end of our dpkg callings" for native package, otherwise
the postscript for these installed packages will be run, and fail
since the rootfs dir is not considered
Signed-off-by: Roy Li
---
.../apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch| 193 ---
.../apt/apt-0.9.9.4/no-ko-translation.patch| 11 -
...ys-run-dpkg-configure-a-at-the-end-of-our.patch | 378 +
.../disable-configure-in-makefile.patch| 0
.../apt/apt-1.0.9.9/disable-test.patch | 58
.../fix-gcc-4.6-null-not-defined.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/no-nls-dpkg.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/noconfigure.patch | 17 +-
.../apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch | 0
.../truncate-filename.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch| 6 +-
meta/recipes-devtools/apt/apt-native.inc | 6 +-
...apt-native_0.9.9.4.bb => apt-native_1.0.9.9.bb} | 4 +-
meta/recipes-devtools/apt/apt.inc | 5 +-
.../apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} | 5 +-
.../apt/files/db_linking_hack.patch| 6 +-
meta/recipes-devtools/apt/files/no-curl.patch | 8 +-
18 files changed, 467 insertions(+), 230 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch
create mode 100644
meta/recipes-devtools/apt/apt-1.0.9.9/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/disable-configure-in-makefile.patch (100%)
create mode 100644 meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/fix-gcc-4.6-null-not-defined.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/no-nls-dpkg.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch
(84%)
rename meta/recipes-devtools/apt/{apt-native_0.9.9.4.bb =>
apt-native_1.0.9.9.bb} (55%)
rename meta/recipes-devtools/apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} (67%)
diff --git
a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
b/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
deleted file mode 100644
index 79a6897..000
--- a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-This patch comes from:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=73;filename=apt_0.9.7.9%2Bdeb7u2.debdiff;att=1;bug=749795
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenlin Kang
-Signed-off-by: Chong Lu
-
-diff -uarN apt-0.9.9.4-org/cmdline/apt-get.cc apt-0.9.9.4/cmdline/apt-get.cc
apt-0.9.9.4-org/cmdline/apt-get.cc 2014-08-29 15:37:42.587156134 +0800
-+++ apt-0.9.9.4/cmdline/apt-get.cc 2014-08-29 15:51:16.672334086 +0800
-@@ -1046,25 +1046,8 @@
-return true;
- }
- /*}}}*/
--// CheckAuth - check if each download comes form a trusted source /*{{{*/
--// -
--/* */
--static bool CheckAuth(pkgAcquire& Fetcher)
-+static bool AuthPrompt(std::string UntrustedList, bool const PromptUser)
- {
-- string UntrustedList;
-- for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I <
Fetcher.ItemsEnd(); ++I)
-- {
-- if (!(*I)->IsTrusted())
-- {
-- UntrustedList += string((*I)->ShortDesc()) + " ";
-- }
-- }
--
-- if (UntrustedList == "")
-- {
-- return true;
-- }
--
-ShowList(c2out,_("WARNING: The following packages cannot be
authenticated!"),UntrustedList,"");
-
-if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
-@@ -1073,6 +1056,9 @@
- return true;
-}
-
-+ if (PromptUser == false)
-+ return _error->Error(_("Some pa
[OE-core] [PATCH][v3] sqlite3: upgrade to 3.8.10
From: Roy Li
upgrade to include CVE fixes:
CVE-2015-3414
CVE-2015-3415
CVE-2015-3416
Signed-off-by: Roy Li
---
.../files/0001-using-the-dynamic-library.patch | 30 ++
.../{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}| 8 +++---
2 files changed, 35 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
rename meta/recipes-support/sqlite/{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}
(64%)
diff --git
a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
new file mode 100644
index 000..e3bfd5f
--- /dev/null
+++ b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
@@ -0,0 +1,30 @@
+[PATCH] using the dynamic library
+
+Upstream-Status: Inappropriate [configuration]
+
+building statically-linked sqlite3 failed since sqlite3.o is generated in
+different dir, even if link successes, the size of sqlite3 is become larger,
+so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/
+
+Signed-off-by: Roy Li
+---
+ Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 88bc23d..fe50f20 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+
+ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
++sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la
++
+
+ include_HEADERS = sqlite3.h sqlite3ext.h
+
+--
+1.9.1
+
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
similarity index 64%
rename from meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
rename to meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
index 4c73d30..d7f72d9 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
@@ -8,10 +8,12 @@ def sqlite_download_version(d):
PE = "3"
SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz";
+SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://0001-using-the-dynamic-library.patch \
+"
-SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba"
-SRC_URI[sha256sum] =
"86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec"
+SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff"
+SRC_URI[sha256sum] =
"c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428"
S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pcmciautils: fix the parallel building issue
From: Roy Li The building failure still display after upstream commit 055a5bbfc[ pcmciautils: fix for parallel build], so refix it. Signed-off-by: Roy Li --- .../0001-fix-a-parallel-building-issue.patch | 45 ++ .../Makefile-fix-for-parallel-build.patch | 41 meta/recipes-bsp/pcmciautils/pcmciautils_018.bb| 2 +- 3 files changed, 46 insertions(+), 42 deletions(-) create mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch delete mode 100644 meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch new file mode 100644 index 000..7b01040 --- /dev/null +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/0001-fix-a-parallel-building-issue.patch @@ -0,0 +1,45 @@ +From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Tue, 19 May 2015 15:54:24 +0800 +Subject: [PATCH] fix a parallel building issue + +Fixed: +| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory +| +|#include "yacc_config.h" +|^ +| compilation terminated. + +And: +Compiling lex_config.c. + src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory + +Upstream-Status: Pending + +there are two Makefile rules to generate lex_config.o, one is to generate +lex_config.o other is to generate src/lex_config.o, so we can remove one. +and add the needed dependence for lex_config.o + + +Signed-off-by: Roy Li +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index d45fdc3..4c53bc2 100644 +--- a/Makefile b/Makefile +@@ -246,8 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +-yacc_config.o lex_config.o: %.o: %.c +- $(CC) -c -MD -O -pipe $(CPPFLAGS) $< ++src/lex_config.o:src/yacc_config.h + + debugtools: ccdv $(CBDUMP) $(CISDUMP) + +-- +1.9.1 + diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch deleted file mode 100644 index d0bb3d6..000 --- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1b8ad348f8c712c8e0c16c49cc1c8e577e4d6d3e Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 5 Feb 2015 01:16:30 -0800 -Subject: [PATCH] Makefile: fix for parallel build - -Fixed: -| src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory -| -|#include "yacc_config.h" -|^ -| compilation terminated. - -And: -Compiling lex_config.c. - src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory - -Upstream-Status: Pending - -Signed-off-by: Robert Yang - Makefile |4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d45fdc3..963453a 100644 a/Makefile -+++ b/Makefile -@@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) - $(QUIET) $(STRIPCMD) $@ - --yacc_config.o lex_config.o: %.o: %.c -+lex_config.o: lex_config.c yacc_config.h -+ $(CC) -c -MD -O -pipe $(CPPFLAGS) $< -+yacc_config.o: yacc_config.c - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< - - debugtools: ccdv $(CBDUMP) $(CISDUMP) --- -1.7.9.5 - diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb index fc76c44..24ceed8 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -1,7 +1,7 @@ require pcmciautils.inc SRC_URI += "file://makefile_fix.patch \ -file://Makefile-fix-for-parallel-build.patch \ +file://0001-fix-a-parallel-building-issue.patch \ " SRC_URI[md5sum] = "5d85669b3440baa4532363da6caaf1b4" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V2] sqlite3: upgrade to 3.8.10
From: Roy Li
upgrade to include CVE fixes
Signed-off-by: Roy Li
---
.../files/0001-using-the-dynamic-library.patch | 28 ++
.../{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}| 8 ---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
rename meta/recipes-support/sqlite/{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}
(64%)
diff --git
a/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
new file mode 100644
index 000..5818aa2
--- /dev/null
+++ b/meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
@@ -0,0 +1,28 @@
+[PATCH] using the dynamic library
+
+Upstream-Status: Inappropriate [configuration]
+
+using the dynamic library, not link statically
+
+Signed-off-by: Roy Li
+---
+ Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 88bc23d..fe50f20 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+
+ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+-sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
++sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la
++
+
+ include_HEADERS = sqlite3.h sqlite3ext.h
+
+--
+1.9.1
+
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
similarity index 64%
rename from meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
rename to meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
index 4c73d30..d7f72d9 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
@@ -8,10 +8,12 @@ def sqlite_download_version(d):
PE = "3"
SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz";
+SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://0001-using-the-dynamic-library.patch \
+"
-SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba"
-SRC_URI[sha256sum] =
"86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec"
+SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff"
+SRC_URI[sha256sum] =
"c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428"
S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][Resend] apt: upgrade to 1.0.9.9
From: Roy Li
Upgrade to fix the several CVEs: CVE-2014-0488, CVE-2014-0490
Remove apt-0.9.9.4-CVE-2014-0478.patch, which was backport.
Romve no-ko-translation.patch, apt-1.0.9.9 has ko translation
Update use-host.patch no-curl.patch db_linking_hack.patch and
noconfigure.patch
Not build the test cases since it requires gtest
Signed-off-by: Roy Li
---
.../apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch| 193 -
.../apt/apt-0.9.9.4/no-ko-translation.patch| 11 --
.../disable-configure-in-makefile.patch| 0
.../apt/apt-1.0.9.9/disable-test.patch | 58 +++
.../fix-gcc-4.6-null-not-defined.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/no-nls-dpkg.patch | 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/noconfigure.patch | 17 +-
.../apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch | 0
.../truncate-filename.patch| 0
.../{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch| 6 +-
...apt-native_0.9.9.4.bb => apt-native_1.0.9.9.bb} | 4 +-
meta/recipes-devtools/apt/apt.inc | 5 +-
.../apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} | 4 +-
.../apt/files/db_linking_hack.patch| 6 +-
meta/recipes-devtools/apt/files/no-curl.patch | 8 +-
16 files changed, 83 insertions(+), 229 deletions(-)
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
delete mode 100644
meta/recipes-devtools/apt/apt-0.9.9.4/no-ko-translation.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/disable-configure-in-makefile.patch (100%)
create mode 100644 meta/recipes-devtools/apt/apt-1.0.9.9/disable-test.patch
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/fix-gcc-4.6-null-not-defined.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/makerace.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/no-nls-dpkg.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/noconfigure.patch (54%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/nodoc.patch
(100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 =>
apt-1.0.9.9}/truncate-filename.patch (100%)
rename meta/recipes-devtools/apt/{apt-0.9.9.4 => apt-1.0.9.9}/use-host.patch
(84%)
rename meta/recipes-devtools/apt/{apt-native_0.9.9.4.bb =>
apt-native_1.0.9.9.bb} (55%)
rename meta/recipes-devtools/apt/{apt_0.9.9.4.bb => apt_1.0.9.9.bb} (74%)
diff --git
a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
b/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
deleted file mode 100644
index 79a6897..000
--- a/meta/recipes-devtools/apt/apt-0.9.9.4/apt-0.9.9.4-CVE-2014-0478.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-This patch comes from:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=73;filename=apt_0.9.7.9%2Bdeb7u2.debdiff;att=1;bug=749795
-
-Upstream-Status: Backport
-
-Signed-off-by: Wenlin Kang
-Signed-off-by: Chong Lu
-
-diff -uarN apt-0.9.9.4-org/cmdline/apt-get.cc apt-0.9.9.4/cmdline/apt-get.cc
apt-0.9.9.4-org/cmdline/apt-get.cc 2014-08-29 15:37:42.587156134 +0800
-+++ apt-0.9.9.4/cmdline/apt-get.cc 2014-08-29 15:51:16.672334086 +0800
-@@ -1046,25 +1046,8 @@
-return true;
- }
- /*}}}*/
--// CheckAuth - check if each download comes form a trusted source /*{{{*/
--// -
--/* */
--static bool CheckAuth(pkgAcquire& Fetcher)
-+static bool AuthPrompt(std::string UntrustedList, bool const PromptUser)
- {
-- string UntrustedList;
-- for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I <
Fetcher.ItemsEnd(); ++I)
-- {
-- if (!(*I)->IsTrusted())
-- {
-- UntrustedList += string((*I)->ShortDesc()) + " ";
-- }
-- }
--
-- if (UntrustedList == "")
-- {
-- return true;
-- }
--
-ShowList(c2out,_("WARNING: The following packages cannot be
authenticated!"),UntrustedList,"");
-
-if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true)
-@@ -1073,6 +1056,9 @@
- return true;
-}
-
-+ if (PromptUser == false)
-+ return _error->Error(_("Some packages could not be authenticated"));
-+
-if (_config->FindI("quiet",0) < 2
-&& _config->FindB("APT::Get::Assume-Yes",false) == false)
-{
-@@ -1090,6 +1076,28 @@
-return _error->Error(_("There are problems and -y was used without
--force-yes"));
- }
- /*}}}*/
-+// CheckAuth - check if each download comes form a trusted source /*{{{*/
-+// -
-+/* */
-+static bool CheckAuth(pkgAcquire& Fetcher, bool PromptUser=true)
-+{
-+ string UntrustedList;
-+ for (pkgAcquire::ItemIterator I
[OE-core] [PATCH] unzip: Security Advisory -CVE-2014-9636 and CVE-2015-1315
From: Roy Li
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9636
unzip 6.0 allows remote attackers to cause a denial of service
(out-of-bounds read or write and crash) via an extra field with
an uncompressed size smaller than the compressed field size in a
zip archive that advertises STORED method compression.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1315
Buffer overflow in the charset_to_intern function in unix/unix.c in
Info-Zip UnZip 6.10b allows remote attackers to execute arbitrary code
via a crafted string, as demonstrated by converting a string from CP866
to UTF-8.
Signed-off-by: Roy Li
---
.../06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch | 402 +
.../unzip/unzip/unzip-6.0_overflow3.diff | 45 +++
meta/recipes-extended/unzip/unzip_6.0.bb | 5 +-
3 files changed, 451 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
create mode 100644 meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff
diff --git
a/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
b/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
new file mode 100644
index 000..9ba3c1d
--- /dev/null
+++
b/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
@@ -0,0 +1,402 @@
+From: Giovanni Scafora
+Subject: unzip files encoded with non-latin, non-unicode file names
+Last-Update: 2015-02-11
+
+Upstream-Status: Backport
+
+Updated 2015-02-11 by Marc Deslauriers
+to fix buffer overflow in charset_to_intern()
+
+Signed-off-by: Marc Deslauriers
+
+Index: unzip-6.0/unix/unix.c
+===
+--- unzip-6.0.orig/unix/unix.c 2015-02-11 08:46:43.675324290 -0500
unzip-6.0/unix/unix.c 2015-02-11 09:18:04.902081319 -0500
+@@ -30,6 +30,9 @@
+ #define UNZIP_INTERNAL
+ #include "unzip.h"
+
++#include
++#include
++
+ #ifdef SCO_XENIX
+ # define SYSNDIR
+ #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
+@@ -1874,3 +1877,102 @@
+ }
+ }
+ #endif /* QLZIP */
++
++
++typedef struct {
++char *local_charset;
++char *archive_charset;
++} CHARSET_MAP;
++
++/* A mapping of local <-> archive charsets used by default to convert
filenames
++ * of DOS/Windows Zip archives. Currently very basic. */
++static CHARSET_MAP dos_charset_map[] = {
++{ "ANSI_X3.4-1968", "CP850" },
++{ "ISO-8859-1", "CP850" },
++{ "CP1252", "CP850" },
++{ "UTF-8", "CP866" },
++{ "KOI8-R", "CP866" },
++{ "KOI8-U", "CP866" },
++{ "ISO-8859-5", "CP866" }
++};
++
++char OEM_CP[MAX_CP_NAME] = "";
++char ISO_CP[MAX_CP_NAME] = "";
++
++/* Try to guess the default value of OEM_CP based on the current locale.
++ * ISO_CP is left alone for now. */
++void init_conversion_charsets()
++{
++const char *local_charset;
++int i;
++
++/* Make a guess only if OEM_CP not already set. */
++if(*OEM_CP == '\0') {
++ local_charset = nl_langinfo(CODESET);
++ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
++ if(!strcasecmp(local_charset,
dos_charset_map[i].local_charset)) {
++ strncpy(OEM_CP, dos_charset_map[i].archive_charset,
++ sizeof(OEM_CP));
++ break;
++ }
++}
++}
++
++/* Convert a string from one encoding to the current locale using iconv().
++ * Be as non-intrusive as possible. If error is encountered during covertion
++ * just leave the string intact. */
++static void charset_to_intern(char *string, char *from_charset)
++{
++iconv_t cd;
++char *s,*d, *buf;
++size_t slen, dlen, buflen;
++const char *local_charset;
++
++if(*from_charset == '\0')
++ return;
++
++buf = NULL;
++local_charset = nl_langinfo(CODESET);
++
++if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
++return;
++
++slen = strlen(string);
++s = string;
++
++/* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
++ * as this function also gets called with G.outbuf in fileio.c
++ */
++buflen = FILNAMSIZ;
++if (OUTBUFSIZ + 1 < FILNAMSIZ)
++{
++buflen = OUTBUFSIZ + 1;
++}
++
++d = buf = malloc(buflen);
++if(!d)
++ goto cleanup;
++
++bzero(buf,buflen);
++dlen = buflen - 1;
++
++if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
++ goto cleanup;
++strncpy(string, buf, buflen);
++
++cleanup:
++free(buf);
++iconv_close(cd);
++}
++
++/* Convert a string from OEM_CP to the current locale charset. */
++inline void oem_intern(char *string)
++{
++charset_to_intern(string, OEM_CP);
++}
++
++/* Convert a string from ISO_CP to the current locale charset. */
++inline void iso_intern(char *string)
++{
++charset_to_intern(string, ISO_CP);
++}
+Index: unzip-6.0/unix/unxcfg.h
+==
[OE-core] [PATCH][V3] mmc-utils: fix the building failure when DEBUG_BUILD is 1
From: Roy Li
AM_CFLAGS in Makefile includes -D_FORTIFY_SOURCE=2 which will lead
to building failure when DEBUG_BUILD is 1.
So Redefine AM_CFLAGS, input it from the environment to overrides
variable in makefile
Signed-off-by: Roy Li
---
meta/recipes-devtools/mmc/mmc-utils_git.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb
b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index bdb4fed..d6d77d9 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -11,6 +11,8 @@ PV = "0.1"
SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branch=${BRANCH}
\
file://0001-mmc.h-don-t-include-asm-generic-int-ll64.h.patch"
+EXTRA_OEMAKE = 'AM_CFLAGS="-D_FILE_OFFSET_BITS=64"'
+
S = "${WORKDIR}/git"
do_install() {
--
2.1.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] elfutils: Disable the unnecessary check in iconv.m4
From: Roy Li
Disable the test "Test against HP-UX 11.11 bug: No converter from EUC-JP
to UTF-8 is provided" since we don't support HP-UX and if the euc-jp is
not installed on the host, the dependence will be built without iconv
support and will cause guild-native building fail.
The patch is similar as 0470bd7a9658d3[libunistring: remove the test to
convert euc-jp in configure]
Signed-off-by: Roy Li
---
.../0001-remove-the-unneed-checking.patch | 38 ++
meta/recipes-devtools/elfutils/elfutils_0.161.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644
meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
diff --git
a/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
new file mode 100644
index 000..5be92d7
--- /dev/null
+++
b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
@@ -0,0 +1,38 @@
+Disable the test to convert euc-jp
+
+Remove the test "Test against HP-UX 11.11 bug:
+No converter from EUC-JP to UTF-8 is provided"
+since we don't support HP-UX and if the euc-jp is not
+installed on the host, the dependence will be built without
+iconv support and will cause guild-native building fail.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Roy Li
+---
+ m4/iconv.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/iconv.m4 b/m4/iconv.m4
+index a503646..299f1eb 100644
+--- a/m4/iconv.m4
b/m4/iconv.m4
+@@ -159,6 +159,7 @@ int main ()
+ }
+ }
+ #endif
++#if 0
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+@@ -170,6 +171,7 @@ int main ()
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ result |= 16;
++#endif
+ return result;
+ }]])],
+ [am_cv_func_iconv_works=yes],
+--
+2.0.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.161.bb
b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
index e111b34..70a3c16 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.161.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
@@ -17,6 +17,7 @@ SRC_URI += "\
file://fixheadercheck.patch \
file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch
\
file://0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch \
+file://0001-remove-the-unneed-checking.patch \
"
# pick the patch from debian
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sqlite3: upgrade to 3.8.10
From: Roy Li
Signed-off-by: Roy Li
---
.../sqlite/files/0001-Add-the-dependence.patch | 24 ++
.../{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}| 8 +---
2 files changed, 29 insertions(+), 3 deletions(-)
create mode 100644
meta/recipes-support/sqlite/files/0001-Add-the-dependence.patch
rename meta/recipes-support/sqlite/{sqlite3_3.8.7.4.bb => sqlite3_3.8.10.0.bb}
(65%)
diff --git a/meta/recipes-support/sqlite/files/0001-Add-the-dependence.patch
b/meta/recipes-support/sqlite/files/0001-Add-the-dependence.patch
new file mode 100644
index 000..dc86a3f
--- /dev/null
+++ b/meta/recipes-support/sqlite/files/0001-Add-the-dependence.patch
@@ -0,0 +1,24 @@
+[PATCH] Add the dependence for sqlite3 on libsqlite3
+
+Upstream-Status: Pending
+
+Signed-off-by: Roy Li
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 88bc23d..a1cdb2a 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -8,6 +8,7 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+ sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
++sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
+
+ include_HEADERS = sqlite3.h sqlite3ext.h
+
+--
+1.9.1
+
diff --git a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
similarity index 65%
rename from meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
rename to meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
index 4c73d30..51f41ea 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.8.7.4.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.8.10.0.bb
@@ -8,10 +8,12 @@ def sqlite_download_version(d):
PE = "3"
SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz";
+SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ file://0001-Add-the-dependence.patch \
+"
-SRC_URI[md5sum] = "33bb8db0038317ce1b0480ca1185c7ba"
-SRC_URI[sha256sum] =
"86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec"
+SRC_URI[md5sum] = "04d0311ef70818e8d914c1dc383eddff"
+SRC_URI[sha256sum] =
"c4b8f9eefbdf0b9bef2044bdc3510c8a3f3b0ddb0489661fb433034187f5a428"
S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] dbus: upgrade to 1.8.16
From: Roy Li Upgrade to fix CVE-2015-0245 Signed-off-by: Roy Li --- meta/recipes-core/dbus/dbus_1.8.10.bb | 4 meta/recipes-core/dbus/dbus_1.8.16.bb | 4 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta/recipes-core/dbus/dbus_1.8.10.bb create mode 100644 meta/recipes-core/dbus/dbus_1.8.16.bb diff --git a/meta/recipes-core/dbus/dbus_1.8.10.bb b/meta/recipes-core/dbus/dbus_1.8.10.bb deleted file mode 100644 index 250ea21..000 --- a/meta/recipes-core/dbus/dbus_1.8.10.bb +++ /dev/null @@ -1,4 +0,0 @@ -include dbus.inc - -SRC_URI[md5sum] = "6be5ef99ae784de9d04589eb067fe038" -SRC_URI[sha256sum] = "10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e" diff --git a/meta/recipes-core/dbus/dbus_1.8.16.bb b/meta/recipes-core/dbus/dbus_1.8.16.bb new file mode 100644 index 000..b549651 --- /dev/null +++ b/meta/recipes-core/dbus/dbus_1.8.16.bb @@ -0,0 +1,4 @@ +include dbus.inc + +SRC_URI[md5sum] = "020824a38850501e7d6ba8307a7c5ac3" +SRC_URI[sha256sum] = "7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] e2fsprogs: fix the CVE-2015-1572
From: Roy Li
Backport a patch to fix CVE-2015-1572
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1572
Signed-off-by: Roy Li
---
...-fix-potential-buffer-overflow-in-closefs.patch | 58 ++
.../recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 1 +
2 files changed, 59 insertions(+)
create mode 100644
meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
diff --git
a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
new file mode 100644
index 000..72f77cc
--- /dev/null
+++
b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch
@@ -0,0 +1,58 @@
+From 49d0fe2a14f2a23da2fe299643379b8c1d37df73 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o
+Date: Fri, 6 Feb 2015 12:46:39 -0500
+Subject: [PATCH] libext2fs: fix potential buffer overflow in closefs()
+
+Upstream-Status: Backport
+
+The bug fix in f66e6ce4446: "libext2fs: avoid buffer overflow if
+s_first_meta_bg is too big" had a typo in the fix for
+ext2fs_closefs(). In practice most of the security exposure was from
+the openfs path, since this meant if there was a carefully crafted
+file system, buffer overrun would be triggered when the file system was
+opened.
+
+However, if corrupted file system didn't trip over some corruption
+check, and then the file system was modified via tune2fs or debugfs,
+such that the superblock was marked dirty and then written out via the
+closefs() path, it's possible that the buffer overrun could be
+triggered when the file system is closed.
+
+Also clear up a signed vs unsigned warning while we're at it.
+
+Thanks to Nick Kralevich for asking me to look at
+compiler warning in the code in question, which led me to notice the
+bug in f66e6ce4446.
+
+Addresses: CVE-2015-1572
+
+Signed-off-by: Theodore Ts'o
+---
+ lib/ext2fs/closefs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
+index 1f99113..ab5b2fb 100644
+--- a/lib/ext2fs/closefs.c
b/lib/ext2fs/closefs.c
+@@ -287,7 +287,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
+ dgrp_t j;
+ #endif
+ char*group_ptr;
+- int old_desc_blocks;
++ blk64_t old_desc_blocks;
+ struct ext2fs_numeric_progress_struct progress;
+
+ EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+@@ -346,7 +346,7 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
+ group_ptr = (char *) group_shadow;
+ if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) {
+ old_desc_blocks = fs->super->s_first_meta_bg;
+- if (old_desc_blocks > fs->super->s_first_meta_bg)
++ if (old_desc_blocks > fs->desc_blocks)
+ old_desc_blocks = fs->desc_blocks;
+ } else
+ old_desc_blocks = fs->desc_blocks;
+--
+2.1.0
+
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index be1db9e..b354088 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -21,6 +21,7 @@ SRC_URI += "file://acinclude.m4 \
file://misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch
\
file://cache_inode.patch \
file://CVE-2015-0247.patch \
+
file://0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch \
"
SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7"
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: upgrade to 7.42.1
From: Roy Li
Upgrade to include a security fixes for CVE-2015-3153
Signed-off-by: Roy Li
---
meta/recipes-support/curl/{curl_7.42.0.bb => curl_7.42.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/curl/{curl_7.42.0.bb => curl_7.42.1.bb} (93%)
diff --git a/meta/recipes-support/curl/curl_7.42.0.bb
b/meta/recipes-support/curl/curl_7.42.1.bb
similarity index 93%
rename from meta/recipes-support/curl/curl_7.42.0.bb
rename to meta/recipes-support/curl/curl_7.42.1.bb
index 228bdb2..8b0ccb8 100644
--- a/meta/recipes-support/curl/curl_7.42.0.bb
+++ b/meta/recipes-support/curl/curl_7.42.1.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
#
SRC_URI += " file://configure_ac.patch"
-SRC_URI[md5sum] = "0a10174a0ea5105c46e92b51e1b311f8"
-SRC_URI[sha256sum] =
"32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f"
+SRC_URI[md5sum] = "296945012ce647b94083ed427c1877a8"
+SRC_URI[sha256sum] =
"e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887"
inherit autotools pkgconfig binconfig multilib_header
--
2.1.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
