* [CONSOLIDATED PULL 01/30] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 02/30] package install failure on systems without /sbin/ldconfig Saul Wold
` (29 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* it wasn't consistent with other machine configs
* reported 2 months ago..
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022154.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/machine/include/arm/arch-armv5.inc | 2 +-
meta/conf/machine/include/arm/arch-armv6.inc | 2 +-
meta/conf/machine/include/arm/arch-armv7a.inc | 2 +-
.../machine/include/powerpc/arch-powerpc64.inc | 2 +-
meta/conf/machine/include/tune-mips32.inc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 4a75530..98780e5 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
ARMPKGARCH ?= "armv5"
TUNEVALID[armv5] = "Enable instructions for ARMv5"
-TUNE_CONFLICTS[armv5] = "armv4"
+TUNECONFLICTS[armv5] = "armv4"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index da8274e..f0fee93 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
ARMPKGARCH ?= "armv6"
TUNEVALID[armv6] = "Enable instructions for ARMv6"
-TUNE_CONFLICTS[armv6] = "armv4 armv5"
+TUNECONFLICTS[armv6] = "armv4 armv5"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index c90aff5..f439de7 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
ARMPKGARCH ?= "armv7a"
TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
-TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
+TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a5e9755..f9e2b2a 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64"
require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32 nf"
+TUNECONFLICTS[m64] = "m32 nf"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 93ed5ee..03cd411 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32"
require conf/machine/include/mips/arch-mips.inc
TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
-TUNE_CONFLICTS[mips32] = "n64 n32"
+TUNECONFLICTS[mips32] = "n64 n32"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 02/30] package install failure on systems without /sbin/ldconfig
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 01/30] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 03/30] mkelfimage: Upstream fixed packaging issue so upgrade to e1e6a91 Saul Wold
` (28 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Amy Fong <amy.fong@windriver.com>
Package install failures due to issues in post install rules.
package_do_shlibs only looks for libraries in a directory "lib", this should be
modified to the variable baselib.
ldconfig_postinst_fragment failure observed on systems without /sbin/ldconfig
[ -x /sbin/ldconfig ] && /sbin/ldconfig
results in the post install rule returning a failure. Modify to
if [ -x /sbin/ldconfig ]; then /sbin/ldconfig; fi
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/package.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e6856cd..ec7de2c 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1141,7 +1141,7 @@ emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime"
ldconfig_postinst_fragment() {
if [ x"$D" = "x" ]; then
- [ -x /sbin/ldconfig ] && /sbin/ldconfig
+ if [ -x /sbin/ldconfig ]; then /sbin/ldconfig ; fi
fi
}
@@ -1251,7 +1251,7 @@ python package_do_shlibs() {
return
lib_re = re.compile("^.*\.so")
- libdir_re = re.compile(".*/lib$")
+ libdir_re = re.compile(".*/%s$" % d.getVar('baselib', True))
packages = d.getVar('PACKAGES', True)
targetos = d.getVar('TARGET_OS', True)
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 03/30] mkelfimage: Upstream fixed packaging issue so upgrade to e1e6a91
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 01/30] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 02/30] package install failure on systems without /sbin/ldconfig Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 04/30] rpm_5.4.9.bb: fix builds on systems with older libc Saul Wold
` (27 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Raymond Danks <ray.danks@se-eng.com>
Address QA issue: Files/directories were installed but not shipped.
New revision contains patch to mkelfimage removing
/usr/share/mkelfImage/elf32-i386 directory from Makefile install target.
http://review.coreboot.org/#/c/1195/
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/mkelfimage/mkelfimage_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
index 1224a63..4b45c67 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a"
-SRCREV = "e13632a939e7dde8d7d44fc73e73a41dae8060c3"
+SRCREV = "e1e6a91ce0738400fa1615179de88ebc0df29f66"
PV = "1.0.0+gitr${SRCPV}"
PR = "r1"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 04/30] rpm_5.4.9.bb: fix builds on systems with older libc
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (2 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 03/30] mkelfimage: Upstream fixed packaging issue so upgrade to e1e6a91 Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 05/30] gconf: Disable gtk support Saul Wold
` (26 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
| dbconvert.o: In function `rpmdb_convert':
| /local/jenkins/jobs/yocto-upstream/workspace/label/master/machine/p4080ds/poky/master/tmp/work/x86_64-linux/rpm-native-5.4.9-r45/rpm-5.4.9/tools/dbconvert.c:126: warning: the use of `tempnam' is dangerous, better use `mkstemp'
| dbconvert.o: In function `main':
| dbconvert.c:(.text+0x923): undefined reference to `htobe32'
| dbconvert.c:(.text+0xaa4): undefined reference to `htole32'
| dbconvert.c:(.text+0xac9): undefined reference to `htole32'
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/rpm/rpm/dbconvert.patch | 27 +++++++++++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 +-
2 files changed, 29 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/dbconvert.patch
diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
new file mode 100644
index 0000000..27dba8c
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/dbconvert.patch
@@ -0,0 +1,27 @@
+Upstream-Status: Not applicable
+
+Hack to prevent unneeded demo app from building on older libc
+where it will break the build
+
+Index: rpm-5.4.9/tools/Makefile.am
+===================================================================
+--- rpm-5.4.9.orig/tools/Makefile.am
++++ rpm-5.4.9/tools/Makefile.am
+@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS)
+
+ EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh
+
+-EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \
++EXTRA_PROGRAMS = augtool cudftool debugedit \
+ nix-build nix-channel nix-collect-garbage nix-copy-closure \
+ nix-env nix-hash nix-install-package nix-instantiate \
+ nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \
+@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \
+ rpmcache rpmdigest rpmrepo rpmspecdump \
+ rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@
+ if WITH_DB
+-pkgbin_PROGRAMS += dbconvert
++pkgbin_PROGRAMS +=
+ endif
+ dist_man_MANS = rpmgrep.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 6ef1aae..e276cc3 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "libpcre attr acl popt ossp-uuid file"
-PR = "r45"
+PR = "r46"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -75,6 +75,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
file://uclibc-support.patch \
file://rpmatch.patch \
file://fstack-protector-configure-check.patch \
+ file://dbconvert.patch \
"
SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 05/30] gconf: Disable gtk support
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (3 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 04/30] rpm_5.4.9.bb: fix builds on systems with older libc Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 06/30] slang: change char type to signed char in macros Saul Wold
` (25 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
There are only a couple of helper utilities within gconf that need gtk+ as a
dependency and those are unused and pretty useless. We might as well drop
the dependency on gtk and allow more parallel builds by reducing dependency
bottlenecks.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index ccbc24e..1da7203 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
POLKIT = "polkit"
POLKIT_libc-uclibc = ""
-DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
-PR = "r8"
+PR = "r9"
inherit gnomebase
@@ -26,10 +26,8 @@ POLKIT_OECONF = "--enable-defaults-service"
POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
POLKIT_OECONF_libc-uclibc = "--disable-default-service"
-GTKOECONF = "--with-gtk=2.0 --enable-gtk"
-GTKOECONF_virtclass-native = "--disable-gtk"
EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
- --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} ${GTKOECONF}"
+ --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
do_configure_prepend () {
touch gtk-doc.make
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 06/30] slang: change char type to signed char in macros
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (4 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 05/30] gconf: Disable gtk support Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 07/30] runqemu/mips: adjust runqemu script to support mipsel machine Saul Wold
` (24 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: "Roy.Li" <rongqing.li@windriver.com>
Fix [YOCTO 2726]
C language has 3 distinct char types:
char
unsigned char
signed char
A char has the same range of values as signed char on X86,
but same as unsigned char on ARM which made Slang's typecast()
and array_sort() unable to work for char value on ARM, since
Slang is assuming "char" as "signed char".
Now we change "char" as "signed char" explicitly in
util/mkslarith2.sl, and use it to regenerate src/slarith2.inc
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...change-char-type-to-signed-char-in-macros.patch | 202 ++++++++++++++++++++
meta/recipes-extended/slang/slang_2.2.4.bb | 3 +-
2 files changed, 204 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
diff --git a/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch b/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
new file mode 100644
index 0000000..18dea13
--- /dev/null
+++ b/meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
@@ -0,0 +1,202 @@
+---
+ src/slarith2.inc | 72 ++++++++++++++++++++++++-------------------------
+ src/util/mkslarith2.sl | 2 -
+ 2 files changed, 37 insertions(+), 37 deletions(-)
+
+--- a/src/util/mkslarith2.sl
++++ b/src/util/mkslarith2.sl
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env slsh
+
+ private variable CTypes =
+- ["char", "unsigned char", "short", "unsigned short", "int", "unsigned int",
++ ["signed char", "unsigned char", "short", "unsigned short", "int", "unsigned int",
+ "long", "unsigned long", "long long", "unsigned long long",
+ "float", "double", "long double"];
+ private variable Is_Int_Type =
+--- a/src/slarith2.inc
++++ b/src/slarith2.inc
+@@ -1,43 +1,43 @@
+ /* DO NOT EDIT -- this file was generated by src/util/mkslarith2.sl */
+-/* ------------ char ---------- */
+-DEFUN_1(copy_char_to_char,char,char)
++/* ------------ signed char ---------- */
++DEFUN_1(copy_char_to_char,signed char,signed char)
+ #define char_to_char NULL
+ #define copy_char_to_uchar copy_char_to_char
+ #define char_to_uchar NULL
+-DEFUN_1(copy_char_to_short,char,short)
++DEFUN_1(copy_char_to_short,signed char,short)
+ #define char_to_short NULL
+-DEFUN_1(copy_char_to_ushort,char,unsigned short)
++DEFUN_1(copy_char_to_ushort,signed char,unsigned short)
+ #define char_to_ushort NULL
+-DEFUN_1(copy_char_to_int,char,int)
+-DEFUN_2(char_to_int,char,int,copy_char_to_int)
+-DEFUN_1(copy_char_to_uint,char,unsigned int)
+-DEFUN_2(char_to_uint,char,unsigned int,copy_char_to_uint)
+-DEFUN_1(copy_char_to_long,char,long)
+-DEFUN_2(char_to_long,char,long,copy_char_to_long)
+-DEFUN_1(copy_char_to_ulong,char,unsigned long)
+-DEFUN_2(char_to_ulong,char,unsigned long,copy_char_to_ulong)
++DEFUN_1(copy_char_to_int,signed char,int)
++DEFUN_2(char_to_int,signed char,int,copy_char_to_int)
++DEFUN_1(copy_char_to_uint,signed char,unsigned int)
++DEFUN_2(char_to_uint,signed char,unsigned int,copy_char_to_uint)
++DEFUN_1(copy_char_to_long,signed char,long)
++DEFUN_2(char_to_long,signed char,long,copy_char_to_long)
++DEFUN_1(copy_char_to_ulong,signed char,unsigned long)
++DEFUN_2(char_to_ulong,signed char,unsigned long,copy_char_to_ulong)
+ #if defined(HAVE_LONG_LONG)
+-DEFUN_1(copy_char_to_llong,char,long long)
+-DEFUN_2(char_to_llong,char,long long,copy_char_to_llong)
++DEFUN_1(copy_char_to_llong,signed char,long long)
++DEFUN_2(char_to_llong,signed char,long long,copy_char_to_llong)
+ #endif /* defined(HAVE_LONG_LONG) */
+ #if defined(HAVE_LONG_LONG)
+-DEFUN_1(copy_char_to_ullong,char,unsigned long long)
+-DEFUN_2(char_to_ullong,char,unsigned long long,copy_char_to_ullong)
++DEFUN_1(copy_char_to_ullong,signed char,unsigned long long)
++DEFUN_2(char_to_ullong,signed char,unsigned long long,copy_char_to_ullong)
+ #endif /* defined(HAVE_LONG_LONG) */
+ #if SLANG_HAS_FLOAT
+-DEFUN_1(copy_char_to_float,char,float)
+-DEFUN_2(char_to_float,char,float,copy_char_to_float)
++DEFUN_1(copy_char_to_float,signed char,float)
++DEFUN_2(char_to_float,signed char,float,copy_char_to_float)
+ #endif /* SLANG_HAS_FLOAT */
+ #if SLANG_HAS_FLOAT
+-DEFUN_1(copy_char_to_double,char,double)
+-DEFUN_2(char_to_double,char,double,copy_char_to_double)
++DEFUN_1(copy_char_to_double,signed char,double)
++DEFUN_2(char_to_double,signed char,double,copy_char_to_double)
+ #endif /* SLANG_HAS_FLOAT */
+ #if defined(HAVE_LONG_DOUBLE)
+-DEFUN_1(copy_char_to_ldouble,char,long double)
+-DEFUN_2(char_to_ldouble,char,long double,copy_char_to_ldouble)
++DEFUN_1(copy_char_to_ldouble,signed char,long double)
++DEFUN_2(char_to_ldouble,signed char,long double,copy_char_to_ldouble)
+ #endif /* defined(HAVE_LONG_DOUBLE) */
+ #if SLANG_HAS_FLOAT
+-TO_DOUBLE_FUN(char_to_one_double,char)
++TO_DOUBLE_FUN(char_to_one_double,signed char)
+ #endif
+
+ /* ------------ unsigned char ---------- */
+@@ -82,7 +82,7 @@ TO_DOUBLE_FUN(uchar_to_one_double,unsign
+ #endif
+
+ /* ------------ short ---------- */
+-DEFUN_1(copy_short_to_char,short,char)
++DEFUN_1(copy_short_to_char,short,signed char)
+ #define short_to_char NULL
+ DEFUN_1(copy_short_to_uchar,short,unsigned char)
+ #define short_to_uchar NULL
+@@ -123,7 +123,7 @@ TO_DOUBLE_FUN(short_to_one_double,short)
+ #endif
+
+ /* ------------ unsigned short ---------- */
+-DEFUN_1(copy_ushort_to_char,unsigned short,char)
++DEFUN_1(copy_ushort_to_char,unsigned short,signed char)
+ #define ushort_to_char NULL
+ DEFUN_1(copy_ushort_to_uchar,unsigned short,unsigned char)
+ #define ushort_to_uchar NULL
+@@ -164,7 +164,7 @@ TO_DOUBLE_FUN(ushort_to_one_double,unsig
+ #endif
+
+ /* ------------ int ---------- */
+-DEFUN_1(copy_int_to_char,int,char)
++DEFUN_1(copy_int_to_char,int,signed char)
+ #define int_to_char NULL
+ DEFUN_1(copy_int_to_uchar,int,unsigned char)
+ #define int_to_uchar NULL
+@@ -205,7 +205,7 @@ TO_DOUBLE_FUN(int_to_one_double,int)
+ #endif
+
+ /* ------------ unsigned int ---------- */
+-DEFUN_1(copy_uint_to_char,unsigned int,char)
++DEFUN_1(copy_uint_to_char,unsigned int,signed char)
+ #define uint_to_char NULL
+ DEFUN_1(copy_uint_to_uchar,unsigned int,unsigned char)
+ #define uint_to_uchar NULL
+@@ -246,7 +246,7 @@ TO_DOUBLE_FUN(uint_to_one_double,unsigne
+ #endif
+
+ /* ------------ long ---------- */
+-DEFUN_1(copy_long_to_char,long,char)
++DEFUN_1(copy_long_to_char,long,signed char)
+ #define long_to_char NULL
+ DEFUN_1(copy_long_to_uchar,long,unsigned char)
+ #define long_to_uchar NULL
+@@ -287,7 +287,7 @@ TO_DOUBLE_FUN(long_to_one_double,long)
+ #endif
+
+ /* ------------ unsigned long ---------- */
+-DEFUN_1(copy_ulong_to_char,unsigned long,char)
++DEFUN_1(copy_ulong_to_char,unsigned long,signed char)
+ #define ulong_to_char NULL
+ DEFUN_1(copy_ulong_to_uchar,unsigned long,unsigned char)
+ #define ulong_to_uchar NULL
+@@ -329,7 +329,7 @@ TO_DOUBLE_FUN(ulong_to_one_double,unsign
+
+ /* ------------ long long ---------- */
+ #if defined(HAVE_LONG_LONG)
+-DEFUN_1(copy_llong_to_char,long long,char)
++DEFUN_1(copy_llong_to_char,long long,signed char)
+ #define llong_to_char NULL
+ DEFUN_1(copy_llong_to_uchar,long long,unsigned char)
+ #define llong_to_uchar NULL
+@@ -372,7 +372,7 @@ TO_DOUBLE_FUN(llong_to_one_double,long l
+
+ /* ------------ unsigned long long ---------- */
+ #if defined(HAVE_LONG_LONG)
+-DEFUN_1(copy_ullong_to_char,unsigned long long,char)
++DEFUN_1(copy_ullong_to_char,unsigned long long,signed char)
+ #define ullong_to_char NULL
+ DEFUN_1(copy_ullong_to_uchar,unsigned long long,unsigned char)
+ #define ullong_to_uchar NULL
+@@ -415,7 +415,7 @@ TO_DOUBLE_FUN(ullong_to_one_double,unsig
+
+ /* ------------ float ---------- */
+ #if SLANG_HAS_FLOAT
+-DEFUN_1(copy_float_to_char,float,char)
++DEFUN_1(copy_float_to_char,float,signed char)
+ #define float_to_char NULL
+ DEFUN_1(copy_float_to_uchar,float,unsigned char)
+ #define float_to_uchar NULL
+@@ -458,7 +458,7 @@ TO_DOUBLE_FUN(float_to_one_double,float)
+
+ /* ------------ double ---------- */
+ #if SLANG_HAS_FLOAT
+-DEFUN_1(copy_double_to_char,double,char)
++DEFUN_1(copy_double_to_char,double,signed char)
+ #define double_to_char NULL
+ DEFUN_1(copy_double_to_uchar,double,unsigned char)
+ #define double_to_uchar NULL
+@@ -501,7 +501,7 @@ TO_DOUBLE_FUN(double_to_one_double,doubl
+
+ /* ------------ long double ---------- */
+ #if defined(HAVE_LONG_DOUBLE)
+-DEFUN_1(copy_ldouble_to_char,long double,char)
++DEFUN_1(copy_ldouble_to_char,long double,signed char)
+ #define ldouble_to_char NULL
+ DEFUN_1(copy_ldouble_to_uchar,long double,unsigned char)
+ #define ldouble_to_uchar NULL
+@@ -545,7 +545,7 @@ TO_DOUBLE_FUN(ldouble_to_one_double,long
+ #if SLANG_HAS_FLOAT
+ static To_Double_Fun_Table_Type To_Double_Fun_Table [MAX_ARITHMETIC_TYPES] =
+ {
+- {sizeof(char), char_to_one_double},
++ {sizeof(signed char), char_to_one_double},
+ {sizeof(unsigned char), uchar_to_one_double},
+ {sizeof(short), short_to_one_double},
+ {sizeof(unsigned short), ushort_to_one_double},
+@@ -583,7 +583,7 @@ static To_Double_Fun_Table_Type To_Doubl
+
+ static Binary_Matrix_Type Binary_Matrix [MAX_ARITHMETIC_TYPES][MAX_ARITHMETIC_TYPES] =
+ {
+- /* char */
++ /* signed char */
+ {
+ {(FVOID_STAR)copy_char_to_char, char_to_char},
+ {(FVOID_STAR)copy_char_to_uchar, char_to_uchar},
diff --git a/meta/recipes-extended/slang/slang_2.2.4.bb b/meta/recipes-extended/slang/slang_2.2.4.bb
index f17bc0f..72dd99f 100644
--- a/meta/recipes-extended/slang/slang_2.2.4.bb
+++ b/meta/recipes-extended/slang/slang_2.2.4.bb
@@ -10,7 +10,7 @@ to recode S-Lang procedures in C if you need to."
HOMEPAGE = "http://www.jedsoft.org/slang/"
SECTION = "libs"
DEPENDS = "pcre"
-PR = "r8"
+PR = "r9"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
@@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
SRC_URI = "ftp://space.mit.edu/pub/davis/slang/v2.2/slang-${PV}.tar.bz2 \
file://rpathfix.patch \
"
+SRC_URI_append_arm = " file://change-char-type-to-signed-char-in-macros.patch"
inherit autotools
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 07/30] runqemu/mips: adjust runqemu script to support mipsel machine
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (5 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 06/30] slang: change char type to signed char in macros Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 08/30] package.bbclass: Allow overriding of debugedit starting path Saul Wold
` (23 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Dennis Lan <dennis.yxun@gmail.com>
Signed-off-by: Dennis Lan <dennis.yxun@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
scripts/runqemu | 5 ++++-
scripts/runqemu-internal | 13 +++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 8d149a2..650d1df 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -94,7 +94,7 @@ KVM_ENABLED="no"
while true; do
arg=${1}
case "$arg" in
- "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4" | "qemuppc")
+ "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc")
[ -z "$MACHINE" ] && MACHINE=$arg || \
error "conflicting MACHINE types [$MACHINE] and [$arg]"
;;
@@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3
QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
QEMUMIPS_DEFAULT_FSTYPE=ext3
+QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
+QEMUMIPSEL_DEFAULT_FSTYPE=ext3
+
QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
QEMUMIPS64_DEFAULT_FSTYPE=ext3
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 041464d..a21ea93 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -236,6 +236,7 @@ fi
case "$MACHINE" in
"qemuarm") ;;
"qemumips") ;;
+ "qemumipsel") ;;
"qemumips64") ;;
"qemush4") ;;
"qemuppc") ;;
@@ -375,12 +376,12 @@ if [ "$MACHINE" = "spitz" ]; then
fi
fi
-if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then
- if [ "$MACHINE" = "qemumips64" ]; then
- QEMU=qemu-system-mips64
- else
- QEMU=qemu-system-mips
- fi
+if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
+ case "$MACHINE" in
+ qemumips) QEMU=qemu-system-mips ;;
+ qemumipsel) QEMU=qemu-system-mipsel ;;
+ qemumips64) QEMU=qemu-system-mips64 ;;
+ esac
MACHINE_SUBTYPE=malta
QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 08/30] package.bbclass: Allow overriding of debugedit starting path
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (6 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 07/30] runqemu/mips: adjust runqemu script to support mipsel machine Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3 Saul Wold
` (22 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Peter Seebach <peter.seebach@windriver.com>
In the usual case, the computed path used for debugedit to fix
up path references for the target filesystem is correct. However,
prebuilt binary components, such as prebuilt toolchains, can
have debug paths that do not reflect paths within the local
build directory. Providing an override lets us continue to use
the standard debugedit logic in package.bbclass.
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/package.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ec7de2c..dfd4211 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -190,7 +190,7 @@ def splitfile(file, debugfile, debugsrcdir, d):
objcopy = d.getVar("OBJCOPY", True)
debugedit = d.expand("${STAGING_LIBDIR_NATIVE}/rpm/bin/debugedit")
workdir = d.getVar("WORKDIR", True)
- workparentdir = os.path.dirname(workdir)
+ workparentdir = d.getVar("DEBUGSRC_OVERRIDE_PATH", True) or os.path.dirname(workdir)
sourcefile = d.expand("${WORKDIR}/debugsources.list")
# We ignore kernel modules, we don't generate debug info files.
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (7 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 08/30] package.bbclass: Allow overriding of debugedit starting path Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:58 ` Bruce Ashfield
2012-07-16 15:47 ` [CONSOLIDATED PULL 10/30] classes/rootfs_deb: use more reliable check for package existence Saul Wold
` (21 subsequent siblings)
30 siblings, 1 reply; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Tested by building core-image-sato-sdk.
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
| 6 ++++++
| 6 ------
3 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index f11e687..0a068be 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.22"
EGLIBCVERSION ?= "2.15"
UCLIBCVERSION ?= "0.9.33"
-LINUXLIBCVERSION ?= "3.4"
+LINUXLIBCVERSION ?= "3.4.3"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
new file mode 100644
index 0000000..6f8d9e8
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
@@ -0,0 +1,6 @@
+require linux-libc-headers.inc
+
+PR = "r0"
+
+SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
+SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
deleted file mode 100644
index 9e8c88f..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require linux-libc-headers.inc
-
-PR = "r0"
-
-SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
-SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 15:47 ` [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3 Saul Wold
@ 2012-07-16 15:58 ` Bruce Ashfield
2012-07-16 16:04 ` Martin Jansa
0 siblings, 1 reply; 39+ messages in thread
From: Bruce Ashfield @ 2012-07-16 15:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>
> Tested by building core-image-sato-sdk.
We've never gone to this level of granularity in the past, since
-stable updates to
the kernel are not going to change something in the libc-headers exports.
As far as I'm concerned, bumping this for each stable release is too much churn.
Sorry I missed this during the original review/posting.
Cheers,
Bruce
>
> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/conf/distro/include/tcmode-default.inc | 2 +-
> .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
> .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
> 3 files changed, 7 insertions(+), 7 deletions(-)
> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>
> diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> index f11e687..0a068be 100644
> --- a/meta/conf/distro/include/tcmode-default.inc
> +++ b/meta/conf/distro/include/tcmode-default.inc
> @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
> BINUVERSION ?= "2.22"
> EGLIBCVERSION ?= "2.15"
> UCLIBCVERSION ?= "0.9.33"
> -LINUXLIBCVERSION ?= "3.4"
> +LINUXLIBCVERSION ?= "3.4.3"
>
> PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> new file mode 100644
> index 0000000..6f8d9e8
> --- /dev/null
> +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> @@ -0,0 +1,6 @@
> +require linux-libc-headers.inc
> +
> +PR = "r0"
> +
> +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
> +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
> diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> deleted file mode 100644
> index 9e8c88f..0000000
> --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -require linux-libc-headers.inc
> -
> -PR = "r0"
> -
> -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
> -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 15:58 ` Bruce Ashfield
@ 2012-07-16 16:04 ` Martin Jansa
2012-07-16 16:08 ` Bruce Ashfield
0 siblings, 1 reply; 39+ messages in thread
From: Martin Jansa @ 2012-07-16 16:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3815 bytes --]
On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> >
> > Tested by building core-image-sato-sdk.
>
> We've never gone to this level of granularity in the past, since
> -stable updates to
> the kernel are not going to change something in the libc-headers exports.
>
> As far as I'm concerned, bumping this for each stable release is too much churn.
But this time it's quite usefull after
http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
removed some headers from sysroots and some packages (like IIRC udev)
were failing to build until someone rebuilt linux-libc-headers manually
to fixup staged headers in machine sysroot..
Cheers,
>
> Sorry I missed this during the original review/posting.
>
> Cheers,
>
> Bruce
>
> >
> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> > ---
> > meta/conf/distro/include/tcmode-default.inc | 2 +-
> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
> > 3 files changed, 7 insertions(+), 7 deletions(-)
> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >
> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> > index f11e687..0a068be 100644
> > --- a/meta/conf/distro/include/tcmode-default.inc
> > +++ b/meta/conf/distro/include/tcmode-default.inc
> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
> > BINUVERSION ?= "2.22"
> > EGLIBCVERSION ?= "2.15"
> > UCLIBCVERSION ?= "0.9.33"
> > -LINUXLIBCVERSION ?= "3.4"
> > +LINUXLIBCVERSION ?= "3.4.3"
> >
> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> > new file mode 100644
> > index 0000000..6f8d9e8
> > --- /dev/null
> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> > @@ -0,0 +1,6 @@
> > +require linux-libc-headers.inc
> > +
> > +PR = "r0"
> > +
> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> > deleted file mode 100644
> > index 9e8c88f..0000000
> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> > +++ /dev/null
> > @@ -1,6 +0,0 @@
> > -require linux-libc-headers.inc
> > -
> > -PR = "r0"
> > -
> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
> > --
> > 1.7.7.6
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 16:04 ` Martin Jansa
@ 2012-07-16 16:08 ` Bruce Ashfield
2012-07-16 16:29 ` Martin Jansa
0 siblings, 1 reply; 39+ messages in thread
From: Bruce Ashfield @ 2012-07-16 16:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Jul 16, 2012 at 12:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
>> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> >
>> > Tested by building core-image-sato-sdk.
>>
>> We've never gone to this level of granularity in the past, since
>> -stable updates to
>> the kernel are not going to change something in the libc-headers exports.
>>
>> As far as I'm concerned, bumping this for each stable release is too much churn.
>
> But this time it's quite usefull after
> http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
> removed some headers from sysroots and some packages (like IIRC udev)
> were failing to build until someone rebuilt linux-libc-headers manually
> to fixup staged headers in machine sysroot..
I'm not following completely .. is that specific to the .3 in 3.4.x ?
Doesn't look
like it to me.
I don't recall Greg changing the mtd exports in 3.4.3 .. but that
wouldn't be the
first time something like that slipped in.
Cheers,
Bruce
>
> Cheers,
>
>>
>> Sorry I missed this during the original review/posting.
>>
>> Cheers,
>>
>> Bruce
>>
>> >
>> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> > ---
>> > meta/conf/distro/include/tcmode-default.inc | 2 +-
>> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
>> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
>> > 3 files changed, 7 insertions(+), 7 deletions(-)
>> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >
>> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
>> > index f11e687..0a068be 100644
>> > --- a/meta/conf/distro/include/tcmode-default.inc
>> > +++ b/meta/conf/distro/include/tcmode-default.inc
>> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
>> > BINUVERSION ?= "2.22"
>> > EGLIBCVERSION ?= "2.15"
>> > UCLIBCVERSION ?= "0.9.33"
>> > -LINUXLIBCVERSION ?= "3.4"
>> > +LINUXLIBCVERSION ?= "3.4.3"
>> >
>> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
>> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
>> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> > new file mode 100644
>> > index 0000000..6f8d9e8
>> > --- /dev/null
>> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> > @@ -0,0 +1,6 @@
>> > +require linux-libc-headers.inc
>> > +
>> > +PR = "r0"
>> > +
>> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
>> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
>> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> > deleted file mode 100644
>> > index 9e8c88f..0000000
>> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> > +++ /dev/null
>> > @@ -1,6 +0,0 @@
>> > -require linux-libc-headers.inc
>> > -
>> > -PR = "r0"
>> > -
>> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
>> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
>> > --
>> > 1.7.7.6
>> >
>> >
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>>
>>
>> --
>> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end"
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 16:08 ` Bruce Ashfield
@ 2012-07-16 16:29 ` Martin Jansa
2012-07-16 16:36 ` Bruce Ashfield
0 siblings, 1 reply; 39+ messages in thread
From: Martin Jansa @ 2012-07-16 16:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 5812 bytes --]
On Mon, Jul 16, 2012 at 12:08:10PM -0400, Bruce Ashfield wrote:
> On Mon, Jul 16, 2012 at 12:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
> >> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> >> >
> >> > Tested by building core-image-sato-sdk.
> >>
> >> We've never gone to this level of granularity in the past, since
> >> -stable updates to
> >> the kernel are not going to change something in the libc-headers exports.
> >>
> >> As far as I'm concerned, bumping this for each stable release is too much churn.
> >
> > But this time it's quite usefull after
> > http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
> > removed some headers from sysroots and some packages (like IIRC udev)
> > were failing to build until someone rebuilt linux-libc-headers manually
> > to fixup staged headers in machine sysroot..
>
> I'm not following completely .. is that specific to the .3 in 3.4.x ?
> Doesn't look
> like it to me.
No it's not specific to any version.. just before referenced patch there
was e.g. ubi-user.h in sysroot "owned" by linux-libc-headers and
mtd-utils recipe.
That patch caused mtd-utils to be rebuilt and restaged again, but this
time without ubi-user.h and IMHO this doesn't track that ubi-user.h
is also "owned by linux-libc-headers recipe so we end without any
ubi-user.h in sysroot until someone rebuilds linux-libc-headers to stage
ubi-user.h again.
Staging the same file from different recipes should imho show some
warning or keep track of all "owners" so ubi-user.h is not removed
unless someone cleansstate both mtd-utils and linux-libc-headers.
Cheers,
>
> I don't recall Greg changing the mtd exports in 3.4.3 .. but that
> wouldn't be the
> first time something like that slipped in.
>
> Cheers,
>
> Bruce
>
> >
> > Cheers,
> >
> >>
> >> Sorry I missed this during the original review/posting.
> >>
> >> Cheers,
> >>
> >> Bruce
> >>
> >> >
> >> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >> > ---
> >> > meta/conf/distro/include/tcmode-default.inc | 2 +-
> >> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
> >> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
> >> > 3 files changed, 7 insertions(+), 7 deletions(-)
> >> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> >
> >> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> >> > index f11e687..0a068be 100644
> >> > --- a/meta/conf/distro/include/tcmode-default.inc
> >> > +++ b/meta/conf/distro/include/tcmode-default.inc
> >> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
> >> > BINUVERSION ?= "2.22"
> >> > EGLIBCVERSION ?= "2.15"
> >> > UCLIBCVERSION ?= "0.9.33"
> >> > -LINUXLIBCVERSION ?= "3.4"
> >> > +LINUXLIBCVERSION ?= "3.4.3"
> >> >
> >> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> >> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> > new file mode 100644
> >> > index 0000000..6f8d9e8
> >> > --- /dev/null
> >> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> > @@ -0,0 +1,6 @@
> >> > +require linux-libc-headers.inc
> >> > +
> >> > +PR = "r0"
> >> > +
> >> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
> >> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> > deleted file mode 100644
> >> > index 9e8c88f..0000000
> >> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> > +++ /dev/null
> >> > @@ -1,6 +0,0 @@
> >> > -require linux-libc-headers.inc
> >> > -
> >> > -PR = "r0"
> >> > -
> >> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
> >> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
> >> > --
> >> > 1.7.7.6
> >> >
> >> >
> >> > _______________________________________________
> >> > Openembedded-core mailing list
> >> > Openembedded-core@lists.openembedded.org
> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >>
> >>
> >>
> >> --
> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
> >> thee at its end"
> >>
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 16:29 ` Martin Jansa
@ 2012-07-16 16:36 ` Bruce Ashfield
2012-07-16 16:38 ` Martin Jansa
0 siblings, 1 reply; 39+ messages in thread
From: Bruce Ashfield @ 2012-07-16 16:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Jul 16, 2012 at 12:29 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jul 16, 2012 at 12:08:10PM -0400, Bruce Ashfield wrote:
>> On Mon, Jul 16, 2012 at 12:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
>> >> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> >> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> >> >
>> >> > Tested by building core-image-sato-sdk.
>> >>
>> >> We've never gone to this level of granularity in the past, since
>> >> -stable updates to
>> >> the kernel are not going to change something in the libc-headers exports.
>> >>
>> >> As far as I'm concerned, bumping this for each stable release is too much churn.
>> >
>> > But this time it's quite usefull after
>> > http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
>> > removed some headers from sysroots and some packages (like IIRC udev)
>> > were failing to build until someone rebuilt linux-libc-headers manually
>> > to fixup staged headers in machine sysroot..
>>
>> I'm not following completely .. is that specific to the .3 in 3.4.x ?
>> Doesn't look
>> like it to me.
>
> No it's not specific to any version.. just before referenced patch there
> was e.g. ubi-user.h in sysroot "owned" by linux-libc-headers and
> mtd-utils recipe.
>
> That patch caused mtd-utils to be rebuilt and restaged again, but this
> time without ubi-user.h and IMHO this doesn't track that ubi-user.h
> is also "owned by linux-libc-headers recipe so we end without any
> ubi-user.h in sysroot until someone rebuilds linux-libc-headers to stage
> ubi-user.h again.
>
> Staging the same file from different recipes should imho show some
> warning or keep track of all "owners" so ubi-user.h is not removed
> unless someone cleansstate both mtd-utils and linux-libc-headers.
ok .. this is what I thought you meant. I'm not a packaging expert by any
stretch of the imagination, but I assume that someone bumping the PR or
PE of the libc-headers package but leaving it on 3.4 would have also fixed
this to not require manual intervention ?
Cheers,
Bruce
>
> Cheers,
>
>>
>> I don't recall Greg changing the mtd exports in 3.4.3 .. but that
>> wouldn't be the
>> first time something like that slipped in.
>>
>> Cheers,
>>
>> Bruce
>>
>> >
>> > Cheers,
>> >
>> >>
>> >> Sorry I missed this during the original review/posting.
>> >>
>> >> Cheers,
>> >>
>> >> Bruce
>> >>
>> >> >
>> >> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> >> > ---
>> >> > meta/conf/distro/include/tcmode-default.inc | 2 +-
>> >> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
>> >> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
>> >> > 3 files changed, 7 insertions(+), 7 deletions(-)
>> >> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> >
>> >> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
>> >> > index f11e687..0a068be 100644
>> >> > --- a/meta/conf/distro/include/tcmode-default.inc
>> >> > +++ b/meta/conf/distro/include/tcmode-default.inc
>> >> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
>> >> > BINUVERSION ?= "2.22"
>> >> > EGLIBCVERSION ?= "2.15"
>> >> > UCLIBCVERSION ?= "0.9.33"
>> >> > -LINUXLIBCVERSION ?= "3.4"
>> >> > +LINUXLIBCVERSION ?= "3.4.3"
>> >> >
>> >> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
>> >> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
>> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> > new file mode 100644
>> >> > index 0000000..6f8d9e8
>> >> > --- /dev/null
>> >> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> > @@ -0,0 +1,6 @@
>> >> > +require linux-libc-headers.inc
>> >> > +
>> >> > +PR = "r0"
>> >> > +
>> >> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
>> >> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
>> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> > deleted file mode 100644
>> >> > index 9e8c88f..0000000
>> >> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> > +++ /dev/null
>> >> > @@ -1,6 +0,0 @@
>> >> > -require linux-libc-headers.inc
>> >> > -
>> >> > -PR = "r0"
>> >> > -
>> >> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
>> >> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
>> >> > --
>> >> > 1.7.7.6
>> >> >
>> >> >
>> >> > _______________________________________________
>> >> > Openembedded-core mailing list
>> >> > Openembedded-core@lists.openembedded.org
>> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >>
>> >>
>> >>
>> >> --
>> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> thee at its end"
>> >>
>> >> _______________________________________________
>> >> Openembedded-core mailing list
>> >> Openembedded-core@lists.openembedded.org
>> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >
>> > --
>> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>> >
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >
>>
>>
>>
>> --
>> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end"
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 16:36 ` Bruce Ashfield
@ 2012-07-16 16:38 ` Martin Jansa
2012-07-16 16:45 ` Bruce Ashfield
0 siblings, 1 reply; 39+ messages in thread
From: Martin Jansa @ 2012-07-16 16:38 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 7542 bytes --]
On Mon, Jul 16, 2012 at 12:36:07PM -0400, Bruce Ashfield wrote:
> On Mon, Jul 16, 2012 at 12:29 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Mon, Jul 16, 2012 at 12:08:10PM -0400, Bruce Ashfield wrote:
> >> On Mon, Jul 16, 2012 at 12:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> > On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
> >> >> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >> >> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> >> >> >
> >> >> > Tested by building core-image-sato-sdk.
> >> >>
> >> >> We've never gone to this level of granularity in the past, since
> >> >> -stable updates to
> >> >> the kernel are not going to change something in the libc-headers exports.
> >> >>
> >> >> As far as I'm concerned, bumping this for each stable release is too much churn.
> >> >
> >> > But this time it's quite usefull after
> >> > http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
> >> > removed some headers from sysroots and some packages (like IIRC udev)
> >> > were failing to build until someone rebuilt linux-libc-headers manually
> >> > to fixup staged headers in machine sysroot..
> >>
> >> I'm not following completely .. is that specific to the .3 in 3.4.x ?
> >> Doesn't look
> >> like it to me.
> >
> > No it's not specific to any version.. just before referenced patch there
> > was e.g. ubi-user.h in sysroot "owned" by linux-libc-headers and
> > mtd-utils recipe.
> >
> > That patch caused mtd-utils to be rebuilt and restaged again, but this
> > time without ubi-user.h and IMHO this doesn't track that ubi-user.h
> > is also "owned by linux-libc-headers recipe so we end without any
> > ubi-user.h in sysroot until someone rebuilds linux-libc-headers to stage
> > ubi-user.h again.
> >
> > Staging the same file from different recipes should imho show some
> > warning or keep track of all "owners" so ubi-user.h is not removed
> > unless someone cleansstate both mtd-utils and linux-libc-headers.
>
> ok .. this is what I thought you meant. I'm not a packaging expert by any
> stretch of the imagination, but I assume that someone bumping the PR or
> PE of the libc-headers package but leaving it on 3.4 would have also fixed
> this to not require manual intervention ?
yes.. I was thinking about sending PR bump patch after I've rebuilt it
manually for all machines on both my builders.. but then noticed this patch
and decided to wait for this instead of just PR bump..
Cheers,
>
> Cheers,
>
> Bruce
>
> >
> > Cheers,
> >
> >>
> >> I don't recall Greg changing the mtd exports in 3.4.3 .. but that
> >> wouldn't be the
> >> first time something like that slipped in.
> >>
> >> Cheers,
> >>
> >> Bruce
> >>
> >> >
> >> > Cheers,
> >> >
> >> >>
> >> >> Sorry I missed this during the original review/posting.
> >> >>
> >> >> Cheers,
> >> >>
> >> >> Bruce
> >> >>
> >> >> >
> >> >> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> >> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >> >> > ---
> >> >> > meta/conf/distro/include/tcmode-default.inc | 2 +-
> >> >> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
> >> >> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
> >> >> > 3 files changed, 7 insertions(+), 7 deletions(-)
> >> >> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> >> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> >> >
> >> >> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
> >> >> > index f11e687..0a068be 100644
> >> >> > --- a/meta/conf/distro/include/tcmode-default.inc
> >> >> > +++ b/meta/conf/distro/include/tcmode-default.inc
> >> >> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
> >> >> > BINUVERSION ?= "2.22"
> >> >> > EGLIBCVERSION ?= "2.15"
> >> >> > UCLIBCVERSION ?= "0.9.33"
> >> >> > -LINUXLIBCVERSION ?= "3.4"
> >> >> > +LINUXLIBCVERSION ?= "3.4.3"
> >> >> >
> >> >> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
> >> >> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
> >> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> >> > new file mode 100644
> >> >> > index 0000000..6f8d9e8
> >> >> > --- /dev/null
> >> >> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
> >> >> > @@ -0,0 +1,6 @@
> >> >> > +require linux-libc-headers.inc
> >> >> > +
> >> >> > +PR = "r0"
> >> >> > +
> >> >> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
> >> >> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
> >> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> >> > deleted file mode 100644
> >> >> > index 9e8c88f..0000000
> >> >> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
> >> >> > +++ /dev/null
> >> >> > @@ -1,6 +0,0 @@
> >> >> > -require linux-libc-headers.inc
> >> >> > -
> >> >> > -PR = "r0"
> >> >> > -
> >> >> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
> >> >> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
> >> >> > --
> >> >> > 1.7.7.6
> >> >> >
> >> >> >
> >> >> > _______________________________________________
> >> >> > Openembedded-core mailing list
> >> >> > Openembedded-core@lists.openembedded.org
> >> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >> >>
> >> >>
> >> >>
> >> >> --
> >> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
> >> >> thee at its end"
> >> >>
> >> >> _______________________________________________
> >> >> Openembedded-core mailing list
> >> >> Openembedded-core@lists.openembedded.org
> >> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >> >
> >> > --
> >> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >> >
> >> > _______________________________________________
> >> > Openembedded-core mailing list
> >> > Openembedded-core@lists.openembedded.org
> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >> >
> >>
> >>
> >>
> >> --
> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
> >> thee at its end"
> >>
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3
2012-07-16 16:38 ` Martin Jansa
@ 2012-07-16 16:45 ` Bruce Ashfield
0 siblings, 0 replies; 39+ messages in thread
From: Bruce Ashfield @ 2012-07-16 16:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Jul 16, 2012 at 12:38 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jul 16, 2012 at 12:36:07PM -0400, Bruce Ashfield wrote:
>> On Mon, Jul 16, 2012 at 12:29 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Mon, Jul 16, 2012 at 12:08:10PM -0400, Bruce Ashfield wrote:
>> >> On Mon, Jul 16, 2012 at 12:04 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >> > On Mon, Jul 16, 2012 at 11:58:52AM -0400, Bruce Ashfield wrote:
>> >> >> On Mon, Jul 16, 2012 at 11:47 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> >> >> > From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> >> >> >
>> >> >> > Tested by building core-image-sato-sdk.
>> >> >>
>> >> >> We've never gone to this level of granularity in the past, since
>> >> >> -stable updates to
>> >> >> the kernel are not going to change something in the libc-headers exports.
>> >> >>
>> >> >> As far as I'm concerned, bumping this for each stable release is too much churn.
>> >> >
>> >> > But this time it's quite usefull after
>> >> > http://git.openembedded.org/openembedded-core/commit/?id=2a4ab6fc2ef10202d13568aba5d7633e88aa71e5
>> >> > removed some headers from sysroots and some packages (like IIRC udev)
>> >> > were failing to build until someone rebuilt linux-libc-headers manually
>> >> > to fixup staged headers in machine sysroot..
>> >>
>> >> I'm not following completely .. is that specific to the .3 in 3.4.x ?
>> >> Doesn't look
>> >> like it to me.
>> >
>> > No it's not specific to any version.. just before referenced patch there
>> > was e.g. ubi-user.h in sysroot "owned" by linux-libc-headers and
>> > mtd-utils recipe.
>> >
>> > That patch caused mtd-utils to be rebuilt and restaged again, but this
>> > time without ubi-user.h and IMHO this doesn't track that ubi-user.h
>> > is also "owned by linux-libc-headers recipe so we end without any
>> > ubi-user.h in sysroot until someone rebuilds linux-libc-headers to stage
>> > ubi-user.h again.
>> >
>> > Staging the same file from different recipes should imho show some
>> > warning or keep track of all "owners" so ubi-user.h is not removed
>> > unless someone cleansstate both mtd-utils and linux-libc-headers.
>>
>> ok .. this is what I thought you meant. I'm not a packaging expert by any
>> stretch of the imagination, but I assume that someone bumping the PR or
>> PE of the libc-headers package but leaving it on 3.4 would have also fixed
>> this to not require manual intervention ?
>
> yes.. I was thinking about sending PR bump patch after I've rebuilt it
> manually for all machines on both my builders.. but then noticed this patch
> and decided to wait for this instead of just PR bump..
Great, so I did properly understand this :)
My comment about the churning of the headers for every -stable update
still stands (and the fact that the 3.4 is at 3.4.4+ anyway), but as does
your comment about something needing to be done to solve the mtd-headers
issue.
If this is dropped, then we obviously do need that PR bump.
I'm not adamantly against this, but inconsistently picking -stable updates
for libc-header refreshes (and only doing it for one, but not all of the kernel
versions that are in oe-core) .. poses a completely different question and
problem.
Cheers,
Bruce
>
> Cheers,
>
>>
>> Cheers,
>>
>> Bruce
>>
>> >
>> > Cheers,
>> >
>> >>
>> >> I don't recall Greg changing the mtd exports in 3.4.3 .. but that
>> >> wouldn't be the
>> >> first time something like that slipped in.
>> >>
>> >> Cheers,
>> >>
>> >> Bruce
>> >>
>> >> >
>> >> > Cheers,
>> >> >
>> >> >>
>> >> >> Sorry I missed this during the original review/posting.
>> >> >>
>> >> >> Cheers,
>> >> >>
>> >> >> Bruce
>> >> >>
>> >> >> >
>> >> >> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
>> >> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> >> >> > ---
>> >> >> > meta/conf/distro/include/tcmode-default.inc | 2 +-
>> >> >> > .../linux-libc-headers/linux-libc-headers_3.4.3.bb | 6 ++++++
>> >> >> > .../linux-libc-headers/linux-libc-headers_3.4.bb | 6 ------
>> >> >> > 3 files changed, 7 insertions(+), 7 deletions(-)
>> >> >> > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> >> > delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> >> >
>> >> >> > diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
>> >> >> > index f11e687..0a068be 100644
>> >> >> > --- a/meta/conf/distro/include/tcmode-default.inc
>> >> >> > +++ b/meta/conf/distro/include/tcmode-default.inc
>> >> >> > @@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
>> >> >> > BINUVERSION ?= "2.22"
>> >> >> > EGLIBCVERSION ?= "2.15"
>> >> >> > UCLIBCVERSION ?= "0.9.33"
>> >> >> > -LINUXLIBCVERSION ?= "3.4"
>> >> >> > +LINUXLIBCVERSION ?= "3.4.3"
>> >> >> >
>> >> >> > PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
>> >> >> > PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
>> >> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> >> > new file mode 100644
>> >> >> > index 0000000..6f8d9e8
>> >> >> > --- /dev/null
>> >> >> > +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.3.bb
>> >> >> > @@ -0,0 +1,6 @@
>> >> >> > +require linux-libc-headers.inc
>> >> >> > +
>> >> >> > +PR = "r0"
>> >> >> > +
>> >> >> > +SRC_URI[md5sum] = "3aefa02db55715d627ed23a01667057d"
>> >> >> > +SRC_URI[sha256sum] = "17f1256daa289dde1a0a587c9753556d37a52770f7c4efcf2666fd4796a6eacc"
>> >> >> > diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> >> > deleted file mode 100644
>> >> >> > index 9e8c88f..0000000
>> >> >> > --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.4.bb
>> >> >> > +++ /dev/null
>> >> >> > @@ -1,6 +0,0 @@
>> >> >> > -require linux-libc-headers.inc
>> >> >> > -
>> >> >> > -PR = "r0"
>> >> >> > -
>> >> >> > -SRC_URI[md5sum] = "146af0160fc7a60cf9acf44aec13482b"
>> >> >> > -SRC_URI[sha256sum] = "a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d"
>> >> >> > --
>> >> >> > 1.7.7.6
>> >> >> >
>> >> >> >
>> >> >> > _______________________________________________
>> >> >> > Openembedded-core mailing list
>> >> >> > Openembedded-core@lists.openembedded.org
>> >> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >> >>
>> >> >>
>> >> >>
>> >> >> --
>> >> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> >> thee at its end"
>> >> >>
>> >> >> _______________________________________________
>> >> >> Openembedded-core mailing list
>> >> >> Openembedded-core@lists.openembedded.org
>> >> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >> >
>> >> > --
>> >> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>> >> >
>> >> > _______________________________________________
>> >> > Openembedded-core mailing list
>> >> > Openembedded-core@lists.openembedded.org
>> >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >> >
>> >>
>> >>
>> >>
>> >> --
>> >> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> >> thee at its end"
>> >>
>> >> _______________________________________________
>> >> Openembedded-core mailing list
>> >> Openembedded-core@lists.openembedded.org
>> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >
>> > --
>> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>> >
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>> >
>>
>>
>>
>> --
>> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end"
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 39+ messages in thread
* [CONSOLIDATED PULL 10/30] classes/rootfs_deb: use more reliable check for package existence
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (8 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 09/30] linux-libc-headers: updated to 3.4.3 Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 11/30] python-dbus: upgrade to 1.1.0 Saul Wold
` (20 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
It turns out "apt-cache showpkg" does return some information when a
package does not exist but another package recommends it, which can
occur for empty *-dev packages; so use "apt-cache policy" with a
different line count instead.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/rootfs_deb.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 4ea71da..67871a9 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -111,7 +111,7 @@ list_package_recommends() {
}
rootfs_check_package_exists() {
- if [ `apt-cache showpkg $1 | wc -l` -gt 2 ]; then
+ if [ `apt-cache policy $1 | wc -l` -gt 4 ]; then
echo $1
fi
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 11/30] python-dbus: upgrade to 1.1.0
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (9 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 10/30] classes/rootfs_deb: use more reliable check for package existence Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 12/30] task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS Saul Wold
` (19 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Tested by compiling core-image-basic
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{python-dbus_1.0.0.bb => python-dbus_1.1.0.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python-dbus_1.0.0.bb => python-dbus_1.1.0.bb} (82%)
diff --git a/meta/recipes-devtools/python/python-dbus_1.0.0.bb b/meta/recipes-devtools/python/python-dbus_1.1.0.bb
similarity index 82%
rename from meta/recipes-devtools/python/python-dbus_1.0.0.bb
rename to meta/recipes-devtools/python/python-dbus_1.1.0.bb
index 1b174eb..a10fda3 100644
--- a/meta/recipes-devtools/python/python-dbus_1.0.0.bb
+++ b/meta/recipes-devtools/python/python-dbus_1.1.0.bb
@@ -4,12 +4,12 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=f5612614133e9a2f2dad527d97554670"
DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
-PR = "r1"
+PR = "r0"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
-SRC_URI[md5sum] = "775a8235736bf760cdd96e2d76546469"
-SRC_URI[sha256sum] = "9e46f97d739dde8a5ab33ec6b11da58794c4c20804aacdad2880b7d3bc05187a"
+SRC_URI[md5sum] = "41a459bbbb5fd92eeebd632623af0bd7"
+SRC_URI[sha256sum] = "2dc30b53cdb2e20f8d0265af3be878e9da68745cf9ccc72f75de869094c4fc60"
S = "${WORKDIR}/dbus-python-${PV}"
inherit distutils-base autotools pkgconfig
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 12/30] task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (10 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 11/30] python-dbus: upgrade to 1.1.0 Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 13/30] xz: update to 5.1.2alpha Saul Wold
` (18 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Zhenhua Luo <b19537@freescale.com>
Signed-off-by: Zhenhua Luo <b19537@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-core-sdk.bb | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb
index ec6cdcc..fe95236 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "task-core-console"
-PR = "r7"
+PR = "r8"
ALLOW_EMPTY = "1"
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
@@ -48,6 +48,10 @@ RDEPENDS_task-core-sdk = "\
file \
tcl"
+RRECOMMENDS_task-core-sdk = "\
+ libgomp \
+ libgomp-dev"
+
#python generate_sdk_pkgs () {
# poky_pkgs = read_pkgdata('task-core', d)['PACKAGES']
# pkgs = d.getVar('PACKAGES', True).split()
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 13/30] xz: update to 5.1.2alpha
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (11 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 12/30] task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 14/30] Update proto -> protocol for recipes Saul Wold
` (17 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Koen Kooi <koen@dominion.thruhere.net>
This contains bugfixes from the 5.0.3 and 5.0.4 releases
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../xz/{xz_5.1.1alpha.bb => xz_5.1.2alpha.bb} | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
rename meta/recipes-extended/xz/{xz_5.1.1alpha.bb => xz_5.1.2alpha.bb} (86%)
diff --git a/meta/recipes-extended/xz/xz_5.1.1alpha.bb b/meta/recipes-extended/xz/xz_5.1.2alpha.bb
similarity index 86%
rename from meta/recipes-extended/xz/xz_5.1.1alpha.bb
rename to meta/recipes-extended/xz/xz_5.1.2alpha.bb
index 7fa7177..9d68720 100644
--- a/meta/recipes-extended/xz/xz_5.1.1alpha.bb
+++ b/meta/recipes-extended/xz/xz_5.1.2alpha.bb
@@ -10,11 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 "
SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "bb24436fa12780808e1c142980484104"
-SRC_URI[sha256sum] = "54e59a83690a4a0ec88a7d7c3bdef90c6b196c892a93463863c71c24fe87951a"
-
-PR = "r0"
+SRC_URI[md5sum] = "9bad1e249537ce69b206815cf28ca87b"
+SRC_URI[sha256sum] = "70e792d2a67cfbb8f2dffd0feab6ca6e5a4a618d65070fb44a367629d1ba94e5"
inherit autotools gettext
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 14/30] Update proto -> protocol for recipes
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (12 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 13/30] xz: update to 5.1.2alpha Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 15/30] puzzles: convert to use SVN Saul Wold
` (16 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +-
meta/recipes-devtools/gcc/gcc-4.7.inc | 2 +-
.../installer/adt-installer_1.0.bb | 2 +-
meta/recipes-devtools/opkg/opkg_svn.bb | 2 +-
meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +-
meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 2 +-
meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb | 2 +-
.../matchbox-wm-2/matchbox-wm-2_git.bb | 2 +-
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 6 +++---
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 7dd9810..110febf 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -7,7 +7,7 @@ PR = "r12"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_15"
-SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
+SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
file://eglibc-svn-arm-lowlevellock-include-tls.patch \
file://IO-acquire-lock-fix.patch \
file://mips-rld-map-check.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc
index 0e40533..a2e9ae0 100644
--- a/meta/recipes-devtools/gcc/gcc-4.7.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.7.inc
@@ -33,7 +33,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
-SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
+SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};protocol=http \
file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
file://100-uclibc-conf.patch \
file://gcc-uclibc-locale-ctype_touplow_t.patch \
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 5dc0896..e1edf2f 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -39,7 +39,7 @@ S = "${WORKDIR}/trunk"
SRCREV = "596"
PV = "0.1.8+svnr${SRCPV}"
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
file://wget_cache.patch \
file://adt_installer \
file://scripts/adt_installer_internal \
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index faf0ba3..a0667ac 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
require opkg.inc
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
file://add_vercmp.patch \
file://add_uname_support.patch \
file://fix_installorder.patch \
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index 8ac8022..25fccaf 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -10,7 +10,7 @@ SRCREV = "4ef94ecb927a8912c3d79ce137182247786cff8f"
PV = "0.4.0+git${SRCPV}"
PR = "r0"
-SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;proto=git \
+SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;protocol=git \
http://www.eclipse.org/legal/epl-v10.html;name=epl \
file://fix_ranlib.patch \
file://fix_tcf-agent.init.patch \
diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index d8c9760..b49e94a 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -8,7 +8,7 @@ PR = "r5"
#RRECOMMENDS_${PN} = "acct"
-SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \
+SRC_URI = "svn://ubootchart.googlecode.com/svn/;protocol=http;module=trunk \
file://sysvinit.patch;striplevel=0 \
file://ubootchart-stop \
file://ubootchart.desktop"
diff --git a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
index 7635e7a..da74a82 100644
--- a/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/recipes-gnome/gtkhtml2/gtkhtml2_svn.bb
@@ -8,7 +8,7 @@ SRCREV = "1161"
PV = "2.11.0+svnr${SRCPV}"
PR = "r3"
-SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;proto=http \
+SRC_URI = "svn://svn.gnome.org/svn/gtkhtml2/;module=trunk;protocol=http \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-stylesheet-user.patch;striplevel=0;name=patch2 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/css-media.patch;striplevel=0;name=patch3 \
http://git.yoctoproject.org/cgit/cgit.cgi/web-patches/plain/add-end-element-signal.patch;striplevel=0;name=patch4 \
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 4aad3a9..8b162be 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -9,7 +9,7 @@ SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
PV = "0.1+git${SRCPV}"
PR = "r1"
-SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;proto=git \
+SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \
file://fix_makefile.patch \
"
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 7d0aae9..6a6839d 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -22,9 +22,9 @@ PV = "1.7.2+svnr${SRCPV}"
PR = "r6"
SRC_URI = "\
- svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
- svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
- svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=Source;protocol=http;name=source \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http \
file://Makefile \
file://Makefile.shared \
file://autogen.sh \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 15/30] puzzles: convert to use SVN
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (13 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 14/30] Update proto -> protocol for recipes Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 16/30] cpan.bbclass: Fix CCFLAGS Saul Wold
` (15 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
Recently the tarball has been changing due the fact it gets rebuilt
nightly and timestamps are getting updated and changed internal to
the tarball. Moving back to SVN to try and address this.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-sato/puzzles/puzzles_r9561.bb | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-sato/puzzles/puzzles_r9561.bb b/meta/recipes-sato/puzzles/puzzles_r9561.bb
index 83fabdf..5b64cda 100644
--- a/meta/recipes-sato/puzzles/puzzles_r9561.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r9561.bb
@@ -9,13 +9,13 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENCE;md5=453de74d749439762ef4814f7bee1fec"
# Upstream updates puzzles.tar.gz for the new release, so checksums seem to be changing regularly right now
-#SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;rev=${MOD_PV}"
-SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
-SRC_URI[md5sum] = "c86695aebfc95efe1d6241863849101b"
-SRC_URI[sha256sum] = "2c20a45189387e3de8804a58bdb4e47ac4bb0f890001a509dfbdc015b5a84b95"
+SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV}"
+S = "${WORKDIR}/${BPN}"
-
-S = "${WORKDIR}/${BPN}-${PV}"
+#SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
+#SRC_URI[md5sum] = "9d84769562007e0f99edac77a3b2d27c"
+#SRC_URI[sha256sum] = "b688b5196f8406a23741e973178bdde78e5f8af4d2a88c33ca1ae1cc1a069d15"
+#S = "${WORKDIR}/${BPN}-${PV}"
do_configure () {
./mkfiles.pl
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 16/30] cpan.bbclass: Fix CCFLAGS.
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (14 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 15/30] puzzles: convert to use SVN Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 17/30] image_types.bbclass: Fix COMPRESS_CMD for xz to redirect compressed data to file Saul Wold
` (14 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Xin Ouyang <Xin.Ouyang@windriver.com>
We should not just replace CCFLAGS with CFLAGS while compiling, because
this may cause run-time errors with perl's DynaLoader.pm.
Tested on qemux86 with new libnet-libidn-perl bb recipe:
root@qemux86:~# perl -e "use Net::LibIDN"
Not a CODE reference at /usr/lib/perl/5.14.2//DynaLoader.pm line 213.
END failed--call queue aborted at /usr/lib/perl/vendor_perl/5.14.2//Net/LibIDN.pm line 213.
Compilation failed in require at -e line 1.
BEGIN failed--compilation aborted at -e line 1.
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/cpan.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 2e9432c..957a6e2 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -26,13 +26,14 @@ cpan_do_configure () {
test -f $f2 || continue
sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
-e 's/perl.real/perl/' \
+ -e "s/^\(CCFLAGS =.*\)/\1 ${CFLAGS}/" \
$f2
done
fi
}
cpan_do_compile () {
- oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}"
+ oe_runmake PASTHRU_INC="${CFLAGS}" LD="${CCLD}"
}
cpan_do_install () {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 17/30] image_types.bbclass: Fix COMPRESS_CMD for xz to redirect compressed data to file
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (15 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 16/30] cpan.bbclass: Fix CCFLAGS Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 18/30] image_types.bbclass: Add XZ variable to set number of threads to be used while compressing Saul Wold
` (13 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
Having -c modifier makes xz to output the compressed data to stdout. In this
way the needed data will be in the do_rootfs log.
Redirect data to ${IMAGE_NAME}.rootfs.${type}.xz .
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image_types.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5734edf..0e79820 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -236,7 +236,7 @@ COMPRESSIONTYPES = "gz bz2 lzma xz"
COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
-COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}"
+COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
COMPRESS_DEPENDS_lzma = "xz-native"
COMPRESS_DEPENDS_gz = ""
COMPRESS_DEPENDS_bz2 = ""
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 18/30] image_types.bbclass: Add XZ variable to set number of threads to be used while compressing
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (16 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 17/30] image_types.bbclass: Fix COMPRESS_CMD for xz to redirect compressed data to file Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 19/30] image_types.bbclass: Default XZ_COMPRESSION_LEVEL to -e -6 Saul Wold
` (12 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
Default this variable to 0. This will make xz use as many threads as there are CPU
cores on the system.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image_types.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 0e79820..b19ad3b 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -124,6 +124,7 @@ def imagetypes_getdepends(d):
XZ_COMPRESSION_LEVEL ?= "-e -9"
XZ_INTEGRITY_CHECK ?= "crc32"
+XZ_THREADS ?= "-T 0"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -n ${EXTRA_IMAGECMD}"
IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
@@ -236,7 +237,7 @@ COMPRESSIONTYPES = "gz bz2 lzma xz"
COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
-COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
+COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} ${XZ_THREADS} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.xz"
COMPRESS_DEPENDS_lzma = "xz-native"
COMPRESS_DEPENDS_gz = ""
COMPRESS_DEPENDS_bz2 = ""
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 19/30] image_types.bbclass: Default XZ_COMPRESSION_LEVEL to -e -6
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (17 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 18/30] image_types.bbclass: Add XZ variable to set number of threads to be used while compressing Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 20/30] runqemu: Fix running qemu when build without gl Saul Wold
` (11 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
Having XZ_COMPRESSION_LEVEL on -e -9 and -T 0 will make xz eat more
than 6Gb memory. Reduce this to -6 to make xz to use about 471Mb
on the tested machine.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image_types.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index b19ad3b..727d8d6 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -122,7 +122,7 @@ def imagetypes_getdepends(d):
return depstr
-XZ_COMPRESSION_LEVEL ?= "-e -9"
+XZ_COMPRESSION_LEVEL ?= "-e -6"
XZ_INTEGRITY_CHECK ?= "crc32"
XZ_THREADS ?= "-T 0"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 20/30] runqemu: Fix running qemu when build without gl
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (18 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 19/30] image_types.bbclass: Default XZ_COMPRESSION_LEVEL to -e -6 Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 21/30] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined Saul Wold
` (10 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
When gl is disabled in PACKAGECONFIG then we dont need
to check for supporting libs to be present before running
qemu.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
scripts/runqemu | 14 --------------
scripts/runqemu-internal | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 650d1df..7454dd4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -387,20 +387,6 @@ echo "FSTYPE: [$FSTYPE]"
setup_sysroot
# OECORE_NATIVE_SYSROOT is now set for all cases
-# We can't run without a libGL.so
-libgl='no'
-
-[ -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so ] && libgl='yes'
-[ -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so ] && libgl='yes'
-[ -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so ] && libgl='yes'
-
-if [ "$libgl" != 'yes' ]; then
- echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
- Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.
- Fedora package names are: mesa-libGL-devel mesa-libGLU-devel."
- exit 1;
-fi
-
INTERNAL_SCRIPT="$0-internal"
if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then
INTERNAL_SCRIPT=`which runqemu-internal`
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index a21ea93..eeadb24 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -468,6 +468,23 @@ if [ ! -x "$QEMUBIN" ]; then
return
fi
+NEED_GL=`ldd $QEMUBIN/$QEMU 2>&1 | grep libGLU`
+# We can't run without a libGL.so
+if [ "$NEED_GL" != "" ]; then
+ libgl='no'
+
+ [ -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so ] && libgl='yes'
+ [ -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so ] && libgl='yes'
+ [ -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so ] && libgl='yes'
+
+ if [ "$libgl" != 'yes' ]; then
+ echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
+ Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.
+ Fedora package names are: mesa-libGL-devel mesa-libGLU-devel."
+ exit 1;
+ fi
+fi
+
do_quit() {
if [ -n "$PIDFILE" ]; then
#echo kill `cat $PIDFILE`
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 21/30] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (19 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 20/30] runqemu: Fix running qemu when build without gl Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 22/30] gmp: upgrade to 5.0.5 Saul Wold
` (9 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Set SERIAL_CONSOLES if you want to define multiple serial consoles, also if
you need to check for the presence of the serial consoles you can also define
SERIAL_CONSOLES_CHECK to determine if these are present when you boot. This
will prevent error message that pop up when the serial port is not present.
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
The above lines in machine.conf or elsewhere will have the effect of having
two serial consoles and removing any that are not present at boot
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 ++++++++++++++++++-
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 9bd087c..1089edb 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Inittab for sysvinit"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r6"
+PR = "r7"
SRC_URI = "file://inittab"
@@ -26,7 +26,8 @@ do_install() {
for i in $tmp
do
j=`echo ${i} | sed s/\;/\ /g`
- echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+ echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+
idx=`expr $idx + 1`
done
@@ -51,6 +52,23 @@ EOF
fi
}
+pkg_postinst_${PN} () {
+# run this on the target
+if [ "x$D" == "x" ]; then
+ tmp="${SERIAL_CONSOLES_CHECK}"
+ for i in $tmp
+ do
+ j=`echo ${i} | sed s/^.*\;//g`
+ if [ -z "`cat /proc/consoles | grep ${j}`" ]; then
+ sed -i /^.*${j}$/d /etc/inittab
+ fi
+ done
+ kill -HUP 1
+else
+ exit 1
+fi
+}
+
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 22/30] gmp: upgrade to 5.0.5
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (20 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 21/30] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 23/30] sstate.bbclass: Move crosssdk before cross to ensure correct variables are set Saul Wold
` (8 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../gmp/{gmp_5.0.4.bb => gmp_5.0.5.bb} | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-support/gmp/{gmp_5.0.4.bb => gmp_5.0.5.bb} (72%)
diff --git a/meta/recipes-support/gmp/gmp_5.0.4.bb b/meta/recipes-support/gmp/gmp_5.0.5.bb
similarity index 72%
rename from meta/recipes-support/gmp/gmp_5.0.4.bb
rename to meta/recipes-support/gmp/gmp_5.0.5.bb
index f794438..2058868 100644
--- a/meta/recipes-support/gmp/gmp_5.0.4.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.5.bb
@@ -2,7 +2,6 @@ require gmp.inc
LICENSE="LGPLv3&GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
-PR = "r1"
SRC_URI_append = " file://use-includedir.patch \
file://gmp_fix_for_x32.patch \
@@ -11,5 +10,5 @@ SRC_URI_append = " file://use-includedir.patch \
export CC_FOR_BUILD = "${BUILD_CC}"
-SRC_URI[md5sum] = "50c3edcb7c9438e04377ee9a1a061b79"
-SRC_URI[sha256sum] = "35d4aade3e4bdf0915c944599b10d23f108ffedf6c3188aeec52221c5cf9a06f"
+SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe"
+SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 23/30] sstate.bbclass: Move crosssdk before cross to ensure correct variables are set
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (21 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 22/30] gmp: upgrade to 5.0.5 Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 24/30] python: Fix python-nativesdk variable contamination issue Saul Wold
` (7 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a bug showing up where the crosssdk recipes were being installed as machine
specific in the sstate-control directory. This turned out to be due to the architecture
fields used by sstate being set incorrectly. The problem is that the crosssdk inherits
the cross class. It therefore needs to be listed in this if statement block before
the cross check, not after.
This should resolve some package architecture issue of crosssdk sstate files.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/sstate.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 4242f88..c2c5bd5 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -23,11 +23,11 @@ SSTATEPOSTINSTFUNCS ?= ""
python () {
if bb.data.inherits_class('native', d):
d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
+ elif bb.data.inherits_class('crosssdk', d):
+ d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}"))
elif bb.data.inherits_class('cross', d):
d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}"))
d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}"))
- elif bb.data.inherits_class('crosssdk', d):
- d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${PACKAGE_ARCH}"))
elif bb.data.inherits_class('nativesdk', d):
d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
elif bb.data.inherits_class('cross-canadian', d):
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 24/30] python: Fix python-nativesdk variable contamination issue
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (22 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 23/30] sstate.bbclass: Move crosssdk before cross to ensure correct variables are set Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 25/30] crosssdk/nativesdk: Ensure EXTRA_OECONF_FPU is unset Saul Wold
` (6 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this, python-nativesdk-crypt can depend on openssl which is incorrect.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/python/python_2.7.3.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index b06d7b7..b736cc2 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -147,6 +147,7 @@ require python-${PYTHON_MAJMIN}-manifest.inc
RPROVIDES_${PN}-core = "${PN}"
RRECOMMENDS_${PN}-core = "${PN}-readline"
RRECOMMENDS_${PN}-crypt = "openssl"
+RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "openssl-nativesdk"
# package libpython2
PACKAGES =+ "lib${BPN}2${PKGSUFFIX}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 25/30] crosssdk/nativesdk: Ensure EXTRA_OECONF_FPU is unset
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (23 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 24/30] python: Fix python-nativesdk variable contamination issue Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 26/30] base.bbclass: add GNUmakefile to the list of possible makefile names Saul Wold
` (5 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
If EXTRA_OECONF_FPU is left set, certain ARM variables related to hard-float
can get pulled in and trigger rebuilds of the crosssdk code. The best solution
is to simply force the variable to a known correct value for the SDK targets
currently supported in the same way as TARGET_FPU.
There is some slight rearrangement of the gcc code to ensure the variable is
always used to call the fpu function.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/crosssdk.bbclass | 3 +++
meta/classes/nativesdk.bbclass | 1 +
meta/recipes-devtools/gcc/gcc-cross-initial.inc | 3 ++-
.../gcc/gcc-cross-intermediate.inc | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 93aba70..f3a502a 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -28,3 +28,6 @@ baselib = "lib"
do_populate_sysroot[stamp-extra-info] = ""
do_package[stamp-extra-info] = ""
+
+# Need to force this to ensure consitency accross architectures
+EXTRA_OECONF_FPU = ""
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index a58fce2..7deaafc 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -36,6 +36,7 @@ TARGET_CC_ARCH = "${SDK_CC_ARCH}"
TARGET_LD_ARCH = "${SDK_LD_ARCH}"
TARGET_AS_ARCH = "${SDK_AS_ARCH}"
TARGET_FPU = ""
+EXTRA_OECONF_FPU = ""
CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
CFLAGS = "${BUILDSDK_CFLAGS}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index faec391..93a6d78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -21,7 +21,8 @@ EXTRA_OECONF = "--with-newlib \
--with-sysroot=${STAGING_DIR_TARGET} \
--with-build-sysroot=${STAGING_DIR_TARGET} \
${EXTRA_OECONF_INITIAL} \
- ${@get_gcc_fpu_setting(bb, d)}"
+ ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
+ ${EXTRA_OECONF_FPU}"
do_compile () {
oe_runmake all-gcc all-target-libgcc
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index c940e54..e06926d 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--enable-shared \
--with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \
--with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \
${EXTRA_OECONF_INTERMEDIATE} \
- ${@get_gcc_fpu_setting(bb, d)} \
+ ${EXTRA_OECONF_FPU} \
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)}"
do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 26/30] base.bbclass: add GNUmakefile to the list of possible makefile names
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (24 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 25/30] crosssdk/nativesdk: Ensure EXTRA_OECONF_FPU is unset Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 27/30] lsof: define linux C library type when using eglibc Saul Wold
` (4 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Ross Burton <ross.burton@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/base.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 08065c6..f691799 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -280,7 +280,7 @@ base_do_configure() {
addtask compile after do_configure
do_compile[dirs] = "${S} ${B}"
base_do_compile() {
- if [ -e Makefile -o -e makefile ]; then
+ if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
oe_runmake || die "make failed"
else
bbnote "nothing to compile"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 27/30] lsof: define linux C library type when using eglibc
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (25 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 26/30] base.bbclass: add GNUmakefile to the list of possible makefile names Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 28/30] mirrors: Add debian archive snapshot mirrors to search list Saul Wold
` (3 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Ting Liu <b28495@freescale.com>
lsof tries to compile a temp c source file and execute the binary to
determine linux C library type (file Configure, line 2689-2717).
It is inpracticable for cross-compilation and may have build issue on
some distros since it depends on host settings.
Fix below error when building for 64bit target on 64bit host:
[...]
| dsock.c:481:44: error: 'TCP_LISTEN' undeclared (first use in this function)
| dsock.c:482:45: error: 'TCP_CLOSING' undeclared (first use in this function)
[...]
| make: *** [dsock.o] Error 1
The actual issue exists in do_configure:
[...]
Testing C library type with cc ... done
Cannot determine C library type; assuming it is not glibc.
Which is in turn caused by missing 'gnu/stubs-32.h" when compiling
the temp c source file on host:
[...]
fatal error: gnu/stubs-32.h: No such file or directory compilation terminated.
file gnu/stubs-32.h is provided by 32bit glibc.
Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/lsof/lsof_4.85.bb | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/lsof/lsof_4.85.bb b/meta/recipes-extended/lsof/lsof_4.85.bb
index 5823725..de7ff68 100644
--- a/meta/recipes-extended/lsof/lsof_4.85.bb
+++ b/meta/recipes-extended/lsof/lsof_4.85.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
Its name stands for LiSt Open Files, and it does just that."
SECTION = "devel"
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
@@ -31,6 +31,11 @@ export LSOF_INCLUDE = "${STAGING_INCDIR}"
do_configure () {
export LSOF_AR="${AR} cr"
export LSOF_RANLIB="${RANLIB}"
+ if [ "x${EGLIBCVERSION}" != "x" ];then
+ LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'`
+ LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
+ export LINUX_CLIB
+ fi
yes | ./Configure ${LSOF_OS}
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 28/30] mirrors: Add debian archive snapshot mirrors to search list
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (26 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 27/30] lsof: define linux C library type when using eglibc Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 29/30] gdb: Replace struct siginfo with proper siginfo_t Saul Wold
` (2 subsequent siblings)
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
I ran across this problem when apt 0.7.14 was not fetchable
from regular debian mirrors and existing snapshot mirror
did not have it either since we did not use proper syntax
so it was not hitting that.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/mirrors.bbclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 86ccd7a..1a9a531 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -1,5 +1,7 @@
MIRRORS += "\
-${DEBIAN_MIRROR}/main http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool/ \n \
+${DEBIAN_MIRROR} http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool \n \
+${DEBIAN_MIRROR} http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool \n \
+${DEBIAN_MIRROR} http://snapshot.debian.org/archive/debian-archive/20090802T004153Z/debian/pool \n \
${DEBIAN_MIRROR} ftp://ftp.de.debian.org/debian/pool \n \
${DEBIAN_MIRROR} ftp://ftp.au.debian.org/debian/pool \n \
${DEBIAN_MIRROR} ftp://ftp.cl.debian.org/debian/pool \n \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 29/30] gdb: Replace struct siginfo with proper siginfo_t
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (27 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 28/30] mirrors: Add debian archive snapshot mirrors to search list Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-16 15:47 ` [CONSOLIDATED PULL 30/30] busybox: Include sys/resource.h for rusage definition Saul Wold
2012-07-17 9:28 ` [CONSOLIDATED PULL 00/30] Fixes and Updates Richard Purdie
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Fixes errors like
/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gdb-7.4.1-r0.0/gdb-7.4.1/gdb/linux-nat.h:79:18:
error: field 'siginfo' has incomplete type
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gdb/gdb-common.inc | 2 +-
meta/recipes-devtools/gdb/gdb.inc | 1 +
meta/recipes-devtools/gdb/gdb/siginfo_t.patch | 403 +++++++++++++++++++++++++
3 files changed, 405 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gdb/gdb/siginfo_t.patch
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index be4d77a..348bdee 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -12,7 +12,7 @@ LTTNGUST_mips64 = ""
LTTNGUST_mips64el = ""
LTTNGUST_sh4 = ""
-INC_PR = "r0"
+INC_PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index a620eca..c1ad83a 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -5,6 +5,7 @@ inherit gettext
SRC_URI += "file://kill_arm_map_symbols.patch \
file://gdbserver-cflags-last.diff;striplevel=0 \
file://renesas-sh-native-support.patch \
+ file://siginfo_t.patch \
"
#LDFLAGS_append = " -s"
#export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/siginfo_t.patch b/meta/recipes-devtools/gdb/gdb/siginfo_t.patch
new file mode 100644
index 0000000..465645d
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/siginfo_t.patch
@@ -0,0 +1,403 @@
+POSIX says you get "siginto_t" *not* "struct siginfo
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gdb-7.4.1/gdb/alpha-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/alpha-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800
++++ gdb-7.4.1/gdb/alpha-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
+@@ -114,7 +114,7 @@
+ /* __NR_rt_sigreturn has a couple of structures on the stack. This is:
+
+ struct rt_sigframe {
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ };
+
+Index: gdb-7.4.1/gdb/amd64-linux-nat.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/amd64-linux-nat.c 2012-01-05 20:43:04.000000000 -0800
++++ gdb-7.4.1/gdb/amd64-linux-nat.c 2012-07-03 10:12:30.154227388 -0700
+@@ -671,13 +671,13 @@
+ INF. */
+
+ static int
+-amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction)
++amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction)
+ {
+ /* Is the inferior 32-bit? If so, then do fixup the siginfo
+ object. */
+ if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32)
+ {
+- gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t));
++ gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
+
+ if (direction == 0)
+ compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
+Index: gdb-7.4.1/gdb/arm-linux-nat.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/arm-linux-nat.c 2012-01-05 20:43:04.000000000 -0800
++++ gdb-7.4.1/gdb/arm-linux-nat.c 2012-07-03 10:12:30.154227388 -0700
+@@ -1137,7 +1137,7 @@
+ static int
+ arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+ {
+- struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
++ siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+ int slot = siginfo_p->si_errno;
+
+ /* This must be a hardware breakpoint. */
+Index: gdb-7.4.1/gdb/arm-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/arm-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800
++++ gdb-7.4.1/gdb/arm-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
+@@ -301,7 +301,7 @@
+
+ /* There are three elements in an rt_sigframe before the ucontext:
+ pinfo, puc, and info. The first two are pointers and the third
+- is a struct siginfo, with size 128 bytes. We could follow puc
++ is a siginfo_t, with size 128 bytes. We could follow puc
+ to the ucontext, but it's simpler to skip the whole thing. */
+ #define ARM_OLD_RT_SIGFRAME_SIGINFO 0x8
+ #define ARM_OLD_RT_SIGFRAME_UCONTEXT 0x88
+Index: gdb-7.4.1/gdb/frv-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/frv-linux-tdep.c 2012-01-05 20:43:12.000000000 -0800
++++ gdb-7.4.1/gdb/frv-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
+@@ -94,9 +94,9 @@
+ {
+ void (*pretcode)(void);
+ int sig;
+- struct siginfo *pinfo;
++ siginfo_t *pinfo;
+ void *puc;
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ uint32_t retcode[2];
+ };
+Index: gdb-7.4.1/gdb/gdbserver/linux-arm-low.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/gdbserver/linux-arm-low.c 2012-01-05 20:43:37.000000000 -0800
++++ gdb-7.4.1/gdb/gdbserver/linux-arm-low.c 2012-07-03 10:12:30.154227388 -0700
+@@ -631,7 +631,7 @@
+ arm_stopped_by_watchpoint (void)
+ {
+ struct lwp_info *lwp = get_thread_lwp (current_inferior);
+- struct siginfo siginfo;
++ siginfo_t siginfo;
+
+ /* We must be able to set hardware watchpoints. */
+ if (arm_linux_get_hw_watchpoint_count () == 0)
+Index: gdb-7.4.1/gdb/gdbserver/linux-low.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.c 2012-01-05 20:43:37.000000000 -0800
++++ gdb-7.4.1/gdb/gdbserver/linux-low.c 2012-07-03 10:12:30.154227388 -0700
+@@ -4522,7 +4522,7 @@
+ layout of the inferiors' architecture. */
+
+ static void
+-siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
++siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction)
+ {
+ int done = 0;
+
+@@ -4534,9 +4534,9 @@
+ if (!done)
+ {
+ if (direction == 1)
+- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
++ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
+ else
+- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
++ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
+ }
+ }
+
+@@ -4545,8 +4545,8 @@
+ unsigned const char *writebuf, CORE_ADDR offset, int len)
+ {
+ int pid;
+- struct siginfo siginfo;
+- char inf_siginfo[sizeof (struct siginfo)];
++ siginfo_t siginfo;
++ char inf_siginfo[sizeof (siginfo_t)];
+
+ if (current_inferior == NULL)
+ return -1;
+Index: gdb-7.4.1/gdb/gdbserver/linux-low.h
+===================================================================
+--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.h 2012-01-05 20:43:37.000000000 -0800
++++ gdb-7.4.1/gdb/gdbserver/linux-low.h 2012-07-03 10:20:28.554250548 -0700
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include "gdb_proc_service.h"
++#include <signal.h>
+
+ #ifdef HAVE_LINUX_REGSETS
+ typedef void (*regset_fill_func) (struct regcache *, void *);
+@@ -46,8 +47,6 @@
+ extern struct regset_info target_regsets[];
+ #endif
+
+-struct siginfo;
+-
+ struct process_info_private
+ {
+ /* Arch-specific additions. */
+@@ -103,7 +102,7 @@
+ Returns true if any conversion was done; false otherwise.
+ If DIRECTION is 1, then copy from INF to NATIVE.
+ If DIRECTION is 0, copy from NATIVE to INF. */
+- int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction);
++ int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction);
+
+ /* Hook to call when a new process is created or attached to.
+ If extra per-process architecture-specific data is needed,
+Index: gdb-7.4.1/gdb/gdbserver/linux-x86-low.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/gdbserver/linux-x86-low.c 2012-01-05 20:43:37.000000000 -0800
++++ gdb-7.4.1/gdb/gdbserver/linux-x86-low.c 2012-07-03 10:12:30.154227388 -0700
+@@ -906,13 +906,13 @@
+ INF. */
+
+ static int
+-x86_siginfo_fixup (struct siginfo *native, void *inf, int direction)
++x86_siginfo_fixup (siginfo_t *native, void *inf, int direction)
+ {
+ #ifdef __x86_64__
+ /* Is the inferior 32-bit? If so, then fixup the siginfo object. */
+ if (register_size (0) == 4)
+ {
+- if (sizeof (struct siginfo) != sizeof (compat_siginfo_t))
++ if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
+ fatal ("unexpected difference in siginfo");
+
+ if (direction == 0)
+Index: gdb-7.4.1/gdb/hppa-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/hppa-linux-tdep.c 2012-01-05 20:43:15.000000000 -0800
++++ gdb-7.4.1/gdb/hppa-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
+@@ -181,10 +181,10 @@
+ }
+
+ /* sp + sfoffs[try] points to a struct rt_sigframe, which contains
+- a struct siginfo and a struct ucontext. struct ucontext contains
++ a siginfo_t and a struct ucontext. struct ucontext contains
+ a struct sigcontext. Return an offset to this sigcontext here. Too
+ bad we cannot include system specific headers :-(.
+- sizeof(struct siginfo) == 128
++ sizeof(siginfo_t) == 128
+ offsetof(struct ucontext, uc_mcontext) == 24. */
+ return sp + sfoffs[try] + 128 + 24;
+ }
+Index: gdb-7.4.1/gdb/ia64-linux-nat.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/ia64-linux-nat.c 2012-01-05 20:43:16.000000000 -0800
++++ gdb-7.4.1/gdb/ia64-linux-nat.c 2012-07-03 10:12:30.158227388 -0700
+@@ -637,7 +637,7 @@
+ ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
+ {
+ CORE_ADDR psr;
+- struct siginfo *siginfo_p;
++ siginfo_t *siginfo_p;
+ struct regcache *regcache = get_current_regcache ();
+
+ siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+Index: gdb-7.4.1/gdb/linux-nat.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/linux-nat.c 2012-01-05 20:43:19.000000000 -0800
++++ gdb-7.4.1/gdb/linux-nat.c 2012-07-03 10:12:30.158227388 -0700
+@@ -179,7 +179,7 @@
+ /* The method to call, if any, when the siginfo object needs to be
+ converted between the layout returned by ptrace, and the layout in
+ the architecture of the inferior. */
+-static int (*linux_nat_siginfo_fixup) (struct siginfo *,
++static int (*linux_nat_siginfo_fixup) (siginfo_t *,
+ gdb_byte *,
+ int);
+
+@@ -4138,7 +4138,7 @@
+ layout of the inferiors' architecture. */
+
+ static void
+-siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
++siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction)
+ {
+ int done = 0;
+
+@@ -4150,9 +4150,9 @@
+ if (!done)
+ {
+ if (direction == 1)
+- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
++ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
+ else
+- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
++ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
+ }
+ }
+
+@@ -4162,8 +4162,8 @@
+ const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
+ {
+ int pid;
+- struct siginfo siginfo;
+- gdb_byte inf_siginfo[sizeof (struct siginfo)];
++ siginfo_t siginfo;
++ gdb_byte inf_siginfo[sizeof (siginfo_t)];
+
+ gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
+ gdb_assert (readbuf || writebuf);
+@@ -5852,7 +5852,7 @@
+ inferior. */
+ void
+ linux_nat_set_siginfo_fixup (struct target_ops *t,
+- int (*siginfo_fixup) (struct siginfo *,
++ int (*siginfo_fixup) (siginfo_t *,
+ gdb_byte *,
+ int))
+ {
+@@ -5861,7 +5861,7 @@
+ }
+
+ /* Return the saved siginfo associated with PTID. */
+-struct siginfo *
++siginfo_t *
+ linux_nat_get_siginfo (ptid_t ptid)
+ {
+ struct lwp_info *lp = find_lwp_pid (ptid);
+Index: gdb-7.4.1/gdb/linux-nat.h
+===================================================================
+--- gdb-7.4.1.orig/gdb/linux-nat.h 2012-01-05 20:43:19.000000000 -0800
++++ gdb-7.4.1/gdb/linux-nat.h 2012-07-03 10:12:30.158227388 -0700
+@@ -76,7 +76,7 @@
+
+ /* Non-zero si_signo if this LWP stopped with a trap. si_addr may
+ be the address of a hardware watchpoint. */
+- struct siginfo siginfo;
++ siginfo_t siginfo;
+
+ /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
+ watchpoint trap. */
+@@ -171,7 +171,7 @@
+ that ptrace returns, and the layout in the architecture of the
+ inferior. */
+ void linux_nat_set_siginfo_fixup (struct target_ops *,
+- int (*) (struct siginfo *,
++ int (*) (siginfo_t *,
+ gdb_byte *,
+ int));
+
+@@ -180,7 +180,7 @@
+ void linux_nat_switch_fork (ptid_t new_ptid);
+
+ /* Return the saved siginfo associated with PTID. */
+-struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
++siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
+
+ /* Compute and return the processor core of a given thread. */
+ int linux_nat_core_of_thread_1 (ptid_t ptid);
+Index: gdb-7.4.1/gdb/linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/linux-tdep.c 2012-01-05 20:43:19.000000000 -0800
++++ gdb-7.4.1/gdb/linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
+@@ -150,7 +150,7 @@
+ append_composite_type_field (type, "si_fd", int_type);
+ append_composite_type_field (sifields_type, "_sigpoll", type);
+
+- /* struct siginfo */
++ /* siginfo_t */
+ siginfo_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
+ TYPE_NAME (siginfo_type) = xstrdup ("siginfo");
+ append_composite_type_field (siginfo_type, "si_signo", int_type);
+Index: gdb-7.4.1/gdb/mips-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/mips-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800
++++ gdb-7.4.1/gdb/mips-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
+@@ -905,7 +905,7 @@
+ struct rt_sigframe {
+ u32 rs_ass[4]; [argument save space for o32]
+ u32 rs_code[2] [signal trampoline or fill]
+- struct siginfo rs_info;
++ siginfo_t rs_info;
+ struct ucontext rs_uc;
+ };
+
+@@ -1033,7 +1033,7 @@
+ struct rt_sigframe_n32 {
+ u32 rs_ass[4]; [ argument save space for o32 ]
+ u32 rs_code[2]; [ signal trampoline or fill ]
+- struct siginfo rs_info;
++ siginfo_t rs_info;
+ struct ucontextn32 rs_uc;
+ };
+
+@@ -1048,7 +1048,7 @@
+ struct rt_sigframe {
+ u32 rs_ass[4]; [ argument save space for o32 ]
+ u32 rs_code[2]; [ signal trampoline ]
+- struct siginfo rs_info;
++ siginfo_t rs_info;
+ struct ucontext rs_uc;
+ };
+
+Index: gdb-7.4.1/gdb/mn10300-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/mn10300-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800
++++ gdb-7.4.1/gdb/mn10300-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
+@@ -528,9 +528,9 @@
+ {
+ void (*pretcode)(void);
+ int sig;
+- struct siginfo *pinfo;
++ siginfo_t *pinfo;
+ void *puc;
+- struct siginfo info;
++ siginfo_t info;
+ struct ucontext uc;
+ struct fpucontext fpuctx;
+ char retcode[8];
+Index: gdb-7.4.1/gdb/ppc-linux-nat.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/ppc-linux-nat.c 2012-01-05 20:43:22.000000000 -0800
++++ gdb-7.4.1/gdb/ppc-linux-nat.c 2012-07-03 10:12:30.158227388 -0700
+@@ -2213,7 +2213,7 @@
+ static int
+ ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+ {
+- struct siginfo *siginfo_p;
++ siginfo_t *siginfo_p;
+
+ siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+
+Index: gdb-7.4.1/gdb/procfs.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/procfs.c 2012-01-05 20:43:25.000000000 -0800
++++ gdb-7.4.1/gdb/procfs.c 2012-07-03 10:12:30.158227388 -0700
+@@ -262,7 +262,7 @@
+ #ifdef HAVE_PR_SIGINFO64_T
+ typedef pr_siginfo64_t gdb_siginfo_t;
+ #else
+-typedef struct siginfo gdb_siginfo_t;
++typedef siginfo_t gdb_siginfo_t;
+ #endif
+
+ /* On mips-irix, praddset and prdelset are defined in such a way that
+Index: gdb-7.4.1/gdb/tic6x-linux-tdep.c
+===================================================================
+--- gdb-7.4.1.orig/gdb/tic6x-linux-tdep.c 2012-01-05 20:54:31.000000000 -0800
++++ gdb-7.4.1/gdb/tic6x-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
+@@ -34,7 +34,7 @@
+
+ /* The offset from rt_sigframe pointer to SP register. */
+ #define TIC6X_SP_RT_SIGFRAME 8
+-/* Size of struct siginfo info. */
++/* Size of siginfo_t info. */
+ #define TIC6X_SIGINFO_SIZE 128
+ /* Size of type stack_t, which contains three fields of type void*, int, and
+ size_t respectively. */
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* [CONSOLIDATED PULL 30/30] busybox: Include sys/resource.h for rusage definition
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (28 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 29/30] gdb: Replace struct siginfo with proper siginfo_t Saul Wold
@ 2012-07-16 15:47 ` Saul Wold
2012-07-17 9:28 ` [CONSOLIDATED PULL 00/30] Fixes and Updates Richard Purdie
30 siblings, 0 replies; 39+ messages in thread
From: Saul Wold @ 2012-07-16 15:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Seen with eglibc 2.16
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../busybox/busybox-1.19.4/sys_resource.patch | 99 ++++++++++++++++++++
meta/recipes-core/busybox/busybox_1.19.4.bb | 3 +-
2 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch b/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch
new file mode 100644
index 0000000..bd55961
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox-1.19.4/sys_resource.patch
@@ -0,0 +1,99 @@
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 06 Jul 2012 03:19:09 +0000
+Subject: include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header. This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+Index: busybox-1.19.4/loginutils/passwd.c
+===================================================================
+--- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800
++++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700
+@@ -15,6 +15,7 @@
+
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+
+ static void nuke_str(char *str)
+ {
+Index: busybox-1.19.4/miscutils/time.c
+===================================================================
+--- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800
++++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700
+@@ -16,6 +16,7 @@
+ //usage: "\n -v Verbose"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+
+ /* Information on the resources used by a child process. */
+ typedef struct {
+Index: busybox-1.19.4/networking/inetd.c
+===================================================================
+--- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800
++++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700
+@@ -165,6 +165,7 @@
+ //usage: "\n (default: 0 - disabled)"
+
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ #include <sys/un.h>
+
+ #include "libbb.h"
+Index: busybox-1.19.4/networking/ntpd.c
+===================================================================
+--- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800
++++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+Index: busybox-1.19.4/networking/ntpd_simple.c
+===================================================================
+--- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800
++++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700
+@@ -7,6 +7,7 @@
+ */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+Index: busybox-1.19.4/runit/chpst.c
+===================================================================
+--- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800
++++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700
+@@ -91,6 +91,7 @@
+ //usage: "\n a SIGXCPU after N seconds"
+
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+Index: busybox-1.19.4/shell/shell_common.c
+===================================================================
+--- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800
++++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700
+@@ -18,6 +18,7 @@
+ */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index de331ad..4271c67 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r8"
+PR = "r9"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://B921600.patch \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://run-parts.in.usr-bin.patch \
file://watch.in.usr-bin.patch \
file://busybox-udhcpc-no_deconfig.patch \
+ file://sys_resource.patch \
file://find-touchscreen.sh \
file://busybox-cron \
file://busybox-httpd \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [CONSOLIDATED PULL 00/30] Fixes and Updates
2012-07-16 15:47 [CONSOLIDATED PULL 00/30] Fixes and Updates Saul Wold
` (29 preceding siblings ...)
2012-07-16 15:47 ` [CONSOLIDATED PULL 30/30] busybox: Include sys/resource.h for rusage definition Saul Wold
@ 2012-07-17 9:28 ` Richard Purdie
30 siblings, 0 replies; 39+ messages in thread
From: Richard Purdie @ 2012-07-17 9:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2012-07-16 at 08:47 -0700, Saul Wold wrote:
> Richard,
>
> This is a load of tested changes from the last week. It's
> been a long time coming since I had tried to pull in Khem's
> Eglibc changes with Nitin's automake changes.
>
> I have seperated those out and will test them again as they
> were a bit of a moving target last week.
>
> I did have to tweak on of your patches as it did not apply
> correctly.
>
> I have also started to add my own Signed-off-by as noted by a
> couple of people that I should be doing that.
>
> Thanks
> Sau!
I've merged these. The patch of mine you tweaked ended up corrupted
(mixed in some of Khem's changes) but I fixed it :).
Cheers,
Richard
^ permalink raw reply [flat|nested] 39+ messages in thread