Skip to contentSkip to conversation

Various bug fixes some are 1.2.1 eligible

PATCH New Saul Wold 1 participant 7 messages Jun 14, 2012

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Various bug fixes some are 1.2.1 eligible

Richard, Scott

There are various fixes that have been tested and could be include in both 1.2.1 and possible an m1 rc2.

The quilt, eglibc and gcc-target and beecrypt are 1.2.1 material

Sau!

The following changes since commit c4d0b1c5438039dab07103c151c0c5a76a4c9499:

connman: bump PR and add some comments (2012-06-13 13:11:11 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fixes

Saul Wold (6):
busybox: Add check for wifi/bluetooth to enable rfkill
curl: enable ssl support
quilt: added ac_cv_path_BASH to CACHED_CONFIGUREVARS
eglibc: added ac_cv_path_ to CACHED_CONFIGUREVARS
gcc-target: ensure target packages have the correct virtual package
names
beecrypt: add patch for build issue on Fedora 17

 meta/recipes-core/busybox/busybox.inc              |    2 ++
 meta/recipes-core/eglibc/eglibc.inc                |    2 ++
 meta/recipes-core/eglibc/eglibc_2.13.bb            |    2 +-
 meta/recipes-core/eglibc/eglibc_2.15.bb            |    2 +-
 meta/recipes-devtools/gcc/gcc-4.7.inc              |    2 +-
 meta/recipes-devtools/gcc/gcc-package-runtime.inc  |    4 ++++
 meta/recipes-devtools/quilt/quilt_0.60.bb          |    5 ++++-
 .../beecrypt/beecrypt/fix-for-gcc-4.7.patch        |   13 +++++++++++++
 meta/recipes-support/beecrypt/beecrypt_4.2.1.bb    |    5 +++--
 meta/recipes-support/curl/curl_7.24.0.bb           |   10 +++++-----
 10 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
Signature · 1 line
1.7.7.6
author
#1 lore raw

PATCH 1/6 busybox: Add check for wifi/bluetooth to enable rfkill

rfkill is a usefull tool when you have a device with bluetooth and wifi enabled

[YOCTO #2494]

---
 meta/recipes-core/busybox/busybox.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-core/busybox/busybox.inc +2 -0
index 5b83d32..db337ad 100644
@@ -57,6 +57,8 @@ def features_to_busybox_settings(d):
 	busybox_cfg('nls',  distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
 	busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
 	busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
+	busybox_cfg('wifi', distro_features, 'CONFIG_RFKILL', cnf, rem)
+	busybox_cfg('bluetooth', distro_features, 'CONFIG_RFKILL', cnf, rem)
 	return "\n".join(cnf), "\n".join(rem)
 
 # X, Y = ${@features_to_uclibc_settings(d)}
Signature · 1 line
1.7.7.6
author
#2 lore raw

PATCH 2/6 curl: enable ssl support

In reply to Saul Wold

This patch enables ssl support for curl to allow git to clone from https / ssl sites.

[YOCTO #2532]

---
 meta/recipes-support/curl/curl_7.24.0.bb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-support/curl/curl_7.24.0.bb +5 -5
index 12e95c9..f9dce7d 100644
@@ -5,10 +5,10 @@ SECTION = "console/network"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
 
-DEPENDS = "zlib gnutls"
-DEPENDS_virtclass-native = "zlib-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+DEPENDS = "zlib gnutls openssl"
+DEPENDS_virtclass-native = "zlib-native openssl-native"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-                --without-ssl \
+		--with-ssl \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
Signature · 1 line
1.7.7.6
author
#3 lore raw

PATCH 3/6 quilt: added ac_cv_path_BASH to CACHED_CONFIGUREVARS

In reply to Saul Wold

On Fedora 17, bash has moved to /usr/bin/bash and the configure process it find it on the host machine there, this ensures that it is set correctly for the target.

[YOCTO #2363]

---
 meta/recipes-devtools/quilt/quilt_0.60.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-devtools/quilt/quilt_0.60.bb +4 -1
index b085daf..89c3f84 100644
@@ -4,7 +4,10 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 SRC_URI += "file://aclocal.patch \
             file://gnu_patch_test_fix_target.patch \
            "
-PR = "r0"
+PR = "r1"
+
+
+CACHED_CONFIGUREVARS += "ac_cv_path_BASH=${base_bindir}/bash"
 
 PERLPATH = "${bindir}/env perl"
 PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
Signature · 1 line
1.7.7.6
author
#4 lore raw

PATCH 4/6 eglibc: added ac_cv_path_ to CACHED_CONFIGUREVARS

In reply to Saul Wold

On Fedora 17, bash has moved to /usr/bin/bash and the configure process it find it on the host machine there, this ensures that it is set correctly for the target.

[YOCTO #2363]

---
 meta/recipes-core/eglibc/eglibc.inc     |    2 ++
 meta/recipes-core/eglibc/eglibc_2.13.bb |    2 +-
 meta/recipes-core/eglibc/eglibc_2.15.bb |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/eglibc/eglibc.inc +2 -0
index 8e3fe50..51061bc 100644
@@ -32,6 +32,8 @@ require eglibc-options.inc
 
 LEAD_SONAME = "libc.so"
 
+CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
+                       ac_cv_path_BASH_SHELL=${base_bindir}/bash"
 GLIBC_EXTRA_OECONF ?= ""
 GLIBC_EXTRA_OECONF_virtclass-nativesdk = ""
 INHIBIT_DEFAULT_DEPS = "1"
meta/recipes-core/eglibc/eglibc_2.13.bb +1 -1
index 73cd0aa..690f99d 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "15508"
 
 DEPENDS += "gperf-native"
-PR = "r27"
+PR = "r28"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -1
index 6dd846f..e57a112 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r11"
+PR = "r12"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
Signature · 1 line
1.7.7.6
author
#5 lore raw

PATCH 5/6 gcc-target: ensure target packages have the correct virtual package names

In reply to Saul Wold

Resolves this error during do_rootfs:

|  * satisfy_dependencies_for: Cannot satisfy the following dependencies for task-core-standalone-sdk-target:
|  * eglibc (>= 2.15) *
|  * opkg_install_cmd: Cannot install package task-core-standalone-sdk-target.

NOTE: package core-image-sato-sdk-1.0-r0: task do_rootfs: Failed

---
 meta/recipes-devtools/gcc/gcc-4.7.inc             |    2 +-
 meta/recipes-devtools/gcc/gcc-package-runtime.inc |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)
meta/recipes-devtools/gcc/gcc-4.7.inc +1 -1
index 0321776..973c211 100644
@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r1"
+PR = "r2"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.7.0
meta/recipes-devtools/gcc/gcc-package-runtime.inc +4 -0
index feb8735..e0cb51b 100644
@@ -61,3 +61,7 @@ FILES_libmudflap-dev = "\
   ${libdir}/libmudflap*.a \
   ${libdir}/libmudflap*.la"
 
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
+
Signature · 1 line
1.7.7.6
author
#6 lore raw

PATCH 6/6 beecrypt: add patch for build issue on Fedora 17

In reply to Saul Wold

../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wa,--noexecstack -c -o Properties.lo Properties.cxx
x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wa,--noexecstack -c Properties.cxx -fPIC -DPIC -o .libs/Properties.o In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0,

                 from ../../include/beecrypt/c++/util/Properties.h:36,
                 from Properties.cxx:25:

../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::util::AbstractSet<E>::equals(const beecrypt::lang::Object*) const [with E = beecrypt::util::Map<beecrypt::lang::Object, beecrypt::lang::Object>::Entry]':
Properties.cxx:228:1: required from here
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent base 'beecrypt::util::AbstractCollection<beecrypt::util::Map<beecrypt::lang::Object, beecrypt::lang::Object>::Entry>' are not found by unqualified lookup ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' instead
../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::util::AbstractSet<E>::equals(const beecrypt::lang::Object*) const [with E = beecrypt::lang::Object]':
Properties.cxx:228:1: required from here
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent base 'beecrypt::util::AbstractCollection<beecrypt::lang::Object>' are not found by unqualified lookup ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' instead

[YOCTO #2593]

---
 .../beecrypt/beecrypt/fix-for-gcc-4.7.patch        |   13 +++++++++++++
 meta/recipes-support/beecrypt/beecrypt_4.2.1.bb    |    5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch new file +13 -0
new file mode 100644
index 0000000..3d3a8ff
@@ -0,0 +1,13 @@
+Index: beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h
+===================================================================
+--- beecrypt-4.2.1.orig/include/beecrypt/c++/util/AbstractSet.h
++++ beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h
+@@ -56,7 +56,7 @@ namespace beecrypt {
+ 					if (c->size() != size())
+ 						return false;
+ 
+-					return containsAll(*c);
++					return this->containsAll(*c);
+ 				}
+ 				return false;
+ 			}
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb +3 -2
index 2b2b348..7baf92e 100644
@@ -6,7 +6,8 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
 	 file://disable-icu-check.patch \
-	 file://fix-security.patch"
+	 file://fix-security.patch \
+         file://fix-for-gcc-4.7.patch"
 
 SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
 SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
@@ -17,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
 
 DEPENDS = "icu"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools multilib_header
 acpaths=""
Signature · 1 line
1.7.7.6