Re: [OE-core] [PATCH 1/2] systemtap: upgrade to 1.6
On Sat, 2011-09-03 at 20:46 -0700, Saul Wold wrote:
> On 09/02/2011 09:45 PM, Tom Zanussi wrote:
> > Also enable for arm, since systemtap now works on arm and remove the
> > gcc-4.6 compile fix patch since the problems it addresses have been
> > fixed upstream.
> >
[...]
> > +PR = "r5"
> > +PV = "1.6+git${SRCPV}"
> >
> Tom, since you have updated PV to 1.6, you can reset PR to 0.
>
OK, good point, patches resent, thanks for the input...
Tom
> Sau!
>
> > SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
> > - file://fix_for_compilation_with_gcc-4.6.0.patch \
> > "
> >
> > EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
> > @@ -23,11 +22,11 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET}
> > --without-rpm \
> > SRC_URI[md5sum]= "cb202866ed704c44a876d041f788bdee"
> > SRC_URI[sha256sum] =
> > "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459"
> >
> > -# systemtap doesn't work on arm and doesn't support mips
> > -COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*)-linux'
> > +# systemtap doesn't support mips
> > +COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux'
> >
> > S = "${WORKDIR}/git"
> >
> > -inherit autotools
> > +inherit autotools gettext
> >
> > FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2][v2] systemtap: upgrade to 1.6
Also enable for arm, since systemtap now works on arm and remove the
gcc-4.6 compile fix patch since the problems it addresses have been
fixed upstream.
Signed-off-by: Tom Zanussi
---
.../fix_for_compilation_with_gcc-4.6.0.patch | 119
meta/recipes-kernel/systemtap/systemtap_git.bb | 15 +--
2 files changed, 7 insertions(+), 127 deletions(-)
delete mode 100644
meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
diff --git
a/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
b/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
deleted file mode 100644
index a322175..000
---
a/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Upstream-Status: Pending
-
-Fix following compiler errors with gcc 4.6.0:
-Nitin A Kamble 2011/05/09
-
-| tapsets.cxx: In member function 'void sdt_query::handle_probe_entry()':
-| tapsets.cxx:5295:8: error: variable 'kprobe_found' set but not used
[-Werror=unused-but-set-variable]
-| tapsets.cxx: In member function 'virtual void
hwbkpt_builder::build(systemtap_session&, probe*, probe_point*, const
literal_map_t&, std::vector&)':
-| tapsets.cxx:7655:18: error: variable 'has_symbol_str' set but not used
[-Werror=unused-but-set-variable]
-| cc1plus: all warnings being treated as errors
-|
-| make[2]: *** [stap-tapsets.o] Error 1
-| translate.cxx: In member function 'virtual void
c_unparser::visit_print_format(print_format*)':
-| translate.cxx:4431:6: error: variable 'width_ix' set but not used
[-Werror=unused-but-set-variable]
-| cc1plus: all warnings being treated as errors
-|
-| make[2]: *** [stap-translate.o] Error 1
-| common.c: In function 'fatal_handler':
-| common.c:397:13: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make[3]: *** [common.o] Error 1
-| make[3]: *** Waiting for unfinished jobs
-| common.c: In function 'fatal_handler':
-| common.c:397:13: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| mainloop.c: In function 'chld_proc':
-| mainloop.c:56:11: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| mainloop.c: In function 'stp_main_loop':
-| mainloop.c:623:17: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-
-Index: git/tapsets.cxx
-===
git.orig/tapsets.cxx
-+++ git/tapsets.cxx
-@@ -5292,7 +5292,6 @@ sdt_query::handle_probe_entry()
- probe *new_base = convert_location();
- probe_point *new_location = new_base->locations[0];
-
-- bool kprobe_found = false;
- bool need_debug_info = false;
-
- Dwarf_Addr bias;
-@@ -5302,7 +5301,6 @@ sdt_query::handle_probe_entry()
- if (have_kprobe())
- {
- convert_probe(new_base);
-- kprobe_found = true;
- // Expand the local variables in the probe body
- sdt_kprobe_var_expanding_visitor svv (module_val,
- provider_name,
-@@ -7652,7 +7650,7 @@ hwbkpt_builder::build(systemtap_session
- {
- string symbol_str_val;
- int64_t hwbkpt_address, len;
-- bool has_addr, has_symbol_str, has_write, has_rw, has_len;
-+ bool has_addr, has_write, has_rw, has_len;
-
- if (! (sess.kernel_config["CONFIG_PERF_EVENTS"] == string("y")))
- throw semantic_error ("CONFIG_PERF_EVENTS not available on this kernel",
-@@ -7662,7 +7660,6 @@ hwbkpt_builder::build(systemtap_session
- location->components[0]->tok);
-
- has_addr = get_param (parameters, TOK_HWBKPT, hwbkpt_address);
-- has_symbol_str = get_param (parameters, TOK_HWBKPT, symbol_str_val);
- has_len = get_param (parameters, TOK_LENGTH, len);
- has_write = (parameters.find(TOK_HWBKPT_WRITE) != parameters.end());
- has_rw = (parameters.find(TOK_HWBKPT_RW) != parameters.end());
-Index: git/translate.cxx
-===
git.orig/translate.cxx
-+++ git/translate.cxx
-@@ -4428,7 +4428,7 @@ c_unparser::visit_print_format (print_fo
- continue;
-
- /* Take note of the width and precision arguments, if any. */
-- int width_ix = -1, prec_ix= -1;
-+ int __attribute((__unused__)) width_ix = -1, prec_ix= -1;
- if (components[i].widthtype == print_format::width_dynamic)
- width_ix = arg_ix++;
- if (components[i].prectype == print_format::prec_dynamic)
-Index: git/runtime/staprun/common.c
-===
git.orig/runtime/staprun/common.c
-+++ git/runtime/staprun/common.c
-@@ -394,7 +394,7 @@ void parse_modpath(const char *inpath)
- #define ERR_MSG "\nUNEXPECTED FATAL ERROR in staprun. Please file a bug
r
[OE-core] [PATCH 2/2][v2] task-core-tools: add systemtap to qemuarm
Systemtap now works with arm, so include it in task-core-tools-profile
for qemuarm.
Signed-off-by: Tom Zanussi
---
meta/recipes-core/tasks/task-core-tools.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-tools.bb
b/meta/recipes-core/tasks/task-core-tools.bb
index 11ea723..3159e06 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Tools tasks for OE-Core"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r11"
+PR = "r12"
PACKAGES = "\
task-core-tools-debug \
@@ -77,7 +77,7 @@ LTTNGUST_libc-uclibc = ""
RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust
${SYSTEMTAP}"
RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST}
${SYSTEMTAP}"
RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST}"
+RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} ${SYSTEMTAP}"
RDEPENDS_task-core-tools-testapps = "\
blktool \
--
1.7.0.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2][v2] systemtap: upgrade to 1.6
This patchset upgrades systemtap to 1.6. The 1.6 version of systemtap also has inproved support for arm, so this enables it for arm and adds it to qemuarm. This upgrade was successfully tested on qemux86, qemux86-64, qemuppc, and qemuarm. The results and the tests can be found at the end of the systemtap section on the yocto wiki: [v2] changes: address feedback from Saul: PV changed, so update PR for systemtap recipe Tom Zanussi (2): systemtap: upgrade to 1.6 task-core-tools: add systemtap to qemuarm meta/recipes-core/tasks/task-core-tools.bb |4 +- .../fix_for_compilation_with_gcc-4.6.0.patch | 119 meta/recipes-kernel/systemtap/systemtap_git.bb | 15 +-- 3 files changed, 9 insertions(+), 129 deletions(-) delete mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] sstate relocation patches
This fixese 2 issues for doc generation discovered in the new autobuilder infrastruture with shared state. opensp and groff both had hard coded locations to look for data files. Sau! The following changes since commit 0616557a8c29b42bae0ffd5fd665a046810047e4: populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH (2011-09-02 23:38:00 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/oe-fix2 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/oe-fix2 Saul Wold (2): groff: Fix sstate relocation issue opensp: Fix sstate relocation issue meta/recipes-devtools/opensp/opensp_1.5.bb |9 - meta/recipes-extended/groff/groff_1.20.1.bb |9 - 2 files changed, 16 insertions(+), 2 deletions(-) -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] groff: Fix sstate relocation issue
[YOCTO #1439]
This fixes a problem where the native groff has a path hard coded into
it, therefor add a wrapper to set the command line with the correct
paths for fonts and tmac directories.
Signed-off-by: Saul Wold
---
meta/recipes-extended/groff/groff_1.20.1.bb |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb
b/meta/recipes-extended/groff/groff_1.20.1.bb
index 7085911..3e24253 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -4,7 +4,7 @@ formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/";
LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -34,4 +34,11 @@ do_configure_prepend() {
fi
}
+do_install_append_virtclass-native() {
+ create_cmdline_wrapper ${D}/${bindir}/groff \
+ -F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
+ -M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
+}
+
+
BBCLASSEXTEND = "native"
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] opensp: Fix sstate relocation issue
[YOCTO #1439]
This fixes a problem where the native nsgmls has a path hard coded into
it, therefor add a wrapper to set the environment with the correct
paths for catalog files.
Signed-off-by: Saul Wold
---
meta/recipes-devtools/opensp/opensp_1.5.bb |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb
b/meta/recipes-devtools/opensp/opensp_1.5.bb
index a402d11..0269c87 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r1"
+PR = "r2"
# At -Os it encounters calls to some inline functions which are then
# not found in any other objects with gcc 4.5
@@ -42,6 +42,13 @@ do_install_append() {
ln -sf osx sgml2xml
}
+do_install_append_virtclass-native() {
+ for util in nsgmls sgmlnorm spam spcat spent sx; do
+ create_wrapper ${D}/${bindir}/$util \
+ SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog
+ done
+}
+
FILES_${PN} += "${datadir}/OpenSP/"
BBCLASSEXTEND = "native"
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] multilib: Only build one kernel
Hi Richard,
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Richard Purdie
> Sent: Friday, September 02, 2011 9:01 PM
> To: openembedded-core
> Subject: [OE-core] multilib: Only build one kernel
>
> For a given system we only want one kernel to be built. This change makes the
> main kernel recipe provide all of the provides of the various enabled
> multilibs
> hence allowing it to fulfil all the appropriate dependencies.
>
> To make this work a global multilib class file needed to be created.
>
> This patch also enables this multi provider functionality for "allarch"
> packages.
>
> [YOCTO #1361]
When testing multilib with latest master, I found bitbake would report failed
dependency of kernel-module-*. As we know, kernel-module-* will be recommended
by some other recipes, while it is defined in kernel related recipe in
PACKAGES_DYNAMIC. I think we need the following patch to make it work:
commit bc04de64057a17ae93be466e32249f9505321f59
Author: Dongxiao Xu
Date: Sun Sep 4 11:49:33 2011 +0800
multilib_global.bbclass: handle kernel-module-* for multilib
bitbake would report failed dependency of kernel-module-* when testing
multilib. kernel-module-* are recommended by some other recipes.
Do not extend name for kernel-module-* related packages.
Signed-off-by: Dongxiao Xu
diff --git a/meta/classes/multilib_global.bbclass
b/meta/classes/multilib_global.bbclass
index 217349b..1263e4e 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -17,6 +17,8 @@ python multilib_virtclass_handler_global () {
addhandler multilib_virtclass_handler_global
def multilib_extend_name(variant, name):
+if name.startswith("kernel-module"):
+return name
if name.startswith("virtual/"):
subs = name.split("/", 1)[1]
if not subs.startswith(variant):
Thanks,
Dongxiao
>
> Signed-off-by: Richard Purdie
> ---
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index
> 5d975fd..583d76b 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -6,12 +6,17 @@ python multilib_virtclass_handler () {
> variant = e.data.getVar("BBEXTENDVARIANT", True)
> if cls != "multilib" or not variant:
> return
> +
> +# There should only be one kernel in multilib configs
> +if bb.data.inherits_class('kernel', e.data) or
> bb.data.inherits_class('module-base', e.data) or
> bb.data.inherits_class('allarch',
> e.data):
> +raise bb.parse.SkipPackage("We shouldn't have multilib variants
> + for the kernel")
> +
> save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
> for name in save_var_name.split():
> val=e.data.getVar(name, True)
> if val:
> e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
> -
> +
> override = ":virtclass-multilib-" + variant
>
> e.data.setVar("MLPREFIX", variant + "-") @@ -28,16 +33,6 @@
> STAGINGCC_prepend = "${BBEXTENDVARIANT}-"
> python __anonymous () {
> variant = d.getVar("BBEXTENDVARIANT", True)
>
> -def extend_name(name):
> -if name.startswith("virtual/"):
> -subs = name.split("/", 1)[1]
> -if not subs.startswith(variant):
> -return "virtual/" + variant + "-" + subs
> -return name
> -if not name.startswith(variant):
> -return variant + "-" + name
> -return name
> -
> def map_dependencies(varname, d, suffix = ""):
> if suffix:
> varname = varname + "_" + suffix @@ -50,25 +45,15 @@
> python __anonymous () {
> if dep.endswith(("-native", "-native-runtime")):
> newdeps.append(dep)
> else:
> -newdeps.append(extend_name(dep))
> +newdeps.append(multilib_extend_name(variant, dep))
> d.setVar(varname, " ".join(newdeps))
>
> -def map_variable(varname, d):
> -var = d.getVar(varname, True)
> -if not var:
> -return
> -var = var.split()
> -newvar = []
> -for v in var:
> -newvar.append(extend_name(v))
> -d.setVar(varname, " ".join(newvar))
> -
> pkgs_mapping = []
> for pkg in (d.getVar("PACKAGES", True) or "").split():
> if pkg.startswith(variant):
> pkgs_mapping.append([pkg.split(variant + "-")[1], pkg])
> continue
> -pkgs_mapping.append([pkg, extend_name(pkg)])
> +pkgs_mapping.append([pkg, multilib_extend_name(variant, pkg)])
>
> d.setVar("PACKAGES", " ".join([row[1] for row in pkgs_mapping]))
>
> @@ -87,8 +72,8 @@ python __anonymous () {
> map_dependencies("RCONFLICTS", d, pkg)
> map_dependencies("PKG", d, pkg)
>
> -map_variable("PROVIDES", d)
> -map_variable("PACKAGES_DYNAMIC", d)
> -m
Re: [OE-core] [PATCH 1/2] systemtap: upgrade to 1.6
On 09/02/2011 09:45 PM, Tom Zanussi wrote:
Also enable for arm, since systemtap now works on arm and remove the
gcc-4.6 compile fix patch since the problems it addresses have been
fixed upstream.
Signed-off-by: Tom Zanussi
---
.../fix_for_compilation_with_gcc-4.6.0.patch | 119
meta/recipes-kernel/systemtap/systemtap_git.bb | 15 +--
2 files changed, 7 insertions(+), 127 deletions(-)
delete mode 100644
meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
diff --git
a/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
b/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
deleted file mode 100644
index a322175..000
---
a/meta/recipes-kernel/systemtap/systemtap/fix_for_compilation_with_gcc-4.6.0.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Upstream-Status: Pending
-
-Fix following compiler errors with gcc 4.6.0:
-Nitin A Kamble 2011/05/09
-
-| tapsets.cxx: In member function 'void sdt_query::handle_probe_entry()':
-| tapsets.cxx:5295:8: error: variable 'kprobe_found' set but not used
[-Werror=unused-but-set-variable]
-| tapsets.cxx: In member function 'virtual void hwbkpt_builder::build(systemtap_session&,
probe*, probe_point*, const literal_map_t&, std::vector&)':
-| tapsets.cxx:7655:18: error: variable 'has_symbol_str' set but not used
[-Werror=unused-but-set-variable]
-| cc1plus: all warnings being treated as errors
-|
-| make[2]: *** [stap-tapsets.o] Error 1
-| translate.cxx: In member function 'virtual void
c_unparser::visit_print_format(print_format*)':
-| translate.cxx:4431:6: error: variable 'width_ix' set but not used
[-Werror=unused-but-set-variable]
-| cc1plus: all warnings being treated as errors
-|
-| make[2]: *** [stap-translate.o] Error 1
-| common.c: In function 'fatal_handler':
-| common.c:397:13: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| make[3]: *** [common.o] Error 1
-| make[3]: *** Waiting for unfinished jobs
-| common.c: In function 'fatal_handler':
-| common.c:397:13: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-| mainloop.c: In function 'chld_proc':
-| mainloop.c:56:11: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| mainloop.c: In function 'stp_main_loop':
-| mainloop.c:623:17: error: variable 'rc' set but not used
[-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-|
-
-Index: git/tapsets.cxx
-===
git.orig/tapsets.cxx
-+++ git/tapsets.cxx
-@@ -5292,7 +5292,6 @@ sdt_query::handle_probe_entry()
- probe *new_base = convert_location();
- probe_point *new_location = new_base->locations[0];
-
-- bool kprobe_found = false;
- bool need_debug_info = false;
-
- Dwarf_Addr bias;
-@@ -5302,7 +5301,6 @@ sdt_query::handle_probe_entry()
- if (have_kprobe())
- {
- convert_probe(new_base);
-- kprobe_found = true;
- // Expand the local variables in the probe body
- sdt_kprobe_var_expanding_visitor svv (module_val,
- provider_name,
-@@ -7652,7 +7650,7 @@ hwbkpt_builder::build(systemtap_session
- {
- string symbol_str_val;
- int64_t hwbkpt_address, len;
-- bool has_addr, has_symbol_str, has_write, has_rw, has_len;
-+ bool has_addr, has_write, has_rw, has_len;
-
- if (! (sess.kernel_config["CONFIG_PERF_EVENTS"] == string("y")))
- throw semantic_error ("CONFIG_PERF_EVENTS not available on this kernel",
-@@ -7662,7 +7660,6 @@ hwbkpt_builder::build(systemtap_session
- location->components[0]->tok);
-
- has_addr = get_param (parameters, TOK_HWBKPT, hwbkpt_address);
-- has_symbol_str = get_param (parameters, TOK_HWBKPT, symbol_str_val);
- has_len = get_param (parameters, TOK_LENGTH, len);
- has_write = (parameters.find(TOK_HWBKPT_WRITE) != parameters.end());
- has_rw = (parameters.find(TOK_HWBKPT_RW) != parameters.end());
-Index: git/translate.cxx
-===
git.orig/translate.cxx
-+++ git/translate.cxx
-@@ -4428,7 +4428,7 @@ c_unparser::visit_print_format (print_fo
- continue;
-
- /* Take note of the width and precision arguments, if any. */
-- int width_ix = -1, prec_ix= -1;
-+ int __attribute((__unused__)) width_ix = -1, prec_ix= -1;
- if (components[i].widthtype == print_format::width_dynamic)
- width_ix = arg_ix++;
- if (components[i].prectype == print_format::prec_dynamic)
-Index: git/runtime/staprun/common.c
-===
git.orig/runtime/staprun/common.c
-+++ git/runtime/staprun/common.c
-@@ -394,7 +394,7 @@ void parse_modpath(const char *inpath)
- #define ERR_MSG "\nUNEXPECTED FATAL ERR
Re: [OE-core] [PATCH 1/1] runqemu: standardize ability to specify custom qemu/kenel boot options
On Sat, Sep 3, 2011 at 19:50, Scott Garman wrote: > The old manner of specifying custom options to QEMU in this script > using angle brackets was a frequent source of confusion. Meanwhile, > Otavio Salvador added a decent method of specifying custom kernel > boot options to this script. This patch documents the bootparams > option and adds a similar way of specifying custom QEMU options > using qemuparams="". > > This fixes [YOCTO #1019] > > Signed-off-by: Scott Garman This really improves the usability of it. Thanks by work on it. Signed-off-by: Otavio Salvador -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] runqemu: standardize ability to specify custom qemu/kenel boot options
The old manner of specifying custom options to QEMU in this script
using angle brackets was a frequent source of confusion. Meanwhile,
Otavio Salvador added a decent method of specifying custom kernel
boot options to this script. This patch documents the bootparams
option and adds a similar way of specifying custom QEMU options
using qemuparams="".
This fixes [YOCTO #1019]
Signed-off-by: Scott Garman
---
scripts/runqemu | 32 ++--
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 113088e..74938f7 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -26,17 +26,19 @@ usage() {
echo " KERNEL - the kernel image file to use"
echo " ROOTFS - the rootfs image file or nfsroot directory to use"
echo " MACHINE=xyz - the machine name (optional, autodetected from KERNEL
filename if unspecified)"
-echo " Additional QEMU command-line options can be passed with:"
+echo " Simplified QEMU command-line options can be passed with:"
echo "nographic - disables video console"
echo "serial - enables a serial console on /dev/ttyS0"
-echo "kvm - enables KVM when running qemux86/qemux86-64, VT capable
CPU required"
-echo "\"\" - enables extra qemu options, excluding
serial and kvm"
+echo "kvm - enables KVM when running qemux86/qemux86-64 (VT-capable
CPU required)"
+echo " qemuparams=\"xyz\" - specify custom parameters to QEMU"
+echo " bootparams=\"xyz\" - specify custom kernel parameters during boot"
echo ""
echo "Examples:"
echo " $MYNAME qemuarm"
echo " $MYNAME qemux86-64 core-image-sato ext3"
echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
-echo " $MYNAME qemux86 \"<-m 256>\""
+echo " $MYNAME qemux86 qemuparams=\"-m 256\""
+echo " $MYNAME qemux86 bootparams=\"psplash=false\""
exit 1
}
@@ -135,6 +137,18 @@ while [ $i -le $# ]; do
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -serial stdio"
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
;;
+"qemuparams="*)
+SCRIPT_QEMU_EXTRA_OPT="${arg##qemuparams=}"
+
+# Warn user if they try to specify serial or kvm options
+# to use simplified options instead
+serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
+kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
+if [[ ! -z "$serial_option" || ! -z "$kvm_option" ]]; then
+echo "Error: Please use simplified serial or kvm options
instead"
+usage
+fi
+;;
"bootparams="*)
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT ${arg##bootparams=}"
;;
@@ -149,16 +163,6 @@ while [ $i -le $# ]; do
KVM_ENABLED="yes"
KVM_CAPABLE=`grep 'vmx\|smx' /proc/cpuinfo`
;;
-\<*\>)
-SCRIPT_QEMU_EXTRA_OPT=$arg
-serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
-kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
-echo "$kvm_option"
-if [[ ! -z "$serial_option" || ! -z "$kvm_option" ]]; then
-echo "Error: Please use serial or kvm params instead!"
-usage
-fi
-;;
*)
# A directory name is an nfs rootfs
if [ -d "$arg" ]; then
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] runqemu fixes
Hello, This pull request standardizes/normalizes the way custom options are passed to QEMU and the kernel boot parameters. The old manner of specifying custom options to QEMU in this script using angle brackets was a frequent source of confusion. Meanwhile, Otavio Salvador added a decent method of specifying custom kernel boot options to this script. This patch documents the bootparams option and adds a similar way of specifying custom QEMU options using qemuparams="". This fixes [YOCTO #1019] Scott Garman The following changes since commit 0616557a8c29b42bae0ffd5fd665a046810047e4: populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH (2011-09-02 23:38:00 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib sgarman/runqemu-fixes http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/runqemu-fixes Scott Garman (1): runqemu: standardize ability to specify custom qemu/kenel boot options scripts/runqemu | 32 ++-- 1 files changed, 18 insertions(+), 14 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] IMAGE_CMD_sdimg first cut
On Sat, Aug 27, 2011 at 5:17 PM, Joel A Fernandes wrote: > Hi Koen, > > Thanks for your feedback. > > On Sat, Aug 27, 2011 at 2:05 AM, Koen Kooi wrote: >> Op 26 aug. 2011, om 21:54 heeft Joel A Fernandes het volgende geschreven: >> >>> Here's an initial version of the SDCard image build functionality. Its not >>> a direct copy paste from Narcissus >> >> Be careful when doing that, narcissus is GPLv2, OE-core is MIT >> >>> , I had to replace paths and am copying files from IMAGE_ROOTFS instead of >>> how Narcissus untars into a mount point. >>> >>> Not build tested. >>> >>> @Koen and all, here are some questions: >>> 1. Where in openembedded-core do we store the "img.gz" template files so >>> that they are available to image.bbclass? >> >> We don't, we can generate is everytime now that we aren't running as www-data >> > > I didn't follow What has running as www-data or any regular user go to > do with generating img.gz? Narcissus ran as www-data. It was necessary to run Narcissus as an unprivileged account, since it is a web service. > > So what you're suggesting is we run dd and fdisk to create an sdcard > image template everytime we bitbake an image? > > thanks! > Joel > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image_types.bbclass: use per-image dirs for extX.gz images generation
Currently image_types.bbclass uses deploy/images/${MACHINE}tpm.gz dir for
temporary files when generating extX.gz images. This can lead to races
and strange errors during image generation. To overcome this use
deploy/images/${MACHINE}tpm.gz-${PN} dir for temporary files.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/classes/image_types.bbclass | 32
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 2bdda41..1abd533 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -40,11 +40,11 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r
IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS}
${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
IMAGE_CMD_ext2.gz () {
- 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
- gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2
- mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
- rmdir ${DEPLOY_DIR_IMAGE}/tmp.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
+ 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_ext3 () {
@@ -52,12 +52,12 @@ IMAGE_CMD_ext3 () {
tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
}
IMAGE_CMD_ext3.gz () {
- 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.ext3
- tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
- gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3
- mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
- rmdir ${DEPLOY_DIR_IMAGE}/tmp.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
+ 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
+ rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
}
oe_mkext4fs () {
@@ -77,11 +77,11 @@ IMAGE_CMD_ext4 () {
oe_mkext4fs ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4
}
IMAGE_CMD_ext4.gz () {
- rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz
- oe_mkext4fs ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4
- gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4
- mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz
- rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz
+ rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir
${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
+ oe_mkext4fs ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4
+ gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4
+ mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext4.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz
+ rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
}
IMAGE_CMD_btrfs () {
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] zaurusd: enable support for collie
On 9/3/11, Koen Kooi wrote: > shouldn't this move to meta-zaurus now that oe-core is qemu only? Maybe. IIUC, currently the plan is to push meta-zaurus into meta-hh as published by Paul Eggleton. On the other hand we didn't start this move (yet). So please ignore this patch for now. BTW: Probably this patch and fix-makefile.patch should just be applied into main git? -- With best wishes Dmitry ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] zaurusd: enable support for collie
shouldn't this move to meta-zaurus now that oe-core is qemu only?
Op 3 sep. 2011, om 20:22 heeft Dmitry Eremin-Solenikov het volgende geschreven:
> Signed-off-by: Dmitry Eremin-Solenikov
> ---
> .../0001-zaurusd-add-support-for-collie.patch | 50
> meta/recipes-bsp/zaurusd/zaurusd_git.bb|3 +-
> 2 files changed, 52 insertions(+), 1 deletions(-)
> create mode 100644
> meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
>
> diff --git
> a/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> new file mode 100644
> index 000..36ded13
> --- /dev/null
> +++
> b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
> @@ -0,0 +1,50 @@
> +From 85b94bed1feab70bc529a59fb80c26da825b9abe Mon Sep 17 00:00:00 2001
> +From: Dmitry Eremin-Solenikov
> +Date: Fri, 5 Aug 2011 16:00:10 +0400
> +Subject: [PATCH] zaurusd: add support for collie
> +Upstream-Status: Pending
> +
> +Note: alsa mixer support is disabled, as collie doesn't support sound (yet).
> +
> +Signed-off-by: Dmitry Eremin-Solenikov
> +---
> + config/mach-config/mach-collie-functions |4
> + config/mach-config/mach-collie-vars.in |3 +++
> + configure.ac |1 +
> + 3 files changed, 8 insertions(+), 0 deletions(-)
> + create mode 100644 config/mach-config/mach-collie-functions
> + create mode 100644 config/mach-config/mach-collie-vars.in
> +
> +diff --git a/config/mach-config/mach-collie-functions
> b/config/mach-config/mach-collie-functions
> +new file mode 100644
> +index 000..4d77c53
> +--- /dev/null
> b/config/mach-config/mach-collie-functions
> +@@ -0,0 +1,4 @@
> ++HAVE_INPUT_SWITCHES=0
> ++HAVE_TSKEYS=0
> ++HAVE_ALSA_MIXER=0
> ++
> +diff --git a/config/mach-config/mach-collie-vars.in
> b/config/mach-config/mach-collie-vars.in
> +new file mode 100644
> +index 000..ec1bfb8
> +--- /dev/null
> b/config/mach-config/mach-collie-vars.in
> +@@ -0,0 +1,3 @@
> ++MACHINE=collie
> ++
> ++ALSA_MIXER_INIT=@appconfdir@/alsa/5500-default.state
> +diff --git a/configure.ac b/configure.ac
> +index 78ea2ae..5160fab 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -65,6 +65,7 @@ AC_CONFIG_FILES([
> + config/config
> + config/mach-config/mach-akita-vars
> + config/mach-config/mach-borzoi-vars
> ++ config/mach-config/mach-collie-vars
> + config/mach-config/mach-corgi-vars
> + config/mach-config/mach-husky-vars
> + config/mach-config/mach-poodle-vars
> +--
> +1.7.2.5
> diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> index 3b8cc43..ebc3c66 100644
> --- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> +++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
> @@ -7,9 +7,10 @@ RDEPENDS_${PN} = "xrandr"
>
> SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
> PV = "0.1+git${SRCPV}"
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
> + file://0001-zaurusd-add-support-for-collie.patch \
> file://fix_makefile.patch"
>
> S = "${WORKDIR}/git"
> --
> 1.7.2.5
>
>
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] gettext: use included libxml and libcroco
Op 3 sep. 2011, om 19:04 heeft Saul Wold het volgende geschreven: > [YOCTO #1400] > > By using the included libxml and libcroco, we do not create additional > on this core library. There was an ordering issue that when one library > was not built, but gettext detected the other library a compliation would > fail, this will force it to always use the included libraries. > > Signed-off-by: Saul Wold > --- > meta/recipes-core/gettext/gettext_0.18.1.1.bb |2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > index 9ec851e..0bcd90b 100644 > --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb > +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb > @@ -36,6 +36,8 @@ EXTRA_OECONF += "--without-lispdir \ > --without-emacs \ > --without-cvs \ > --without-git \ > + --with-included-libxml \ > + --with-included-libcroco \ > " That's missing a PR bump ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] icu-3.6: fix building with big make -j
icu-3.6 buildsystem contains small problem which causes some parallel
builds to fail. Fix that.
Signed-off-by: Dmitry Eremin-Solenikov
---
.../icu/files/fix-parallel-build.patch | 19 +++
meta/recipes-support/icu/icu-3.6.inc |1 +
2 files changed, 20 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-support/icu/files/fix-parallel-build.patch
diff --git a/meta/recipes-support/icu/files/fix-parallel-build.patch
b/meta/recipes-support/icu/files/fix-parallel-build.patch
new file mode 100644
index 000..5b01a4c
--- /dev/null
+++ b/meta/recipes-support/icu/files/fix-parallel-build.patch
@@ -0,0 +1,19 @@
+Upstream-Status: pending
+
+Fix parallel builds
+
+Signed-off-by: Dmitry Eremin-Solenikov
+
+Index: source/data/Makefile.in
+===
+--- source.orig/data/Makefile.in 2011-09-02 02:03:37.0 +0400
source/data/Makefile.in2011-09-02 02:06:26.0 +0400
+@@ -351,8 +351,8 @@
+ endif
+
+
+-build-dir: $(BUILD_DIRS)
+-$(BUILD_DIRS):
++$(MAINBUILDDIR) $(BUILD_DIRS): build-dir
++build-dir:
+ -$(MKINSTALLDIRS) $(BUILD_DIRS)
diff --git a/meta/recipes-support/icu/icu-3.6.inc
b/meta/recipes-support/icu/icu-3.6.inc
index 1c611bd..18efd16 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -3,6 +3,7 @@ HOMEPAGE =
"http://www-01.ibm.com/software/globalization/icu/index.jsp";
BASE_SRC_URI =
"ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz \
file://gccfix.patch;apply=yes \
+ file://fix-parallel-build.patch \
file://use-g++-for-linking.patch;apply=yes"
SRC_URI = "${BASE_SRC_URI} \
file://noldlibpath.patch;apply=yes"
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] zaurusd: enable support for collie
Signed-off-by: Dmitry Eremin-Solenikov
---
.../0001-zaurusd-add-support-for-collie.patch | 50
meta/recipes-bsp/zaurusd/zaurusd_git.bb|3 +-
2 files changed, 52 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
diff --git
a/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
new file mode 100644
index 000..36ded13
--- /dev/null
+++ b/meta/recipes-bsp/zaurusd/zaurusd/0001-zaurusd-add-support-for-collie.patch
@@ -0,0 +1,50 @@
+From 85b94bed1feab70bc529a59fb80c26da825b9abe Mon Sep 17 00:00:00 2001
+From: Dmitry Eremin-Solenikov
+Date: Fri, 5 Aug 2011 16:00:10 +0400
+Subject: [PATCH] zaurusd: add support for collie
+Upstream-Status: Pending
+
+Note: alsa mixer support is disabled, as collie doesn't support sound (yet).
+
+Signed-off-by: Dmitry Eremin-Solenikov
+---
+ config/mach-config/mach-collie-functions |4
+ config/mach-config/mach-collie-vars.in |3 +++
+ configure.ac |1 +
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 config/mach-config/mach-collie-functions
+ create mode 100644 config/mach-config/mach-collie-vars.in
+
+diff --git a/config/mach-config/mach-collie-functions
b/config/mach-config/mach-collie-functions
+new file mode 100644
+index 000..4d77c53
+--- /dev/null
b/config/mach-config/mach-collie-functions
+@@ -0,0 +1,4 @@
++HAVE_INPUT_SWITCHES=0
++HAVE_TSKEYS=0
++HAVE_ALSA_MIXER=0
++
+diff --git a/config/mach-config/mach-collie-vars.in
b/config/mach-config/mach-collie-vars.in
+new file mode 100644
+index 000..ec1bfb8
+--- /dev/null
b/config/mach-config/mach-collie-vars.in
+@@ -0,0 +1,3 @@
++MACHINE=collie
++
++ALSA_MIXER_INIT=@appconfdir@/alsa/5500-default.state
+diff --git a/configure.ac b/configure.ac
+index 78ea2ae..5160fab 100644
+--- a/configure.ac
b/configure.ac
+@@ -65,6 +65,7 @@ AC_CONFIG_FILES([
+ config/config
+ config/mach-config/mach-akita-vars
+ config/mach-config/mach-borzoi-vars
++ config/mach-config/mach-collie-vars
+ config/mach-config/mach-corgi-vars
+ config/mach-config/mach-husky-vars
+ config/mach-config/mach-poodle-vars
+--
+1.7.2.5
diff --git a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
index 3b8cc43..ebc3c66 100644
--- a/meta/recipes-bsp/zaurusd/zaurusd_git.bb
+++ b/meta/recipes-bsp/zaurusd/zaurusd_git.bb
@@ -7,9 +7,10 @@ RDEPENDS_${PN} = "xrandr"
SRCREV = "82b30c7865f007fff81372c3cdc71b2ff6843ccc"
PV = "0.1+git${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
+ file://0001-zaurusd-add-support-for-collie.patch \
file://fix_makefile.patch"
S = "${WORKDIR}/git"
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] qt-demo-init: fix init script
qt-demo-init initscript lacks some quotes, which makes it bave not fulle
correct. Fix that.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |8
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
index affb958..0748fcd 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
@@ -14,11 +14,11 @@ case "$1" in
if [ -f /etc/profile.d/tslib.sh ]; then
source /etc/profile.d/tslib.sh
fi
- if [ -e $TSLIB_TSDEVICE ]; then
+ if [ -e "$TSLIB_TSDEVICE" ]; then
if [ ! -f /etc/pointercal ]; then
/usr/bin/ts_calibrate
fi
- if [ $QTDEMO == qtdemo ]; then
+ if [ "$QTDEMO" == qtdemo ]; then
Xorg &
export DISPLAY=:0
$QTDEMO &
@@ -26,7 +26,7 @@ case "$1" in
QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
fi
else
- if [ $QTDEMO == qtdemo ]; then
+ if [ "$QTDEMO" == qtdemo ]; then
Xorg &
export DISPLAY=:0
fi
@@ -35,7 +35,7 @@ case "$1" in
;;
stop)
echo "Stopping qtdemo"
- if [ $QTDEMO == qtdemo ]; then
+ if [ "$QTDEMO" == qtdemo ]; then
killall Xorg
killall qtdemo
else
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
index 8d0dd19..0f089ad 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Init script for qtdemo"
LICENSE = "MIT"
SRC_URI = "file://qtdemo-init"
-PR = "r2"
+PR = "r3"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
--
1.7.2.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] gettext: use included libxml and libcroco
[YOCTO #1400]
By using the included libxml and libcroco, we do not create additional
on this core library. There was an ordering issue that when one library
was not built, but gettext detected the other library a compliation would
fail, this will force it to always use the included libraries.
Signed-off-by: Saul Wold
---
meta/recipes-core/gettext/gettext_0.18.1.1.bb |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 9ec851e..0bcd90b 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -36,6 +36,8 @@ EXTRA_OECONF += "--without-lispdir \
--without-emacs \
--without-cvs \
--without-git \
+ --with-included-libxml \
+ --with-included-libcroco \
"
acpaths = '-I ${S}/gettext-runtime/m4 \
--
1.7.6
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix gettext dependency issue
Use gettext's internal libraries for libxml and libcroco to ensure that there is not any strange behavior if ordering of the build of these items changes. The gettext-tools configure script looks for a libxml and libcroco in sysroot and this can cause an unforseen dependency issue. Sau! The following changes since commit 0616557a8c29b42bae0ffd5fd665a046810047e4: populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH (2011-09-02 23:38:00 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix Saul Wold (1): gettext: use included libxml and libcroco meta/recipes-core/gettext/gettext_0.18.1.1.bb |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- 1.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
