[OE-core] [PATCH 2/2] bluez4: update recipe from meta-oe
* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core
Signed-off-by: Martin Jansa
---
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 17 ++---
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
index ebd2849..edba167 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.96.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb
@@ -7,12 +7,9 @@ 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 = "gst-plugins-base alsa-lib libusb dbus-glib libnl"
+DEPENDS = "udev gst-plugins-base alsa-lib libusb dbus-glib usbpath"
RDEPENDS_${PN}-dev = "bluez-hcidump"
-# For angstrom we want this to replace at least bluez-libs
-PROVIDES_append_angstrom = " bluez-utils bluez-libs"
-
ASNEEDED = ""
PR = "r0"
@@ -24,6 +21,7 @@ SRC_URI = "\
SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
SRC_URI[sha256sum] =
"c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
+
S = "${WORKDIR}/bluez-${PV}"
inherit autotools
@@ -32,20 +30,16 @@ EXTRA_OECONF = "\
--enable-gstreamer \
--enable-alsa \
--enable-usb \
- --enable-netlink \
--enable-tools \
--enable-bccmd \
--enable-hid2hci \
--enable-dfutool \
--enable-hidd \
- --enable-pandd \
+ --enable-pand \
--enable-dund \
--disable-cups \
--enable-test \
- --enable-manpages \
--enable-configfiles \
- --enable-initscripts \
- --disable-pcmciarules \
"
do_install_append() {
@@ -59,8 +53,8 @@ do_install_append() {
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/
${base_libdir}/systemd/"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
${libdir}/alsa-lib/*.la \
@@ -70,4 +64,5 @@ FILES_${PN}-dev += "\
FILES_${PN}-dbg += "\
${libdir}/bluetooth/plugins/.debug \
${libdir}/*/.debug \
+ ${base_libdir}/udev/.debug \
"
--
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/2] Small fixes
The following changes since commit 2e83e6755441cb14bd907d306974338c15173189: kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib jansa/pull http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull Martin Jansa (2): task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager bluez4: update recipe from meta-oe meta/recipes-connectivity/bluez/bluez4_4.96.bb | 17 ++--- meta/recipes-core/tasks/task-core-boot.bb |5 - 2 files changed, 10 insertions(+), 12 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] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager
Signed-off-by: Martin Jansa
---
meta/recipes-core/tasks/task-core-boot.bb |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-boot.bb
b/meta/recipes-core/tasks/task-core-boot.bb
index eb2b548..9116c38 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -17,6 +17,9 @@ PR = "r8"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+# Distro can override dev_manager provider
+VIRTUAL-RUNTIME_dev_manager ?= "udev"
+
PACKAGES = "\
task-core-boot \
task-core-boot-dbg \
@@ -33,7 +36,7 @@ RDEPENDS_task-core-boot = "\
netbase \
sysvinit \
tinylogin \
-udev \
+${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
--
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][RFC] cortexa8: use hard floating point
>From what I could gather, it makes sense to address using mfloat-abi=hard
for the beagleboard in the cortexa8 tune file. Before I submit this as a pull
request, I'd appreciate a sanity check from the Beagleboard experts.
Is there any reason the cortexa8 tune file should not be using "hf" by default?
Thanks,
Darren
Fixes [YOCTO #1203]
mfloat-abi is currently set to soft for beagleboard (cortexa8) and needs to be
set to hard to take advantage of the floating point hardware.
Append "hf" to each of the cortexa8 TUNE_FEATURES and PACKAGE_EXTRA_ARCHS
variables. This enables "callconvention-hard" from the included
arch-armv7a.inc.
Add a missing closing quote to the VFP AVAILTUNES append operation.
Signed-off-by: Darren Hart
CC: Jason Kridner
CC: Koen Kooi
---
meta/conf/machine/include/arm/arch-armv7a.inc |2 +-
meta/conf/machine/include/tune-cortexa8.inc | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc
b/meta/conf/machine/include/arm/arch-armv7a.inc
index 704f86b..d508352 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -20,7 +20,7 @@ PACKAGE_EXTRA_ARCHS_tune-armv7at =
"${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a ar
PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}
armv7a-vfp-neon armv7at2-vfp-neon"
# VFP Tunes
-AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon
+AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon"
TUNE_FEATURES_tune-armv7ahf ?= "${TUNE_FEATURES_tune-armv7a}
callconvention-hard"
TUNE_FEATURES_tune-armv7athf ?= "${TUNE_FEATURES_tune-armv7at}
callconvention-hard"
TUNE_FEATURES_tune-armv7ahf-neon ?= "${TUNE_FEATURES_tune-armv7a-neon}
callconvention-hard"
diff --git a/meta/conf/machine/include/tune-cortexa8.inc
b/meta/conf/machine/include/tune-cortexa8.inc
index 02b560c..e7483b9 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -6,11 +6,11 @@ TUNEVALID[cortexa8] = "Enable Cortex-A8 specific processor
optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "cortexa8",
"-mtune=cortex-a8", "", d)}"
AVAILTUNES += "cortexa8 cortexa8t"
-TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8"
-TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8"
+TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7ahf} cortexa8"
+TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7athf} cortexa8"
TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-cortexa8} neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at}"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon}"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf}"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8t = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf}"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon =
"${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon}"
--
1.7.1
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] remove lttng-ust from mips GDB Build
Richard, This patch remove lttng-ust from the mips depends list since lttng-ust and liburcu do not build for mips at this time. Sau! The following changes since commit 2e83e6755441cb14bd907d306974338c15173189: kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +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): gdb: remove lttng-ust from DEPENDS for mips meta/recipes-devtools/gdb/gdb-common.inc |1 + 1 files changed, 1 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
[OE-core] [PATCH 1/1] gdb: remove lttng-ust from DEPENDS for mips
Signed-off-by: Saul Wold --- meta/recipes-devtools/gdb/gdb-common.inc |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index df6c70f..5ffbf87 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdb/"; LICENSE="GPLv3+" SECTION = "devel" DEPENDS = "ncurses readline elfutils lttng-ust" +DEPENDS_mips = "ncurses readline elfutils" INC_PR = "r2" -- 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][v2] file: new file version 5.07
* file version 5.07 also prevents magic file mistmatch
in Fedora 15
* related to bug 1358.
http://bugzilla.pokylinux.org/show_bug.cgi?id=1358
* v2 remove previous file version 5.04
remove unused patchs
Signed-off-by: Adrian Alonso
---
meta/recipes-devtools/file/file/ge-le.patch| 72
.../file/file/stringb-compat.patch | 31 -
meta/recipes-devtools/file/file_5.04.bb| 39 ---
meta/recipes-devtools/file/file_5.07.bb| 36 ++
4 files changed, 36 insertions(+), 142 deletions(-)
delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch
delete mode 100644 meta/recipes-devtools/file/file/stringb-compat.patch
delete mode 100644 meta/recipes-devtools/file/file_5.04.bb
create mode 100644 meta/recipes-devtools/file/file_5.07.bb
diff --git a/meta/recipes-devtools/file/file/ge-le.patch
b/meta/recipes-devtools/file/file/ge-le.patch
deleted file mode 100644
index fb7d671..000
--- a/meta/recipes-devtools/file/file/ge-le.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream-Status: Pending
-
-`>=' and `<=' was silently ignored in previous version,
-but causes an warning in file 5.04. Add support for these
-two operators as a feature extension, however, users should
-not rely on them.
-
-8/17/2010 - created by Qing He
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 3d4c3cf..a2b86ed 100644
a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry
**mentryp, uint32_t *nmentryp,
- m->reln = *l;
- ++l;
- if (*l == '=') {
-- if (ms->flags & MAGIC_CHECK) {
-- file_magwarn(ms, "%c= not supported",
-- m->reln);
-- return -1;
-- }
-+ if (m->reln == '>')
-+ m->reln = 'g';
-+ else if (m->reln == '<')
-+ m->reln = 'l';
- ++l;
- }
- break;
-diff --git a/src/softmagic.c b/src/softmagic.c
-index d8a5675..1648e43 100644
a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m)
- }
- break;
-
-+ case 'g':
-+ if (m->flag & UNSIGNED) {
-+ matched = v >= l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%llu >= %llu = %d\n",
-+ (unsigned long long)v,
-+ (unsigned long long)l, matched);
-+ }
-+ else {
-+ matched = (int64_t) v >= (int64_t) l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%lld >= %lld = %d\n",
-+ (long long)v, (long long)l, matched);
-+ }
-+ break;
-+
-+ case 'l':
-+ if (m->flag & UNSIGNED) {
-+ matched = v <= l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%llu <= %llu = %d\n",
-+ (unsigned long long)v,
-+ (unsigned long long)l, matched);
-+ }
-+ else {
-+ matched = (int64_t) v <= (int64_t) l;
-+ if ((ms->flags & MAGIC_DEBUG) != 0)
-+ (void) fprintf(stderr, "%lld <= %lld = %d\n",
-+ (long long)v, (long long)l, matched);
-+ }
-+ break;
-+
- case '&':
- matched = (v & l) == l;
- if ((ms->flags & MAGIC_DEBUG) != 0)
diff --git a/meta/recipes-devtools/file/file/stringb-compat.patch
b/meta/recipes-devtools/file/file/stringb-compat.patch
deleted file mode 100644
index 8aba31e..000
--- a/meta/recipes-devtools/file/file/stringb-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-`B' in file 4.x has the same meaning with `W' in file 5,
-let `B' be an alias of `W'.
-
-8/17/2010 - created by Qing He
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 58826c3..3d4c3cf 100644
a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -1340,6 +1340,7 @@ parse(struct magic_set *ms, struct magic_entry
**mentryp, uint32_t *nmentryp,
- "zero range");
- l = t - 1;
- break;
-+ case CHAR_COMPACT_BLANK:
- case CHAR_COMPACT_WHITESPACE:
- m->str_flags |=
STRING_COMPACT_WHITESPACE;
- break;
-diff --
[OE-core] [PATCH] tcl: fix networking breakage
Without providing these site entries tcl networking doesn't work on the target.
Original OE commit:
commit 0c340037644f87054462f62b50cd397c162615b7
Author: Koen Kooi
Date: Wed May 26 13:04:18 2010 +0200
tcl: add 2 entries to arm-linux site file (possibly only glibc specific,
need to check)
Signed-off-by: Koen Kooi
---
meta/recipes-devtools/tcltk/tcl_8.5.9.bb |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
index 2eabb4d..1b4ae83 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM =
"file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
"
-PR = "r1"
+PR = "r2"
BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
file://tcl-add-soname.patch"
@@ -30,7 +30,9 @@ inherit autotools
DEPENDS_virtclass-native = ""
-EXTRA_OECONF = "--enable-threads"
+EXTRA_OECONF = "--enable-threads \
+tcl_cv_api_getaddrinfo=yes \
+ "
do_configure() {
gnu-configize
--
1.6.6.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 1/2] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
On Wed, 2011-08-17 at 19:37 +0100, Paul Eggleton wrote: > +Files in the deploy directory will not be re-created automatically if you > +delete them. If you do delete a file, you will need to run: > + > + bitbake -c clean TARGET > + bitbake TARGET > + > +where TARGET is the name of the appropriate package or target e.g. > +"virtual/kernel" for the kernel, an image, etc. Doesn't it suffice to run "bitbake -f -c deploy TARGET"? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 0/2] Couple of fixes to help new users
Please review the following changes for suitability for inclusion. If you have any objections or suggestions for improvement, please respond to the patches. If you agree with the changes, please provide your Acked-by. The following changes since commit 2e83e6755441cb14bd907d306974338c15173189: kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/sanity3 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sanity3 Paul Eggleton (2): image.bbclass, kernel.bbclass: create warning file about deleting deploydir files sanity.bbclass: add optional untested host distro warning meta/classes/image.bbclass |2 + meta/classes/kernel.bbclass |2 + meta/classes/sanity.bbclass | 48 +++ meta/files/deploydir_readme.txt |8 ++ 4 files changed, 60 insertions(+), 0 deletions(-) create mode 100644 meta/files/deploydir_readme.txt -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 1/2] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files
New users sometimes delete files in tmp/deploy/images assuming they will
be re-created just by re-running the build, and then are confused when
this doesn't work. To discourage people from doing this, create a file
called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in
tmp/deploy/images containing an explanation of what needs to be done to
re-create files there.
Fixes [YOCTO #1315] and [YOCTO #1346].
Signed-off-by: Paul Eggleton
---
meta/classes/image.bbclass |2 ++
meta/classes/kernel.bbclass |2 ++
meta/files/deploydir_readme.txt |8
3 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 meta/files/deploydir_readme.txt
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 54eb78b..286ae01 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -138,6 +138,8 @@ fakeroot do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
+ cp -n ${COREBASE}/meta/files/deploydir_readme.txt
${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
+
if [ "${USE_DEVFS}" != "1" ]; then
for devtable in ${@get_devtable_list(d)}; do
makedevs -r ${IMAGE_ROOTFS} -D $devtable
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 386b05e..a2b10f2 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -500,6 +500,8 @@ kernel_do_deploy() {
cd ${DEPLOYDIR}
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+
+ cp -n ${COREBASE}/meta/files/deploydir_readme.txt
${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt
}
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
diff --git a/meta/files/deploydir_readme.txt b/meta/files/deploydir_readme.txt
new file mode 100644
index 000..97ec185
--- /dev/null
+++ b/meta/files/deploydir_readme.txt
@@ -0,0 +1,8 @@
+Files in the deploy directory will not be re-created automatically if you
+delete them. If you do delete a file, you will need to run:
+
+ bitbake -c clean TARGET
+ bitbake TARGET
+
+where TARGET is the name of the appropriate package or target e.g.
+"virtual/kernel" for the kernel, an image, etc.
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 2/2] sanity.bbclass: add optional untested host distro warning
SANITY_TESTED_DISTROS, if specified, is expected to be a
newline-delimited list of distro identifier strings, e.g.
SANITY_TESTED_DISTROS = " \
Ubuntu 11.04 \
Fedora release 14 (Laughlin) \
"
(spaces, tabs etc. are trimmed)
If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host
distribution. If the distribution is not in SANITY_TESTED_DISTROS or we
could not detect the distribution then we show a warning during sanity
checking.
Provides the mechanism for fixing [YOCTO #1096].
Signed-off-by: Paul Eggleton
---
meta/classes/sanity.bbclass | 48 +++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index d50c843..16af029 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -118,6 +118,52 @@ def check_connectivity(d):
return retval
+def check_supported_distro(e):
+tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+if not tested_distros:
+return
+
+if os.path.exists("/etc/redhat-release"):
+f = open("/etc/redhat-release", "r")
+try:
+distro = f.readline()
+finally:
+f.close()
+elif os.path.exists("/etc/SuSE-release"):
+f = open("/etc/SuSE-release", "r")
+try:
+distro = f.readline()
+# Remove the architecture suffix e.g. (i586)
+distro = re.sub(r' \([a-zA-Z0-9\-_]*\)$', '', distro).strip()
+finally:
+f.close()
+else:
+# Use LSB method
+import subprocess as sub
+try:
+p =
sub.Popen(['lsb_release','-d','-s'],stdout=sub.PIPE,stderr=sub.PIPE)
+out, err = p.communicate()
+distro = out.rstrip()
+except Exception:
+distro = None
+
+if not distro:
+if os.path.exists("/etc/lsb-release"):
+f = open("/etc/lsb-release", "r")
+try:
+for line in f:
+lns = line.split('=')
+if lns[0] == "DISTRIB_DESCRIPTION":
+distro = lns[1].strip('"\n')
+break
+finally:
+f.close()
+if distro:
+if distro not in [x.strip() for x in tested_distros.split('\n')]:
+bb.warn('Host distribution "%s" has not been validated with this
version of the build system; you may possibly experience unexpected failures.
It is recommended that you use a tested distribution.' % distro)
+else:
+bb.warn('Host distribution could not be determined; you may possibly
experience unexpected failures. It is recommended that you use a tested
distribution.')
+
def check_sanity(e):
from bb import note, error, data, __version__
@@ -249,6 +295,8 @@ def check_sanity(e):
if pseudo_msg != "":
messages = messages + pseudo_msg + '\n'
+check_supported_distro(e)
+
# Check if DISPLAY is set if IMAGETEST is set
if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar(
'IMAGETEST', e.data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu,
please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] qt4: allow a reduction in build time
* Richard Purdie [110817 16:09]:
> On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> > phrasebook_dir =
> > bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> > phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s',
> > d)
> > -do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > +try:
> > +do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > +except:
> > +pass
> Please use some actual test here, not a general try/except/pass. This
> reason is that is some failure we want to know about happens, this will
> hide it as the code stands.
> The rest of the patch is ok, this just needs tweaking.
An updated patch is available at the same pull tree. I've also sent a
new pull request titled: [PATCH v3 0/1] Qt4: reduce build time.
In this updated version, I'll check if the path in phrasebook_dir
exists, and depending on this outcome, I'll call do_split_packages.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/1] qt4: allow a reduction in build time
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui
-nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to
not building
all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()
Signed-off-by: Anders Darander
---
meta/recipes-qt/qt4/qt4.inc | 13 +++--
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 0410a92..5545be7 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -227,10 +227,11 @@ python populate_packages_prepend() {
phrasebook_dir =
bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
-do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name,
'${PN} phrasebook for %s', extra_depends='' )
+import os;
+if os.path.exists(phrasebook_dir):
+do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
# Package all the plugins and their -dbg version and create a meta
package
-import os
def qtopia_split(path, name, glob):
"""
Split the package into a normal and -dbg package and then add
the
@@ -278,11 +279,11 @@ do_install() {
# These are host binaries, we should only use them in staging
rm ${D}/${bindir}/qmake
- rm ${D}/${bindir}/uic
- rm ${D}/${bindir}/uic3
+ rm -f ${D}/${bindir}/uic
+ rm -f ${D}/${bindir}/uic3
rm ${D}/${bindir}/moc
rm ${D}/${bindir}/rcc
- rm ${D}/${bindir}/lrelease
+ rm -f ${D}/${bindir}/lrelease
# fix pkgconfig, libtool and prl files
sed -i -e s#-L${S}/lib##g \
@@ -319,6 +320,6 @@ do_install() {
#Append an E to the qtdemo file
if [ -n "${QT_LIBINFIX}" ] ; then
- mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+ [ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo
${D}${bindir}/qtdemo${QT_LIBINFIX}
fi
}
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/1] Qt4: reduce build time
Reduce the build time of qt4-embedded. V3: * Explicitly check if the phrasebook dir exists, instead of relying on a try-except clause that also would catch other errors. V2 and earlier was a larger patch series. There were no modifications to this patch in V2. The following changes since commit 2e83e6755441cb14bd907d306974338c15173189: kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100) are available in the git repository at: git://github.com/darander/oe-core qt4-fixes https://github.com/darander/oe-core/tree/qt4-fixes Anders Darander (1): qt4: allow a reduction in build time meta/recipes-qt/qt4/qt4.inc | 13 +++-- 1 files changed, 7 insertions(+), 6 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] qt4: allow a reduction in build time
* Richard Purdie [110817 16:09]:
> On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> > When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui
> > -nomake tools
> > -nomake examples -nomake demos -nomake docs', build failure can occur, due
> > to not building
> > all tools.
> >
> > * Make rm not error out when removing one of the, possibly, non-existing
> > tools.
> > * Only try to rename qtdemo, if qtdemo exists.
> > * Guard do_split_packages() with an try-except-clause, otherwise we get an
> > error stating
> > that .../phrasebooks/... do not exist.
> >
> > Signed-off-by: Anders Darander
> > ---
> > meta/recipes-qt/qt4/qt4.inc | 13 -
> > 1 files changed, 8 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> > index 0410a92..994ec12 100644
> > --- a/meta/recipes-qt/qt4/qt4.inc
> > +++ b/meta/recipes-qt/qt4/qt4.inc
> > @@ -227,7 +227,10 @@ python populate_packages_prepend() {
> >
> > phrasebook_dir =
> > bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> > phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s',
> > d)
> > -do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > +try:
> > +do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> > phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> > +except:
> > +pass
> Please use some actual test here, not a general try/except/pass. This
> reason is that is some failure we want to know about happens, this will
> hide it as the code stands.
Yes, that's right. Initially I had a plan to get some ideas on how to
tackle this, but I think I've got a good test outlined. Hopefully I can
implement and test it tonight, otherwise I'll do it tomorrow.
Cheers,
Anders
--
Anders Darander
ChargeStorm AB
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] glib-2.0: explicitly disable dtrace and systemtap for native varaint
This prevents systemtap and dtrace being picked up from the host as
reported on the Yocto mailing list by Andre Haupt
Signed-off-by: Joshua Lock
---
meta/recipes-core/glib-2.0/glib.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc
b/meta/recipes-core/glib-2.0/glib.inc
index e25db3d..fdbfa54 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -26,7 +26,7 @@ inherit autotools pkgconfig gettext
S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
-EXTRA_OECONF_virtclass-native = ""
+EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d
${datadir}/glib-2.0/schemas"
--
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] Disable dtrace and system tap for glib-2.0-native
Per discussion on the Yocto mailing list: https://lists.yoctoproject.org/pipermail/yocto/2011-August/004571.html Regards, Joshua The following changes since commit 2e83e6755441cb14bd907d306974338c15173189: kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib josh/work http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work Joshua Lock (1): glib-2.0: explicitly disable dtrace and systemtap for native varaint meta/recipes-core/glib-2.0/glib.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 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] [PATCH] libc-package bbclass: fix binary localedata dependency code
On Thu, Aug 4, 2011 at 3:00 PM, Phil Blundell wrote:
> On Wed, 2011-08-03 at 08:19 +0200, Koen Kooi wrote:
>> Op 2 aug. 2011, om 17:01 heeft Phil Blundell het volgende geschreven:
>>
>> > It does look a bit weird. That code was introduced in 561d8754,
>> > ostensibly as a merger of the eglibc and glibc equivalents. But, the
>> > original code from glibc-package.bbclass did:
>> >
>> > def output_locale_binary_rdepends(name, pkgname, locale, encoding):
>> > m = re.match("(.*)\.(.*)", name)
>> > if m:
>> > glibc_name = "%s.%s" % (m.group(1),
>> > m.group(2).lower().replace("-",""))
>> > else:
>> > glibc_name = name
>> > bb.data.setVar('RDEPENDS_%s' % pkgname,
>> > legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
>> >
>> > ... i.e. it was using the "." separator both for splitting and joining,
>> > which seems reasonable. But somehow when it showed up in
>> > libc-package.bbclass it had gotten transmogrified so that it split on
>> > "_" but joined with "." as you showed below. That seems bogus to me.
>
> I'm not sure whether your original locale problem is still an issue, but
> I am still fairly convinced that the change to the regex in the code
> above was incorrect. Unless the author of 561d8754 wants to speak up in
> its defence soon, I will submit a patch to change it back to using ".".
yes I think that would be right thing to do. Will you submit a patch please ?
>
> p.
>
>
>
> ___
> 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] libc-package bbclass: fix binary localedata dependency code
On Thu, Aug 11, 2011 at 9:43 PM, Kamble, Nitin A
wrote:
> Hi Koen,
> Sorry for replying late, I am on vacation now. I looked at my commit
> 561d875404ef1783f94f37314b6e756766db8411, and from it I see that both eglibc
> & glibc package.bbclass has same lines
> - if m:
> - eglibc_name = "%s.%s" % (m.group(1),
> m.group(2).lower().replace("-",""))
> - else:
> - eglibc_name = name
> So I am not sure that this is the correct fix. I will look into it further
> and reply later.
this code is not the problem the real problem is the splitting code
that changed in this commit
- m = re.match("(.*)\.(.*)", name)
+ m = re.match("(.*)_(.*)", name)
Why is regular expression splitting at _ and joining with . ?
original behaviour was to split and join with .
This seems incorrect to me.
> Thanks,
> Nitin
>
>> -Original Message-
>> From: Koen Kooi [mailto:k...@dominion.thruhere.net]
>> Sent: Tuesday, August 09, 2011 11:14 PM
>> To: Patches and discussions about the oe-core layer
>> Cc: Kamble, Nitin A
>> Subject: Re: [OE-core] [PATCH] libc-package bbclass: fix binary
>> localedata dependency code
>>
>> Nitin, any insights on this?
>>
>> Op 2 aug. 2011, om 17:01 heeft Phil Blundell het volgende geschreven:
>>
>> > It does look a bit weird. That code was introduced in 561d8754,
>> > ostensibly as a merger of the eglibc and glibc equivalents. But, the
>> > original code from glibc-package.bbclass did:
>> >
>> > def output_locale_binary_rdepends(name, pkgname, locale,
>> encoding):
>> > m = re.match("(.*)\.(.*)", name)
>> > if m:
>> > glibc_name = "%s.%s" % (m.group(1),
>> m.group(2).lower().replace("-",""))
>> > else:
>> > glibc_name = name
>> > bb.data.setVar('RDEPENDS_%s' % pkgname,
>> legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
>> >
>> > ... i.e. it was using the "." separator both for splitting and
>> joining,
>> > which seems reasonable. But somehow when it showed up in
>> > libc-package.bbclass it had gotten transmogrified so that it split on
>> > "_" but joined with "." as you showed below. That seems bogus to me.
>> >
>> > p.
>> >
>> > On Tue, 2011-08-02 at 16:55 +0200, Koen Kooi wrote:
>> >> The bug I was seeing was caused by something else, but I'd still
>> like feedback on this patch to find out why the dot vs dash difference
>> exists
>> >>
>> >> Op 2 aug. 2011, om 16:47 heeft Koen Kooi het volgende geschreven:
>> >>
>> >>> When using binary locales rootfs generation fails with:
>> >>>
>> >>> | Unknown package 'locale-base-en-us'.
>> >>> | Collected errors:
>> >>> | * opkg_install_cmd: Cannot install package locale-base-en-us.
>> >>>
>> >>> This is due to:
>> >>>
>> >>> $ dpkg-deb -I ipk/armv7a/locale-base-en-us_2.12-r16_armv7a.ipk |
>> grep Depends
>> >>> Depends: eglibc-binary-localedata-en.us
>> >>>
>> >>> Note the '.' seperator
>> >>>
>> >>> $ ls ipk/armv7a/ | grep binary-localedata-en | grep us
>> >>> eglibc-binary-localedata-en-us_2.12-r16_armv7a.ipk
>> >>>
>> >>> Note the '-' seperator vs the '.' in the locale-base packages.
>> >>>
>> >>> Signed-off-by: Koen Kooi
>> >>> ---
>> >>> meta/classes/libc-package.bbclass | 2 +-
>> >>> 1 files changed, 1 insertions(+), 1 deletions(-)
>> >>>
>> >>> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-
>> package.bbclass
>> >>> index de57230..67d08c0 100644
>> >>> --- a/meta/classes/libc-package.bbclass
>> >>> +++ b/meta/classes/libc-package.bbclass
>> >>> @@ -243,7 +243,7 @@ python package_do_split_gconvs () {
>> >>> def output_locale_binary_rdepends(name, pkgname, locale,
>> encoding):
>> >>> m = re.match("(.*)_(.*)", name)
>> >>> if m:
>> >>> - libc_name = "%s.%s" % (m.group(1),
>> m.group(2).lower().replace("-",""))
>> >>> + libc_name = "%s-%s" % (m.group(1),
>> m.group(2).lower().replace("-",""))
>> >>> else:
>> >>> libc_name = name
>> >>> bb.data.setVar('RDEPENDS_%s' % pkgname,
>> legitimize_package_name('%s-binary-localedata-%s' \
>> >>> --
>> >>> 1.6.6.1
>> >>>
>> >>
>> >>
>> >> ___
>> >> 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
>
>
> ___
> 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
h
Re: [OE-core] populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH
On 2011-08-10 07:48, Gary Thomas wrote: On 2011-08-10 07:40, Richard Purdie wrote: On Wed, 2011-08-10 at 07:34 -0600, Gary Thomas wrote: On a related thought to these changes - how does this play if you use multiple SDKs for different, but somewhat related, architectures? I'd like to create a simple SDK (just toolchain mostly) using 'meta-toolchain' for both armv5te and armv7a and install them simultaneously on the same host. My previous attempts at this fell flat as there were a number of files marked as "arm" (i.e. not armv5te or arvm7a) that were common between the two SDK packages, but they didn't seem to be identical. This is supposed to work but wouldn't due to the issue and the patch I've proposed. Whether that is the only issue I don't know. I'll be glad to test this once you've worked it out. Any progress on this yet? The discussion seems to have died down... -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] qemu: Make qemu buildable inside qemux86/qemuppc target
On Tue, 2011-08-16 at 14:32 +0800, Zhai, Edwin wrote:
> On Mon, Aug 15, 2011 at 10:25:49PM +0800, Richard Purdie wrote:
> >
> > The patch is fine but could we change this to something like:
> >
> > # Only use the GL passthrough patches for native/nativesdk versions
> > $QEMUGLPATCHES = "\
> > file://qemu-git-qemugl-host.patch \
> > file://fix-nogl.patch \
> > file://qemugl-allow-glxcontext-release.patch \
> > file://init-info.patch \
> > file://enable-i386-linux-user.patch \
> > file://qemugl-fix.patch \
> > file://opengl-sdl-fix.patch \
> > "
> >
> > SRC_URI_append_virtclass-native = "\
> > ${QEMUGLPATCHES} \
> > "
> >
> > SRC_URI_append_virtclass-nativesdk = "\
> > ${QEMUGLPATCHES} \
> > file://glflags.patch \
> > "
> >
> > which is just a little bit neater. Also, no need for the commented out
> > line.
>
> RP,
> Thanks for your comments. I have modified it. Pls. pull @ same branch:
>
> git://git.pokylinux.org/poky-contrib gzhai/master2
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
>
> BTW, I saw qemugl_git.bb is extended as "nativesdk", and was curious about it
> as
> qemugl is hacked libgl inside qemu guest, thus should not be related to
> "native"
> case. Any reason? Meet the dependency requirement?
I've merged this, thanks.
We need the GL code in nativesdk since this ships as part of the SDK/ADT
toolchain and we want the GL pass through support there.
Cheers,
Richard
___
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] kernel: restore crtsavres.o to enable building external modules on powerpc
On Tue, 2011-08-16 at 21:16 -0700, Darren Hart wrote: > Fixes [YOCTO #1276] > > As of Linux kernel version 3.0.1, and much earlier, the make clean target > removes arch/powerpc/lib/crtsavres.o. As this object is present in > KBUILD_LDFLAGS_MODULE, it is required to build external modules, and should > therefor not be removed by make clean. > > While I do not advocate fixing buggy kernels in the generic kernel classes, > we should probably account for this one in kernel.bbclass as it affects > such a long list of kernel versions. > > Signed-off-by: Darren Hart > CC: Bruce Ashfield > CC: Tom Zanussi Merged to master, thanks. Richard ___ 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] shadow: switch to a fetchable SRC_URI
On Tue, 2011-08-16 at 17:02 -0700, Joshua Lock wrote: > Swith the SRC_URI to the one referenced on the sources section of the > utilities download page (http://pkg-shadow.alioth.debian.org/download.php). > > Signed-off-by: Joshua Lock > --- > .../shadow/shadow-native_4.1.4.3.bb|2 +- > meta/recipes-extended/shadow/shadow_4.1.4.3.bb |2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Merged to master, thanks. Richard ___ 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] buildstats.bbclass: Fixing task endtime
On Wed, 2011-08-17 at 04:38 -0700, Beth Flanagan wrote: > Task endtime got left out of recent changes. Adding it back in. > > Signed-off-by: Beth Flanagan > --- > meta/classes/buildstats.bbclass |6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 4/5] ofono: conditionally enable bluetooth
On Wed, 2011-08-17 at 08:41 +0200, Anders Darander wrote: > Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling > bluetooth. > > Signed-off-by: Anders Darander > --- > meta/recipes-connectivity/ofono/ofono.inc |2 +- > meta/recipes-connectivity/ofono/ofono_0.50.bb |1 + > meta/recipes-connectivity/ofono/ofono_git.bb |4 > 3 files changed, 6 insertions(+), 1 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/27] Updates and various fixes
On Tue, 2011-08-16 at 23:26 -0700, Saul Wold wrote: > This address some issues with the x11 and bluez patches recently, > it also has the latest kernel update. There is also a multi-lib > change that needs your more detailed review. > > The ofono patch from Anders had a question from Koen, so we might > want to hold on that one, otherwise it looks OK to me. > The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4: > > distro-tracking: Update info for gpgme, libassuan, apr... after last > upgrade. (2011-08-15 15:26:04 +0100) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib sgw/stage > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage > > Anders Darander (5): > qt4: allow a reduction in build time > qmake_base: add uclibceabi > connman: use DISTRO_FEATURES to enable wifi and bluetooth > ofono: conditionally enable bluetooth > create-pull-request: increase likelihood of detecting a rename > > Bruce Ashfield (3): > linux-yocto: bump version string to 3.0.1 > qemu: change default kernel to 3.0.x > linux-yocto: meta SRCREV bump > > Dexuan Cui (10): > bluez-hcidump: upgrade from 2.0 to 2.1 > tcf-agent: add openssl into DEPENDS > cronie: upgrade from 1.4.7 to 1.4.8 > mdadm: upgrade mdadm from 3.2.1 to 3.2.2 > util-macros: upgrade from 1.14.0 to the latest version 0.15.0 > freetype: upgrade from 2.4.4 to 2.4.6 > xproto: upgrade from 7.0.21 to 7.0.22 > glproto: upgrade from 1.4.13 to 1.4.14 > dri2proto: upgrade from 2.4 to 2.6 > distro_tracking_fields.inc: update the info for the following recipes > > Dmitry Eremin-Solenikov (1): > libxcb: enable native/nativesdk builds as was done previously in > meta-oe > > Dongxiao Xu (4): > rootfs_rpm: Fix DEFAULTTUNE setting in multilib case > package_rpm: enhance strip_multilib function > package_rpm: Fix package rename issue in multilib case > gtk-icon-cache: Adding MLPREFIX when dynamically set RDEPENDS > > Lianhao Lu (1): > package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS > > Phil Blundell (2): > cmake.bbclass, perlnative.bbclass: arrange for cmake to find > perl-native > libproxy: remove dependency on X libs > > Zhai Edwin (1): > qemu: Make qemu buildable inside qemux86/qemuppc target Merged to master with the exception of the ofono and qt patches from Anders which need smal tweaks. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] qt4: allow a reduction in build time
On Tue, 2011-08-16 at 15:57 +0200, Anders Darander wrote:
> When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui
> -nomake tools
> -nomake examples -nomake demos -nomake docs', build failure can occur, due to
> not building
> all tools.
>
> * Make rm not error out when removing one of the, possibly, non-existing
> tools.
> * Only try to rename qtdemo, if qtdemo exists.
> * Guard do_split_packages() with an try-except-clause, otherwise we get an
> error stating
> that .../phrasebooks/... do not exist.
>
> Signed-off-by: Anders Darander
> ---
> meta/recipes-qt/qt4/qt4.inc | 13 -
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index 0410a92..994ec12 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -227,7 +227,10 @@ python populate_packages_prepend() {
>
> phrasebook_dir =
> bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
> phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
> -do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name,
> '${PN} phrasebook for %s', extra_depends='' )
> +try:
> +do_split_packages(d, phrasebook_dir, '^(.*)\.qph$',
> phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
> +except:
> +pass
Please use some actual test here, not a general try/except/pass. This
reason is that is some failure we want to know about happens, this will
hide it as the code stands.
The rest of the patch is ok, this just needs tweaking.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxslt: fix packaging of static libraries
This prevents warnings about .a files being installed but not shipped.
Signed-off-by: Phil Blundell
---
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 15 ---
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index b5f6962..cc64ba7 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -6,8 +6,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
SECTION = "libs"
-DEPENDS = "libxml2 (>=2.6.27)"
-PR = "r1"
+DEPENDS = "libxml2"
+PR = "r2"
SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
file://pkgconfig_fix.patch;patch=1"
@@ -16,13 +16,14 @@ SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
SRC_URI[sha256sum] =
"55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
S = "${WORKDIR}/libxslt-${PV}"
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig lib_package
EXTRA_OECONF = "--without-python --without-debug --without-mem-debug
--without-crypto"
+# older versions of this recipe had ${PN}-utils
+RPROVIDES_${PN}-bin += "${PN}-utils"
+RCONFLICTS_${PN}-bin += "${PN}-utils"
+RREPLACES_${PN}-bin += "${PN}-utils"
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
+FILES_${PN}-dev += "${bindir}/xsltConf.sh"
BBCLASSEXTEND = "native"
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libxkbcommon: new
This is needed by Clutter's egl backend.
Signed-off-by: Phil Blundell
---
.../xorg-lib/libxkbcommon/cross.patch | 43
meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 22 ++
2 files changed, 65 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
new file mode 100644
index 000..7fd35be
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon/cross.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Inappropriate
+Signed-off-by: Phil Blundell
+
+Use makekeys from -native package rather than trying to compile it here, and
fix up
+configure logic to find keysymdef.h in the sysroot.
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a4d448..214271f 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -1,5 +1,5 @@
+ # Order: makekeys before src
+-SUBDIRS = include makekeys src test
++SUBDIRS = include src test
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xkbcommon.pc
+diff --git a/configure.ac b/configure.ac
+index e6a8f15..7f2c387 100644
+--- a/configure.ac
b/configure.ac
+@@ -74,7 +74,8 @@ PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4])
+
+ # Obtain the path to the X Window System Core Protocol
+ AC_MSG_CHECKING([for X11 includedir])
+-includex11dir="`$PKG_CONFIG --variable=includex11dir xproto`"
++m4_pattern_allow([PKG_CONFIG_SYSROOT_DIR])
++includex11dir="$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includex11dir
xproto`"
+ AC_MSG_RESULT([$includex11dir])
+
+ # Obtain full path for keysymdef header file
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b9a12b9..c625b4c 100644
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -26,5 +26,5 @@ libxkbcommon_la_SOURCES = \
+ BUILT_SOURCES = ks_tables.h
+ CLEANFILES = $(BUILT_SOURCES)
+
+-ks_tables.h: $(top_builddir)/makekeys/makekeys$(EXEEXT) $(KEYSYMDEF_H)
$(XF86KEYSYM_H)
+- $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) |
$(top_builddir)/makekeys/makekeys$(EXEEXT) > $@
++ks_tables.h: $(KEYSYMDEF_H) $(XF86KEYSYM_H)
++ $(AM_V_GEN)cat $(KEYSYMDEF_H) $(XF86KEYSYM_H) |
libxkbcommon-makekeys$(EXEEXT) > $@
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
new file mode 100644
index 000..1b63b0e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb
@@ -0,0 +1,22 @@
+require xorg-lib-common.inc
+
+SUMMARY = "library interface to the XKB compiler"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=469a86f811ec5d6bba592811c3005a2a"
+PR = "r0"
+DEPENDS = "xproto kbproto ${@['', '${PN}-native'][oe.utils.inherits(d,
'virtclass-native')]}"
+
+S = "${WORKDIR}/git"
+
+patches = "file://cross.patch"
+patches_virtclass-native = ""
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libxkbcommon \
+ ${patches}"
+SRCREV = "f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a"
+
+BBCLASSEXTEND = "native"
+
+do_install_append_virtclass-native() {
+ install -m 755 "makekeys/makekeys"
"${STAGING_BINDIR}/libxkbcommon-makekeys"
+}
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] scripts/runqemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so. Use a wildcard to match different locations, as uname -i only return unknown on Debian. Signed-off-by: Anders Darander --- scripts/runqemu |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 2b8e88a..ed8c05b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -388,7 +388,7 @@ libgl='no' test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes' test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes' -test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname -i`-linux-gnu/libGLU.so && libgl='yes' +test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so && libgl='yes' if [ "$libgl" != 'yes' ]; then echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator. -- 1.7.5.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] Make qemu & runqemu detect libgl on Debian
Modify the patches to make qemu-native compile and run on Ubuntu 11.10, to use a wildcard match instead of `uname -i`. The latter only returns unknown on e.g. Debian. These patches are similar to what we did for perl-native in the Configure-multilib.patch (commit id 9260c1b9d04a88d15ab5376c7cd56f381fe3e53b in oe-core). The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4: distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100) are available in the git repository at: git://github.com/darander/oe-core qemu-native https://github.com/darander/oe-core/tree/qemu-native Anders Darander (2): qemu: modify search paths for libgl scripts/runqemu: modify search paths for libgl meta/recipes-devtools/qemu/qemu.inc |2 +- scripts/runqemu |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] qemu: modify search paths for libgl
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on
Debian.
Signed-off-by: Anders Darander
---
meta/recipes-devtools/qemu/qemu.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 85476d6..8a1e934 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,7 +26,7 @@ do_configure_prepend_virtclass-native() {
test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
-test -e /usr/lib/`uname -i`-linux-gnu/libGL.so -a -e /usr/lib/`uname
-i`-linux-gnu/libGLU.so && libgl='yes'
+test -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so
&& libgl='yes'
test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc -o -e
/usr/include/SDL/SDL.h && libsdl='yes'
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] meta-efl/screenshot: add LIC_FILES_CHKSUM
Signed-off-by: Dmitry Eremin-Solenikov
---
meta-efl/recipes-efl/e17/screenshot_svn.bb |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb
b/meta-efl/recipes-efl/e17/screenshot_svn.bb
index 0cd0d8b..a3678e6 100644
--- a/meta-efl/recipes-efl/e17/screenshot_svn.bb
+++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb
@@ -1,6 +1,7 @@
LICENSE = "MIT"
PV = "0.3.0+svnr${SRCREV}"
PR = "${INC_PR}.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
require e-module.inc
--
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] meta-efl/screenshot: fix building with current gettext/auto*
Current auto*/gettext stopped substituting @MKINSTALLDIRS@ variable
which is necessary in screenshot/po/Makefile. Fix that by calling
AM_MKINSTALLDIRS manually.
Signed-off-by: Dmitry Eremin-Solenikov
---
.../screenshot/screenshot-fix-mkinstalldirs.patch | 23
meta-efl/recipes-efl/e17/screenshot_svn.bb |1 +
2 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644
meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
diff --git
a/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
new file mode 100644
index 000..14f1141
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
@@ -0,0 +1,23 @@
+From: Dmitry Eremin-Solenikov
+Subject: fix screenshot po/ building
+Upstream-Status: Pending
+
+Somehow configure doesn't substitute @MKINSTALLDIRS@ by default anymore,
+however this substitution is required for po/Makefile
+
+Fix that by calling AM_MKINSTALLDIRS from configure.ac
+
+Signed-off-by: Dmitry Eremin-Solenikov
+
+Index: E-MODULES-EXTRA/screenshot/configure.ac
+===
+--- E-MODULES-EXTRA.orig/screenshot/configure.ac 2011-08-17
15:49:22.0 +0400
E-MODULES-EXTRA/screenshot/configure.ac2011-08-17 15:49:34.0
+0400
+@@ -24,6 +24,7 @@
+ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+ AC_PROG_LIBTOOL
+
++AM_MKINSTALLDIRS
+ m4_ifdef([AM_GNU_GETTEXT_VERSION], [
+ AM_GNU_GETTEXT_VERSION([0.14])
+ ])
diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb
b/meta-efl/recipes-efl/e17/screenshot_svn.bb
index a3678e6..465ffcf 100644
--- a/meta-efl/recipes-efl/e17/screenshot_svn.bb
+++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb
@@ -2,6 +2,7 @@ LICENSE = "MIT"
PV = "0.3.0+svnr${SRCREV}"
PR = "${INC_PR}.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
+SRC_URI += "file://screenshot-fix-mkinstalldirs.patch"
require e-module.inc
--
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] udisks: add checksums for udisks-1.0.2
Signed-off-by: Dmitry Eremin-Solenikov
---
meta-oe/recipes-support/udisks/udisks_1.0.2.bb |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.2.bb
b/meta-oe/recipes-support/udisks/udisks_1.0.2.bb
index aafeca7..5fe8e36 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.2.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
# optional dependencies: device-mapper parted
-SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
+SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN}
\
file://optional-depends.patch"
inherit autotools
@@ -19,4 +19,6 @@ FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+SRC_URI[udisks.md5sum] = "f630eefa51b95d6485eb3246bc1bea9a"
+SRC_URI[udisks.sha256sum] =
"7dc1a150a6a31b2727144603fa5a8f9852696fc5bdc4a11917b9b0f1b8e3dcf1"
--
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] buildstats.bbclass: Fixing task endtime
Task endtime got left out of recent changes. Adding it back in.
Signed-off-by: Beth Flanagan
---
meta/classes/buildstats.bbclass |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
index 939e3af..55cbb3c 100644
--- a/meta/classes/buildstats.bbclass
+++ b/meta/classes/buildstats.bbclass
@@ -138,9 +138,10 @@ def write_task_data(status, logfile, dev, e):
for key in sorted(diskdata.iterkeys()):
file.write(key + ": " + diskdata[key] + "\n")
if status is "passed":
- file.write("Status: PASSED")
+ file.write("Status: PASSED \n")
else:
-file.write("Status: FAILED")
+file.write("Status: FAILED \n")
+file.write("Ended: %0.2f \n" % time.time())
file.close()
python run_buildstats () {
@@ -149,7 +150,6 @@ python run_buildstats () {
import bb.data
import time, subprocess, platform
-
if isinstance(e, bb.event.BuildStarted):
# at first pass make the buildstats heriarchy and 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] Minor patch to buildstats
Task endtime got left out of recent changes. Adding it back in and removing a superfluous line of whitespace. The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd: Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +0100) are available in the git repository at: ssh://g...@git.yoctoproject.org/poky-contrib eflanagan/disk_io_stats Beth Flanagan (1): buildstats.bbclass: Fixing task endtime meta/classes/buildstats.bbclass |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Beth Flanagan (1): buildstats.bbclass: Fixing task endtime meta/classes/buildstats.bbclass |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mtd-utils: Added recipe of newer version 1.4.4.
From: Noor Ahsan
* Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files.
Signed-off-by: Noor Ahsan
---
.../add-exclusion-to-mkfs-jffs2-git-2.patch| 103
.../add-exclusion-to-mkfs-jffs2-git-2.patch| 103
meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb | 31 --
meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb | 32 ++
4 files changed, 135 insertions(+), 134 deletions(-)
diff --git
a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
deleted file mode 100644
index 57d6a30..000
---
a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Upstream-Status: Pending
-
/tmp/mkfs.jffs2.c 2009-01-11 15:28:41.0 +0100
-+++ git/mkfs.jffs2.c 2009-01-11 15:59:29.0 +0100
-@@ -100,6 +100,11 @@
- struct rb_node hardlink_rb;
- };
-
-+struct ignorepath_entry {
-+ struct ignorepath_entry* next; /* Points to the next ignorepath
element */
-+ char name[PATH_MAX];/* Name of the entry */
-+};
-+static struct ignorepath_entry* ignorepath = 0;
- struct rb_root hardlinks;
- static int out_fd = -1;
- static int in_fd = -1;
-@@ -408,7 +413,7 @@
- char *hpath, *tpath;
- struct dirent *dp, **namelist;
- struct filesystem_entry *entry;
--
-+ struct ignorepath_entry* element = ignorepath;
-
- if (lstat(hostpath, &sb)) {
- perror_msg_and_die("%s", hostpath);
-@@ -417,6 +422,15 @@
- entry = add_host_filesystem_entry(targetpath, hostpath,
- sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
-
-+ while ( element ) {
-+ if ( strcmp( element->name, targetpath ) == 0 ) {
-+ printf( "Note: ignoring directories below '%s'\n",
targetpath );
-+ return entry;
-+ break;
-+ }
-+ element = element->next;
-+ }
-+
- n = scandir(hostpath, &namelist, 0, alphasort);
- if (n < 0) {
- perror_msg_and_die("opening directory %s", hostpath);
-@@ -1453,6 +1467,7 @@
- {"root", 1, NULL, 'r'},
- {"pagesize", 1, NULL, 's'},
- {"eraseblock", 1, NULL, 'e'},
-+ {"ignore", 1, NULL, 'I'},
- {"output", 1, NULL, 'o'},
- {"help", 0, NULL, 'h'},
- {"verbose", 0, NULL, 'v'},
-@@ -1500,6 +1515,7 @@
- " -L, --list-compressors Show the list of the avaiable compressors\n"
- " -t, --test-compression Call decompress and compare with the original (for
test)\n"
- " -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n"
-+" -I, --ignore=PATH Ignore sub directory and file tree below PATH when
recursing over the file system\n"
- " -o, --output=FILE Output to FILE (default: stdout)\n"
- " -l, --little-endian Create a little-endian filesystem\n"
- " -b, --big-endianCreate a big-endian filesystem\n"
-@@ -1666,6 +1682,7 @@
- char *compr_name = NULL;
- int compr_prior = -1;
- int warn_page_size = 0;
-+ struct ignorepath_entry* element = ignorepath;
-
- page_size = sysconf(_SC_PAGESIZE);
- if (page_size < 0) /* System doesn't know so ... */
-@@ -1676,7 +1693,7 @@
- jffs2_compressors_init();
-
- while ((opt = getopt_long(argc, argv,
--
"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
-+
"D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
- {
- switch (opt) {
- case 'D':
-@@ -1700,6 +1717,28 @@
- warn_page_size = 0; /* set by user, so don't
need to warn */
- break;
-
-+ case 'I':
-+ printf( "Note: Adding '%s' to ignore Path\n",
optarg );
-+ element = ignorepath;
-+ if ( !ignorepath ) {
-+ ignorepath = xmalloc( sizeof( struct
ignorepath_entry ) );
-+ ignorepath->next = 0;
-+ strcpy( &ignorepath->name[0], optarg );
-+ } else {
-+ while ( element->next ) element =
element->next;
-+ element->next = xmalloc( sizeof( struct
ignorepath_entry ) );
-+ element->next->next = 0;
-+ strcpy( &element->next->name[0], optarg
);
-+ }
-+ printf( "- Dumping ignore path list
\n" );
-+ element = ignorepath;
-+
Re: [OE-core] Problems with generating and installing localepackages of eglibc/glibc
>> Our questions now: >> >> What was the intention of the changes in the function >> "output_locale_binary_rdepends"? >> Is there a problem using the old function for our local installation ? >> What language definition patterns (in GLIBC_GENERATE_LOCALES) should be >> covered by the new function ? >> Is this a bug ? >That looks like the same bug as described in http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/00740 7.html >Nitin said he'd look into it after getting back from vacation: This is right, this is the solution I would suggest too, I changed it in my environment and it works for me. But there is the questionable rprovides handling in "output_locale_binary_rdepends" of libc-packages.bbclass in oe-core and oe.dev which have to be examined too. Thanks for pointing me to that solution. Regards Wolfgang Hauser ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] at: make at usable for common user
From: Kang Kai
Fixes [Yocto #1297]
The pkg_postinst was added to fix Yocto #675. But it seems not needed
any more. Remove it then unprivilege user could use at.
Signed-off-by: Kang Kai
---
meta/recipes-extended/at/at_3.1.12.bb | 26 +-
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-extended/at/at_3.1.12.bb
b/meta/recipes-extended/at/at_3.1.12.bb
index c76b50e..baf15df 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -4,11 +4,14 @@ the system load levels drop to a particular level."
SECTION = "base"
LICENSE="GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
-DEPENDS = "flex libpam initscripts \
+DEPENDS = "flex initscripts \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+RDEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
+PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
+
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r5"
+PR = "r6"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
@@ -56,23 +59,4 @@ do_install () {
done
}
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ] ; then
- exit 1
- fi
-
- # below is necessary to allow at usable to normal users
- # now at is has its own /var/spool/at instead of under /var/spool/cron
- # this way is better to allow setgid on both sides
- grep "^daemon" /etc/group || groupadd daemon
- chown root:daemon /usr/bin/at
- chmod 2755 /usr/bin/at
-
- chown root:daemon -R /var/spool/at
- chmod 770 -R /var/spool/at
-
- chown root:daemon /etc/at.deny
- chmod 640 /etc/at.deny
-}
-
PARALLEL_MAKE = ""
--
1.7.5.1.300.gc565c
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] at: make at usable for common user
From: Kang Kai Fixes [Yocto #1297] The pkg_postinst was added to fix Yocto #675. But it seems not needed any more. Remove it then unprivilege user could use at. The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd: Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/at http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/at Kang Kai (1): at: make at usable for common user meta/recipes-extended/at/at_3.1.12.bb | 26 +- 1 files changed, 5 insertions(+), 21 deletions(-) -- 1.7.5.1.300.gc565c ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Problems with generating and installing locale packages of eglibc/glibc
Op 17 aug. 2011, om 10:17 heeft Hauser, Wolfgang (external) het volgende
geschreven:
> Hello,
>
> we generated some locale packages of eglibc and wanted to install them
> while offline image generation. The locale-base* packages are installed
> properly, but the corresponding packages e.g. eglibc-binary-localedata-*
> are not installed.(the same occurs with glibc).
> we use following settings:
>
> 2011.03-mainenance branch
>
> local.conf:
> ***
> ENABLE_BINARY_LOCALE_GENERATION = "1"
> LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
> GLIBC_INTERNAL_USE_BINARY_LOCALE = "compile"
> GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8
> de_CH.UTF-8 es_ES.
> UTF-8 fr_FR.UTF-8 fr_CH.UTF-8 it_IT.UTF-8 it_CH.UTF-8"
> ***
>
> xx-image.bb:
> ***
> IMAGE_LINGUAS = "en-us en-gb de-de de-ch es-es fr-fr fr-ch it-it it-ch"
>
> ROOTFS_POSTPROCESS_COMMAND += "install_linguas;"
> ***
>
> The "locale-base-*" packages (e.g de-de) got following package
> description:
>
>
> dpkg-deb -I locale-base-de-de_2.12-r21.8+svnr12323.9_armv7a.ipk
> new debian package, version 2.0.
> size 906 bytes: control archive= 608 bytes.
> 808 bytes,14 lines control
> Package: locale-base-de-de
> Version: 2.12-r21.8+svnr12323.9
> Description: Embedded GNU C Library
> Section: libs
> Priority: required
> Maintainer: Angstrom Developers
> License: LGPL
> Architecture: armv7a
> OE: eglibc
> Homepage: http://www.eglibc.org/home
> Build: /9426
> Depends: eglibc-binary-localedata-de.de
> Provides: virtual-locale-de-de, virtual-locale-de,
> eglibc-binary-localedata-de.de
> Source: svn://svn.eglibc.org/branches;module=eglibc-2_12;proto=svn
> file://eglibc-svn-arm-lowlevellock-include-tls.patch
> file://IO-acquire-lock-fix.patch file://shorten-build-commands.patch
> file://sh4_set_fpscr_2.12.patch file://sh4_local-fpscr_values.patch
> file://eglibc-dont-cache-slibdir.patch
> file://armv4-eabi-compile-fix.patch file://etc/ld.so.conf
> file://generate-supported.mk
> ***
>
> this causes that the corresponding eglibc-binary-localedata-* packages
> are not installed while offline image creation.
>
> The problem is the wrong dependency entry (here: "Depends:
> eglibc-binary-localedata-de.de" package name is
> eglibc-binary-localedata-de-de) and the "self providing" entry (here:
> "Provides: virtual-locale-de-de, virtual-locale-de,
> eglibc-binary-localedata-de.de").
>
> After examine the history of the locale generation, we found a change
> from glibc-package.bbclass to libc-package.bbclass after the
> release-2010.12. Hereby the function "output_locale_binary_rdepends" is
> different.
>
> Version release-2010.12
> glibc-packages.bbclass
>
> ***
> def output_locale_binary_rdepends(name, pkgname, locale,
> encoding):
> m = re.match("(.*)\.(.*)", name)
> if m:
> glibc_name = "%s.%s" % (m.group(1),
> m.group(2).lower().replace("-",""))
> else:
> glibc_name = name
> bb.data.setVar('RDEPENDS_%s' % pkgname,
> legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
> ***
>
> Version 2011.03-maintenance:
> libc-packages.bbclass
>
> ***
> def output_locale_binary_rdepends(name, pkgname, locale,
> encoding):
> m = re.match("(.*)_(.*)", name)
> if m:
> libc_name = "%s.%s" % (m.group(1),
> m.group(2).lower().replace("-",""))
> else:
> libc_name = name
> bb.data.setVar('RDEPENDS_%s' % pkgname,
> legitimize_package_name('%s-binary-localedata-%s' \
> % (bpn, libc_name)), d)
> rprovides = (bb.data.getVar('RPROVIDES_%s' % pkgname, d,
> True) or "").split()
>
> rprovides.append(legitimize_package_name('%s-binary-localedata-%s' %
> (bpn, libc_name)))
> bb.data.setVar('RPROVIDES_%s' % pkgname, "
> ".join(rprovides), d)
> ***
>
> If we use the old function, the locale packages are processed and
> installed properly.
>
> The "locale-base-*" package description now was:
>
> ***
> dpkg-deb -I locale-base-de-de_2.12-r21.8+svnr12323.9_armv7a.ipk
> new debian package, version 2.0.
> size 902 bytes: control archive= 604 bytes.
> 776 bytes,14 lines control
> Package: locale-base-de-de
> Version: 2.12-r21.8+svnr12323.9
> Description: Embedded GNU C Library
> Section: libs
> Priority: required
> Maintainer: Angstrom Developers
> License: LGPL
> Architecture: armv7a
> OE: eglibc
> Homepage: http://www.eglibc.org/home
> Build: /9196
> Depends: eglibc-binary-localedata-de-de
> Provides: virtual-locale-de-de, virtual-locale-de
> Source: svn://svn.eglibc.org/branches;module=eglibc-2_12;proto=svn
> file://eglibc-svn-arm-lowlevellock-include-tls.patch
> file://IO-acquire-lock-fix.patch file://shorten-build-commands.patch
> file://sh4_set_fpscr_2.12.patch file://sh4_local-fpscr_values.patch
> file://eglibc-dont-cache-slibdir.patch
> fi
[OE-core] [PATCH 2/2] sysvinit: Change ${PN} to ${BPN} in file names
Some files in sysvinit are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
Signed-off-by: Dongxiao Xu
---
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index bda8a51..663e298 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r4"
+PR = "r5"
RDEPENDS_${PN} = "${PN}-inittab"
@@ -65,41 +65,41 @@ do_install () {
install -d ${D}${sysconfdir}/rc$level.d
ln -s ../init.d/stop-bootlogd
${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
done
- mv ${D}${base_sbindir}/init
${D}${base_sbindir}/init.${PN}
- mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN}
- mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
- mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
- mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
- mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}
- mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
- mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
- mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+ mv ${D}${base_sbindir}/init
${D}${base_sbindir}/init.${BPN}
+ mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN}
+ mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN}
+ mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN}
+ mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN}
+ mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN}
+ mv ${D}${bindir}/last ${D}${bindir}/last.${BPN}
+ mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${BPN}
+ mv ${D}${bindir}/wall ${D}${bindir}/wall.${BPN}
}
pkg_postinst_${PN} () {
- update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
- update-alternatives --install ${base_sbindir}/reboot reboot
reboot.${PN} 200
- update-alternatives --install ${base_sbindir}/shutdown shutdown
shutdown.${PN} 200
- update-alternatives --install ${base_sbindir}/poweroff poweroff
poweroff.${PN} 200
- update-alternatives --install ${bindir}/last last last.${PN} 200
- update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
- update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+ update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200
+ update-alternatives --install ${base_sbindir}/reboot reboot
reboot.${BPN} 200
+ update-alternatives --install ${base_sbindir}/shutdown shutdown
shutdown.${BPN} 200
+ update-alternatives --install ${base_sbindir}/poweroff poweroff
poweroff.${BPN} 200
+ update-alternatives --install ${bindir}/last last last.${BPN} 200
+ update-alternatives --install ${bindir}/mesg mesg mesg.${BPN} 200
+ update-alternatives --install ${bindir}/wall wall wall.${BPN} 200
}
pkg_prerm_${PN} () {
- update-alternatives --remove halt halt.${PN}
- update-alternatives --remove reboot reboot.${PN}
- update-alternatives --remove shutdown shutdown.${PN}
- update-alternatives --remove poweroff poweroff.${PN}
- update-alternatives --remove last last.${PN}
- update-alternatives --remove mesg mesg.${PN}
- update-alternatives --remove wall wall.${PN}
+ update-alternatives --remove halt halt.${BPN}
+ update-alternatives --remove reboot reboot.${BPN}
+ update-alternatives --remove shutdown shutdown.${BPN}
+ update-alternatives --remove poweroff poweroff.${BPN}
+ update-alternatives --remove last last.${BPN}
+ update-alternatives --remove mesg mesg.${BPN}
+ update-alternatives --remove wall wall.${BPN}
}
pkg_postinst_sysvinit-pidof () {
- update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+ update-alternatives --install ${base_bindir}/pidof pidof pidof.${BPN}
200
}
pkg_prerm_sysvinit-pidof () {
- update-alternatives --remove pidof pidof.${PN}
+ update-alternatives --remove pidof pidof.${BPN}
}
--
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/2][PULL] multilib: use ${BPN} in file names
Hi Richard,
This pull request is to fix some file names in certain recipes,
please help to review and pull.
Thanks,
Dongxiao
The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.
(2011-08-15 15:26:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ml2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml2
Dongxiao Xu (2):
busybox: Change ${PN} to ${BPN} in file names
sysvinit: Change ${PN} to ${BPN} in file names
meta/recipes-core/busybox/busybox.inc | 30 +++---
meta/recipes-core/busybox/busybox_1.18.4.bb|2 +-
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52
3 files changed, 42 insertions(+), 42 deletions(-)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] busybox: Change ${PN} to ${BPN} in file names
Some files in busybox are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.
Signed-off-by: Dongxiao Xu
---
meta/recipes-core/busybox/busybox.inc | 30 +-
meta/recipes-core/busybox/busybox_1.18.4.bb |2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc
b/meta/recipes-core/busybox/busybox.inc
index d46c135..3f93358 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev"
INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
-CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
+CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}"
CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
@@ -152,24 +152,24 @@ do_install () {
install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
cat busybox.links | while read FILE; do
NAME=`basename "$FILE"`
- install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}"
+ install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
done
# add suid bit where needed
for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))"
include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`;
do
- find ${D} -name $i.${PN} -exec chmod a+s {} \;
+ find ${D} -name $i.${BPN} -exec chmod a+s {} \;
done
install -m 0755 0_lib/libbusybox.so.${PV}
${D}${libdir}/libbusybox.so.${PV}
- ln -sf sh.${PN} ${D}${base_bindir}/sh
- ln -sf ln.${PN} ${D}${base_bindir}/ln
- ln -sf test.${PN} ${D}${bindir}/test
- if [ -f ${D}/linuxrc.${PN} ]; then
- mv ${D}/linuxrc.${PN} ${D}/linuxrc
+ ln -sf sh.${BPN} ${D}${base_bindir}/sh
+ ln -sf ln.${BPN} ${D}${base_bindir}/ln
+ ln -sf test.${BPN} ${D}${bindir}/test
+ if [ -f ${D}/linuxrc.${BPN} ]; then
+ mv ${D}/linuxrc.${BPN} ${D}/linuxrc
fi
fi
if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
- install -m 0755 ${WORKDIR}/syslog
${D}${sysconfdir}/init.d/syslog.${PN}
- install -m 644 ${WORKDIR}/syslog.conf
${D}${sysconfdir}/syslog.conf.${PN}
+ install -m 0755 ${WORKDIR}/syslog
${D}${sysconfdir}/init.d/syslog.${BPN}
+ install -m 644 ${WORKDIR}/syslog.conf
${D}${sysconfdir}/syslog.conf.${BPN}
fi
if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
install -m 0755 ${WORKDIR}/busybox-cron
${D}${sysconfdir}/init.d/
@@ -193,7 +193,7 @@ do_install () {
install -m 0755 ${WORKDIR}/busybox-udhcpc
${D}${sysconfdir}/init.d/
fi
if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then
- install -m 0755 ${WORKDIR}/inetd
${D}${sysconfdir}/init.d/inetd.${PN}
+ install -m 0755 ${WORKDIR}/inetd
${D}${sysconfdir}/init.d/inetd.${BPN}
install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
fi
if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
@@ -217,8 +217,8 @@ pkg_postinst_${PN} () {
}
pkg_postinst_${PN}-syslog () {
- update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init
syslog.${PN} 50
- update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf
syslog.conf.${PN} 50
+ update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init
syslog.${BPN} 50
+ update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf
syslog.conf.${BPN} 50
}
pkg_prerm_${PN} () {
@@ -260,6 +260,6 @@ pkg_prerm_${PN}-syslog () {
fi
fi
- update-alternatives --remove syslog-init syslog.${PN}
- update-alternatives --remove syslog-conf syslog.conf.${PN}
+ update-alternatives --remove syslog-init syslog.${BPN}
+ update-alternatives --remove syslog-conf syslog.conf.${BPN}
}
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb
b/meta/recipes-core/busybox/busybox_1.18.4.bb
index b4681a4..b2053ee 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r8"
+PR = "r9"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball
\
file://udhcpscript.patch \
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Problems with generating and installing locale packages of eglibc/glibc
Hello,
we generated some locale packages of eglibc and wanted to install them
while offline image generation. The locale-base* packages are installed
properly, but the corresponding packages e.g. eglibc-binary-localedata-*
are not installed.(the same occurs with glibc).
we use following settings:
2011.03-mainenance branch
local.conf:
***
ENABLE_BINARY_LOCALE_GENERATION = "1"
LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
GLIBC_INTERNAL_USE_BINARY_LOCALE = "compile"
GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8
de_CH.UTF-8 es_ES.
UTF-8 fr_FR.UTF-8 fr_CH.UTF-8 it_IT.UTF-8 it_CH.UTF-8"
***
xx-image.bb:
***
IMAGE_LINGUAS = "en-us en-gb de-de de-ch es-es fr-fr fr-ch it-it it-ch"
ROOTFS_POSTPROCESS_COMMAND += "install_linguas;"
***
The "locale-base-*" packages (e.g de-de) got following package
description:
dpkg-deb -I locale-base-de-de_2.12-r21.8+svnr12323.9_armv7a.ipk
new debian package, version 2.0.
size 906 bytes: control archive= 608 bytes.
808 bytes,14 lines control
Package: locale-base-de-de
Version: 2.12-r21.8+svnr12323.9
Description: Embedded GNU C Library
Section: libs
Priority: required
Maintainer: Angstrom Developers
License: LGPL
Architecture: armv7a
OE: eglibc
Homepage: http://www.eglibc.org/home
Build: /9426
Depends: eglibc-binary-localedata-de.de
Provides: virtual-locale-de-de, virtual-locale-de,
eglibc-binary-localedata-de.de
Source: svn://svn.eglibc.org/branches;module=eglibc-2_12;proto=svn
file://eglibc-svn-arm-lowlevellock-include-tls.patch
file://IO-acquire-lock-fix.patch file://shorten-build-commands.patch
file://sh4_set_fpscr_2.12.patch file://sh4_local-fpscr_values.patch
file://eglibc-dont-cache-slibdir.patch
file://armv4-eabi-compile-fix.patch file://etc/ld.so.conf
file://generate-supported.mk
***
this causes that the corresponding eglibc-binary-localedata-* packages
are not installed while offline image creation.
The problem is the wrong dependency entry (here: "Depends:
eglibc-binary-localedata-de.de" package name is
eglibc-binary-localedata-de-de) and the "self providing" entry (here:
"Provides: virtual-locale-de-de, virtual-locale-de,
eglibc-binary-localedata-de.de").
After examine the history of the locale generation, we found a change
from glibc-package.bbclass to libc-package.bbclass after the
release-2010.12. Hereby the function "output_locale_binary_rdepends" is
different.
Version release-2010.12
glibc-packages.bbclass
***
def output_locale_binary_rdepends(name, pkgname, locale,
encoding):
m = re.match("(.*)\.(.*)", name)
if m:
glibc_name = "%s.%s" % (m.group(1),
m.group(2).lower().replace("-",""))
else:
glibc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname,
legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
***
Version 2011.03-maintenance:
libc-packages.bbclass
***
def output_locale_binary_rdepends(name, pkgname, locale,
encoding):
m = re.match("(.*)_(.*)", name)
if m:
libc_name = "%s.%s" % (m.group(1),
m.group(2).lower().replace("-",""))
else:
libc_name = name
bb.data.setVar('RDEPENDS_%s' % pkgname,
legitimize_package_name('%s-binary-localedata-%s' \
% (bpn, libc_name)), d)
rprovides = (bb.data.getVar('RPROVIDES_%s' % pkgname, d,
True) or "").split()
rprovides.append(legitimize_package_name('%s-binary-localedata-%s' %
(bpn, libc_name)))
bb.data.setVar('RPROVIDES_%s' % pkgname, "
".join(rprovides), d)
***
If we use the old function, the locale packages are processed and
installed properly.
The "locale-base-*" package description now was:
***
dpkg-deb -I locale-base-de-de_2.12-r21.8+svnr12323.9_armv7a.ipk
new debian package, version 2.0.
size 902 bytes: control archive= 604 bytes.
776 bytes,14 lines control
Package: locale-base-de-de
Version: 2.12-r21.8+svnr12323.9
Description: Embedded GNU C Library
Section: libs
Priority: required
Maintainer: Angstrom Developers
License: LGPL
Architecture: armv7a
OE: eglibc
Homepage: http://www.eglibc.org/home
Build: /9196
Depends: eglibc-binary-localedata-de-de
Provides: virtual-locale-de-de, virtual-locale-de
Source: svn://svn.eglibc.org/branches;module=eglibc-2_12;proto=svn
file://eglibc-svn-arm-lowlevellock-include-tls.patch
file://IO-acquire-lock-fix.patch file://shorten-build-commands.patch
file://sh4_set_fpscr_2.12.patch file://sh4_local-fpscr_values.patch
file://eglibc-dont-cache-slibdir.patch
file://armv4-eabi-compile-fix.patch file://etc/ld.so.conf
file://generate-supported.mk
***
Our questions now:
What was the intention of the changes in the function
"output_locale_binary_rdepends"?
Is there a problem using the old function for our local installation ?
What language definition pattern
Re: [OE-core] [PATCH v2 0/1] perl-native: Update find_perl to find the perl wrapper
Op 17 aug. 2011, om 10:06 heeft het volgende geschreven: > From: Wenzong Fan > > v2 updates: Add patch header to the 'MM_Unix.pm.patch' > > The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd: > Richard Purdie (1): >Fixup remaining bb.msg.domain users > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib wenzong/perl > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/perl That's against poky, not oe-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/1] perl-native: Update find_perl to find the perl wrapper
From: Wenzong Fan v2 updates: Add patch header to the 'MM_Unix.pm.patch' The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd: Richard Purdie (1): Fixup remaining bb.msg.domain users are available in the git repository at: git://git.pokylinux.org/poky-contrib wenzong/perl http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/perl Wenzong Fan (1): perl-native: Update find_perl to find the perl wrapper .../perl/perl-5.12.3/MM_Unix.pm.patch | 22 meta/recipes-devtools/perl/perl-native_5.12.3.bb |5 ++- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] perl-native: Update find_perl to find the perl wrapper
From: Wenzong Fan
[YOCTO #1157] [YOCTO #829]
This is a common issue to the packages which using 'MakeMaker.pm' to
generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
will be used to figure out the path/link of 'PERL/FULLPERL', but it
always find the 'perl.real' instead of perl wrapper.
Just update it to find the perl wrapper correctly.
Signed-off-by: Wenzong Fan
---
.../perl/perl-5.12.3/MM_Unix.pm.patch | 22
meta/recipes-devtools/perl/perl-native_5.12.3.bb |5 ++-
2 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
new file mode 100644
index 000..eb92ccb
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
@@ -0,0 +1,22 @@
+Upstream-Status:Pending
+
+The perl-native should be relocatable while re-use sstate-cache from
+another build, especially the original build was renamed/removed.
+
+To get the MakeMaker.pm works in this case, we need perl wrapper here
+instead of real perl binary.
+
+Signed-off-by: Wenzong Fan
+===
+--- perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig
2011-08-12 16:07:30.0 +0800
perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
2011-08-12 16:08:56.0 +0800
+@@ -1019,6 +1019,9 @@
+ }
+
+ foreach my $name (@$names){
++# Getting MakeMaker.pm use perl wrapper instead of 'perl.real'
directly
++$name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/);
++
+ foreach my $dir (@$dirs){
+ next unless defined $dir; # $self->{PERL_SRC} may be undefined
+ my ($abs, $val);
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index 945ebd4..a8e2346 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "Artistic|GPL"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r4"
+PR = "r5"
LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -19,7 +19,8 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
file://native-nopacklist.patch \
- file://native-perlinc.patch"
+ file://native-perlinc.patch \
+ file://MM_Unix.pm.patch"
SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
SRC_URI[sha256sum] =
"5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
--
1.7.0.4
___
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] perl-native: Update 'find_perl()' to find the perl wrapper
On 08/17/2011 05:35 AM, Saul Wold wrote:
On 08/16/2011 12:56 AM, wenzong@windriver.com wrote:
From: Wenzong Fan
[YOCTO #1157] [YOCTO #829]
This is a common issue to the packages which using 'MakeMaker.pm' to
generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
will be used to figure out the path/link of 'PERL/FULLPERL', but it
always find the 'perl.real' instead of perl wrapper.
Just update it to find the perl wrapper correctly.
Should the be looking for the perl_native directory?
Yes, it should. Otherwise it'll use the 'perl' on host.
See additional comment about patch header below.
I'll add the patch header.
Thanks
Wenzong
Thanks
Sau!
Signed-off-by: Wenzong Fan
---
.../perl/perl-5.12.3/MM_Unix.pm.patch | 12
meta/recipes-devtools/perl/perl-native_5.12.3.bb |5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
new file mode 100644
index 000..7a6e02d
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.3/MM_Unix.pm.patch
This needs a patch header with a Signed-off-by and Upstream-Status as
per the guidelines:
http://wiki.openembedded.org/index.php/Commit_Patch_Message_Guidelines
@@ -0,0 +1,12 @@
+---
perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig
2011-08-12 16:07:30.0 +0800
perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
2011-08-12 16:08:56.0 +0800
+@@ -1019,6 +1019,9 @@
+ }
+
+ foreach my $name (@$names){
++# Getting MakeMaker.pm use perl wrapper instead of
'perl.real' directly
++$name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/);
++
+ foreach my $dir (@$dirs){
+ next unless defined $dir; # $self->{PERL_SRC} may be
undefined
+ my ($abs, $val);
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index 945ebd4..a8e2346 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "Artistic|GPL"
LIC_FILES_CHKSUM =
"file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r4"
+PR = "r5"
LIC_FILES_CHKSUM =
"file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -19,7 +19,8 @@ SRC_URI =
"http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
file://parallel_build_fix_5.patch \
file://parallel_build_fix_6.patch \
file://native-nopacklist.patch \
- file://native-perlinc.patch"
+ file://native-perlinc.patch \
+ file://MM_Unix.pm.patch"
SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
SRC_URI[sha256sum] =
"5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
