* [PATCH 3/6] machine/include/tune-atom.inc: add atom-specific settings
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Atom tunings are currently the same as core2; this patch changes them
to make use of atom-specific settings such as the atom arch and
instruction support in gcc.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-atom.inc | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 5e1bb74..ab4aa14 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -1,2 +1,24 @@
-# Atom tunings are the same as core2 for now...
-require conf/machine/include/tune-core2.inc
+DEFAULTTUNE ?= "atom"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "atom", "atom-64", d)}"
+
+require conf/machine/include/tune-i586.inc
+
+# Extra tune features
+TUNEVALID[atom] = "Enable atom-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "atom", "-march=atom -mssse3 -mfpmath=sse", "", d)}"
+
+# Extra tune selections
+AVAILTUNES += "atom"
+TUNE_FEATURES_tune-atom ?= "${TUNE_FEATURES_tune-x86} atom"
+BASE_LIB_tune-atom ?= "lib"
+PACKAGE_EXTRA_ARCHS_tune-atom = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 i686 atom"
+
+AVAILTUNES += "atom-64"
+TUNE_FEATURES_tune-atom-64 ?= "${TUNE_FEATURES_tune-x86-64} atom"
+BASE_LIB_tune-atom-64 ?= "lib64"
+PACKAGE_EXTRA_ARCHS_tune-atom-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} atom-64"
+
+AVAILTUNES += "atom-64-x32"
+TUNE_FEATURES_tune-atom-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} atom"
+BASE_LIB_tune-atom-64-x32 ?= "libx32"
+PACKAGE_EXTRA_ARCHS_tune-atom-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} atom-64-x32"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 4/6] gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
CC_FOR_BUILD was compiling the test programs using the target's
compile options and executing those on the host, causing errors such
as:
/bin/sh: line 1: 15032 Illegal instruction ./gen-bases table 64 0 > mpn/mp_bases.c
/bin/sh: line 1: 15033 Illegal instruction ./gen-bases header 64 0 > mp_bases.h
Export CC_FOR_BUILD using BUILD_CC to fix the problem.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-support/gmp/gmp_5.0.2.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.2.bb
index 03fef45..16bdcbc 100644
--- a/meta/recipes-support/gmp/gmp_5.0.2.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.2.bb
@@ -2,11 +2,12 @@ require gmp.inc
LICENSE="LGPLv3&GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://version.c;endline=18;md5=d8c56b52b9092346b9f93b4da65ef790"
-PR = "r0"
+PR = "r1"
SRC_URI_append += "file://sh4-asmfix.patch \
file://use-includedir.patch "
+export CC_FOR_BUILD = "${BUILD_CC}"
SRC_URI[md5sum] = "0bbaedc82fb30315b06b1588b9077cd3"
SRC_URI[sha256sum] = "dbc2db76fdd4e99f85d5e35aa378ed62c283e0d586b91bd8703aff75a7804c28"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/6] tune-corei7: Add tune file for Intel Core i7 machines
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Add a tune file for Intel Core i7 machines both with and without AVX
support.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-corei7.inc | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/machine/include/tune-corei7.inc
diff --git a/meta/conf/machine/include/tune-corei7.inc b/meta/conf/machine/include/tune-corei7.inc
new file mode 100644
index 0000000..2e0c67f
--- /dev/null
+++ b/meta/conf/machine/include/tune-corei7.inc
@@ -0,0 +1,17 @@
+DEFAULTTUNE ?= "corei7"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "avx", "corei7-avx", "corei7", d)}"
+
+require conf/machine/include/tune-x86_64.inc
+
+TUNEVALID[corei7] = "Enable corei7-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "corei7", "-march=corei7${COREI7_AVX}", "", d)}"
+
+COREI7_AVX = "${@bb.utils.contains("TUNE_FEATURES", [ "corei7", "avx" ], "-avx", "", d)}"
+
+AVAILTUNES += "corei7"
+TUNE_FEATURES_tune-corei7 = "${TUNE_FEATURES_tune-x86-64} corei7"
+PACKAGE_EXTRA_ARCHS_tune-corei7 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} corei7"
+
+AVAILTUNES += "corei7-avx"
+TUNE_FEATURES_tune-corei7-avx = "${TUNE_FEATURES_tune-x86-64} corei7 avx"
+PACKAGE_EXTRA_ARCHS_tune-corei7-avx = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} corei7-avx"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 2/6] tune-ivb: Add tune file for Intel Ivy Bridge machines
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Add a tune file for Intel Ivy Bridge machines.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/conf/machine/include/tune-ivb.inc | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/machine/include/tune-ivb.inc
diff --git a/meta/conf/machine/include/tune-ivb.inc b/meta/conf/machine/include/tune-ivb.inc
new file mode 100644
index 0000000..3c0b670
--- /dev/null
+++ b/meta/conf/machine/include/tune-ivb.inc
@@ -0,0 +1,11 @@
+DEFAULTTUNE ?= "ivb"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "ivb", "ivb", "", d)}"
+
+require conf/machine/include/tune-x86_64.inc
+
+TUNEVALID[ivb] = "Enable ivb-specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ivb", "-march=core-avx-i", "", d)}"
+
+AVAILTUNES += "ivb"
+TUNE_FEATURES_tune-ivb = "${TUNE_FEATURES_tune-x86-64} ivb"
+PACKAGE_EXTRA_ARCHS_tune-ivb = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} ivb"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 6/6] python: skip setup.py
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
build_extension() in setup.py, as part of the build process, does an
'import check' on the built extension. The import check in turn
dlopen()'s the shared library associated with the extension, which
isn't something that makes sense if that library was cross-compiled
for a different architecture.
This was noticed with an x86_64 target that was compiled with avx
support, because it caused 'illegal instruction' exceptions:
| /bin/sh: line 1: 14575 Illegal instruction ... -E ./setup.py -q build
For other target architectures, it doesn't necessarily cause illegal
instruction exceptions, but still fails. For example, on arm, the
failure pathway causes this warning:
*** WARNING: renaming "cmath" since importing it failed: .../cmath.so:
wrong ELF class: ELFCLASS32
This patch to setup.py and the associated recipe changes allow the
whole 'import check' logic to be skipped when cross-compiling.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.7.2.bb | 7 ++++-
2 files changed, 33 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
new file mode 100644
index 0000000..6ccdb94
--- /dev/null
+++ b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
@@ -0,0 +1,27 @@
+This patch skips over the 'import check' setup.py does when building
+extensions. This generally won't work when cross-compiling.
+
+Upstream-Status: Inappropriate [embedded-specific]
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: Python-2.7.2/setup.py
+===================================================================
+--- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500
++++ Python-2.7.2/setup.py 2011-11-04 16:59:49.692802313 -0500
+@@ -287,6 +287,15 @@
+ (ext.name, sys.exc_info()[1]))
+ self.failed.append(ext.name)
+ return
++
++ # If we're cross-compiling, we want to skip the import check
++ # i.e. we shouldn't be dynamically loading target shared libs
++ if os.environ.get('CROSS_COMPILE') is not None:
++ self.announce(
++ 'WARNING: skipping import check for cross-compiled "%s"' %
++ ext.name)
++ return
++
+ # Workaround for Mac OS X: The Carbon-based modules cannot be
+ # reliably imported into a command-line Python
+ if 'Carbon' in ext.extra_link_args:
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 45d8350..0981d5b 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -18,6 +18,7 @@ SRC_URI += "\
file://multilib.patch \
file://cgi_py.patch \
file://remove_sqlite_rpath.patch \
+ file://setup_py_skip_cross_import_check.patch \
"
S = "${WORKDIR}/Python-${PV}"
@@ -57,6 +58,8 @@ do_compile() {
# then call do_install twice we get Makefile.orig == Makefile.sysroot
install -m 0644 Makefile Makefile.sysroot
+ export CROSS_COMPILE="${TARGET_PREFIX}"
+
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
STAGING_LIBDIR=${STAGING_LIBDIR} \
@@ -78,6 +81,8 @@ do_install() {
# make install needs the original Makefile, or otherwise the inclues would
# go to ${D}${STAGING...}/...
install -m 0644 Makefile.orig Makefile
+
+ export CROSS_COMPILE="${TARGET_PREFIX}"
oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
--
1.7.0.4
^ permalink raw reply related
* [PATCH 5/6] libzypp: fix mishandling of hyphenated arches
From: tom.zanussi @ 2011-11-07 15:53 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
From: Tom Zanussi <tom.zanussi@intel.com>
Several hyphen-to-underscore translations were missing, causing
compiler errors trying to build arches with hyphens in their names.
This adds the missing translations.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-extended/libzypp/libzypp_git.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 20e8f7c..a6b270c 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
S = "${WORKDIR}/git"
SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
PV = "0.0-git${SRCPV}"
-PR = "r15"
+PR = "r16"
SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
file://no-doc.patch \
@@ -98,10 +98,10 @@ do_archgen () {
esac
if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "(_${each_arch});" >> zypp/oe-arch.h
+ echo "(_${each_arch});" | tr - _ >> zypp/oe-arch.h
else
echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h
- echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h
+ echo "( IdString ( \"${each_arch}\" ) );" | tr - _ >> zypp/oe-arch.h
fi
done
echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h
@@ -142,7 +142,7 @@ do_archgen () {
COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
done
for each_compat in ${COMPAT_WITH} ; do
- echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h
+ echo " defCompatibleWith( ${each_compat} );" | tr - _ >> zypp/oe-arch.h
done
echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h
echo "" >> zypp/oe-arch.h
--
1.7.0.4
^ permalink raw reply related
* Re: [PATCH] lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
From: Saul Wold @ 2011-11-07 17:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1320416813-22888-1-git-send-email-koen@dominion.thruhere.net>
On 11/04/2011 07:26 AM, Koen Kooi wrote:
> As Martin Jansa pointed out before, bitbake will silently peek in DL_DIR before FILESPATH and use files from there if found.
>
> The failure mode for lighttpd involves a 404 redirect placing index.html into DL_DIR, which will end up in the lighttpd packages. In my specific case iproute2 hit the linuxfoundation 404 redirect so lighttpd.ipk now serves the linuxfoundation frontpage :)
>
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
> meta/recipes-extended/lighttpd/files/index.html | 1 -
> .../lighttpd/files/index.html.lighttpd | 1 +
> meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb | 6 +++---
> 3 files changed, 4 insertions(+), 4 deletions(-)
> delete mode 100644 meta/recipes-extended/lighttpd/files/index.html
> create mode 100644 meta/recipes-extended/lighttpd/files/index.html.lighttpd
>
> diff --git a/meta/recipes-extended/lighttpd/files/index.html b/meta/recipes-extended/lighttpd/files/index.html
> deleted file mode 100644
> index cd25bf1..0000000
> --- a/meta/recipes-extended/lighttpd/files/index.html
> +++ /dev/null
> @@ -1 +0,0 @@
> -<html><body><h1>It works!</h1></body></html>
> \ No newline at end of file
> diff --git a/meta/recipes-extended/lighttpd/files/index.html.lighttpd b/meta/recipes-extended/lighttpd/files/index.html.lighttpd
> new file mode 100644
> index 0000000..cd25bf1
> --- /dev/null
> +++ b/meta/recipes-extended/lighttpd/files/index.html.lighttpd
> @@ -0,0 +1 @@
> +<html><body><h1>It works!</h1></body></html>
> \ No newline at end of file
> diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
> index c1d5f81..9fdb5f6 100644
> --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
> +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb
> @@ -16,10 +16,10 @@ RDEPENDS_${PN} += " \
> lighttpd-module-staticfile \
> "
>
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \
> - file://index.html \
> + file://index.html.lighttpd \
> file://lighttpd.conf \
> file://lighttpd \
> "
> @@ -48,7 +48,7 @@ do_install_append() {
> install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var
> install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
> install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
> - install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/
> + install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
> }
>
> FILES_${PN} += "${sysconfdir} /www"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 0/3] Misc fixes
From: Saul Wold @ 2011-11-07 17:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Paul Eggleton
In-Reply-To: <cover.1320429060.git.paul.eggleton@linux.intel.com>
On 11/04/2011 10:52 AM, Paul Eggleton wrote:
> The following changes since commit f01fbc17b5d9bf9a227d64fe858014376cd19432:
>
> avahi: fix useradd race condition (2011-11-03 14:48:42 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/fixes8
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes8
>
> Paul Eggleton (3):
> allarch.bbclass: disable shlib and debug symbol processing
> core-image-minimal-initramfs: force IMAGE_FSTYPES
> qemugl: switch to new git repo
>
> meta/classes/allarch.bbclass | 5 +++++
> .../images/core-image-minimal-initramfs.bb | 1 +
> meta/recipes-graphics/mesa/qemugl_git.bb | 2 +-
> 3 files changed, 7 insertions(+), 1 deletions(-)
>
Merged into OE-Core with tweak to IMAGE_FSTYPES as suggested
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH v2] dtc: update to latest git version
From: Saul Wold @ 2011-11-07 17:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <1320169056-19008-1-git-send-email-msm@freescale.com>
On 11/01/2011 10:37 AM, Matthew McClintock wrote:
> Also remove patches that are no longer needed, as well as use the
> installation that is provided by the Makefile. Put all the extra
> stuff in a new dtc-misc package
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
> meta/recipes-kernel/dtc/dtc.inc | 12 ++--
> .../dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 --------------------
> meta/recipes-kernel/dtc/dtc/remove_space_opt.patch | 18 -------
> meta/recipes-kernel/dtc/dtc_git.bb | 10 +---
> 4 files changed, 9 insertions(+), 82 deletions(-)
> delete mode 100644 meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
> delete mode 100644 meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
>
> diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
> index eae46ac..0f45d5f 100644
> --- a/meta/recipes-kernel/dtc/dtc.inc
> +++ b/meta/recipes-kernel/dtc/dtc.inc
> @@ -6,13 +6,13 @@ DEPENDS = "flex-native bison-native"
>
> inherit autotools
>
> -do_install() {
> - install -m 0755 -d ${D}${bindir}
> - install -m 755 dtc ${D}${bindir}/dtc
> -}
> SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
> - file://fix_for_compilation_with_gcc_4.6.0.patch"
> + "
>
> -INC_PR = "r0"
> +EXTRA_OEMAKE='PREFIX="${prefix}"'
> +INC_PR = "r1"
>
> S = "${WORKDIR}/git"
> +
> +PACKAGES =+ "${PN}-misc"
> +FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff"
> diff --git a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch b/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
> deleted file mode 100644
> index b34894d..0000000
> --- a/meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -Upstream-Status: Pending
> -
> -Fix following compilation errors with gcc 4.6.0
> -| dtc.c: In function 'main':
> -| dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable]
> -| cc1: all warnings being treated as errors
> -|
> -| make: *** [dtc.o] Error 1
> -| make: *** Waiting for unfinished jobs....
> -| flattree.c: In function 'flat_read_mem_reserve':
> -| flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable]
> -| cc1: all warnings being treated as errors
> -|
> -| make: *** [flattree.o] Error 1
> -| ERROR: oe_runmake failed
> -
> -Nitin A Kamble<nitin.a.kamble@intel.com> 2011/05/10
> -
> -Index: git/dtc.c
> -===================================================================
> ---- git.orig/dtc.c
> -+++ git/dtc.c
> -@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
> - const char *inform = "dts";
> - const char *outform = "dts";
> - const char *outname = "-";
> -- int force = 0, check = 0;
> -+ int force = 0, __attribute__((__unused__)) check = 0;
> - const char *arg;
> - int opt;
> - FILE *outf = NULL;
> -Index: git/flattree.c
> -===================================================================
> ---- git.orig/flattree.c
> -+++ git/flattree.c
> -@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me
> - {
> - struct reserve_info *reservelist = NULL;
> - struct reserve_info *new;
> -- const char *p;
> - struct fdt_reserve_entry re;
> -
> - /*
> -@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me
> - *
> - * First pass, count entries.
> - */
> -- p = inb->ptr;
> - while (1) {
> - flat_read_chunk(inb,&re, sizeof(re));
> - re.address = fdt64_to_cpu(re.address);
> diff --git a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch b/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
> deleted file mode 100644
> index 8c26dec..0000000
> --- a/meta/recipes-kernel/dtc/dtc/remove_space_opt.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Remove the -Os flag
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Saul Wold<sgw@linux.intel.com>
> -Index: git/Makefile
> -===================================================================
> ---- git.orig/Makefile
> -+++ git/Makefile
> -@@ -18,7 +18,7 @@ CONFIG_LOCALVERSION =
> - CPPFLAGS = -I libfdt
> - WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> - -Wstrict-prototypes -Wmissing-prototypes
> --CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
> -+CFLAGS = -g -fPIC -Werror $(WARNINGS)
> -
> - BISON = bison
> - LEX = flex
> diff --git a/meta/recipes-kernel/dtc/dtc_git.bb b/meta/recipes-kernel/dtc/dtc_git.bb
> index e010488..c205de7 100644
> --- a/meta/recipes-kernel/dtc/dtc_git.bb
> +++ b/meta/recipes-kernel/dtc/dtc_git.bb
> @@ -3,14 +3,10 @@ require dtc.inc
> LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
> file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
>
> -SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
> +SRCREV = "033089f29099bdfd5c2d6986cdb9fd07b16cfde0"
> PV = "1.3.0+git${SRCPV}"
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
> S = "${WORKDIR}/git"
>
> -SRC_URI_PATCH = " file://remove_space_opt.patch"
> -SRC_URI_PATCH_virtclass-native = ""
> -SRC_URI += "${SRC_URI_PATCH}"
> -
> -BBCLASSEXTEND = "native"
> +BBCLASSEXTEND = "native nativesdk"
Merged v2 into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 0/1] linux-yocto: update base to v3.0.8 + meta config changes
From: Saul Wold @ 2011-11-07 17:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: dvhart
In-Reply-To: <cover.1320340081.git.bruce.ashfield@windriver.com>
On 11/03/2011 10:11 AM, Bruce Ashfield wrote:
> Richard/Saul,
>
> Here's a bump to 3.0.8 for the 3.0 kernel, and some config changes from TomZ.
> These are destined for master and separate from any point updates to the 1.1
> release.
>
> In case anyone cares my -dev kernel also has these changes, and it will take
> them to the latest kernel shortly.
>
> This also doesn't bump the preempt-rt branches, since they'll be updated
> to the new -rt first, before taking the 3.0.x stable updates.
>
> Built and booted for all the qemu targets.
>
> cc: Tom Zanussi<tom.zanussi@intel.com>
> cc: Darren Hart<dvhart@linux.intel.com>
>
> Cheers,
>
> Bruce
>
> The following changes since commit 9b76e6a2cfc5a4d779f3b06e3acc5ff7b8275470:
>
> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:28 +0000)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib zedd/kernel
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
>
> Bruce Ashfield (1):
> linux-yocto_3.0: update base to v3.0.8 + meta config changes
>
> meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
> meta/recipes-kernel/linux/linux-yocto_3.0.bb | 18 +++++++++---------
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 1/1] [Yocto Bug 1700] Fix for buildstats on tmpfs
From: Saul Wold @ 2011-11-07 17:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <ac412c93c681ef335970a678465aa015164f1015.1320190748.git.elizabeth.flanagan@intel.com>
On 11/01/2011 11:41 PM, Beth Flanagan wrote:
> From: Elizabeth Flanagan<elizabeth.flanagan@intel.com>
>
> tmpfs/encryptfs/(and most likely, but not confirmed)ramfs TMPDIRs
> cause diskstats to choke. No device entry ends up in /proc/diskstats
> for these fs types, which ends up causing the failure.
>
> The short term solution is to exclude these fs types from diskstat
> collection. Longer term we will want to see if we can collect
> meaningful diskio for each of these, and other, use cases, but for
> this cleans up Bug 1700.
>
> Signed-off-by: Elizabeth Flanagan<elizabeth.flanagan@intel.com>
> ---
> meta/classes/buildstats.bbclass | 37 ++++++++++++++++++++++++++-----------
> 1 files changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
> index 55cbb3c..96c98d4 100644
> --- a/meta/classes/buildstats.bbclass
> +++ b/meta/classes/buildstats.bbclass
> @@ -48,13 +48,24 @@ def set_device(e):
> # something like stick DL_DIR on a different partition and this would
> # throw stats gathering off. The same goes with SSTATE_DIR. However, let's
> # get the basics in here and work on the cornercases later.
> + # A note. /proc/diskstats does not contain info on encryptfs, tmpfs, etc.
> + # If we end up hitting one of these fs, we'll just skip diskstats collection.
> ############################################################################
> device=os.stat(tmpdir)
> majordev=os.major(device.st_dev)
> minordev=os.minor(device.st_dev)
> + ############################################################################
> + # Bug 1700:
> + # Because tmpfs/encryptfs/ramfs etc inserts no entry in /proc/diskstats
> + # we set rdev to NoLogicalDevice and search for it later. If we find NLD
> + # we do not collect diskstats as the method to collect meaningful statistics
> + # for these fs types requires a bit more research.
> + ############################################################################
> for line in open("/proc/diskstats", "r"):
> if majordev == int(line.split()[0]) and minordev == int(line.split()[1]):
> rdev=line.split()[2]
> + else:
> + rdev="NoLogicalDevice"
> file = open(bb.data.getVar('DEVFILE', e.data, True), "w")
> file.write(rdev)
> file.close()
> @@ -133,10 +144,11 @@ def write_task_data(status, logfile, dev, e):
> # For the best information, running things with BB_TOTAL_THREADS = "1"
> # would return accurate per task results.
> ############################################################################
> - diskdata = get_diskdata("__diskdata_task", dev, e.data)
> - if diskdata:
> - for key in sorted(diskdata.iterkeys()):
> - file.write(key + ": " + diskdata[key] + "\n")
> + if dev != "NoLogicalDevice":
> + diskdata = get_diskdata("__diskdata_task", dev, e.data)
> + if diskdata:
> + for key in sorted(diskdata.iterkeys()):
> + file.write(key + ": " + diskdata[key] + "\n")
> if status is "passed":
> file.write("Status: PASSED \n")
> else:
> @@ -169,7 +181,8 @@ python run_buildstats () {
> bb.mkdirhier(bsdir)
> except:
> pass
> - set_diskdata("__diskdata_build", device, e.data)
> + if device != "NoLogicalDevice":
> + set_diskdata("__diskdata_build", device, e.data)
> set_timedata("__timedata_build", e.data)
> build_time = os.path.join(bsdir, "build_stats")
> # write start of build into build_time
> @@ -185,7 +198,7 @@ python run_buildstats () {
>
> elif isinstance(e, bb.event.BuildCompleted):
> bn = get_bn(e)
> - dev = get_device(e)
> + device = get_device(e)
> bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
> taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
> build_time = os.path.join(bsdir, "build_stats")
> @@ -201,10 +214,11 @@ python run_buildstats () {
> file.write("Elapsed time: %0.2f seconds \n" % (time))
> if cpu:
> file.write("CPU usage: %0.1f%% \n" % cpu)
> - diskio = get_diskdata("__diskdata_build", dev, e.data)
> - if diskio:
> - for key in sorted(diskio.iterkeys()):
> - file.write(key + ": " + diskio[key] + "\n")
> + if device != "NoLogicalDevice":
> + diskio = get_diskdata("__diskdata_build", device, e.data)
> + if diskio:
> + for key in sorted(diskio.iterkeys()):
> + file.write(key + ": " + diskio[key] + "\n")
> file.close()
>
> if isinstance(e, bb.build.TaskStarted):
> @@ -212,7 +226,8 @@ python run_buildstats () {
> device = get_device(e)
> bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
> taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
> - set_diskdata("__diskdata_task", device, e.data)
> + if device != "NoLogicalDevice":
> + set_diskdata("__diskdata_task", device, e.data)
> set_timedata("__timedata_task", e.data)
> try:
> bb.mkdirhier(taskdir)
Merged into OE-Core with minor tweak to fix commit message formating
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] udev-164: Update init script to do an explicit add action
From: Saul Wold @ 2011-11-07 17:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320218594-13009-1-git-send-email-galak@kernel.crashing.org>
On 11/02/2011 12:23 AM, Kumar Gala wrote:
> With udev 152 or greater the default action for 'udevadm trigger' was
> modified to be 'change' instead of 'add.
>
> To ensure initial coldplug events at boot are seen be scripts the are
> expecting them as 'add' events we invoke udevadm with an explicit
> '--action=add'.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
> meta/recipes-core/udev/udev-164/init | 4 ++--
> meta/recipes-core/udev/udev_164.bb | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/udev/udev-164/init b/meta/recipes-core/udev/udev-164/init
> index 9ce95ee..073942f 100644
> --- a/meta/recipes-core/udev/udev-164/init
> +++ b/meta/recipes-core/udev/udev-164/init
> @@ -48,10 +48,10 @@ kill_udevd> "/dev/null" 2>&1
>
> /sbin/udevadm control --env=STARTUP=1
> if [ "$not_first_boot" != "" ];then
> - /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
> + /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
> (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)&
> else
> - /sbin/udevadm trigger
> + /sbin/udevadm trigger --action=add
> /sbin/udevadm settle
> fi
>
> diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
> index 7cbe4d8..d487add 100644
> --- a/meta/recipes-core/udev/udev_164.bb
> +++ b/meta/recipes-core/udev/udev_164.bb
> @@ -1,6 +1,6 @@
> include udev-new.inc
>
> -PR = "r6"
> +PR = "r7"
>
> SRC_URI += "file://udev-166-v4l1-1.patch"
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] tslib: fix the bug with loading libts-1.0.so
From: Saul Wold @ 2011-11-07 18:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320235399-15434-1-git-send-email-dima_ch@emcraft.com>
On 11/02/2011 05:03 AM, Dmitry Cherukhin wrote:
> Touchpad did not work in the qtdemoE if the library libts-1.0.so was not loaded
> manually using the LD_PRELOAD variable. This problem was fixed in the tslib mainline
> https://github.com/kergoth/tslib after the 1.0 release. We just import the patch.
>
> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> ---
> .../tslib/0001-Link-plugins-against-libts.patch | 57 ++++++++++++++++++++
> meta/recipes-graphics/tslib/tslib_1.0.bb | 3 +-
> 2 files changed, 59 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
>
> diff --git a/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
> new file mode 100644
> index 0000000..c6b9f59
> --- /dev/null
> +++ b/meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
> @@ -0,0 +1,57 @@
> +From 9623bbedf4ff409e5036edfcfe52b2595932a6d7 Mon Sep 17 00:00:00 2001
> +From: Chris Larson<clarson@kergoth.com>
> +Date: Sat, 1 Nov 2008 20:46:07 +0000
> +Subject: [PATCH] Link plugins against libts
> +
> +Some plugins use tslib functions. Link those plugins against libts.
> +The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
> +Without this change DirectFB in unable to use tslib because symbols
> +in the tslib plugins can't be resolved.
> +
> +Signed-off-by: Ville Syrjala<syrjala@sci.fi>
> +Signed-off-by: Chris Larson<clarson@kergoth.com>
> +
> +The patch was imported from git server git://github.com/kergoth/tslib.git
> +as of commit id 9623bbedf4ff409e5036edfcfe52b2595932a6d7.
> +
> +Upstream-Status: Accepted
> +Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> +---
> + plugins/Makefile.am | 5 +++++
> + 1 files changed, 5 insertions(+), 0 deletions(-)
> +
> +diff --git a/plugins/Makefile.am b/plugins/Makefile.am
> +index 3b902c2..4c4ef8b 100644
> +--- a/plugins/Makefile.am
> ++++ b/plugins/Makefile.am
> +@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
> +
> + variance_la_SOURCES = variance.c
> + variance_la_LDFLAGS = -module $(LTVSN)
> ++variance_la_LIBADD = $(top_builddir)/src/libts.la
> +
> + dejitter_la_SOURCES = dejitter.c
> + dejitter_la_LDFLAGS = -module $(LTVSN)
> ++dejitter_la_LIBADD = $(top_builddir)/src/libts.la
> +
> + linear_la_SOURCES = linear.c
> + linear_la_LDFLAGS = -module $(LTVSN)
> ++linear_la_LIBADD = $(top_builddir)/src/libts.la
> +
> + pthres_la_SOURCES = pthres.c
> + pthres_la_LDFLAGS = -module $(LTVSN)
> ++pthres_la_LIBADD = $(top_builddir)/src/libts.la
> +
> + # hw access
> + corgi_la_SOURCES = corgi-raw.c
> +@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
> +
> + input_la_SOURCES = input-raw.c
> + input_la_LDFLAGS = -module $(LTVSN)
> ++input_la_LIBADD = $(top_builddir)/src/libts.la
> +
> + linear_h2200_la_SOURCES = linear-h2200.c
> + linear_h2200_la_LDFLAGS = -module $(LTVSN)
> +--
> +1.7.6.4
> +
> diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
> index ad9bfa7..b2315ff 100644
> --- a/meta/recipes-graphics/tslib/tslib_1.0.bb
> +++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
> @@ -10,10 +10,11 @@ SECTION = "base"
> LICENSE = "LGPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
>
> -PR = "r18"
> +PR = "r19"
>
> SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
> file://fix_version.patch \
> + file://0001-Link-plugins-against-libts.patch \
> file://ts.conf \
> file://tslib.sh"
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: useradd changes to dbus, base-passwd
From: Scott Garman @ 2011-11-07 18:24 UTC (permalink / raw)
To: Eric Bénard; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4EB79894.3050209@eukrea.com>
On 11/07/2011 12:36 AM, Eric Bénard wrote:
> Hi Scott,
>
> Le 07/11/2011 00:16, Scott Garman a écrit :
>> This looks good, thank you! Two questions though:
>>
>> When I was testing my own variation of this fix out, I found that testing
>> bb.data.inherits_class('nativesdk', d) did not work as I expected. It
>> returned
>> false for a recipe I was testing with that used BBCLASSEXTEND = "native
>> nativesdk". So instead I was checking if PN ended with -nativesdk. Are
>> you
>> certain the inherits_class test works?
>>
> this seems to work as expected in the present case :
>
> $ grep BBCLASSEXTEND
> sources/openembedded-core/meta/recipes-core/dbus/dbus.inc
> BBCLASSEXTEND = "native nativesdk"
>
> $ bitbake dbus -e |grep ^DEPENDS=
> DEPENDS="pkgconfig-native autoconf-native automake-native libtool-native
> libtool-cross gnu-config-native virtual/gettext gettext-native
> virtual/arm-angstrom-linux-gnueabi-gcc
> virtual/arm-angstrom-linux-gnueabi-compilerlibs virtual/libc expat
> virtual/libintl virtual/libx11 libsm shadow-native shadow-sysroot
> base-passwd update-rc.d-native"
>
> $ bitbake dbus-native -e |grep ^DEPENDS=
> DEPENDS="pkgconfig-native autoconf-native automake-native libtool-native
> gnu-config-native gettext-minimal-native expat-native
> virtual/libintl-native shadow-native shadow-sysroot base-passwd
> update-rc.d-native"
>
> $ bitbake dbus-nativesdk -e |grep ^DEPENDS=
> DEPENDS="pkgconfig-native autoconf-native automake-native libtool-native
> libtool-cross gnu-config-native virtual/gettext-nativesdk gettext-native
> virtual/i686-angstromsdk-linux-gcc-crosssdk
> virtual/i686-angstromsdk-linux-compilerlibs-nativesdk
> virtual/libc-nativesdk expat-nativesdk virtual/libintl-nativesdk
> virtual/libx11-nativesdk update-rc.d-native"
>
> $ bitbake dbus-nativesdk -e |grep ^SSTATEPOSTIN
> $ bitbake dbus-native -e |grep ^SSTATEPOSTIN
> SSTATEPOSTINSTFUNCS="useradd_sysroot_sstate"
> $ bitbake dbus -e |grep ^SSTATEPOSTIN
> SSTATEPOSTINSTFUNCS="useradd_sysroot_sstate"
>
>
>> My second question is why the autotools_do_install is needed for the
>> nativesdk
>> case?
>>
> because without the do_install_virtclass-nativesdk() , that's the
> standard do_install which is used which tries to setup some rigths using
> chown on the files and that fails (and is not very useful for a nativesdk).
> Maybe we could use a similar do_install as the one used for native.
Thanks for the explanation and verifying the inherit_class call.
I'm happy to ack a patch for this, please submit it.
Thanks!
Scott
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply
* Re: [PATCH] libcense.bbclass: fix OpenSSL mapping [BUGID# 1712]
From: Saul Wold @ 2011-11-07 18:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <1320236800-6978-1-git-send-email-Martin.Jansa@gmail.com>
On 11/02/2011 05:26 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/classes/license.bbclass | 2 +-
> .../recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index 3f93bf5..baf35f0 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -44,7 +44,7 @@ SPDXLICENSEMAP[MPLv1.1] = "MPL-1"
> SPDXLICENSEMAP[MIT-X] = "MIT"
>
> #Openssl variations
> -SPDXLICENSEMAP[openssl] = "Openssl"
> +SPDXLICENSEMAP[openssl] = "OpenSSL"
>
> #Other variations
> SPDXLICENSEMAP[AFL2.1] = "AFL-2"
> diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
> index 5add70e..555bacf 100644
> --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb
> @@ -1,6 +1,6 @@
> require openssl.inc
>
> -PR = "r6"
> +PR = "r7"
> SRC_URI += "file://debian/ca.patch \
> file://debian/config-hurd.patch;apply=no \
> file://debian/debian-targets.patch \
Merged into OE-Core with a tweak to the commit message formatting
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] image_types bbclass: use 4k bytes per inode so we don't run out of space immediately
From: Saul Wold @ 2011-11-07 18:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1320243402-2116-1-git-send-email-koen@dominion.thruhere.net>
On 11/02/2011 07:16 AM, Koen Kooi wrote:
> genext2fs only creates the minimum number of inodes, after this patch it will scale with the rootfs size
>
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
> meta/classes/image_types.bbclass | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
> index 0d64705..9549a9e 100644
> --- a/meta/classes/image_types.bbclass
> +++ b/meta/classes/image_types.bbclass
> @@ -38,36 +38,36 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLO
>
> IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
>
> -IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
> +IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
> IMAGE_CMD_ext2.gz () {
> rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}&& mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
> gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
> mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
> rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
> }
> IMAGE_CMD_ext2.bz2 () {
> rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&& mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2
> rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
> }
> IMAGE_CMD_ext2.lzma () {
> rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz&& mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> lzma -f -7 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
> mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.lzma ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.lzma
> rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
> }
>
> IMAGE_CMD_ext3 () {
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
> tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
> }
> IMAGE_CMD_ext3.gz () {
> rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}&& mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
> tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
> gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
> mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
> @@ -75,7 +75,7 @@ IMAGE_CMD_ext3.gz () {
> }
>
> oe_mkext4fs () {
> - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
> + genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
> tune2fs -O extents,uninit_bg,dir_index,has_journal $1
> e2fsck -yfDC0 $1 || chk=$?
> case $chk in
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 0/1] distro tracking updates for some recipes
From: Saul Wold @ 2011-11-07 18:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Scott Garman
In-Reply-To: <cover.1320252973.git.scott.a.garman@intel.com>
On 11/02/2011 09:58 AM, Scott Garman wrote:
> Hello,
>
> Now that the date formatting is normalized in the distro tracking file,
> here are updates for the recipes that I recently updated: sudo, mtools,
> grep, and openssh.
>
> The following changes since commit 37579d7d74d127c90c1e078d05c5bf4ba0b3f755:
>
> meta: glib-2.0: don't apply qsort_r test removable patch for native version (2011-11-02 09:08:21 +0000)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib sgarman/distro-tracking
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/distro-tracking
>
> Scott Garman (1):
> distro_tracking_fields: updates for sudo, mtools, grep, and openssh
>
> .../conf/distro/include/distro_tracking_fields.inc | 32 ++++++++++----------
> 1 files changed, 16 insertions(+), 16 deletions(-)
>
Merged int OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] python: improve packaging
From: Saul Wold @ 2011-11-07 18:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <1320274906-2086-1-git-send-email-Martin.Jansa@gmail.com>
On 11/02/2011 04:01 PM, Martin Jansa wrote:
> * move 2to3 to separate package and include lib2to3 (was in python-misc)
> * fix pattern for python-unittest (was in python-misc because it's in subdirectory now)
> * add pydoc_data to python-pydoc (was in python-misc)
> * add more stuff to smtpd, audio, codecs, ctypes, html, io, json, mime,
> pickle, stringold, xmlrpc
> * move all FILES_ details from python recipe to manifest generator so it's in one place
> * added manual line break in FILES_${PN}-core, because git send-email
> doesn't like too long lines
> $ git send-email -1 dfaae65839f0ab23e5b2ae2a68df0f370bca84d2
> fatal: /tmp/k8zbDajUNP/0001-python-improve-packaging.patch: 64: patch contains a line longer than 998 characters
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> .../python/python-2.7-manifest.inc | 43 ++++++++++--------
> meta/recipes-devtools/python/python_2.7.2.bb | 22 +---------
> scripts/contrib/python/generate-manifest-2.7.py | 47 ++++++++++++-------
> 3 files changed, 55 insertions(+), 57 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] connman 0.75: bump PR for iptables library change
From: Saul Wold @ 2011-11-07 18:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1320311143-5693-1-git-send-email-koen@dominion.thruhere.net>
On 11/03/2011 02:05 AM, Koen Kooi wrote:
> connmand[180]: /usr/sbin/connmand: error while loading shared libraries: libxtables.so.5: cannot open shared object file: No such file or directory
>
> $ dpkg-deb -c ipk/armv7a/iptables_1.4.12.1-r0_armv7a.ipk | grep libxtables
> -rwxr-xr-x root/root 35252 2011-11-01 20:16 ./usr/lib/libxtables.so.7.0.0
> lrwxrwxrwx root/root 0 2011-11-01 20:16 ./usr/lib/libxtables.so.7 -> libxtables.so.7.0.0
>
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
> meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
> index 78f2199..c6e911b 100644
> --- a/meta/recipes-connectivity/connman/connman_0.75.bb
> +++ b/meta/recipes-connectivity/connman/connman_0.75.bb
> @@ -1,5 +1,5 @@
> require connman.inc
> -PR = "r3"
> +PR = "r4"
>
> EXTRA_OECONF += "\
> ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] iproute2: update to 3.0.0 to fix build with updated iptables
From: Saul Wold @ 2011-11-07 18:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1320313970-2247-1-git-send-email-koen@dominion.thruhere.net>
On 11/03/2011 02:52 AM, Koen Kooi wrote:
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
> .../configure-cross.patch | 57 +++++++++++++-------
> meta/recipes-connectivity/iproute2/iproute2.inc | 7 ++-
> .../iproute2/iproute2_2.6.38.bb | 9 ---
> .../iproute2/iproute2_3.0.0.bb | 8 +++
> 4 files changed, 51 insertions(+), 30 deletions(-)
> rename meta/recipes-connectivity/iproute2/{iproute2-2.6.38 => iproute2-3.0.0}/configure-cross.patch (50%)
> delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
> create mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
>
> diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
> similarity index 50%
> rename from meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
> rename to meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
> index e26e8ef..92c12be 100644
> --- a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
> +++ b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
> @@ -1,31 +1,38 @@
> +From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
> +From: Koen Kooi<koen@dominion.thruhere.net>
> +Date: Thu, 3 Nov 2011 10:46:16 +0100
> +Subject: [PATCH] make configure cross compile safe
> +
> +According to Kevin Tian:
> Upstream-Status: Pending
>
> -# borrow from OE, to handle cross compile mess
> -#
> -# ktian1, 06/28/2010
> -Index: iproute2-2.6.34/configure
> -===================================================================
> ---- iproute2-2.6.34.orig/configure
> -+++ iproute2-2.6.34/configure
> -@@ -4,7 +4,7 @@
> +Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> +---
> + configure | 13 +++++++------
> + 1 files changed, 7 insertions(+), 6 deletions(-)
> +
> +diff --git a/configure b/configure
> +index f5c3d40..bcc1948 100755
> +--- a/configure
> ++++ b/configure
> +@@ -2,6 +2,7 @@
> + # This is not an autconf generated configure
> + #
> INCLUDE=${1:-"$PWD/include"}
> -
> - TABLES=
> --
> +SYSROOT=$1
> +
> check_atm()
> {
> - cat>/tmp/atmtest.c<<EOF
> -@@ -15,7 +15,7 @@ int main(int argc, char **argv) {
> +@@ -13,7 +14,7 @@ int main(int argc, char **argv) {
> return 0;
> }
> EOF
> -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm>/dev/null 2>&1
> -+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm>/dev/null 2>&1
> ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm>/dev/null 2>&1
> if [ $? -eq 0 ]
> then
> echo "TC_CONFIG_ATM:=y">>Config
> -@@ -49,7 +49,7 @@ int main(int argc, char **argv)
> +@@ -47,7 +48,7 @@ int main(int argc, char **argv)
>
> EOF
>
> @@ -34,7 +41,7 @@ Index: iproute2-2.6.34/configure
> then
> echo "TC_CONFIG_XT:=y">>Config
> echo "using xtables"
> -@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
> +@@ -84,7 +85,7 @@ int main(int argc, char **argv) {
> }
>
> EOF
> @@ -43,7 +50,7 @@ Index: iproute2-2.6.34/configure
>
> if [ $? -eq 0 ]
> then
> -@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
> +@@ -124,7 +125,7 @@ int main(int argc, char **argv) {
> }
>
> EOF
> @@ -52,12 +59,24 @@ Index: iproute2-2.6.34/configure
>
> if [ $? -eq 0 ]
> then
> -@@ -150,7 +150,7 @@ check_ipt()
> +@@ -145,7 +146,7 @@ check_ipt()
> check_ipt_lib_dir()
> {
> IPT_LIB_DIR=""
> - for dir in /lib /usr/lib /usr/local/lib
> + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
> do
> - for file in $dir/$TABLES/lib*t_*so ; do
> + for file in $dir/{xtables,iptables}/lib*t_*so ; do
> if [ -f $file ]; then
> +@@ -168,7 +169,7 @@ int main(int argc, char **argv)
> + return 0;
> + }
> + EOF
> +-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c>/dev/null 2>&1
> ++$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c>/dev/null 2>&1
> + if [ $? -eq 0 ]
> + then
> + echo "IP_CONFIG_SETNS:=y">>Config
> +--
> +1.7.2.5
> +
> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
> index 0f27a01..6fc30a0 100644
> --- a/meta/recipes-connectivity/iproute2/iproute2.inc
> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc
> @@ -23,8 +23,11 @@ do_install () {
> rm ${D}/share -rf || true
> }
>
> -FILES_${PN} += "/usr/lib/tc/*"
> -FILES_${PN}-dbg += "/usr/lib/tc/.debug"
> +# There are only .so files in iproute2
> +INSANE_SKIP_${PN} = "dev-so"
> +
> +FILES_${PN} += "${base_libdir}/tc/*"
> +FILES_${PN}-dbg += "${base_libdir}/tc/.debug"
>
> ALTERNATIVE_NAME = "ip"
> ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
> diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
> deleted file mode 100644
> index 7abc41f..0000000
> --- a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -require iproute2.inc
> -
> -PR = "r0"
> -
> -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${BPN}-${PV}.tar.bz2 \
> - file://configure-cross.patch"
> -
> -SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8"
> -SRC_URI[sha256sum] = "47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4"
> diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
> new file mode 100644
> index 0000000..8d1db85
> --- /dev/null
> +++ b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
> @@ -0,0 +1,8 @@
> +require iproute2.inc
> +
> +#v3.0.0 tag
> +SRCREV = "ce691fb5ce78b2c75243c60a757a3990ae09681c"
> +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
> + file://configure-cross.patch"
> +S = "${WORKDIR}/git"
> +
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 1/4] libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch
From: Saul Wold @ 2011-11-07 18:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <1320339165-25029-1-git-send-email-Martin.Jansa@gmail.com>
On 11/03/2011 09:52 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> .../libnl/libnl-2.0/fix-makefile.patch | 32 --------------------
> .../{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch | 5 ++-
> meta/recipes-support/libnl/libnl_2.0.bb | 8 ++--
> 3 files changed, 8 insertions(+), 37 deletions(-)
> delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
> rename meta/recipes-support/libnl/{ => libnl-2.0}/fix-pktloc_syntax_h-race.patch (86%)
>
> diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
> deleted file mode 100644
> index 3e88fbd..0000000
> --- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -Upstream-Status: Pending
> -
> -12/03/2010
> -
> -add explicit rules for header files generated by lex and yacc,
> -otherwise the build of lib/route/pktloc.c may fail in a parallel
> -environment.
> -
> -Signed-off-by: Qing He<qing.he@intel.com>
> -
> -12/06/2010
> -
> -the dependency rule should really read pktloc.lo instead of
> -pktloc.$(OBJEXT), since it's in a libtool setup.
> -
> -Signed-off-by: Qing He<qing.he@intel.com>
> -
> -diff --git a/lib/Makefile.am b/lib/Makefile.am
> -index 92a916e..e8b8ef3 100644
> ---- a/lib/Makefile.am
> -+++ b/lib/Makefile.am
> -@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l
> - route/pktloc_syntax.c: route/pktloc_syntax.y
> - $(YACC) -d $(YFLAGS) -o $@ $^
> -
> -+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
> -+route/pktloc_syntax.h: route/pktloc_syntax.c
> -+route/pktloc_grammar.h: route/pktloc_grammar.c
> -+
> - libnl_route_la_LDFLAGS = -version-info 2:0:0
> - libnl_route_la_LIBADD = libnl.la
> - libnl_route_la_SOURCES = \
> diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
> similarity index 86%
> rename from meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> rename to meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
> index 05d75db..ea32e82 100644
> --- a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
> +++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
> @@ -4,11 +4,13 @@ libnl has progressed to 0.3.2 and there does not appear to be any
> "make -j" issues with this build after my limited testing on that
> newer version so we can assume this issue is fixed upstream
>
> +Signed-off-by: Martin Jansa<martin.jansa@gmail.com>
> +
> Index: libnl-2.0/lib/Makefile.am
> ===================================================================
> --- libnl-2.0.orig/lib/Makefile.am
> +++ libnl-2.0/lib/Makefile.am
> -@@ -27,11 +27,15 @@ CLEANFILES = \
> +@@ -27,11 +27,16 @@ CLEANFILES = \
> route/pktloc_grammar.c route/pktloc_grammar.h \
> route/pktloc_syntax.c route/pktloc_syntax.h
>
> @@ -16,6 +18,7 @@ Index: libnl-2.0/lib/Makefile.am
> +
> # Hack to avoid using ylwrap. It does not function correctly in combination
> # with --header-file=
> ++route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
> +route/pktloc_grammar.h: route/pktloc_grammar.c
> route/pktloc_grammar.c: route/pktloc_grammar.l
> $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
> diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
> index 5339846..f783867 100644
> --- a/meta/recipes-support/libnl/libnl_2.0.bb
> +++ b/meta/recipes-support/libnl/libnl_2.0.bb
> @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
> DEPENDS = "flex-native bison-native"
> PR = "r3"
>
> -SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
> - file://fix-makefile.patch \
> - file://fix-pktloc_syntax_h-race.patch \
> - "
> +SRC_URI = "\
> + http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
> + file://fix-pktloc_syntax_h-race.patch \
> +"
>
> SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
> SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH v2] Add new IMAGE_CLASSES variable for classes for image generation
From: Saul Wold @ 2011-11-07 19:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <1320251115-29360-1-git-send-email-msm@freescale.com>
On 11/02/2011 09:25 AM, Matthew McClintock wrote:
> Allows us to import classes only for images and not to the global
> namespace
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
> Change IMAGE_CLASSES definition to use ?= instead of =
> so it's clear we want to override this variable. This worked
> before because the value in my distro.conf file overwrote
> this value regardless of the fact it was set with =
>
> meta-yocto/conf/local.conf.sample | 6 ++++++
> meta/classes/image.bbclass | 3 ++-
> 2 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
> index da3f8df..8177713 100644
> --- a/meta-yocto/conf/local.conf.sample
> +++ b/meta-yocto/conf/local.conf.sample
> @@ -163,6 +163,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
> # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> USER_CLASSES ?= "image-mklibs image-prelink"
>
> +# Additional image generation features
> +#
> +# The following is a list of classes to import to use in the generation of images
> +# currently an example class is image_types_uboot
> +# IMAGE_CLASSES = " image_types_uboot"
> +
> #
> # Runtime testing of images
> #
The preferred location for this advanced functionality should be the
local.conf.sample.extended as Richard points out, please resubmit.
Thanks
Sau!
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 05f4331..a2770a4 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -111,7 +111,8 @@ def get_devtable_list(d):
> str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
> return str
>
> -inherit image_types
> +IMAGE_CLASSES ?= "image_types"
> +inherit ${IMAGE_CLASSES}
>
> IMAGE_POSTPROCESS_COMMAND ?= ""
> MACHINE_POSTPROCESS_COMMAND ?= ""
^ permalink raw reply
* Re: [PATCH 0/8] Subversion-1.7.0 and arm/thumb work arounds
From: Saul Wold @ 2011-11-07 19:13 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <cover.1319184832.git.Martin.Jansa@gmail.com>
On 10/21/2011 01:17 AM, Martin Jansa wrote:
> Hi,
>
> arm mode was forced without PR bump, because if it was failing for someone he
> will notice.
>
> Be carefull with using subversion-1.7.0 (read the commit message).
>
> Pulseaudio-1.1 was released, so hopefully this work arounds won't be needed
> there or they could be resolved better with upgrade.
>
> Regards,
>
> The following changes since commit 99da9a4e65f9dffb04efc3ad60125194c476d6b3:
>
> distro-tracking-fields: update fields for tzdata and gst-plugins-good (2011-10-20 13:07:16 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/pull2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2
>
> Martin Jansa (8):
> pulseaudio-0.9.23: inherit perlnative to work around build on host
> without XML/Parser.pm
> libatomics-ops: force ARM mode
> pulseaudio-0.9.23: force ARM mode
> webkit-gtk: force arm mode to work around binutils segfault
Martin,
What is the status of these various workarounds, did you do any further
work to determine root causes, or do we still need these patches to do in?
Thanks
Sau!
> apr: add native support
> neon: add native support
> apr-util: add native support
> subversion: add 1.7.0 with native support and negative D_P for now
>
> .../subversion/subversion-1.7.0/libtool2.patch | 15 ++++++++
> .../subversion/subversion_1.7.0.bb | 37 ++++++++++++++++++++
> .../pulseaudio/libatomics-ops_1.2.bb | 2 +
> .../pulseaudio/pulseaudio_0.9.23.bb | 3 +-
> meta/recipes-sato/webkit/webkit-gtk_svn.bb | 17 +++++++++
> meta/recipes-support/apr/apr-util_1.3.12.bb | 8 ++++
> meta/recipes-support/apr/apr_1.4.5.bb | 2 +
> meta/recipes-support/neon/neon_0.29.5.bb | 3 ++
> 8 files changed, 86 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-devtools/subversion/subversion-1.7.0/libtool2.patch
> create mode 100644 meta/recipes-devtools/subversion/subversion_1.7.0.bb
>
^ permalink raw reply
* [PATCH v3] Add new IMAGE_CLASSES variable for classes for image generation
From: Matthew McClintock @ 2011-11-07 19:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <4EB82C5F.6020806@linux.intel.com>
Allows us to import classes only for images and not to the global
namespace
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
v2: Change IMAGE_CLASSES definition to use ?= instead of =
so it's clear we want to override this variable. This worked
before because the value in my distro.conf file overwrote
this value regardless of the fact it was set with =
v3: Move documentation to local.conf.sample.extended
meta-yocto/conf/local.conf.sample.extended | 6 ++++++
meta/classes/image.bbclass | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index 0c3197d..e9935ce 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -114,3 +114,9 @@
# The network based PR service host and port
#PRSERV_HOST = "localhost"
#PRSERV_PORT = "8585"
+
+# Additional image generation features
+#
+# The following is a list of classes to import to use in the generation of images
+# currently an example class is image_types_uboot
+# IMAGE_CLASSES = " image_types_uboot"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 05f4331..a2770a4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -111,7 +111,8 @@ def get_devtable_list(d):
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
return str
-inherit image_types
+IMAGE_CLASSES ?= "image_types"
+inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
--
1.7.6.1
^ permalink raw reply related
* Re: [PATCH 0/6] Add some intel-specific tune files, and related fixes
From: Saul Wold @ 2011-11-07 19:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1320638388.git.tom.zanussi@intel.com>
On 11/07/2011 07:53 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This patchset adds some new tune files for corei7, ivb, and atom.
>
Tom,
Where is the repo containing this patch set? Are you using the
create_pull_request script, which generates the formatted message which
includes the repo from which to pull this patchset?
Thanks
Sau!
> The corei7 and atom were build- and boot-tested on sugarbay (with
> corei7-avx), jasperforest (corei7), crownbay, fri2, fishriver (atom).
> The ivb is one I'll be using for new Ivy Bridge development and
> hasn't been tested yet, but will be needed for that.
>
> This patchset also contains a few patches for packages that had build
> problems with the corei7-avx tuning. The python and gmp packages had
> problems because they tried to execute target code on the host and caused
> illegal instruction errors. The libzypp failed compilation because of
> the hyphens in the tune name (corei7-avx).
>
> Tom Zanussi (6):
> tune-corei7: Add tune file for Intel Core i7 machines
> tune-ivb: Add tune file for Intel Ivy Bridge machines
> machine/include/tune-atom.inc: add atom-specific settings
> gmp_5.0.2: Set CC_FOR_BUILD to BUILD_CC
> libzypp: fix mishandling of hyphenated arches
> python: skip setup.py
>
> meta/conf/machine/include/tune-atom.inc | 26 +++++++++++++++++-
> meta/conf/machine/include/tune-corei7.inc | 17 ++++++++++++
> meta/conf/machine/include/tune-ivb.inc | 11 ++++++++
> .../python/setup_py_skip_cross_import_check.patch | 27 ++++++++++++++++++++
> meta/recipes-devtools/python/python_2.7.2.bb | 7 ++++-
> meta/recipes-extended/libzypp/libzypp_git.bb | 8 +++---
> meta/recipes-support/gmp/gmp_5.0.2.bb | 3 +-
> 7 files changed, 91 insertions(+), 8 deletions(-)
> create mode 100644 meta/conf/machine/include/tune-corei7.inc
> create mode 100644 meta/conf/machine/include/tune-ivb.inc
> create mode 100644 meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox