* [CONSOLIDATED PULL - v2 09/26] x86 tune files: set baselib for x32 tune as libx32
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/conf/machine/include/ia32/arch-ia32.inc | 2 +-
meta/conf/machine/include/tune-core2.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index a52e33a..ee91983 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -44,6 +44,6 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
AVAILTUNES += "x86-64-x32"
TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
-BASE_LIB_tune-x86-64-x32 ?= "lib"
+BASE_LIB_tune-x86-64-x32 ?= "libx32"
PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 78f8f4d..565a39c 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -20,5 +20,5 @@ PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64
AVAILTUNES += "core2-64-x32"
TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
-BASE_LIB_tune-core2-64-x32 ?= "lib"
+BASE_LIB_tune-core2-64-x32 ?= "libx32"
PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 08/26] insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Darren Hart <dvhart@linux.intel.com>
Currently only the basename is printed when os.path.isfile() returns a failure
for the license file. If the file is present, but in the wrong directory, this
can be non-obvious to debug. Use the full path instead.
Make a minor grammatical correction in the error message while we're at it.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/classes/insane.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b861e85..017f7be 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -330,7 +330,7 @@ def package_qa_check_license(workdir, d):
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
srclicfile = os.path.join(srcdir, path)
if not os.path.isfile(srclicfile):
- raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path)
+ raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
if 'md5' not in parm:
bb.error(pn + ": md5 checksum is not specified for ", url)
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 06/26] src_distribute.bbclass, src_distribute_local.bbclass: mostly rewritten
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Otavio Salvador <otavio@ossystems.com.br>
The code used to reference unavailable variables and mistakenly define
the tasks so fully demonstrating this have not been in use for a
while.
During the code rewrite, it was extended to copy also the patches into
the source distribution directory but using the PF as prefix to avoid
name colision among other recipes.
As 'distsrcall' task was not properly defined and noone noticed it,
until now, it got renamed to 'distribute_sources_all' as it is a
better and more meanful name for the task.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/src_distribute.bbclass | 54 ++++++++++++++++++++---------
meta/classes/src_distribute_local.bbclass | 28 ++++++++-------
2 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/meta/classes/src_distribute.bbclass b/meta/classes/src_distribute.bbclass
index 17d6c09..fbfbdf0 100644
--- a/meta/classes/src_distribute.bbclass
+++ b/meta/classes/src_distribute.bbclass
@@ -2,28 +2,48 @@ SRC_DISTRIBUTECOMMAND[func] = "1"
python do_distribute_sources () {
l = bb.data.createCopy(d)
bb.data.update_data(l)
- licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1)
- import re
- for license in licenses:
- for entry in license.split("|"):
- for s in (bb.data.getVar('A', d, 1) or "").split():
- s = re.sub(';.*$', '', s)
- cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
- if not cmd:
- raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
- bb.data.setVar('SRC', s, d)
- bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, entry), d)
- bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
+ src_uri = bb.data.getVar('SRC_URI', d, 1).split()
+ fetcher = bb.fetch2.Fetch(src_uri, d)
+ ud = fetcher.ud
+
+ licenses = bb.data.getVar('LICENSE', d, 1).replace('&', '|')
+ licenses = licenses.replace('(', '').replace(')', '')
+ clean_licenses = ""
+ for x in licenses.split():
+ if x.strip() == '' or x == 'CLOSED':
+ continue
+
+ if x != "|":
+ clean_licenses += x
+
+ for license in clean_licenses.split('|'):
+ for url in ud.values():
+ cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
+ if not cmd:
+ raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
+ url.setup_localpath(d)
+ bb.data.setVar('SRC', url.localpath, d)
+ if url.type == 'file':
+ if url.basename == '*':
+ import os.path
+ dest_dir = os.path.basename(os.path.dirname(os.path.abspath(url.localpath)))
+ bb.data.setVar('DEST', "%s_%s/" % (bb.data.getVar('PF', d, 1), dest_dir), d)
+ else:
+ bb.data.setVar('DEST', "%s_%s" % (bb.data.getVar('PF', d, 1), url.basename), d)
+ else:
+ bb.data.setVar('DEST', '', d)
+
+ bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, license), d)
+ bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
}
addtask distribute_sources before do_build after do_fetch
-addtask distsrcall after do_distribute_sources
-do_distall[recrdeptask] = "do_distribute_sources"
-base_do_distsrcall() {
+addtask distribute_sources_all after do_distribute_sources
+do_distribute_sources_all[recrdeptask] = "do_distribute_sources"
+do_distribute_sources_all[nostamp] = "1"
+do_distribute_sources_all () {
:
}
-
-EXPORT_FUNCTIONS do_distsrcall
diff --git a/meta/classes/src_distribute_local.bbclass b/meta/classes/src_distribute_local.bbclass
index 5f0cef5..17b67e3 100644
--- a/meta/classes/src_distribute_local.bbclass
+++ b/meta/classes/src_distribute_local.bbclass
@@ -1,31 +1,33 @@
inherit src_distribute
# SRC_DIST_LOCAL possible values:
-# copy copies the files from ${A} to the distributedir
-# symlink symlinks the files from ${A} to the distributedir
+# copy copies the files to the distributedir
+# symlink symlinks the files to the distributedir
# move+symlink moves the files into distributedir, and symlinks them back
SRC_DIST_LOCAL ?= "move+symlink"
SRC_DISTRIBUTEDIR ?= "${DEPLOY_DIR}/sources"
SRC_DISTRIBUTECOMMAND () {
s="${SRC}"
- if [ ! -L "$s" ] && (echo "$s"|grep "^${DL_DIR}"); then
- :
- else
- exit 0;
- fi
+ d="${DEST}"
+
mkdir -p ${SRC_DISTRIBUTEDIR}
+
+ if echo $d | grep -q '/$'; then
+ mkdir -p ${SRC_DISTRIBUTEDIR}/$d
+ fi
+
case "${SRC_DIST_LOCAL}" in
copy)
- test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/
- cp -f $s ${SRC_DISTRIBUTEDIR}/
+ test -e $s.md5 && cp -f $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+ cp -f $s ${SRC_DISTRIBUTEDIR}/$d
;;
symlink)
- test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/
- ln -sf $s ${SRC_DISTRIBUTEDIR}/
+ test -e $s.md5 && ln -sf $s.md5 ${SRC_DISTRIBUTEDIR}/$d.md5
+ ln -sf $s ${SRC_DISTRIBUTEDIR}/$d
;;
move+symlink)
- mv $s ${SRC_DISTRIBUTEDIR}/
- ln -sf ${SRC_DISTRIBUTEDIR}/`basename $s` $s
+ mv $s ${SRC_DISTRIBUTEDIR}/$d
+ ln -sf ${SRC_DISTRIBUTEDIR}/$d $s
;;
esac
}
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 07/26] ghostscript: renamed x86_64 to x86-64 for patch to work
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../ghostscript/{x86_64 => x86-64}/objarch.h | 0
.../ghostscript/{x86_64 => x86-64}/soobjarch.h | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-extended/ghostscript/ghostscript/{x86_64 => x86-64}/objarch.h (100%)
rename meta/recipes-extended/ghostscript/ghostscript/{x86_64 => x86-64}/soobjarch.h (100%)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/x86_64/objarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
diff --git a/meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h
similarity index 100%
rename from meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
rename to meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h
--
1.7.6.2
^ permalink raw reply
* [CONSOLIDATED PULL - v2 05/26] ghostscript: Disable parallel make due to install issues
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
ghostscript uses a script called instcopy to install files first
to temp dir and then rm's and copies dirs|files to the final destination.
When parallel make happens multiple threads of this runs and tries to
remove existing directories with contents, not a good thing, therefore
disable parallel make for install.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../ghostscript/ghostscript_9.02.bb | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
index 9b21c66..1d48cce 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
@@ -90,3 +90,7 @@ do_install_virtclass-native () {
}
BBCLASSEXTEND = "native"
+
+# Ghostscript install tool 'instcopy' tries to remove already created
+# directories during install and parallel make causes problems.
+PARALLEL_MAKEINST=""
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 04/26] gcc-4.6: Backport PR46934 fix
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
We have been hitting this issue on ARM/thumb and
have a workaround in place to compile samba
http://git.openembedded.org/openembedded/commit/recipes/samba/samba_3.2.15.bb?id=4ba7aa07c0dcd28f94515ff9927e2a04403fcf15
This backport should fix the gcc bug
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch | 392 +++++++++++++++++++++++
2 files changed, 394 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 0fb6287..fbc90ea 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r14"
+PR = "r15"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -69,6 +69,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://powerpc-e5500.patch \
file://fix-for-ice-50099.patch \
file://gcc-with-linker-hash-style.patch \
+ file://pr46934.patch \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
new file mode 100644
index 0000000..afd3eef
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
@@ -0,0 +1,392 @@
+2011-09-19 chengbin <bin.cheng@arm.com>
+
+ Backport r174035 from mainline
+ 2011-05-22 Tom de Vries <tom@codesourcery.com>
+
+ PR middle-end/48689
+ * fold-const.c (fold_checksum_tree): Guard TREE_CHAIN use with
+ CODE_CONTAINS_STRUCT (TS_COMMON).
+
+ Backport r172297 from mainline
+ 2011-04-11 Chung-Lin Tang <cltang@codesourcery.com>
+ Richard Earnshaw <rearnsha@arm.com>
+
+ PR target/48250
+ * config/arm/arm.c (arm_legitimize_reload_address): Update cases
+ to use sign-magnitude offsets. Reject unsupported unaligned
+ cases. Add detailed description in comments.
+ * config/arm/arm.md (reload_outdf): Disable for ARM mode; change
+ condition from TARGET_32BIT to TARGET_ARM.
+
+ Backport r171978 from mainline
+ 2011-04-05 Tom de Vries <tom@codesourcery.com>
+
+ PR target/43920
+ * config/arm/arm.h (BRANCH_COST): Set to 1 for Thumb-2 when optimizing
+ for size.
+
+ Backport r171632 from mainline
+ 2011-03-28 Richard Sandiford <richard.sandiford@linaro.org>
+
+ * builtins.c (expand_builtin_memset_args): Use gen_int_mode
+ instead of GEN_INT.
+
+ Backport r171379 from mainline
+ 2011-03-23 Chung-Lin Tang <cltang@codesourcery.com>
+
+ PR target/46934
+ * config/arm/arm.md (casesi): Use the gen_int_mode() function
+ to subtract lower bound instead of GEN_INT().
+
+ Backport r171251 from mainline
+ 2011-03-21 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * config/arm/unwind-arm.c (__gnu_unwind_pr_common): Correct test
+ for barrier handlers.
+
+ Backport r171096 from mainline
+ 2011-03-17 Chung-Lin Tang <cltang@codesourcery.com>
+
+ PR target/43872
+ * config/arm/arm.c (arm_get_frame_offsets): Adjust early
+ return condition with !cfun->calls_alloca.
+
+Index: gcc-4_6-branch/gcc/builtins.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/builtins.c 2011-10-17 17:45:32.050502963 -0700
++++ gcc-4_6-branch/gcc/builtins.c 2011-10-17 17:46:11.154696878 -0700
+@@ -3972,6 +3972,7 @@
+ {
+ tree fndecl, fn;
+ enum built_in_function fcode;
++ enum machine_mode val_mode;
+ char c;
+ unsigned int dest_align;
+ rtx dest_mem, dest_addr, len_rtx;
+@@ -4006,14 +4007,14 @@
+
+ len_rtx = expand_normal (len);
+ dest_mem = get_memory_rtx (dest, len);
++ val_mode = TYPE_MODE (unsigned_char_type_node);
+
+ if (TREE_CODE (val) != INTEGER_CST)
+ {
+ rtx val_rtx;
+
+ val_rtx = expand_normal (val);
+- val_rtx = convert_to_mode (TYPE_MODE (unsigned_char_type_node),
+- val_rtx, 0);
++ val_rtx = convert_to_mode (val_mode, val_rtx, 0);
+
+ /* Assume that we can memset by pieces if we can store
+ * the coefficients by pieces (in the required modes).
+@@ -4024,8 +4025,7 @@
+ builtin_memset_read_str, &c, dest_align,
+ true))
+ {
+- val_rtx = force_reg (TYPE_MODE (unsigned_char_type_node),
+- val_rtx);
++ val_rtx = force_reg (val_mode, val_rtx);
+ store_by_pieces (dest_mem, tree_low_cst (len, 1),
+ builtin_memset_gen_str, val_rtx, dest_align,
+ true, 0);
+@@ -4051,7 +4051,8 @@
+ true))
+ store_by_pieces (dest_mem, tree_low_cst (len, 1),
+ builtin_memset_read_str, &c, dest_align, true, 0);
+- else if (!set_storage_via_setmem (dest_mem, len_rtx, GEN_INT (c),
++ else if (!set_storage_via_setmem (dest_mem, len_rtx,
++ gen_int_mode (c, val_mode),
+ dest_align, expected_align,
+ expected_size))
+ goto do_libcall;
+Index: gcc-4_6-branch/gcc/config/arm/arm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.c 2011-10-17 17:45:41.914551883 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.c 2011-10-17 17:48:35.447412371 -0700
+@@ -6406,23 +6406,126 @@
+ HOST_WIDE_INT val = INTVAL (XEXP (*p, 1));
+ HOST_WIDE_INT low, high;
+
+- if (mode == DImode || (mode == DFmode && TARGET_SOFT_FLOAT))
+- low = ((val & 0xf) ^ 0x8) - 0x8;
+- else if (TARGET_MAVERICK && TARGET_HARD_FLOAT)
+- /* Need to be careful, -256 is not a valid offset. */
+- low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
+- else if (mode == SImode
+- || (mode == SFmode && TARGET_SOFT_FLOAT)
+- || ((mode == HImode || mode == QImode) && ! arm_arch4))
+- /* Need to be careful, -4096 is not a valid offset. */
+- low = val >= 0 ? (val & 0xfff) : -((-val) & 0xfff);
+- else if ((mode == HImode || mode == QImode) && arm_arch4)
+- /* Need to be careful, -256 is not a valid offset. */
+- low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
+- else if (GET_MODE_CLASS (mode) == MODE_FLOAT
+- && TARGET_HARD_FLOAT && TARGET_FPA)
+- /* Need to be careful, -1024 is not a valid offset. */
+- low = val >= 0 ? (val & 0x3ff) : -((-val) & 0x3ff);
++ /* Detect coprocessor load/stores. */
++ bool coproc_p = ((TARGET_HARD_FLOAT
++ && (TARGET_VFP || TARGET_FPA || TARGET_MAVERICK)
++ && (mode == SFmode || mode == DFmode
++ || (mode == DImode && TARGET_MAVERICK)))
++ || (TARGET_REALLY_IWMMXT
++ && VALID_IWMMXT_REG_MODE (mode))
++ || (TARGET_NEON
++ && (VALID_NEON_DREG_MODE (mode)
++ || VALID_NEON_QREG_MODE (mode))));
++
++ /* For some conditions, bail out when lower two bits are unaligned. */
++ if ((val & 0x3) != 0
++ /* Coprocessor load/store indexes are 8-bits + '00' appended. */
++ && (coproc_p
++ /* For DI, and DF under soft-float: */
++ || ((mode == DImode || mode == DFmode)
++ /* Without ldrd, we use stm/ldm, which does not
++ fair well with unaligned bits. */
++ && (! TARGET_LDRD
++ /* Thumb-2 ldrd/strd is [-1020,+1020] in steps of 4. */
++ || TARGET_THUMB2))))
++ return false;
++
++ /* When breaking down a [reg+index] reload address into [(reg+high)+low],
++ of which the (reg+high) gets turned into a reload add insn,
++ we try to decompose the index into high/low values that can often
++ also lead to better reload CSE.
++ For example:
++ ldr r0, [r2, #4100] // Offset too large
++ ldr r1, [r2, #4104] // Offset too large
++
++ is best reloaded as:
++ add t1, r2, #4096
++ ldr r0, [t1, #4]
++ add t2, r2, #4096
++ ldr r1, [t2, #8]
++
++ which post-reload CSE can simplify in most cases to eliminate the
++ second add instruction:
++ add t1, r2, #4096
++ ldr r0, [t1, #4]
++ ldr r1, [t1, #8]
++
++ The idea here is that we want to split out the bits of the constant
++ as a mask, rather than as subtracting the maximum offset that the
++ respective type of load/store used can handle.
++
++ When encountering negative offsets, we can still utilize it even if
++ the overall offset is positive; sometimes this may lead to an immediate
++ that can be constructed with fewer instructions.
++ For example:
++ ldr r0, [r2, #0x3FFFFC]
++
++ This is best reloaded as:
++ add t1, r2, #0x400000
++ ldr r0, [t1, #-4]
++
++ The trick for spotting this for a load insn with N bits of offset
++ (i.e. bits N-1:0) is to look at bit N; if it is set, then chose a
++ negative offset that is going to make bit N and all the bits below
++ it become zero in the remainder part.
++
++ The SIGN_MAG_LOW_ADDR_BITS macro below implements this, with respect
++ to sign-magnitude addressing (i.e. separate +- bit, or 1's complement),
++ used in most cases of ARM load/store instructions. */
++
++#define SIGN_MAG_LOW_ADDR_BITS(VAL, N) \
++ (((VAL) & ((1 << (N)) - 1)) \
++ ? (((VAL) & ((1 << ((N) + 1)) - 1)) ^ (1 << (N))) - (1 << (N)) \
++ : 0)
++
++ if (coproc_p)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 10);
++ else if (GET_MODE_SIZE (mode) == 8)
++ {
++ if (TARGET_LDRD)
++ low = (TARGET_THUMB2
++ ? SIGN_MAG_LOW_ADDR_BITS (val, 10)
++ : SIGN_MAG_LOW_ADDR_BITS (val, 8));
++ else
++ /* For pre-ARMv5TE (without ldrd), we use ldm/stm(db/da/ib)
++ to access doublewords. The supported load/store offsets are
++ -8, -4, and 4, which we try to produce here. */
++ low = ((val & 0xf) ^ 0x8) - 0x8;
++ }
++ else if (GET_MODE_SIZE (mode) < 8)
++ {
++ /* NEON element load/stores do not have an offset. */
++ if (TARGET_NEON_FP16 && mode == HFmode)
++ return false;
++
++ if (TARGET_THUMB2)
++ {
++ /* Thumb-2 has an asymmetrical index range of (-256,4096).
++ Try the wider 12-bit range first, and re-try if the result
++ is out of range. */
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ if (low < -255)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
++ }
++ else
++ {
++ if (mode == HImode || mode == HFmode)
++ {
++ if (arm_arch4)
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
++ else
++ {
++ /* The storehi/movhi_bytes fallbacks can use only
++ [-4094,+4094] of the full ldrb/strb index range. */
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ if (low == 4095 || low == -4095)
++ return false;
++ }
++ }
++ else
++ low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
++ }
++ }
+ else
+ return false;
+
+@@ -15415,7 +15518,10 @@
+ offsets->soft_frame = offsets->saved_regs + CALLER_INTERWORKING_SLOT_SIZE;
+ /* A leaf function does not need any stack alignment if it has nothing
+ on the stack. */
+- if (leaf && frame_size == 0)
++ if (leaf && frame_size == 0
++ /* However if it calls alloca(), we have a dynamically allocated
++ block of BIGGEST_ALIGNMENT on stack, so still do stack alignment. */
++ && ! cfun->calls_alloca)
+ {
+ offsets->outgoing_args = offsets->soft_frame;
+ offsets->locals_base = offsets->soft_frame;
+Index: gcc-4_6-branch/gcc/config/arm/arm.h
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.h 2011-10-17 17:45:41.910551858 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.h 2011-10-17 17:48:35.447412371 -0700
+@@ -2041,7 +2041,8 @@
+ /* Try to generate sequences that don't involve branches, we can then use
+ conditional instructions */
+ #define BRANCH_COST(speed_p, predictable_p) \
+- (TARGET_32BIT ? 4 : (optimize > 0 ? 2 : 0))
++ (TARGET_32BIT ? (TARGET_THUMB2 && !speed_p ? 1 : 4) \
++ : (optimize > 0 ? 2 : 0))
+ \f
+ /* Position Independent Code. */
+ /* We decide which register to use based on the compilation options and
+Index: gcc-4_6-branch/gcc/config/arm/arm.md
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/arm.md 2011-10-17 17:46:11.002696119 -0700
++++ gcc-4_6-branch/gcc/config/arm/arm.md 2011-10-17 17:46:11.202697111 -0700
+@@ -6187,7 +6187,7 @@
+ [(match_operand:DF 0 "arm_reload_memory_operand" "=o")
+ (match_operand:DF 1 "s_register_operand" "r")
+ (match_operand:SI 2 "s_register_operand" "=&r")]
+- "TARGET_32BIT"
++ "TARGET_THUMB2"
+ "
+ {
+ enum rtx_code code = GET_CODE (XEXP (operands[0], 0));
+@@ -8359,7 +8359,8 @@
+ rtx reg = gen_reg_rtx (SImode);
+
+ emit_insn (gen_addsi3 (reg, operands[0],
+- GEN_INT (-INTVAL (operands[1]))));
++ gen_int_mode (-INTVAL (operands[1]),
++ SImode)));
+ operands[0] = reg;
+ }
+
+Index: gcc-4_6-branch/gcc/config/arm/unwind-arm.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/config/arm/unwind-arm.c 2011-10-17 17:45:41.390549278 -0700
++++ gcc-4_6-branch/gcc/config/arm/unwind-arm.c 2011-10-17 17:46:11.000000000 -0700
+@@ -1196,8 +1196,6 @@
+ ucbp->barrier_cache.bitpattern[4] = (_uw) &data[1];
+
+ if (data[0] & uint32_highbit)
+- phase2_call_unexpected_after_unwind = 1;
+- else
+ {
+ data += rtti_count + 1;
+ /* Setup for entry to the handler. */
+@@ -1207,6 +1205,8 @@
+ _Unwind_SetGR (context, 0, (_uw) ucbp);
+ return _URC_INSTALL_CONTEXT;
+ }
++ else
++ phase2_call_unexpected_after_unwind = 1;
+ }
+ if (data[0] & uint32_highbit)
+ data++;
+Index: gcc-4_6-branch/gcc/fold-const.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/fold-const.c 2011-10-17 17:45:32.050502963 -0700
++++ gcc-4_6-branch/gcc/fold-const.c 2011-10-17 17:46:11.178696990 -0700
+@@ -13788,7 +13788,8 @@
+ if (TREE_CODE_CLASS (code) != tcc_type
+ && TREE_CODE_CLASS (code) != tcc_declaration
+ && code != TREE_LIST
+- && code != SSA_NAME)
++ && code != SSA_NAME
++ && CODE_CONTAINS_STRUCT (code, TS_COMMON))
+ fold_checksum_tree (TREE_CHAIN (expr), ctx, ht);
+ switch (TREE_CODE_CLASS (code))
+ {
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr40887.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,6 @@
+ /* { dg-options "-O2 -march=armv5te" } */
+ /* { dg-final { scan-assembler "blx" } } */
++/* { dg-prune-output "switch .* conflicts with" } */
+
+ int (*indirect_func)();
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr42575.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,4 +1,4 @@
+-/* { dg-options "-O2 -march=armv7-a" } */
++/* { dg-options "-O2" } */
+ /* Make sure RA does good job allocating registers and avoids
+ unnecessary moves. */
+ /* { dg-final { scan-assembler-not "mov" } } */
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr43698.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,5 @@
+ /* { dg-do run } */
+-/* { dg-options "-Os -march=armv7-a" } */
++/* { dg-options "-Os" } */
+ #include <stdint.h>
+ #include <stdlib.h>
+
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr44788.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-require-effective-target arm_thumb2_ok } */
+-/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -march=armv7-a -mfpu=vfp3 -mfloat-abi=softfp" } */
++/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -mfpu=vfp3 -mfloat-abi=softfp" } */
+
+ void joint_decode(float* mlt_buffer1, int t) {
+ int i;
+Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c
+===================================================================
+--- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/sync-1.c 2011-06-24 08:13:47.000000000 -0700
++++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c 2011-10-17 17:46:11.182697014 -0700
+@@ -1,5 +1,6 @@
+-/* { dg-do run } */
+-/* { dg-options "-O2 -march=armv7-a" } */
++
++/* { dg-do run { target sync_int_long } } */
++/* { dg-options "-O2" } */
+
+ volatile int mem;
+
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 03/26] gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 8ca3174..0fb6287 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -18,7 +18,7 @@ PV = "4.6.1+svnr${SRCPV}"
BINV = "4.6.2"
-SRCREV = 178924
+SRCREV = 180099
BRANCH = "gcc-4_6-branch"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 02/26] bluez4: Add glib-2.0 to DEPENDS
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Khem Raj <raj.khem@gmail.com>
Fixes
| attrib/utils.c:25:18: fatal error: glib.h: No such file or directory
| compilation terminated.
| make[1]: *** [attrib/utils.o] Error 1
| make[1]: *** Waiting for unfinished jobs....
| attrib/interactive.c:27:18: fatal error: glib.h: No such file or
directory
| compilation terminated.
| make[1]: *** [attrib/interactive.o] Error 1
| make: *** [all] Error 2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-connectivity/bluez/bluez4.inc | 2 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fc515f6..9158687 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "udev alsa-lib libusb dbus-glib"
+DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0"
RDEPENDS_${PN}-dev = "bluez-hcidump"
ASNEEDED = ""
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index 52268cf..88ec7a4 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -1,6 +1,6 @@
require bluez4.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://bluetooth.conf"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 01/26] poky: fix broken ubifs link in deploy folder
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Fix broken rootfs image link when ubifs is used.
Function runimagecmd is using image name "${IMAGE_NAME}.rootfs.${type}".
Let's use the same name in IMAGE_CMD_ubifs.
Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
---
meta/classes/image_types.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 2260915..0d64705 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -125,7 +125,7 @@ IMAGE_CMD_ubi () {
echo vol_flags=autoresize >> ubinize.cfg
mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg
}
-IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
+IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
EXTRA_IMAGECMD = ""
EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 00/26] More Updates and Fixes
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
Richard,
This adds on to yesterday's Consolidated Pull with more patches for
both updates and fixes.
a couple of note: Anders' module.bbclass change
Otavio's distubute_src, this change looks good,
but needs your eyes.
The rest are mostly straight forward updates, I held off Nitin's gmp change
on this round do to a failure I was seeing when images failed to work.
Sau!
The following changes since commit e31dd9b65f3b03f79cabab25eca157532de3bd9c:
fontconfig: fix fix-pkgconfig.patch (2011-10-18 18:13:47 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage2
Anders Darander (1):
module.bbclass: add lock to prevent error bulding ext modules
Darren Hart (1):
insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
Joshua Lock (5):
gst-plugins-good: update to 0.10.30
tzdata: updated SRC_URI and update to 2011k
tzcode-native: update SRC_URI to new IANA location
gst-plugins-good: correctly handle gconf schema
distro-tracking-fields: update fields for tzdata and gst-plugins-good
Kang Kai (5):
ghostscript: update to 9.04
libxml-sax-perl: update to 0.99
liburi-perl: update to 1.59
libsdl: update to 1.2.14
distro_tracking_fields: update packages tracking fields
Khem Raj (3):
bluez4: Add glib-2.0 to DEPENDS
gcc-4.6: Upgrade SRCREV to latest FSF 4.6 branch
gcc-4.6: Backport PR46934 fix
Lauri Hintsala (1):
poky: fix broken ubifs link in deploy folder
Nitin A Kamble (5):
x86 tune files: set baselib for x32 tune as libx32
python-scons: upgrade from 2.0.1 to 2.1.0
python-dbus: upgrade from 0.83.2 to 0.84.0
libxml-parser-perl: upgrade from 2.40 to 2.41
distro-tracking: update data for some toolchain recipes
Otavio Salvador (1):
src_distribute.bbclass, src_distribute_local.bbclass: mostly
rewritten
Saul Wold (2):
ghostscript: Disable parallel make due to install issues
ghostscript: renamed x86_64 to x86-64 for patch to work
Wenzong Fan (2):
ccache: update to 3.1.6
chkconfig: Update to 1.3.55
meta/classes/image_types.bbclass | 2 +-
meta/classes/insane.bbclass | 2 +-
meta/classes/module.bbclass | 5 +-
meta/classes/src_distribute.bbclass | 54 ++-
meta/classes/src_distribute_local.bbclass | 28 +-
.../conf/distro/include/distro_tracking_fields.inc | 82 +++--
meta/conf/machine/include/ia32/arch-ia32.inc | 2 +-
meta/conf/machine/include/tune-core2.inc | 2 +-
meta/recipes-connectivity/bluez/bluez4.inc | 2 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
.../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 +-
meta/recipes-devtools/gcc/gcc-4.6.inc | 5 +-
meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch | 392 ++++++++++++++++++++
.../{liburi-perl_1.58.bb => liburi-perl_1.59.bb} | 6 +-
...ser-perl_2.40.bb => libxml-parser-perl_2.41.bb} | 6 +-
...python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} | 4 +-
...ative_2.0.1.bb => python-scons-native_2.1.0.bb} | 3 +-
...python-scons_2.0.1.bb => python-scons_2.1.0.bb} | 6 +-
.../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +-
.../ghostscript/ghostscript/arm/soobjarch.h | 40 --
.../ghostscript-9.02-prevent_recompiling.patch | 74 ++--
.../ghostscript/ghostscript/i586/soobjarch.h | 41 --
.../ghostscript/ghostscript/mips/soobjarch.h | 40 --
.../ghostscript/ghostscript/powerpc/soobjarch.h | 40 --
.../ghostscript/ghostscript/powerpc64/soobjarch.h | 40 --
.../ghostscript/{x86_64 => x86-64}/objarch.h | 0
.../ghostscript/ghostscript/x86_64/soobjarch.h | 40 --
.../{ghostscript_9.02.bb => ghostscript_9.04.bb} | 28 +-
...ml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} | 7 +-
.../recipes-extended/tzcode/tzcode-native_2011i.bb | 4 +-
.../tzdata/{tzdata_2011k.bb => tzdata_2011l.bb} | 6 +-
meta/recipes-graphics/libsdl/files/acinclude.m4 | 189 ----------
.../libsdl/files/configure_tweak.patch | 281 +++++++--------
.../libsdl/files/kernel-asm-page.patch | 15 -
.../libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} | 17 +-
...good_0.10.28.bb => gst-plugins-good_0.10.30.bb} | 10 +-
36 files changed, 738 insertions(+), 747 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
rename meta/recipes-devtools/perl/{liburi-perl_1.58.bb => liburi-perl_1.59.bb} (81%)
rename meta/recipes-devtools/perl/{libxml-parser-perl_2.40.bb => libxml-parser-perl_2.41.bb} (82%)
rename meta/recipes-devtools/python/{python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} (83%)
rename meta/recipes-devtools/python/{python-scons-native_2.0.1.bb => python-scons-native_2.1.0.bb} (89%)
rename meta/recipes-devtools/python/{python-scons_2.0.1.bb => python-scons_2.1.0.bb} (51%)
rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
rename meta/recipes-extended/ghostscript/ghostscript/{x86_64 => x86-64}/objarch.h (100%)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86_64/soobjarch.h
rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (78%)
rename meta/recipes-extended/perl/{libxml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} (85%)
rename meta/recipes-extended/tzdata/{tzdata_2011k.bb => tzdata_2011l.bb} (96%)
delete mode 100644 meta/recipes-graphics/libsdl/files/acinclude.m4
delete mode 100644 meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
rename meta/recipes-graphics/libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} (81%)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-good_0.10.28.bb => gst-plugins-good_0.10.30.bb} (75%)
--
1.7.6.2
^ permalink raw reply
* Re: [PATCH 2/6] gmp: also generate the libgmpcxx library
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <35417d38f61615445ed0c4d875e0bd0aa5649af4.1318984111.git.nitin.a.kamble@intel.com>
On 10/18/2011 05:30 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> configure runs few checks to make sure c++ compiler and runtime are working as expected
> with the --enable-cxx=detect option.
>
Somehow this change has also changed what the gmp package provides,
before this change the package provided libgmp10 via PKG_gmp: libgmp10,
after this change, the libgmp10 is no longer provided and causes other
breakage.
The example case I found was a coreutils package that was built prior to
this change failed to fulfill it's dependencies after this change when
creating an image. If I rebuild coreutils with the newer gmp build,
then all is well, I think we need to understand this better before
making this change.
Did something else change in the packaging that would cause use to look
the mapping above?
Sau!
> Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com>
> ---
> meta/recipes-support/gmp/gmp.inc | 2 ++
> meta/recipes-support/gmp/gmp_4.2.1.bb | 2 +-
> meta/recipes-support/gmp/gmp_5.0.2.bb | 2 +-
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc
> index 66349e6..3c662a0 100644
> --- a/meta/recipes-support/gmp/gmp.inc
> +++ b/meta/recipes-support/gmp/gmp.inc
> @@ -14,3 +14,5 @@ ARM_INSTRUCTION_SET = "arm"
> acpaths = ""
>
> BBCLASSEXTEND = "native nativesdk"
> +
> +EXTRA_OECONF += " --enable-cxx=detect"
> diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
> index 74da6b8..97ac4b2 100644
> --- a/meta/recipes-support/gmp/gmp_4.2.1.bb
> +++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
> @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+"
> LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
> file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
> file://gmp-h.in;startline=6;endline=21;md5=5e25ffd16996faba8c1cd27b04b16099"
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
> file://disable-stdc.patch"
> diff --git a/meta/recipes-support/gmp/gmp_5.0.2.bb b/meta/recipes-support/gmp/gmp_5.0.2.bb
> index 03fef45..f80971e 100644
> --- a/meta/recipes-support/gmp/gmp_5.0.2.bb
> +++ b/meta/recipes-support/gmp/gmp_5.0.2.bb
> @@ -2,7 +2,7 @@ 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 "
^ permalink raw reply
* Re: [PATCH 3/3 v2] distro_tracking_fields: update packages tracking fields
From: Saul Wold @ 2011-10-20 7:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <79447d2d8514eb75a5cda1a32d7b25d7fc66e50c.1319090166.git.wenzong.fan@windriver.com>
On 10/19/2011 10:59 PM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan<wenzong.fan@windriver.com>
>
> Update packages tracking fields including ccache, chkconfig.
>
> Signed-off-by: Wenzong Fan<wenzong.fan@windriver.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> index abc2cbf..a7c2db5 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -5914,6 +5914,18 @@ RECIPE_LATEST_RELEASE_DATE_pn-gettext = "Jun 06, 2010"
> RECIPE_LAST_UPDATE_pn-gettext = "May 24, 2011"
> RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Sep 29, 2011"
>
> +RECIPE_STATUS_pn-ccache = "green"
> +RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan<wenzong.fan@windriver.com>"
> +RECIPE_LATEST_VERSION_pn-ccache = "3.1.6"
> +RECIPE_LAST_UPDATE_pn-ccache = "June 24, 2011"
You just updated this package, so this should be today's date
Do you mean theis to be RECIPE_LATEST_RELEASE_DATE of June? Is that
when the 3.1.6 tarball was released?
> +RECIPE_MANUAL_CHECK_DATE_pn-ccache = "October 11, 2011"
> +
> +RECIPE_STATUS_pn-chkconfig = "green"
> +RECIPE_MAINTAINER_pn-chkconfig = "Wenzong Fan<wenzong.fan@windriver.com>"
> +RECIPE_LATEST_VERSION_pn-chkconfig = "1.3.55"
> +RECIPE_LAST_UPDATE_pn-chkconfig = "May 24, 2011"
Same as above!
Sau!
> +RECIPE_MANUAL_CHECK_DATE_pn-chkconfig = "October 11, 2011"
> +
> RECIPE_STATUS_pn-pseudo = "green"
> RECIPE_LATEST_VERSION_pn-pseudo = "1.1.1"
> RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
^ permalink raw reply
* Re: [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
From: Koen Kooi @ 2011-10-20 6:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAP9ODKopjm-bJY3WJriMiQDtwZcsOWeqZkqnm7F2PwiZvWY0bg@mail.gmail.com>
Op 28 sep. 2011, om 22:04 heeft Otavio Salvador het volgende geschreven:
> On Wed, Sep 28, 2011 at 16:50, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>>> This patch improves the current situation and I don't foresee the
>>> autoPR code working soon
>>
>> Which is why we need to switch to that model and shake out the issues
>> sooner than later. Enough is enough with the PR madness and we need to
>> get to grips and fix it.
>
> I fully agree this is the way to go but this doesn't mean we ought to
> hold this patch until all this happens. This patch allows the removal
> of the kernel.bbclass from meta-oe so reducing the delta between
> oe-core and meta-oe.
So a month later and no sign of the mythical working auto-PR-incrementer or work on it. So can this patch go in? It would mean we can drop kernel.bbclass from meta-oe.
^ permalink raw reply
* Re: [PATCH 1/3 v2] ccache: update to 3.1.6
From: wenzong fan @ 2011-10-20 6:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <b475d0b4e57ccfa1b7001238aabe7d88b0fa5c3d.1319090166.git.wenzong.fan@windriver.com>
Recall this threads, they are duplicated with another one.
Wenzong
On 10/20/2011 01:59 PM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan<wenzong.fan@windriver.com>
>
> Update ccache to 3.1.6 from 3.1.5.
>
> Signed-off-by: Wenzong Fan<wenzong.fan@windriver.com>
> ---
> .../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
>
> diff --git a/meta/recipes-devtools/ccache/ccache_3.1.5.bb b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
> similarity index 47%
> rename from meta/recipes-devtools/ccache/ccache_3.1.5.bb
> rename to meta/recipes-devtools/ccache/ccache_3.1.6.bb
> index 9a967b2..e87468a 100644
> --- a/meta/recipes-devtools/ccache/ccache_3.1.5.bb
> +++ b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
> @@ -4,5 +4,5 @@ PR = "r0"
> LICENSE = "GPLv3+"
> LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932"
>
> -SRC_URI[md5sum] = "b1a9684828eae68382d6afc98ce80d24"
> -SRC_URI[sha256sum] = "54afc35c672ce451e04a478cfc0eb74c1ba184e27ef24881206602aa0eb94d63"
> +SRC_URI[md5sum] = "e6565e7d6c95d1e35b7a0d67e39901e8"
> +SRC_URI[sha256sum] = "59f58bb73f00db5bbff36b8eb530d3000c86b3110e34cf8dba9e2a5d19eb684f"
>
^ permalink raw reply
* Re: [PATCH 0/3 v2] Update packages
From: wenzong fan @ 2011-10-20 6:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319090166.git.wenzong.fan@windriver.com>
I got some issues on the git-sendmail, please ignore the duplicate emails.
Sorry for the inconvenience.
Thanks
Wenzong
On 10/20/2011 02:04 PM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan<wenzong.fan@windriver.com>
>
> v2 add the patch to distro_tracking_fields.inc file.
>
> The following changes since commit b4757833c3548b5ee3a1cce58e2f059b3f63cb09:
> Martin Jansa (1):
> fontconfig: fix fix-pkgconfig.patch
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib wenzong/update_pkgs
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/update_pkgs
>
> Wenzong Fan (3):
> ccache: update to 3.1.6
> chkconfig: Update to 1.3.55
> distro_tracking_fields: update packages tracking fields
>
> .../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
> .../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
> .../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
> 3 files changed, 17 insertions(+), 5 deletions(-)
> rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
> rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply
* [PATCH 0/3 v2] Update packages
From: wenzong.fan @ 2011-10-20 6:04 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
v2 add the patch to distro_tracking_fields.inc file.
The following changes since commit b4757833c3548b5ee3a1cce58e2f059b3f63cb09:
Martin Jansa (1):
fontconfig: fix fix-pkgconfig.patch
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/update_pkgs
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/update_pkgs
Wenzong Fan (3):
ccache: update to 3.1.6
chkconfig: Update to 1.3.55
distro_tracking_fields: update packages tracking fields
.../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
.../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
.../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
3 files changed, 17 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
^ permalink raw reply
* [PATCH 3/3 v2] distro_tracking_fields: update packages tracking fields
From: wenzong.fan @ 2011-10-20 5:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319090166.git.wenzong.fan@windriver.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
Update packages tracking fields including ccache, chkconfig.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index abc2cbf..a7c2db5 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5914,6 +5914,18 @@ RECIPE_LATEST_RELEASE_DATE_pn-gettext = "Jun 06, 2010"
RECIPE_LAST_UPDATE_pn-gettext = "May 24, 2011"
RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Sep 29, 2011"
+RECIPE_STATUS_pn-ccache = "green"
+RECIPE_MAINTAINER_pn-ccache = "Wenzong Fan <wenzong.fan@windriver.com>"
+RECIPE_LATEST_VERSION_pn-ccache = "3.1.6"
+RECIPE_LAST_UPDATE_pn-ccache = "June 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-ccache = "October 11, 2011"
+
+RECIPE_STATUS_pn-chkconfig = "green"
+RECIPE_MAINTAINER_pn-chkconfig = "Wenzong Fan <wenzong.fan@windriver.com>"
+RECIPE_LATEST_VERSION_pn-chkconfig = "1.3.55"
+RECIPE_LAST_UPDATE_pn-chkconfig = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-chkconfig = "October 11, 2011"
+
RECIPE_STATUS_pn-pseudo = "green"
RECIPE_LATEST_VERSION_pn-pseudo = "1.1.1"
RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
--
1.7.0.4
^ permalink raw reply related
* [PATCH 2/3 v2] chkconfig: Update to 1.3.55
From: wenzong.fan @ 2011-10-20 5:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319090166.git.wenzong.fan@windriver.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
Update chkconfig to 1.3.55 from 1.3.52.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
similarity index 83%
rename from meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
rename to meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
index 6dc8a0e..0e50936 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
@@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
DEPENDS = "libnewt popt"
-PR = "r1"
+PR = "r0"
SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "a576808a6d66763606d750ec451bab6d"
-SRC_URI[sha256sum] = "aa36bf7fd3f7c6e3371eddd8a7846b83435c48f132cc5919d83a830504b797d6"
+SRC_URI[md5sum] = "de562d5bff5116d1acf2d3191603096b"
+SRC_URI[sha256sum] = "ac5e8f6c5ed83f5b65a3dd9187f8c534f167193446082e6a6576a0d9f72ba968"
inherit autotools gettext
--
1.7.0.4
^ permalink raw reply related
* [PATCH 1/3 v2] ccache: update to 3.1.6
From: wenzong.fan @ 2011-10-20 5:59 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319090166.git.wenzong.fan@windriver.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
Update ccache to 3.1.6 from 3.1.5.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
diff --git a/meta/recipes-devtools/ccache/ccache_3.1.5.bb b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
similarity index 47%
rename from meta/recipes-devtools/ccache/ccache_3.1.5.bb
rename to meta/recipes-devtools/ccache/ccache_3.1.6.bb
index 9a967b2..e87468a 100644
--- a/meta/recipes-devtools/ccache/ccache_3.1.5.bb
+++ b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
@@ -4,5 +4,5 @@ PR = "r0"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932"
-SRC_URI[md5sum] = "b1a9684828eae68382d6afc98ce80d24"
-SRC_URI[sha256sum] = "54afc35c672ce451e04a478cfc0eb74c1ba184e27ef24881206602aa0eb94d63"
+SRC_URI[md5sum] = "e6565e7d6c95d1e35b7a0d67e39901e8"
+SRC_URI[sha256sum] = "59f58bb73f00db5bbff36b8eb530d3000c86b3110e34cf8dba9e2a5d19eb684f"
--
1.7.0.4
^ permalink raw reply related
* Re: [PATCH 4/4] gst-plugins-good: correctly handle gconf schema
From: Koen Kooi @ 2011-10-20 5:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <04a2c43182d07a54ec535dea8c7434f6741014e1.1319064437.git.josh@linux.intel.com>
Op 20 okt. 2011, om 00:49 heeft Joshua Lock het volgende geschreven:
> Add the shipped gconf schema to the base package and inherit the gconf class
> so that scheme processing is handled via post* scripts.
>
> Signed-off-by: Joshua Lock <josh@linux.intel.com>
> ---
> .../gstreamer/gst-plugins-good_0.10.30.bb | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
> index 96855aa..d63b09a 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
> @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>
> DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
> speex libsoup-2.4 pulseaudio"
> -PR = "r2"
> +PR = "r3"
>
> -inherit gettext
> +inherit gettext gconf
>
> EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check"
>
> @@ -20,3 +20,5 @@ do_configure_prepend() {
>
> SRC_URI[md5sum] = "62fd7a3ef187c4f99b3d7c352d58dae9"
> SRC_URI[sha256sum] = "b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"
> +
> +FILES_${PN} += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas"
If think that schema needs to go into the gconf-elements plugin package, no?
regards,
Koen
^ permalink raw reply
* useradd class not working
From: Otavio Salvador @ 2011-10-20 4:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Hello,
I am using useradd in a recipe and it needs to add a group in the
rootfs at build time. This doesn't work.
it seems groupadd does nothing.
Has someone used or tried it?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: [PATCH 1/2] qmmp: update to 0.5.2
From: Xiaofeng Yan @ 2011-10-20 2:27 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E9F5AC2.9080905@intel.com>
On 2011年10月20日 07:18, Saul Wold wrote:
> On 10/19/2011 03:31 AM, Xiaofeng Yan wrote:
>> On 2011年10月18日 13:44, Xiaofeng Yan wrote:
>>> On 2011年10月18日 13:35, Saul Wold wrote:
>>>> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote:
>>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>>
>>>>> The new version of qmmp can run on core-image-sato by test.
>>>>> $qmmp *.mp3
>>>>>
>>>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>> ---
>>>>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49
>>>>> +++++++++++++++++++++++++++++++++
>>>>> 1 files changed, 49 insertions(+), 0 deletions(-)
>>>>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>>>
>>>>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>>> new file mode 100644
>>>>> index 0000000..f31409b
>>>>> --- /dev/null
>>>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>>> @@ -0,0 +1,49 @@
>>>>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an
>>>>> audio-player, written with help of Qt library"
>>>>> +HOMEPAGE = "http://qmmp.ylsoftware.com"
>>>>> +LICENSE = "GPLv2"
>>>>> +LIC_FILES_CHKSUM =
>>>>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>>>>> +SECTION = "multimedia"
>>>>> +
>>>>> +PR = "r3"
>>>>> +
>>>>> +PROVIDES = "qmmp"
>>>>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
>>>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
>>>>> +
>>>>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
>>>>> +
>>>>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
>>>>> +SRC_URI[sha256sum] =
>>>>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
>>>>> +
>>>>> +
>>>>> +PARALLEL_MAKE = ""
>>>>> +
>>>>> +inherit qmake2 cmake
>>>>> +
>>>>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
>>>>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
>>>>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
>>>>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
>>>>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
>>>>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
>>>>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
>>>>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
>>>>> + "
>>>>> +
>>>>> +FILES_${PN} =+ "\
>>>>> + ${libdir}/qmmp/*/*.so \
>>>>> + ${datadir}/icons/* \
>>>>> + ${datadir}/qmmp/images/* \
>>>>> + ${datadir}/applications/qmmp.desktop \
>>>>> + "
>>>>> +
>>>> Xiaofeng,
>>>>
>>>> I was looking into this also, I think it would be better to split all
>>>> the various plugins into separate packages using
>>>> do_split_packages(), in
>>>> the packages.bbclass.
>>>>
>>>> I started with this code:
>>>>> PACKAGES_DYNAMIC = "qmmp-plugin-*"
>>>>>
>>>>> python populate_packages_prepend () {
>>>>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
>>>>>
>>>>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$',
>>>>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='')
>>>>> }
>>>>
>>>> But have not completed it yet, if you have time to investigate
>>>> further and complete this correctly, there might be a problem with
>>>> using multiple Regular expressions in the do_split_packages code, but
>>>> I have not fully debugged this yet.
>>>>
>>>> Please let me know if you can complete this task.
>>>>
>> Hi saul,
>>
>> The following is my modification to qmmp_0.5.2.bb. Please review it.
>> I want to get a reply about how to ship files in ${datadir} for qmmp. I
>> shipped them to FILES_${PN} because qmmp need these files when starting
>> up. Do you think that they should be packaged like qmmp-plugin-* ?
>>
>> Please give me your suggestion and I will modify this file.
>>
>>
>> PACKAGES_DYNAMIC += "qmmp-plugin-*"
>>
>>
>> python populate_packages_prepend () {
>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
>> do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$',
>> 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='')
>> }
>>
> Ah, I see you added the recursive flag, I was trying to capture the
> plugin group (Input, Ouput, Effect, ...) in the package name incase
> there was name conflict, also to match the mad and vorbis naming below.
>
> If using multiple RE expressions in the re match does not work, then
> we should make do_split_package for each grouping and name them correctly
> qmmp-plugin-<group>-<library> with the Description: Qmmp <Group>
> plugin for %s"
>
>> FILES_${PN} = "\
> I think this should be a +=
>> ${bindir}/qmmp \
>> ${libdir}/lib*${SOLIBS} \
> These 2 should go away (part of default FILES_${PN}
>> ${datadir}/icons/* \
>> ${datadir}/qmmp/images/* \
>> ${datadir}/applications/* \
>> "
> There are added via the += above.
>
I agree with your comment
>>
>> FILES_${PN}-dbg += "\
>> ${libdir}/qmmp/*/.debug/* \
>> "
>>
> These should be picked up by the do_split_package above I believe
>
I will use do_split_package to split up them .
>> PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis "
>>
>> FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
>> RDEPENDS_${PN}-plugin-input-mad = "libmad"
>> FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
>> RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
>>
> Ideally the above PACKAGES and FILES_ go away and the default actions
> take over.
>
I will continue looking into them and push this bb file to OE-core after
modifying defects.
Thanks for your reply
Thanks
Yan
> Thanks for looking into this.
>
> Sau!
>
>>
>>
>> Thanks
>> Yan
>>> Thanks for your reply and I will investigate it according to your
>>> suggestion.
>>>
>>> Thanks
>>> Yan
>>>> Thanks
>>>> Sau!
>>>>
>>>>
>>>>> +FILES_${PN}-dbg += "\
>>>>> + ${libdir}/qmmp/*/.debug/* \
>>>>> + "
>>>>> +
>>>>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
>>>>> +
>>>>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
>>>>> +RDEPENDS_${PN}-plugin-input-mad = "libmad"
>>>>> +FILES_${PN}-plugin-input-vorbis =
>>>>> "${libdir}/qmmp/Input/libvorbis.so"
>>>>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
>>>>
>>>>
>>>
>>>
>>> _______________________________________________
>>> 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
>
>
^ permalink raw reply
* Re: [CONSOLIDATED PULL 14/16] distro-tracking: update data for some toolchain recipes
From: Saul Wold @ 2011-10-19 23:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Phil Blundell
In-Reply-To: <CAP9ODKoFRiVnimZ3MDvK9S2v8JLykpR2-pWmmwz_2ua0pr-HfA@mail.gmail.com>
On 10/19/2011 12:00 PM, Otavio Salvador wrote:
> On Wed, Oct 19, 2011 at 16:30, Khem Raj<raj.khem@gmail.com> wrote:
> ...
>>>>> Many upstreams we can't track if updates are required automagically, so
>>>>> we
>>>>> need a place to record when the last manual check was, also possible
>>>>> reasons
>>>>> why we should not update to newer versions, ...
>>
>> hmm manual check means it has to be done manually is there any thing
>> that needs it ?
>>
>> I think unless they are distro specific which seems not since they are
>> in oe-core
>> they could exist in recipes thats my opinion.
>
> I agree that this should be put into the recipes. Besides this allows
> for checking if it was updated when the version has been updated.
>
> If done right, when updating the version this data will be updated
> together. I see no change in the amount of changes.
>
> A plus of this choice is it will be more difficult to forget to update
> that info. This happened in last qt update for an example.
>
This may need to be something that the TSC brings up, possibly we can
talk about it in Prague next week.
Sau!
^ permalink raw reply
* Re: [PATCH 0/2] Update packages
From: Saul Wold @ 2011-10-19 23:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1319012299.git.wenzong.fan@windriver.com>
On 10/19/2011 01:53 AM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan<wenzong.fan@windriver.com>
>
> Update ccache/chkconfig to latest version.
>
> The following changes since commit b4757833c3548b5ee3a1cce58e2f059b3f63cb09:
> Martin Jansa (1):
> fontconfig: fix fix-pkgconfig.patch
>
Please update the distro_tracking_fields file when updates recipes.
Thanks
Sau!
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib wenzong/update_pkgs
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/update_pkgs
>
> Wenzong Fan (2):
> ccache: update to 3.1.6
> chkconfig: Update to 1.3.55
>
> .../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
> .../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
> rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
> rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH 1/2] qmmp: update to 0.5.2
From: Saul Wold @ 2011-10-19 23:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E9EA6E7.9000409@windriver.com>
On 10/19/2011 03:31 AM, Xiaofeng Yan wrote:
> On 2011年10月18日 13:44, Xiaofeng Yan wrote:
>> On 2011年10月18日 13:35, Saul Wold wrote:
>>> On 10/17/2011 10:21 PM, Xiaofeng Yan wrote:
>>>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>>
>>>> The new version of qmmp can run on core-image-sato by test.
>>>> $qmmp *.mp3
>>>>
>>>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>>> ---
>>>> meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 49
>>>> +++++++++++++++++++++++++++++++++
>>>> 1 files changed, 49 insertions(+), 0 deletions(-)
>>>> create mode 100644 meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>>
>>>> diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>> b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>> new file mode 100644
>>>> index 0000000..f31409b
>>>> --- /dev/null
>>>> +++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
>>>> @@ -0,0 +1,49 @@
>>>> +dESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an
>>>> audio-player, written with help of Qt library"
>>>> +HOMEPAGE = "http://qmmp.ylsoftware.com"
>>>> +LICENSE = "GPLv2"
>>>> +LIC_FILES_CHKSUM =
>>>> "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
>>>> +SECTION = "multimedia"
>>>> +
>>>> +PR = "r3"
>>>> +
>>>> +PROVIDES = "qmmp"
>>>> +DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib"
>>>> +RDEPENDS_${PN} += "taglib alsa-lib libmad curl"
>>>> +
>>>> +SRC_URI = "http://qmmp.ylsoftware.com/files/${BPN}-${PV}.tar.bz2"
>>>> +
>>>> +SRC_URI[md5sum] = "20852f3cce3471bfc5affa9b2e947dc6"
>>>> +SRC_URI[sha256sum] =
>>>> "6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec"
>>>> +
>>>> +
>>>> +PARALLEL_MAKE = ""
>>>> +
>>>> +inherit qmake2 cmake
>>>> +
>>>> +export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \
>>>> + -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \
>>>> + -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \
>>>> + -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \
>>>> + -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \
>>>> + -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \
>>>> + -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \
>>>> + -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \
>>>> + "
>>>> +
>>>> +FILES_${PN} =+ "\
>>>> + ${libdir}/qmmp/*/*.so \
>>>> + ${datadir}/icons/* \
>>>> + ${datadir}/qmmp/images/* \
>>>> + ${datadir}/applications/qmmp.desktop \
>>>> + "
>>>> +
>>> Xiaofeng,
>>>
>>> I was looking into this also, I think it would be better to split all
>>> the various plugins into separate packages using do_split_packages(), in
>>> the packages.bbclass.
>>>
>>> I started with this code:
>>>> PACKAGES_DYNAMIC = "qmmp-plugin-*"
>>>>
>>>> python populate_packages_prepend () {
>>>> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
>>>>
>>>> do_split_packages(d, qmmp_libdir, '^(.*)/(.*)\.so$',
>>>> 'qmmp-plugin-%s-%s', 'Qmmp %s Plugin for %s', extra_depends='')
>>>> }
>>>
>>> But have not completed it yet, if you have time to investigate
>>> further and complete this correctly, there might be a problem with
>>> using multiple Regular expressions in the do_split_packages code, but
>>> I have not fully debugged this yet.
>>>
>>> Please let me know if you can complete this task.
>>>
> Hi saul,
>
> The following is my modification to qmmp_0.5.2.bb. Please review it.
> I want to get a reply about how to ship files in ${datadir} for qmmp. I
> shipped them to FILES_${PN} because qmmp need these files when starting
> up. Do you think that they should be packaged like qmmp-plugin-* ?
>
> Please give me your suggestion and I will modify this file.
>
>
> PACKAGES_DYNAMIC += "qmmp-plugin-*"
>
>
> python populate_packages_prepend () {
> qmmp_libdir = bb.data.expand('${libdir}/qmmp', d)
> do_split_packages(d, qmmp_libdir, '^lib(.*)\.so$',
> 'qmmp-plugin-%s', 'Qmmp %s Plugin for', recursive=True,extra_depends='')
> }
>
Ah, I see you added the recursive flag, I was trying to capture the
plugin group (Input, Ouput, Effect, ...) in the package name incase
there was name conflict, also to match the mad and vorbis naming below.
If using multiple RE expressions in the re match does not work, then we
should make do_split_package for each grouping and name them correctly
qmmp-plugin-<group>-<library> with the Description: Qmmp <Group> plugin
for %s"
> FILES_${PN} = "\
I think this should be a +=
> ${bindir}/qmmp \
> ${libdir}/lib*${SOLIBS} \
These 2 should go away (part of default FILES_${PN}
> ${datadir}/icons/* \
> ${datadir}/qmmp/images/* \
> ${datadir}/applications/* \
> "
There are added via the += above.
>
> FILES_${PN}-dbg += "\
> ${libdir}/qmmp/*/.debug/* \
> "
>
These should be picked up by the do_split_package above I believe
> PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis "
>
> FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
> RDEPENDS_${PN}-plugin-input-mad = "libmad"
> FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
> RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
>
Ideally the above PACKAGES and FILES_ go away and the default actions
take over.
Thanks for looking into this.
Sau!
>
>
> Thanks
> Yan
>> Thanks for your reply and I will investigate it according to your
>> suggestion.
>>
>> Thanks
>> Yan
>>> Thanks
>>> Sau!
>>>
>>>
>>>> +FILES_${PN}-dbg += "\
>>>> + ${libdir}/qmmp/*/.debug/* \
>>>> + "
>>>> +
>>>> +PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis"
>>>> +
>>>> +FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
>>>> +RDEPENDS_${PN}-plugin-input-mad = "libmad"
>>>> +FILES_${PN}-plugin-input-vorbis = "${libdir}/qmmp/Input/libvorbis.so"
>>>> +RDEPENDS_${PN}-plugin-input-vorbis = "libvorbis libogg"
>>>
>>>
>>
>>
>> _______________________________________________
>> 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
^ 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