[OE-core] pkg-config sometimes return unexpanded variables
My webkit-efl build fails with: -- checking for module 'cairo' -- found cairo, version 1.10.0 CMake Error at /OE/shr-core/tmp/sysroots/x86_64-linux/usr/share/cmake-2.8/Modules/FindPkgConfig.cmake:104 (set): Syntax error in cmake code at �:104 when parsing string ;/OE/shr-core/tmp/sysroots/nokia900\{libdir\} Invalid escape sequence \{ and it's because pkg-config itself returns unexpanded variable found it only with --libs-only-L and --static params $ pkg-config --libs-only-L --static cairo -L/OE/shr-core/tmp/sysroots/nokia900\{libdir\} $ pkg-config --version 0.25 I'm not sure if it's pkg-config fault worth reporting upstream or something wrong in our sysroot, but .pc looks sane (and it's the same as with oe.dev): prefix=/usr exec_prefix=/usr libdir=/usr/lib includedir=/usr/include Name: cairo Description: Multi-platform 2D graphics library Version: 1.10.0 Requires.private: gobject-2.0 glib-2.0pixman-1 = 0.18.4 fontconfig = 2.2.95 freetype2 = 9.7.3 libpng xrender = 0.6 x11 Libs: -L${libdir} -lcairo Libs.private: -lz -lz Cflags: -I${includedir}/cairo I haven't seen this with pkg-config-0.23 from oe.dev and there is 0.26 relase available upstream, but looking on changelog it doesn't look like resolved there. Have anyone seen this too? Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com pgp052n5PJALw.pgp Description: PGP signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 05/13] distro-tracking: update openssh, tar, and grep
From: Scott Garman scott.a.gar...@intel.com Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 26 ++-- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index cd1ee9d..0d47f52 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -1981,32 +1981,32 @@ RECIPE_MAINTAINER_pn-cronie = Dexuan Cui dexuan@intel.com RECIPE_STATUS_pn-grep = green RECIPE_DEPENDENCY_CHECK_pn-grep = not done -RECIPE_LATEST_VERSION_pn-grep = 2.7 +RECIPE_LATEST_VERSION_pn-grep = 2.8 RECIPE_INTEL_SECTION_pn-grep = base RECIPE_NO_OF_PATCHES_pn-grep = 0 -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = 5 months -RECIPE_LATEST_RELEASE_DATE_pn-grep = 09/2010 -RECIPE_LAST_UPDATE_pn-grep = Sep 24, 2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-grep = 8 months +RECIPE_LATEST_RELEASE_DATE_pn-grep = 05/2011 +RECIPE_LAST_UPDATE_pn-grep = Jun 5, 2011 RECIPE_MAINTAINER_pn-grep = Scott Garman scott.a.gar...@intel.com -RECIPE_STATUS_pn-openssh = red +RECIPE_STATUS_pn-openssh = green RECIPE_DEPENDENCY_CHECK_pn-openssh = not done -RECIPE_LATEST_VERSION_pn-openssh = 5.6p1 +RECIPE_LATEST_VERSION_pn-openssh = 5.8p2 RECIPE_INTEL_SECTION_pn-openssh = base RECIPE_NO_OF_PATCHES_pn-openssh = 1 -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = 4 months -RECIPE_LATEST_RELEASE_DATE_pn-openssh = 08/2010 -RECIPE_LAST_UPDATE_pn-openssh = Aug 31, 2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = 3 months +RECIPE_LATEST_RELEASE_DATE_pn-openssh = 05/2011 +RECIPE_LAST_UPDATE_pn-openssh = Jun 5, 2011 RECIPE_MAINTAINER_pn-openssh = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-tar = green RECIPE_DEPENDENCY_CHECK_pn-tar = not done -RECIPE_LATEST_VERSION_pn-tar = 1.25 +RECIPE_LATEST_VERSION_pn-tar = 1.26 RECIPE_INTEL_SECTION_pn-tar = base RECIPE_NO_OF_PATCHES_pn-tar = 2 -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tar = 2 weeks -RECIPE_LATEST_RELEASE_DATE_pn-tar = 11/2010 -RECIPE_LAST_UPDATE_pn-tar = Nov 17, 2010 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tar = 4 months +RECIPE_LATEST_RELEASE_DATE_pn-tar = 03/2011 +RECIPE_LAST_UPDATE_pn-tar = Jun 5, 2011 RECIPE_MAINTAINER_pn-tar = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-lrzsz=yellow # patch investigation needed. -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 03/13] grep: upgrade to v2.8
From: Scott Garman scott.a.gar...@intel.com Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../grep/{grep_2.7.bb = grep_2.8.bb} |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) rename meta/recipes-extended/grep/{grep_2.7.bb = grep_2.8.bb} (84%) diff --git a/meta/recipes-extended/grep/grep_2.7.bb b/meta/recipes-extended/grep/grep_2.8.bb similarity index 84% rename from meta/recipes-extended/grep/grep_2.7.bb rename to meta/recipes-extended/grep/grep_2.8.bb index c3e0986..7e58ff8 100644 --- a/meta/recipes-extended/grep/grep_2.7.bb +++ b/meta/recipes-extended/grep/grep_2.8.bb @@ -1,7 +1,8 @@ -DESCRIPTION = grep GNU utility +DESCRIPTION = GNU grep utility HOMEPAGE = http://savannah.gnu.org/projects/grep/; BUGTRACKER = http://savannah.gnu.org/bugs/?group=grep; SECTION = console/utils +PRIORITY = optional LICENSE = GPLv3 LIC_FILES_CHKSUM = file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee @@ -9,8 +10,8 @@ PR = r0 SRC_URI = ${GNU_MIRROR}/grep/grep-${PV}.tar.gz -SRC_URI[md5sum] = e848f07e3e79aa7899345d17c7e4115e -SRC_URI[sha256sum] = ad14831015a79cea36785aa47415f6c0653a6ac4eaf9c15456f0d9d09c9e1bad +SRC_URI[md5sum] = cb2dfc502c5afc7a4a6e5f6cefd6850e +SRC_URI[sha256sum] = da48d0e20bceaacc7d05bfcbccb34c3dee0c50bd7e80de5222fd5e319809af27 inherit autotools gettext -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/13] 06-June-2011
Updates for the kernel and lots of distro tracking updates for manual based updates checking. Sau! The following changes since commit 925de3b3e74d15547840a2edaceff437e135bddd: tzcode: Update to 2011g (2011-06-06 15:52:18 +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 Bruce Ashfield (2): linux-yocto: update target/meta SRCREVs linux-yocto: make e1000e structure common [commit: bec3f1e8c] Koen Kooi (1): util-linux: package agetty seperately Phil Blundell (1): sqlite: remove dependency on tcl-native Saul Wold (4): json-glib: Update to 0.12.4 distro tracking: update Qing - Saul distro tracking: fixup some bad entries distro tracking: Manual Updates Scott Garman (5): distro-tracking: updates openssh: upgrade to v5.8p2 grep: upgrade to v2.8 tar: upgrade to v1.26 distro-tracking: update openssh, tar, and grep .../conf/distro/include/distro_tracking_fields.inc | 225 +++- .../openssh/{openssh-5.6p1 = openssh-5.8p2}/init |0 .../{openssh-5.6p1 = openssh-5.8p2}/nostrip.patch |0 .../{openssh-5.6p1 = openssh-5.8p2}/ssh_config|0 .../{openssh-5.6p1 = openssh-5.8p2}/sshd_config |0 .../openssh/{openssh_5.6p1.bb = openssh_5.8p2.bb} |9 +- meta/recipes-core/util-linux/util-linux.inc|3 +- meta/recipes-core/util-linux/util-linux_2.19.1.bb |2 +- .../grep/{grep_2.7.bb = grep_2.8.bb} |7 +- ...tive_1.25.bb = tar-replacement-native_1.26.bb} |0 meta/recipes-extended/tar/tar.inc |1 + meta/recipes-extended/tar/tar_1.25.bb |9 - meta/recipes-extended/tar/tar_1.26.bb |9 + .../{json-glib_0.12.2.bb = json-glib_0.12.4.bb} |0 meta/recipes-kernel/linux/linux-yocto_git.bb | 14 +- meta/recipes-support/sqlite/sqlite3.inc|4 +- 16 files changed, 153 insertions(+), 130 deletions(-) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/init (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/nostrip.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/ssh_config (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/sshd_config (100%) rename meta/recipes-connectivity/openssh/{openssh_5.6p1.bb = openssh_5.8p2.bb} (93%) rename meta/recipes-extended/grep/{grep_2.7.bb = grep_2.8.bb} (84%) rename meta/recipes-extended/tar/{tar-replacement-native_1.25.bb = tar-replacement-native_1.26.bb} (100%) delete mode 100644 meta/recipes-extended/tar/tar_1.25.bb create mode 100644 meta/recipes-extended/tar/tar_1.26.bb rename meta/recipes-gnome/json-glib/{json-glib_0.12.2.bb = json-glib_0.12.4.bb} (100%) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 01/13] distro-tracking: updates
From: Scott Garman scott.a.gar...@intel.com Update the distro tracking fields for: * apmd * at * blktool * cpio * dosfstools * gzip * libatomics-ops * shadow Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 34 +++ 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 73e6782..cd1ee9d 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -817,7 +817,7 @@ RECIPE_NO_OF_PATCHES_pn-blktool = 0 RECIPE_INTEL_SECTION_pn-blktool = base utils RECIPE_LATEST_RELEASE_DATE_pn-blktool = 02/2010 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-blktool = 3 years -RECIPE_LAST_UPDATE_pn-blktool = Jan 4, 2011 +RECIPE_LAST_UPDATE_pn-blktool = Jun 4, 2011 RECIPE_MAINTAINER_pn-blktool = Scott Garman scott.a.gar...@intel.com DISTRO_PN_ALIAS_pn-blktool = Debian=blktool Mandriva=blktool @@ -910,7 +910,7 @@ RECIPE_INTEL_SECTION_pn-apmd = base utils RECIPE_LATEST_RELEASE_DATE_pn-apmd = 07/2009 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-apmd = 1 year RECIPE_COMMENTS_pn-apmd = -RECIPE_LAST_UPDATE_pn-apmd = Jan 4, 2011 +RECIPE_LAST_UPDATE_pn-apmd = Jun 4, 2011 RECIPE_MAINTAINER_pn-apmd = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-gperf = green @@ -1010,9 +1010,13 @@ RECIPE_LAST_UPDATE_pn-screen = Aug 31, 2010 RECIPE_MAINTAINER_pn-screen = Dexuan Cui dexuan@intel.com RECIPE_STATUS_pn-gzip = green -RECIPE_LAST_UPDATE_pn-gzip = Jul 23, 2010 -RECIPE_MAINTAINER_pn-gzip = Scott Garman scott.a.gar...@intel.com +RECIPE_DEPENDENCY_CHECK_pn-gzip = not done RECIPE_LATEST_VERSION_pn-gzip = 1.4 +RECIPE_NO_OF_PATCHES_pn-gzip = 0 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gzip = 4 months +RECIPE_LATEST_RELEASE_DATE_pn-gzip = Jan 20, 2010 +RECIPE_LAST_UPDATE_pn-gzip = Jun 4, 2011 +RECIPE_MAINTAINER_pn-gzip = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-iptables = green RECIPE_LAST_UPDATE_pn-iptables = Nov 10, 2010 @@ -1032,13 +1036,12 @@ RECIPE_LATEST_VERSION_pn-net-tools = 1.60-23 RECIPE_STATUS_pn-shadow = green RECIPE_DEPENDENCY_CHECK_pn-shadow = not done -RECIPE_LAST_UPDATE_pn-shadow = Aug 6, 2010 -RECIPE_MAINTAINER_pn-shadow = Scott Garman scott.a.gar...@intel.com -RECIPE_LATEST_VERSION_pn-shadow = 4.1.4.2 +RECIPE_LATEST_VERSION_pn-shadow = 4.1.4.3 RECIPE_INTEL_SECTION_pn-shadow = base utils -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-shadow = 2 months -RECIPE_LATEST_RELEASE_DATE_pn-shadow = 07/2009 -RECIPE_COMMENTS_pn-formfactor = +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-shadow = 7 months +RECIPE_LATEST_RELEASE_DATE_pn-shadow = Feb 15, 2011 +RECIPE_LAST_UPDATE_pn-shadow = Jun 4, 2011 +RECIPE_MAINTAINER_pn-shadow = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-coreutils = green RECIPE_LAST_UPDATE_pn-coreutils = Jan 20, 2011 @@ -1123,7 +1126,7 @@ RECIPE_INTEL_SECTION_pn-libatomics-ops = optional RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libatomics-ops = unknown RECIPE_LATEST_RELEASE_DATE_pn-libatomics-ops = unknown DISTRO_PN_ALIAS_pn-libatomics-ops = Meego=libatomic-ops Debian=libatomic-ops Ubuntu=libatomic-ops OpenSuSE=libatomic-ops Mandriva=libatomic-ops -RECIPE_LAST_UPDATE_pn-libatomics-ops = Nov 22, 2010 +RECIPE_LAST_UPDATE_pn-libatomics-ops = Jun 4, 2011 RECIPE_MAINTAINER_pn-libatomics-ops = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-libffi = red @@ -1162,8 +1165,11 @@ RECIPE_LAST_UPDATE_pn-chrpath = Dec 15, 2009 RECIPE_MAINTAINER_pn-chrpath = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-dosfstools = red +RECIPE_DEPENDENCY_CHECK_pn-dosfstools = not done RECIPE_LATEST_VERSION_pn-dosfstools = 2.11 -RECIPE_LAST_UPDATE_pn-dosfstools = Oct 11, 2007 +RECIPE_LATEST_RELEASE_DATE_pn-dosfstools = Mar 12, 2005 +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dosfstools = 15 months +RECIPE_LAST_UPDATE_pn-dosfstools = Jun 4, 2011 RECIPE_MAINTAINER_pn-dosfstools = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-eee-acpi-scripts = green @@ -1949,7 +1955,7 @@ RECIPE_INTEL_SECTION_pn-at = base RECIPE_NO_OF_PATCHES_pn-at = 3 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-at = 13 months RECIPE_LATEST_RELEASE_DATE_pn-at = 11/2009 -RECIPE_LAST_UPDATE_pn-at = Jul 23, 2010 +RECIPE_LAST_UPDATE_pn-at = Jun 4, 2011 RECIPE_MAINTAINER_pn-at = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-cpio = green @@ -1959,7 +1965,7 @@ RECIPE_INTEL_SECTION_pn-cpio = base RECIPE_NO_OF_PATCHES_pn-cpio = 0 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cpio = 9 months RECIPE_LATEST_RELEASE_DATE_pn-cpio = 03/2010 -RECIPE_LAST_UPDATE_pn-cpio = Sep 25, 2010 +RECIPE_LAST_UPDATE_pn-cpio = Jun 4, 2011 RECIPE_MAINTAINER_pn-cpio = Scott Garman scott.a.gar...@intel.com RECIPE_STATUS_pn-cronie = green -- 1.7.3.4 ___ Openembedded-core mailing list
[OE-core] [CONSOLIDATED PULL 10/13] sqlite: remove dependency on tcl-native
From: Phil Blundell p...@pbcl.net Older versions of sqlite required tclsh at compile time but this is no longer the case with recent 3.7.x. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003653.html Signed-off-by: Phil Blundell ph...@gnu.org --- meta/recipes-support/sqlite/sqlite3.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index d8ef8dc..939df14 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -2,8 +2,8 @@ DESCRIPTION = An Embeddable SQL Database Engine HOMEPAGE = http://www.sqlite.org; SECTION = libs PRIORITY = optional -DEPENDS = readline ncurses tcl-native -DEPENDS_virtclass-native = tcl-native +DEPENDS = readline ncurses +DEPENDS_virtclass-native = LICENSE = PD inherit autotools pkgconfig -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 06/13] json-glib: Update to 0.12.4
Signed-off-by: Saul Wold s...@linux.intel.com --- .../{json-glib_0.12.2.bb = json-glib_0.12.4.bb} |0 1 files changed, 0 insertions(+), 0 deletions(-) rename meta/recipes-gnome/json-glib/{json-glib_0.12.2.bb = json-glib_0.12.4.bb} (100%) diff --git a/meta/recipes-gnome/json-glib/json-glib_0.12.2.bb b/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb similarity index 100% rename from meta/recipes-gnome/json-glib/json-glib_0.12.2.bb rename to meta/recipes-gnome/json-glib/json-glib_0.12.4.bb -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 11/13] util-linux: package agetty seperately
From: Koen Kooi k...@dominion.thruhere.net Some packages like systemd only want agetty to spawn a console and not drag in all of util-linux just for that. Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-core/util-linux/util-linux.inc |3 ++- meta/recipes-core/util-linux/util-linux_2.19.1.bb |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 71601dc..4b36100 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -25,7 +25,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util- file://make_include \ -PACKAGES =+ util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ +PACKAGES =+ util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ util-linux-swaponoff util-linux-losetup util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-libblkid \ util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ @@ -37,6 +37,7 @@ EXTRA_OECONF = --disable-use-tty-group --disable-makeinstall-chown --enable-elv FILES_${PN}-doc += ${datadir}/getopt/getopt-*.* +FILES_util-linux-agetty = ${base_sbindir}/agetty FILES_util-linux-fdisk = ${base_sbindir}/fdisk.${PN} FILES_util-linux-cfdisk = ${base_sbindir}/cfdisk FILES_util-linux-sfdisk = ${sbindir}/sfdisk diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb index 8067ab5..132f28b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = 2.19 -PR = r0 +PR = r1 require util-linux.inc # note that `lscpu' is under GPLv3+ -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 08/13] linux-yocto: update target/meta SRCREVs
From: Bruce Ashfield bruce.ashfi...@windriver.com This SRCREV update picks up the following changes from the 2.6.37 kernel tree: - fishriver: create and use a dedicated BSP branch - fishriver: usbnet fixes, but common to all boards - standard: update omap baseline match the 2.6.34 upstream merge content Built and boot tested on qemu* Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_git.bb | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 3aedb7a..b625cf2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -14,13 +14,13 @@ KMETA = meta LINUX_VERSION ?= 2.6.37 LINUX_VERSION_EXTENSION ?= -yocto-${LINUX_KERNEL_TYPE} -SRCREV_machine_qemuarm = 8776b242fe2db7b4570e11496e9105b51212a446 -SRCREV_machine_qemumips = 8f8a5e034d7e98ed871fa7ed487fbf72a79229a5 -SRCREV_machine_qemuppc = d9c6b3e576184f0c4223b6251c57b16ac1bac428 -SRCREV_machine_qemux86 = b2afed7ecd54918b73db7f30062aaaf02fdaba54 -SRCREV_machine_qemux86-64 = 86bbbc079652d87392322fbfc14f6bd8792b0f38 -SRCREV_machine = 0974631b821b70aee3613723ed0d4d6ba8da91c6 -SRCREV_meta = 06d3793d459048ee1b4db7170f24670c479e8b29 +SRCREV_machine_qemuarm = 9192bec81b274a6bb71bcddcab9de5475f55ec15 +SRCREV_machine_qemumips = 3e57c1547b07b30900bb29fdedcc38e99c237446 +SRCREV_machine_qemuppc = 492cff27ae13c33fdab68f8d971b15dcb719e7bf +SRCREV_machine_qemux86 = ae10acfb83ed405127748393d9b4efb9e95cc78b +SRCREV_machine_qemux86-64 = 28a3080512e19612a2e0b65d3077686f614ae556 +SRCREV_machine = 301ab1710d29a9bb931cb64c747d03da09dfea3f +SRCREV_meta = f1dc3722d45cdcc92c84ebfecf4ce616d2efed26 PR = r18 PV = ${LINUX_VERSION}+git${SRCPV} -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 09/13] linux-yocto: make e1000e structure common [commit: bec3f1e8c]
From: Bruce Ashfield bruce.ashfi...@windriver.com During work on 1.1 BSPs, some driver options changed. The result was that the upstream fix b1d670f10e8078485884f0cf7e384d890909aeaa needs to be available for all BSPs. These SRCREV updates are the result of making that commit common. Signed-off-by: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-yocto_git.bb | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index b625cf2..1d43e1e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb @@ -14,12 +14,12 @@ KMETA = meta LINUX_VERSION ?= 2.6.37 LINUX_VERSION_EXTENSION ?= -yocto-${LINUX_KERNEL_TYPE} -SRCREV_machine_qemuarm = 9192bec81b274a6bb71bcddcab9de5475f55ec15 -SRCREV_machine_qemumips = 3e57c1547b07b30900bb29fdedcc38e99c237446 -SRCREV_machine_qemuppc = 492cff27ae13c33fdab68f8d971b15dcb719e7bf -SRCREV_machine_qemux86 = ae10acfb83ed405127748393d9b4efb9e95cc78b -SRCREV_machine_qemux86-64 = 28a3080512e19612a2e0b65d3077686f614ae556 -SRCREV_machine = 301ab1710d29a9bb931cb64c747d03da09dfea3f +SRCREV_machine_qemuarm = 2070a54dbde57d2987c832a016b05949f7e6e086 +SRCREV_machine_qemumips = bd9eab8e382e11dc08a5de8b010570f03de949e5 +SRCREV_machine_qemuppc = 704497b3a48c0882078f6167277d65d932292535 +SRCREV_machine_qemux86 = c1a74a7872fdd1152265087aa7e59b96a8f2f42a +SRCREV_machine_qemux86-64 = 1950ea205407d8950475a37404173572d55fd27f +SRCREV_machine = 697d84759be192403a8a87ab269196c67a0c2c88 SRCREV_meta = f1dc3722d45cdcc92c84ebfecf4ce616d2efed26 PR = r18 -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 07/13] distro tracking: update Qing - Saul
Signed-off-by: Saul Wold s...@linux.intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 127 +++- 1 files changed, 68 insertions(+), 59 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index 0d47f52..f1fded2 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -337,7 +337,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-gdbm = 10/2002 RECIPE_STATUS_pn-pth = yellow# custom do_configure RECIPE_LAST_UPDATE_pn-pth = Mar 14, 2008 -RECIPE_MAINTAINER_pn-pth = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-pth = Saul Wold s...@linux.intel.com RECIPE_LATEST_VERSION_pn-pth = 2.0.7 RECIPE_INTEL_SECTION_pn-pth = base libs RECIPE_LATEST_RELEASE_DATE_pn-pth = 06/2006 @@ -355,7 +355,7 @@ RECIPE_COMMENTS_pn-python-pycurl = the so called MIT/X here is actually ISC lic RECIPE_STATUS_pn-libusb1 = green RECIPE_LAST_UPDATE_pn-libusb1 = Jul 15, 2010 -RECIPE_MAINTAINER_pn-libusb1 = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libusb1 = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-libusb1 = not done RECIPE_LATEST_VERSION_pn-libusb1 = 1.0.8 RECIPE_INTEL_SECTION_pn-libusb1 = base libs @@ -365,7 +365,7 @@ RECIPE_COMMENTS_pn-libusb1 = RECIPE_STATUS_pn-libusb-compat = green RECIPE_LAST_UPDATE_pn-libusb-compat = Jul 16, 2010 -RECIPE_MAINTAINER_pn-libusb-compat = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libusb-compat = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-libusb-compat = done RECIPE_LATEST_VERSION_pn-libusb-compat = 0.1.3 RECIPE_INTEL_SECTION_pn-libusb-compat = base utils @@ -376,14 +376,14 @@ DISTRO_PN_ALIAS_pn-libusb-compat = OSPDT RECIPE_STATUS_pn-libnl = green RECIPE_LAST_UPDATE_pn-libnl = Nov 15, 2010 -RECIPE_MAINTAINER_pn-libnl = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libnl = Saul Wold s...@linux.intel.com RECIPE_LATEST_VERSION_pn-libnl = 2.0 RECIPE_INTEL_SECTION_pn-libnl = base libs RECIPE_LATEST_RELEASE_DATE_pn-libnl = 10/2010 RECIPE_STATUS_pn-zlib = yellow # local config scripts RECIPE_LAST_UPDATE_pn-zlib = Jun 11, 2010 -RECIPE_MAINTAINER_pn-zlib = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-zlib = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-zlib = not done RECIPE_LATEST_VERSION_pn-zlib = 1.2.5 RECIPE_PATCH_pn-zlib+configure.ac = override default build method @@ -395,7 +395,7 @@ RECIPE_COMMENTS_pn-zlib = rconflicts: libxml2 ( 2.7.7) (rbreaks) RECIPE_STATUS_pn-libxml2 = yellow RECIPE_LAST_UPDATE_pn-libxml2 = Jun 18, 2010 -RECIPE_MAINTAINER_pn-libxml2 = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libxml2 = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-libxml2 = done RECIPE_LATEST_VERSION_pn-libxml2 = 2.7.7 RECIPE_PATCH_pn-libxml2+install = use poky environment variables @@ -406,7 +406,7 @@ RECIPE_COMMENTS_pn-libxml2 = RECIPE_STATUS_pn-readline = green RECIPE_LAST_UPDATE_pn-readline = Jun 17, 2010 -RECIPE_MAINTAINER_pn-readline = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-readline = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-readline = not done RECIPE_LATEST_VERSION_pn-readline = 6.1 RECIPE_PATCH_pn-readline+configure-fix = fix configure for build @@ -418,7 +418,7 @@ RECIPE_COMMENTS_pn-readline = RECIPE_STATUS_pn-libgcrypt = green RECIPE_LAST_UPDATE_pn-libgcrypt = Jul 29, 2010 -RECIPE_MAINTAINER_pn-libgcrypt = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libgcrypt = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-libgcrypt = not done RECIPE_LATEST_VERSION_pn-libgcrypt = 1.4.5 RECIPE_PATCH_pn-libgcrypt+add-pkgconfig-support = add .pc file @@ -449,7 +449,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-lzo = 10/2010 RECIPE_STATUS_pn-libtasn1 = green RECIPE_LAST_UPDATE_pn-libtasn1 = Nov 16, 2010 -RECIPE_MAINTAINER_pn-libtasn1 = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libtasn1 = Saul Wold s...@linux.intel.com RECIPE_DEPENDENCY_CHECK_pn-libtasn1 = not done RECIPE_LATEST_VERSION_pn-libtasn1 = 2.7 RECIPE_INTEL_SECTION_pn-libtasn1 = base libs @@ -459,7 +459,7 @@ RECIPE_COMMENTS_pn-libtasn1 = RECIPE_STATUS_pn-openssl = green RECIPE_LAST_UPDATE_pn-openssl = Nov 17, 2010 -RECIPE_MAINTAINER_pn-openssl = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-openssl = Saul Wold s...@linux.intel.com RECIPE_LATEST_VERSION_pn-openssl = 1.0.0c RECIPE_NO_UPDATE_REASON_pn-openssl = compatibility and stability concerns on new major release RECIPE_INTEL_SECTION_pn-openssl = base libs @@ -468,7 +468,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-openssl = 12/2010 RECIPE_STATUS_pn-libnss-mdns = green DISTRO_PN_ALIAS_pn-libnss-mdns = Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns RECIPE_LAST_UPDATE_pn-libnss-mdns = Jul 8, 2010 -RECIPE_MAINTAINER_pn-libnss-mdns = Qing He qing...@intel.com +RECIPE_MAINTAINER_pn-libnss-mdns = Saul Wold s...@linux.intel.com
[OE-core] [CONSOLIDATED PULL 12/13] distro tracking: fixup some bad entries
Signed-off-by: Saul Wold s...@linux.intel.com --- .../conf/distro/include/distro_tracking_fields.inc | 35 +--- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index f1fded2..19bb1d5 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -1354,8 +1354,7 @@ RECIPE_PATCH_pn-portmap+no-tcpd-support = override default build method RECIPE_INTEL_SECTION_pn-portmap = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-portmap = n/a RECIPE_LATEST_RELEASE_DATE_pn-portmap = 05/2007 -RECIPE_COMMENTS_pn-portmap = most part is under 4-clause BSD, Sun RPC code is under another license, \ -however debian portmap package licenses RPC code under 3-clause BSD. This needs further investigation +RECIPE_COMMENTS_pn-portmap = most part is under 4-clause BSD, Sun RPC code is under another license, however debian portmap package licenses RPC code under 3-clause BSD. This needs further investigation RECIPE_STATUS_pn-grub = green RECIPE_LAST_UPDATE_pn-grub = Oct 8, 2008 @@ -1580,8 +1579,7 @@ RECIPE_LATEST_VERSION_pn-hal = 0.5.14 RECIPE_INTEL_SECTION_pn-hal = base utils RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-hal = 4 months RECIPE_LATEST_RELEASE_DATE_pn-hal = 11/2009 -RECIPE_COMMENTS_pn-hal = The licensing is very complicated, Most files are GPLv2+ | AFL \ -with some borrowed code under LGPLv2.1, AFL itself is incompatible with GPL/LGPL +RECIPE_COMMENTS_pn-hal = The licensing is very complicated, Most files are GPLv2+ | AFL with some borrowed code under LGPLv2.1, AFL itself is incompatible with GPL/LGPL RECIPE_STATUS_pn-hal-info = green RECIPE_LAST_UPDATE_pn-hal-info = Jul 20, 2010 @@ -2876,7 +2874,7 @@ RECIPE_MAINTAINER_pn-gcc = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-autoconf=red RECIPE_LATEST_VERSION_pn-autoconf=2.68 RECIPE_LAST_UPDATE_pn-autoconf = Jan 29, 2010 -RECIPE_NO_UPDATE_REASON_autoconf=seeing rpm issue with the 2.68 version, a bug is open +RECIPE_NO_UPDATE_REASON_pn-autoconf=seeing rpm issue with the 2.68 version, a bug is open RECIPE_MAINTAINER_pn-autoconf = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-automake=green @@ -3056,7 +3054,6 @@ RECIPE_LATEST_VERSION_pn-byacc=20101229 RECIPE_MAINTAINER_pn-byacc = Nitin A Kamble nitin.a.kam...@intel.com RECIPE_STATUS_pn-libconvert-asn1-perl=green -# 0.22 version does not build, so created a recipe for version 0.21 RECIPE_LATEST_VERSION_pn-libconvert-asn1-perl=0.22 RECIPE_NO_UPDATE_REASON_pn-libconvert-asn1-perl = 0.22 version does not build, so created a recipe for version 0.21 RECIPE_LAST_UPDATE_pn-libconvert-asn1-perl = Aug 13, 2010 @@ -3552,7 +3549,7 @@ DISTRO_PN_ALIAS_pn-xf86-video-vesa = Debian=xserver-xorg-video-vesa Fedora=xorg RECIPE_STATUS_pn-cairo=green # no update needed RECIPE_LATEST_VERSION_pn-cairo=1.9.10 -ECIPE_NO_UPDATE_REASON_cairo=latest version is not stable release +RECIPE_NO_UPDATE_REASON_pn-cairo=latest version is not stable release RECIPE_NO_OF_PATCHES_pn-cairo=1 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cairo=1 monthes RECIPE_LATEST_RELEASE_DATE_pn-cairo=2010/02/20 @@ -3563,16 +3560,16 @@ RECIPE_MAINTAINER_pn-cairo=Yu Ke ke...@intel.com RECIPE_STATUS_pn-xserver-nodm-init=green # no update needed RECIPE_LATEST_VERSION_pn-xserver-nodm-init=1.0 RECIPE_NO_OF_PATCHES_pn-xserver-nodm-init=0 -#RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-nodm-init= -#RECIPE_LATEST_RELEASE_DATE_pn-xserver-nodm-init= +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-nodm-init= +RECIPE_LATEST_RELEASE_DATE_pn-xserver-nodm-init= RECIPE_INTEL_SECTION_pn-xserver-nodm-init=graphic core RECIPE_MAINTAINER_pn-xserver-nodm-init=Yu Ke ke...@intel.com RECIPE_STATUS_pn-xserver-xf86-config=green # no update needed RECIPE_LATEST_VERSION_pn-xserver-xf86-config=0.1 RECIPE_NO_OF_PATCHES_pn-xserver-xf86-config=0 -#RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-config= -#RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-config= +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-config= +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-config= RECIPE_INTEL_SECTION_pn-xserver-xf86-config=graphic core RECIPE_LAST_UPDATE_pn-xserver-xf86-config = May 31, 2009 RECIPE_MAINTAINER_pn-xserver-xf86-config=Yu Ke ke...@intel.com @@ -4708,7 +4705,7 @@ RECIPE_MAINTAINER_pn-libxprintutil = Dexuan Cui dexuan@intel.com RECIPE_STATUS_pn-libxscrnsaver = green DISTRO_PN_ALIAS_pn-libxscrnsaver = Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver -DEPENDENCY_CHECK_pn-libxscrnsaver = not done +RECIPE_DEPENDENCY_CHECK_pn-libxscrnsaver = not done RECIPE_LATEST_VERSION_pn-libxscrnsaver = 1.2.1 RECIPE_NO_OF_PATCHES_pn-libxscrnsaver = 0 RECIPE_INTEL_SECTION_pn-libxscrnsaver = x11/libs @@ -4731,7 +4728,7 @@ RECIPE_MAINTAINER_pn-libxtrap = Dexuan Cui dexuan@intel.com
[OE-core] [CONSOLIDATED PULL 02/13] openssh: upgrade to v5.8p2
From: Scott Garman scott.a.gar...@intel.com LICENCE checksum updated due to a one-line change in the file (RedHat was added as a copyright holder). Signed-off-by: Scott Garman scott.a.gar...@intel.com --- .../openssh/{openssh-5.6p1 = openssh-5.8p2}/init |0 .../{openssh-5.6p1 = openssh-5.8p2}/nostrip.patch |0 .../{openssh-5.6p1 = openssh-5.8p2}/ssh_config|0 .../{openssh-5.6p1 = openssh-5.8p2}/sshd_config |0 .../openssh/{openssh_5.6p1.bb = openssh_5.8p2.bb} |9 + 5 files changed, 5 insertions(+), 4 deletions(-) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/init (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/nostrip.patch (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/ssh_config (100%) rename meta/recipes-connectivity/openssh/{openssh-5.6p1 = openssh-5.8p2}/sshd_config (100%) rename meta/recipes-connectivity/openssh/{openssh_5.6p1.bb = openssh_5.8p2.bb} (93%) diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/init b/meta/recipes-connectivity/openssh/openssh-5.8p2/init similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.6p1/init rename to meta/recipes-connectivity/openssh/openssh-5.8p2/init diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-5.8p2/nostrip.patch similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch rename to meta/recipes-connectivity/openssh/openssh-5.8p2/nostrip.patch diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/ssh_config b/meta/recipes-connectivity/openssh/openssh-5.8p2/ssh_config similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.6p1/ssh_config rename to meta/recipes-connectivity/openssh/openssh-5.8p2/ssh_config diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/sshd_config b/meta/recipes-connectivity/openssh/openssh-5.8p2/sshd_config similarity index 100% rename from meta/recipes-connectivity/openssh/openssh-5.6p1/sshd_config rename to meta/recipes-connectivity/openssh/openssh-5.8p2/sshd_config diff --git a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb similarity index 93% rename from meta/recipes-connectivity/openssh/openssh_5.6p1.bb rename to meta/recipes-connectivity/openssh/openssh_5.8p2.bb index b112b79..04d99d9 100644 --- a/meta/recipes-connectivity/openssh/openssh_5.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb @@ -4,10 +4,11 @@ Ssh (Secure Shell) is a program for logging into a remote machine \ and for executing commands on a remote machine. HOMEPAGE = http://openssh.org; SECTION = console/network +PRIORITY = optional LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENCE;md5=7ae09218173be1643c998a4b71027f9b +LIC_FILES_CHKSUM = file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e -PR = r2 +PR = r0 DEPENDS = zlib openssl DEPENDS += ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} @@ -25,8 +26,8 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. file://ssh_config \ file://init \ -SRC_URI[md5sum] = e6ee52e47c768bf0ec42a232b5d18fb0 -SRC_URI[sha256sum] = 538af53b2b8162c21a293bb004ae2bdb141abd250f61b4cea55244749f3c6c2b +SRC_URI[md5sum] = 0541579adf9d55abb15ef927048d372e +SRC_URI[sha256sum] = 5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314 inherit autotools -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 04/13] tar: upgrade to v1.26
From: Scott Garman scott.a.gar...@intel.com Signed-off-by: Scott Garman scott.a.gar...@intel.com --- ...tive_1.25.bb = tar-replacement-native_1.26.bb} |0 meta/recipes-extended/tar/tar.inc |1 + meta/recipes-extended/tar/tar_1.25.bb |9 - meta/recipes-extended/tar/tar_1.26.bb |9 + 4 files changed, 10 insertions(+), 9 deletions(-) rename meta/recipes-extended/tar/{tar-replacement-native_1.25.bb = tar-replacement-native_1.26.bb} (100%) delete mode 100644 meta/recipes-extended/tar/tar_1.25.bb create mode 100644 meta/recipes-extended/tar/tar_1.26.bb diff --git a/meta/recipes-extended/tar/tar-replacement-native_1.25.bb b/meta/recipes-extended/tar/tar-replacement-native_1.26.bb similarity index 100% rename from meta/recipes-extended/tar/tar-replacement-native_1.25.bb rename to meta/recipes-extended/tar/tar-replacement-native_1.26.bb diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc index 6e77051..bbed65c 100644 --- a/meta/recipes-extended/tar/tar.inc +++ b/meta/recipes-extended/tar/tar.inc @@ -3,6 +3,7 @@ DESCRIPTION = GNU tar saves many files together into a single tape \ or disk archive, and can restore individual files from the archive. HOMEPAGE = http://www.gnu.org/software/tar/; SECTION = base +PRIORITY = optional SRC_URI = ${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 diff --git a/meta/recipes-extended/tar/tar_1.25.bb b/meta/recipes-extended/tar/tar_1.25.bb deleted file mode 100644 index cdb6f54..000 --- a/meta/recipes-extended/tar/tar_1.25.bb +++ /dev/null @@ -1,9 +0,0 @@ -require tar.inc - -LICENSE = GPLv3 -LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 - -PR = r0 - -SRC_URI[md5sum] = 6e497f861c77bbba2f7da4e10270995b -SRC_URI[sha256sum] = f3f6ce41b8e0f327abd05c95990f113ddafbae131e10f79a99728ed46458494b diff --git a/meta/recipes-extended/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb new file mode 100644 index 000..26fdc4a --- /dev/null +++ b/meta/recipes-extended/tar/tar_1.26.bb @@ -0,0 +1,9 @@ +require tar.inc + +LICENSE = GPLv3 +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +PR = r0 + +SRC_URI[md5sum] = 2cee42a2ff4f1cd4f9298eeeb2264519 +SRC_URI[sha256sum] = 5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41 -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sysvinitL split inittab into it's own recipe
ping Op 4 jun 2011, om 11:21 heeft Koen Kooi het volgende geschreven: A proper fix for [YOCTO ##1131] Signed-off-by: k...@dominion.thruhere.net --- .../recipes-core/sysvinit/sysvinit-inittab/inittab | 30 +++ .../sysvinit/sysvinit-inittab_2.88dsf.bb | 55 meta/recipes-core/sysvinit/sysvinit/inittab| 30 --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 41 +-- 4 files changed, 86 insertions(+), 70 deletions(-) create mode 100644 meta/recipes-core/sysvinit/sysvinit-inittab/inittab create mode 100644 meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb delete mode 100644 meta/recipes-core/sysvinit/sysvinit/inittab diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab/inittab b/meta/recipes-core/sysvinit/sysvinit-inittab/inittab new file mode 100644 index 000..6abbdf4 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit-inittab/inittab @@ -0,0 +1,30 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:5:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb new file mode 100644 index 000..4e57b5a --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -0,0 +1,55 @@ +DESCRIPTION = Inittab for sysvinit +LICENSE = GPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4 + +PR = r5 + +# Need the whole source for the license checks +SRC_URI = http://download.savannah.gnu.org/releases-noredirect/sysvinit/sysvinit-${PV}.tar.bz2 \ + file://inittab + +SRC_URI[md5sum] = 6eda8a97b86e0a6f59dabbf25202aa6f +SRC_URI[sha256sum] = 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 + +S = ${WORKDIR}/sysvinit-${PV} + +do_install() { + install -d ${D}${sysconfdir} +install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab +if [ ! -z ${SERIAL_CONSOLE} ]; then +echo S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE} ${D}${sysconfdir}/inittab +fi +if [ ${USE_VT} = 1 ]; then +cat EOF ${D}${sysconfdir}/inittab +# ${base_sbindir}/getty invocations for the runlevels. +# +# The id field MUST be the same as the last +# characters of the device (after tty). +# +# Format: +# id:runlevels:action:process +# + +EOF + +for n in ${SYSVINIT_ENABLED_GETTYS} +do +echo $n:2345:respawn:${base_sbindir}/getty 38400 tty$n ${D}${sysconfdir}/inittab +done +echo ${D}${sysconfdir}/inittab +fi +} + +# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. +# Set PACKAGE_ARCH appropriately. +PACKAGE_ARCH = ${MACHINE_ARCH} + +FILES_${PN} = ${sysconfdir}/inittab +CONFFILES_${PN} = ${sysconfdir}/inittab + +USE_VT ?= 1 +SYSVINIT_ENABLED_GETTYS ?= 1 + + + diff --git a/meta/recipes-core/sysvinit/sysvinit/inittab b/meta/recipes-core/sysvinit/sysvinit/inittab deleted file mode 100644 index 6abbdf4..000 --- a/meta/recipes-core/sysvinit/sysvinit/inittab +++ /dev/null @@ -1,30 +0,0 @@ -# /etc/inittab: init(8) configuration. -# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ - -# The default runlevel. -id:5:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:wait:/sbin/sulogin - -# /etc/init.d executes the S and K scripts upon change -# of runlevel. -# -# Runlevel 0 is halt. -# Runlevel 1 is single-user. -# Runlevels 2-5 are multi-user. -# Runlevel 6 is reboot. - -l0:0:wait:/etc/init.d/rc 0 -l1:1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 -# Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogin diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
Re: [OE-core] [poky] [PATCH 0/5] 3G network support
Shouldn't these be sent to the oe-core list instead? Op 7 jun 2011, om 10:54 heeft Dongxiao Xu het volgende geschreven: Hi Saul, The following commits enables 3G feature for Yocto Project. Please help to review and pull. (Resend due to error From info in previous mail). Some notes: a) 0001.patch: Automatically load some kernel modules which is used to support usb network. b) 0002.patch: upgrade connman to 0.73, also add ofono plugin. c) 0003.patch: Remove 0.6.10 versio of wpa-supplicant. (This commit is not related with 3G support). d) 0004.patch: Add 0.42 version of ofono. Because ofonod after 0.42 would crash on Ericsson 3G module. e) 0005.patch: Add 3G config UI in connman-gnome. Also upgrade it to latest git head. The following changes since commit 7f34cd1eb2a459709006ae985a14decd4d2152e6: tzcode: Update to 2011g (2011-06-06 15:58:42 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib dxu4/upgrade http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/upgrade Dongxiao Xu (5): kernel.bbclass: Auto load cdc-acm and cdc-wdm connman: Upgrade to version 0.73 wpa-supplicant: remove the 0.6.10 version. ofono: add 0.42 version which works OK for Ericsson 3G module. connman-gnome: Add 3G configuration support meta/classes/kernel.bbclass|2 + meta/conf/distro/include/default-versions.inc |1 + .../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 - .../add_xuser_dbus_permission.patch|2 + .../connman/{connman-0.65 = connman-0.73}/connman |0 .../{connman-0.65 = connman-0.73}/dbusperms.patch |2 + .../connman/connman-gnome/3g.patch | 505 +++ .../connman-gnome/applet_menu_popup_fix.patch | 19 - .../connman/connman-gnome/connman-gnome.patch | 4162 .../remove-connman-property-desktop-file.patch | 42 - .../connman-gnome/service_name_update.patch| 36 - .../{connman-gnome_0.5.bb = connman-gnome_git.bb} | 17 +- meta/recipes-connectivity/connman/connman.inc |2 +- .../connman/{connman_0.65.bb = connman_0.73.bb} |8 +- meta/recipes-connectivity/ofono/ofono.inc |2 + meta/recipes-connectivity/ofono/ofono_0.42.bb | 13 + .../wpa-supplicant-0.6.10/99_wpa_supplicant|1 - .../wpa-supplicant-0.6.10/defaults-sane|8 - .../wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls | 180 - .../wpa-supplicant-0.6.10/wpa-supplicant.sh| 85 - .../wpa-supplicant-0.6.10/wpa_supplicant.conf | 690 .../wpa-supplicant-0.6.10/wpa_supplicant.conf-sane |7 - .../wpa-supplicant/wpa-supplicant-0.6.inc | 83 - .../wpa-supplicant/wpa-supplicant_0.6.10.bb|4 - 24 files changed, 542 insertions(+), 5371 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/add_xuser_dbus_permission.patch (94%) rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/connman (100%) rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/dbusperms.patch (91%) create mode 100644 meta/recipes-connectivity/connman/connman-gnome/3g.patch delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/applet_menu_popup_fix.patch delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/connman-gnome.patch delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch delete mode 100644 meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch rename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb = connman-gnome_git.bb} (72%) rename meta/recipes-connectivity/connman/{connman_0.65.bb = connman_0.73.bb} (74%) create mode 100644 meta/recipes-connectivity/ofono/ofono_0.42.bb delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/99_wpa_supplicant delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defaults-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/defconfig-0.6.0-gnutls delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa-supplicant.sh delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.10/wpa_supplicant.conf-sane delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.6.inc delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.6.10.bb ___ poky mailing list p...@yoctoproject.org https://lists.yoctoproject.org/listinfo/poky ___ Openembedded-core mailing list
Re: [OE-core] [poky] [PATCH 2/5] connman: Upgrade to version 0.73
Op 7 jun 2011, om 10:54 heeft Dongxiao Xu het volgende geschreven: Enable ofono plugin into sato image. Remove the fix-shutdown-ap-disconnect.patch since the original logic no longer exists. Add Upstream-Status information for patches. Signed-off-by: Dongxiao Xu dongxiao...@intel.com How different is this from the connman 0.74 in meta-oe? --- .../connman-0.65/fix-shutdown-ap-disconnect.patch | 42 .../add_xuser_dbus_permission.patch|2 + .../connman/{connman-0.65 = connman-0.73}/connman |0 .../{connman-0.65 = connman-0.73}/dbusperms.patch |2 + meta/recipes-connectivity/connman/connman.inc |2 +- .../connman/{connman_0.65.bb = connman_0.73.bb} |8 ++-- 6 files changed, 9 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/add_xuser_dbus_permission.patch (94%) rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/connman (100%) rename meta/recipes-connectivity/connman/{connman-0.65 = connman-0.73}/dbusperms.patch (91%) rename meta/recipes-connectivity/connman/{connman_0.65.bb = connman_0.73.bb} (74%) diff --git a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch deleted file mode 100644 index a0ad099..000 --- a/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch +++ /dev/null @@ -1,42 +0,0 @@ -Schedule delayed scan when being disconnected from an AP - -When being disconnected from an AP, a delayed scan is scheduled to make -sure the AP is still there. wpa_supplicant removes a BSS from its bss list -when it disappears from the scan results twice in a row. - -Author: Samuel Ortiz sa...@linux.intel.com -Ported by Dongxiao Xu dongxiao...@intel.com - -diff -ruN connman-0.56-orig/plugins/supplicant.c connman-0.56/plugins/supplicant.c connman-0.56-orig/plugins/supplicant.c 2010-09-25 15:08:21.242927383 +0800 -+++ connman-0.56/plugins/supplicant.c2010-09-25 15:12:46.346136858 +0800 -@@ -2184,6 +2184,15 @@ - scanning == TRUE ? started : finished); - } - -+static gboolean delayed_scan(gpointer user_data) -+{ -+struct supplicant_task *task = user_data; -+ -+supplicant_scan(task-device); -+ -+return FALSE; -+} -+ - static void state_change(struct supplicant_task *task, DBusMessage *msg) - { - DBusError error; -@@ -2277,7 +2286,13 @@ - task_connect(task); - } else - task-network = NULL; -+} else { -+if (task-state == WPA_DISCONNECTED) -+g_timeout_add_seconds(10, delayed_scan, task); -+ -+remove_network(task); - } -+ - break; - - default: diff --git a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch similarity index 94% rename from meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch rename to meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch index 787d49b..764c689 100644 --- a/meta/recipes-connectivity/connman/connman-0.65/add_xuser_dbus_permission.patch +++ b/meta/recipes-connectivity/connman/connman-0.73/add_xuser_dbus_permission.patch @@ -1,6 +1,8 @@ Some platform (like atom-pc) enables rootless X, thus we need to add the xuser in the list. +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Dongxiao Xu dongxiao...@intel.com diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf diff --git a/meta/recipes-connectivity/connman/connman-0.65/connman b/meta/recipes-connectivity/connman/connman-0.73/connman similarity index 100% rename from meta/recipes-connectivity/connman/connman-0.65/connman rename to meta/recipes-connectivity/connman/connman-0.73/connman diff --git a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.73/dbusperms.patch similarity index 91% rename from meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch rename to meta/recipes-connectivity/connman/connman-0.73/dbusperms.patch index 100af03..c331654 100644 --- a/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch +++ b/meta/recipes-connectivity/connman/connman-0.73/dbusperms.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: git/src/connman-dbus.conf === --- git.orig/src/connman-dbus.conf2009-05-26 00:34:35.0
Re: [OE-core] Tell me your build error message annoyances!
On Mon, 2011-06-06 at 21:53 -0700, Darren Hart wrote: On 06/03/2011 08:47 AM, Chris Larson wrote: Heh, I used to have a personal branch where I dropped those, and also removed the unnecessary NOTE: prefix. I think its a given that something that doesn't indicate a warning or an error is simply informative :) The problem with dropping those messages is for postprocessing scripts, which may well want/need to know when a task completes, not just when it starts. Still, yet another case of something we could drop as long as we log it. We need to add a main bitbake execution log that captures everything, including debug messages, whether the user specifies -D or not. In most systems, running with -D implies not only greater verbosity, but also reduced performance. I haven't checked, but I expect that is the case with bitbake as well. I don't think we want to enable all of -D and log it by default. I'm not sure the performance hit of this would be that great to be honest, particularly if we localised the output to the tasks and didn't hit the IPC mechanism for all the messages. It certainly could be valuable to have more robust logfiles on disk so that when things do break we can dive into them and get full debug info rather than the current partial info. The main cost would be increased disk space but disks are cheap comparatively and the IO is minor compared to other things we do... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] bitbake: add another local configuration file
From: Kang Kai kai.k...@windriver.com Add a new local configuration file local.conf.sample.extended, and more advanced settings what user can configure could put in this file. Signed-off-by: Kang Kai kai.k...@windriver.com --- meta-yocto/conf/local.conf.sample.extended |5 + meta/conf/bitbake.conf |1 + scripts/oe-setup-builddir | 19 +++ 3 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 meta-yocto/conf/local.conf.sample.extended diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended new file mode 100644 index 000..048d641 --- /dev/null +++ b/meta-yocto/conf/local.conf.sample.extended @@ -0,0 +1,5 @@ +# eglibc configurability is used to reduce minimal images's size. +# the all supported eglibc options are default enabled by adding +# to DISTRO_FEATURES in default-distrovars.inc +# put the options what you want to enable below and uncomment it +#DISTRO_FEATURES = alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index de94316..1b1cf6b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -641,6 +641,7 @@ CPU_FEATURES_arm ?= vfp include conf/site.conf include conf/auto.conf include conf/local.conf +include conf/local.extended.conf include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5fc8b19..7af2373 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -55,6 +55,7 @@ if [ x != x$TEMPLATECONF ]; then fi OECORELAYERCONF=$TEMPLATECONF/bblayers.conf.sample OECORELOCALCONF=$TEMPLATECONF/local.conf.sample +OECORELOCALCONFEXTENDED=$TEMPLATECONF/local.conf.sample.extended fi if [ x = x$OECORELOCALCONF ]; then @@ -79,6 +80,24 @@ EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf fi +if ! (test -r $BUILDDIR/conf/local.extended.conf); then +cat EOM +You had no conf/local.conf file. This configuration file has therefore been +created for you with some default values. You may wish to edit it to use +different eglibc configuration options for example. See the file for more +information as common configuration options are commented. + +The Yocto Project has extensive documentation about OE including a reference manual +which can be found at: +http://yoctoproject.org/community/documentation + +For more information about OpenEmbedded see their website: +http://www.openembedded.org/ + +EOM + cp -f $OECORELOCALCONFEXTENDED $BUILDDIR/conf/local.extended.conf +fi + if [ x = x$OECORELAYERCONF ]; then OECORELAYERCONF=$OEROOT/meta/conf/bblayers.conf.sample fi -- 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 2/2] eglibc: migrate configurability from oe
From: Kang Kai kai.k...@windriver.com Migrate configurability from oe, try to shrink minimal image size Update to get eglibc configuration options from DISTRO_FEATURES and enable them. All the options are enabled by default. Uncomment the line in conf/local.extended.conf to define DISTRO_FEATURES, so put what options you want to enable there. Signed-off-by: Kang Kai kai.k...@windriver.com --- meta/conf/distro/include/default-distrovars.inc|8 ++- .../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 ++ meta/recipes-core/eglibc/eglibc-options.inc| 62 meta/recipes-core/eglibc/eglibc.inc|6 ++ meta/recipes-core/eglibc/eglibc_2.13.bb|4 +- 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 4b68a0a..16ac681 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -10,7 +10,13 @@ LIMIT_BUILT_LOCALES ?= POSIX en_US en_GB ENABLE_BINARY_LOCALE_GENERATION ?= 1 LOCALE_UTF8_ONLY ?= 0 -DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci \ + libc-ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ + libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ + libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ + libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ + libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ + libc-posix-wchar-io IMAGE_FEATURES ?= diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch new file mode 100644 index 000..dffc648 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch @@ -0,0 +1,20 @@ +When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails. +Created on Jun 1, 2011 by Kang Kai kai.k...@windriver.com + +Upstream-Status: Submitted + +Signed-off-by: Kang Kai kai.k...@windriver.com +Index: libc/elf/dl-lookup.c +=== +--- libc/elf/dl-lookup.c (revision 13356) libc/elf/dl-lookup.c (working copy) +@@ -423,7 +423,9 @@ +hash table. */ + if (__builtin_expect (tab-size, 0)) + { ++ #if __OPTION_EGLIBC_RTLD_DEBUG + assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK); ++ #endif + __rtld_lock_unlock_recursive (tab-lock); + goto success; + } diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc new file mode 100644 index 000..9214a0c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-options.inc @@ -0,0 +1,62 @@ +def eglibc_cfg(feature, features, tokens, cnf): + if type(tokens) == type(): + tokens = [tokens] + if type(features) == type([]) and feature in features: + cnf.extend([token + ' = y' for token in tokens]) + else: + for token in tokens: + cnf.extend([token + ' = n']) + if token == 'OPTION_EGLIBC_NSSWITCH': + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf]) + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions]) + +# Map distro features to eglibc options settings +def features_to_eglibc_settings(d): +cnf = ([]) +distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split() +eglibc_cfg('libc-ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf) +eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf) +eglibc_cfg('libc-big-macros', distro_features, 'OPTION_EGLIBC_BIG_MACROS', cnf) +eglibc_cfg('libc-bsd', distro_features, 'OPTION_EGLIBC_BSD', cnf) +eglibc_cfg('libc-cxx-tests', distro_features, 'OPTION_EGLIBC_CXX_TESTS', cnf) +eglibc_cfg('libc-catgets', distro_features, 'OPTION_EGLIBC_CATGETS', cnf) +eglibc_cfg('libc-charsets', distro_features, 'OPTION_EGLIBC_CHARSETS', cnf) +
Re: [OE-core] [CONSOLIDATED PULL 01/20] bitbake.conf: Create staticlibs pacakge for static libraries
On Mon, 2011-06-06 at 19:07 +, Otavio Salvador wrote: On Mon, Jun 6, 2011 at 19:00, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Mon, 2011-06-06 at 17:31 +, Otavio Salvador wrote: I personally prefer -static. -staticlib seems redundant for me since we can end with libfoo-staticlib -static doesn't really work well given we already have -static packages meaning something else (e.g. the busybox case). Aren't we changing the wrong name? In my opinion then busybox ought to be renamed. Like busybox-staticlinked or busybox-nolibs. I don't think busybox-static even exists in oe-core at the moment so there may not actually be anything to rename. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] uclibc: remove PACKAGE_ARCH, fix compilation on i586
On Tue, 2011-06-07 at 08:33 -0700, Saul Wold wrote: This patch has not comments, Upstream-Status, or Sign-off-by. Please add these so we have some history to this patch and can determine if it should be upstreamed. Is there some documentation which describes how Upstream-Status is meant to be set? Thanks p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] bitbake: add another local configuration file
On 06/07/2011 02:42 AM, Kang Kai wrote: From: Kang Kaikai.k...@windriver.com Add a new local configuration file local.conf.sample.extended, and more advanced settings what user can configure could put in this file. Signed-off-by: Kang Kaikai.k...@windriver.com --- meta-yocto/conf/local.conf.sample.extended |5 + meta/conf/bitbake.conf |1 + scripts/oe-setup-builddir | 19 +++ 3 files changed, 25 insertions(+), 0 deletions(-) create mode 100644 meta-yocto/conf/local.conf.sample.extended You seem to have inconsistent naming of your local.extended.conf sample file, this should probably named local.extended.conf.sample to be more consistent. Sau! diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended new file mode 100644 index 000..048d641 --- /dev/null +++ b/meta-yocto/conf/local.conf.sample.extended @@ -0,0 +1,5 @@ +# eglibc configurability is used to reduce minimal images's size. +# the all supported eglibc options are default enabled by adding +# to DISTRO_FEATURES in default-distrovars.inc +# put the options what you want to enable below and uncomment it +#DISTRO_FEATURES = alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index de94316..1b1cf6b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -641,6 +641,7 @@ CPU_FEATURES_arm ?= vfp include conf/site.conf include conf/auto.conf include conf/local.conf +include conf/local.extended.conf include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5fc8b19..7af2373 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -55,6 +55,7 @@ if [ x != x$TEMPLATECONF ]; then fi OECORELAYERCONF=$TEMPLATECONF/bblayers.conf.sample OECORELOCALCONF=$TEMPLATECONF/local.conf.sample +OECORELOCALCONFEXTENDED=$TEMPLATECONF/local.conf.sample.extended fi if [ x = x$OECORELOCALCONF ]; then @@ -79,6 +80,24 @@ EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf fi +if ! (test -r $BUILDDIR/conf/local.extended.conf); then +catEOM +You had no conf/local.conf file. This configuration file has therefore been +created for you with some default values. You may wish to edit it to use +different eglibc configuration options for example. See the file for more +information as common configuration options are commented. + +The Yocto Project has extensive documentation about OE including a reference manual +which can be found at: +http://yoctoproject.org/community/documentation + +For more information about OpenEmbedded see their website: +http://www.openembedded.org/ + +EOM + cp -f $OECORELOCALCONFEXTENDED $BUILDDIR/conf/local.extended.conf +fi + if [ x = x$OECORELAYERCONF ]; then OECORELAYERCONF=$OEROOT/meta/conf/bblayers.conf.sample fi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] uclibc: remove PACKAGE_ARCH, fix compilation on i586
On 06/07/2011 08:51 AM, Phil Blundell wrote: On Tue, 2011-06-07 at 08:33 -0700, Saul Wold wrote: This patch has not comments, Upstream-Status, or Sign-off-by. Please add these so we have some history to this patch and can determine if it should be upstreamed. Is there some documentation which describes how Upstream-Status is meant to be set? Mark Hatle has been working on the doc and a draft is out on the oe-dev alias, search for subject: [oe] Commit and Patch message guidelines - fifth draft I think he will be sending another draft this week, but the core info is there. Sau! Thanks p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Layer index wiki page
Hi all, I've created a wiki page to provide a central index of all layers that can be used with oe-core: http://www.openembedded.org/index.php/LayerIndex This is by no means complete - I started with the list from Cliff's changelog and added a few on from there. I was also looking around for a page with the Ångström setup instructions that specifically mentions being oe-core based but I couldn't find it (Koen?) I'm still thinking about how to best represent layer repos that contain multiple layers too (e.g. meta-oe, meta-smartphone, etc.). Comments / updates / additions welcome. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] beagleboard: cleanup board-omap3beagle.c and allow for building without wl1271
Add two patches to the linux-omap_2.6.37.bb recipe. The first corrects some whitespace usage. The second adds an ifdef arround the usage of symbols from the wl1271 driver, allowing the beagleboard kernel to be built without that driver configured. Signed-off-by: Darren Hart dvh...@linux.intel.com Cc: Koen Kooi k...@dominion.thruhere.net --- ...0001-board-omap3beagle-whitespace-cleanup.patch | 91 ...3beagle-allow-for-building-without-wl1271.patch | 42 + recipes-kernel/linux/linux-omap_2.6.37.bb |2 + 3 files changed, 135 insertions(+), 0 deletions(-) create mode 100644 recipes-kernel/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch create mode 100644 recipes-kernel/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch diff --git a/recipes-kernel/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch b/recipes-kernel/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch new file mode 100644 index 000..6910557 --- /dev/null +++ b/recipes-kernel/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch @@ -0,0 +1,91 @@ +From e5e52482147151fbd388d1e5978268e51d24 Mon Sep 17 00:00:00 2001 +Message-Id: e5e52482147151fbd388d1e5978268e51d24.1307392642.git.dvh...@linux.intel.com +From: Darren Hart dvh...@linux.intel.com +Date: Mon, 6 Jun 2011 10:17:56 -0700 +Subject: [PATCH 1/2] board-omap3beagle: whitespace cleanup + +Eliminate leading and trailing whitespace. +Indent with tabs. + +Signed-off-by: Darren Hart dvh...@linux.intel.com +--- + arch/arm/mach-omap2/board-omap3beagle.c | 28 ++-- + 1 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index b035bb5..b618cb6 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -167,12 +167,12 @@ struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { + .board_ref_clock = 2, /* 38.4 MHz */ + }; + +- static struct omap2_hsmmc_info mmcbbt[] = { +- { +- .mmc= 1, +- .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, +- .gpio_wp= 29, +- }, ++static struct omap2_hsmmc_info mmcbbt[] = { ++ { ++ .mmc= 1, ++ .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, ++ .gpio_wp= 29, ++ }, + { + .name = wl1271, + .mmc= 2, +@@ -181,8 +181,8 @@ struct wl12xx_platform_data omap_beagle_wlan_data __initdata = { + .gpio_cd= -EINVAL, + .nonremovable = true, + }, +- {} /* Terminator */ +- }; ++ {} /* Terminator */ ++}; + + static struct regulator_consumer_supply beagle_vmmc2_supply = { + .supply = vmmc, +@@ -455,7 +455,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + /* gpio + 0 is mmc0_cd (input/IRQ) */ + mmc[0].gpio_cd = gpio + 0; + #if defined(CONFIG_WL1271) || defined(CONFIG_WL1271_MODULE) +- if(!strcmp(expansionboard_name, bbtoys-wifi)) { ++ if(!strcmp(expansionboard_name, bbtoys-wifi)) { + omap2_hsmmc_init(mmcbbt); + /* link regulators to MMC adapters */ + beagle_vmmc1_supply.dev = mmcbbt[0].dev; +@@ -648,9 +648,9 @@ static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = { + }; + + static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { +- { +- I2C_BOARD_INFO(eeprom, 0x50), +- }, ++ { ++ I2C_BOARD_INFO(eeprom, 0x50), ++ }, + }; + + #if defined(CONFIG_RTC_DRV_DS1307) || \ +@@ -888,7 +888,7 @@ static void __init omap3_beagle_init(void) + /* REVISIT leave DVI powered down until it's needed ... */ + gpio_direction_output(170, true); + +- if(!strcmp(expansionboard_name, zippy)) ++ if(!strcmp(expansionboard_name, zippy)) + { + printk(KERN_INFO Beagle expansionboard: initializing enc28j60\n); + omap3beagle_enc28j60_init(); +@@ -897,7 +897,7 @@ static void __init omap3_beagle_init(void) + mmc[1].gpio_cd = 162; + } + +- if(!strcmp(expansionboard_name, zippy2)) ++ if(!strcmp(expansionboard_name, zippy2)) + { + printk(KERN_INFO Beagle expansionboard: initializing ks_8851\n); + omap3beagle_ks8851_init(); +-- +1.7.1 + diff --git a/recipes-kernel/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch b/recipes-kernel/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch new file mode 100644 index 000..51978e2 --- /dev/null +++ b/recipes-kernel/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch @@ -0,0 +1,42 @@ +From
[OE-core] [PATCH v2 0/1][meta-ti] linux-omap: cleanup and wl1271 build fix
This adds two patches cleaning up whitespace and fixing a build issue with the iwl12xx expansionboard initialization. These do not apply to the linux-omap tree directly, and need to be pushed along with the rest of the patches currently residing in the linux-omap directory. v2: sync with relocated kernel recipes. The following changes since commit 675b2a2a54f1bb4b805f61dfc3eba3b5683fee93: beagleboard: add comment about rev C5 NAND size (2011-06-07 10:34:57 +0200) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib dvhart/beagleboard http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dvhart/beagleboard Darren Hart (1): beagleboard: cleanup board-omap3beagle.c and allow for building without wl1271 ...0001-board-omap3beagle-whitespace-cleanup.patch | 91 ...3beagle-allow-for-building-without-wl1271.patch | 42 + recipes-kernel/linux/linux-omap_2.6.37.bb |2 + 3 files changed, 135 insertions(+), 0 deletions(-) create mode 100644 recipes-kernel/linux/linux-omap/0001-board-omap3beagle-whitespace-cleanup.patch create mode 100644 recipes-kernel/linux/linux-omap/0002-board-omap3beagle-allow-for-building-without-wl1271.patch ___ 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] eglibc: migrate configurability from oe
On Tue, Jun 7, 2011 at 2:42 AM, Kang Kai kai.k...@windriver.com wrote: From: Kang Kai kai.k...@windriver.com Migrate configurability from oe, try to shrink minimal image size Update to get eglibc configuration options from DISTRO_FEATURES and enable them. All the options are enabled by default. Uncomment the line in conf/local.extended.conf to define DISTRO_FEATURES, so put what options you want to enable there. Signed-off-by: Kang Kai kai.k...@windriver.com --- meta/conf/distro/include/default-distrovars.inc | 8 ++- .../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 ++ meta/recipes-core/eglibc/eglibc-options.inc | 62 meta/recipes-core/eglibc/eglibc.inc | 6 ++ meta/recipes-core/eglibc/eglibc_2.13.bb | 4 +- 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 4b68a0a..16ac681 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -10,7 +10,13 @@ LIMIT_BUILT_LOCALES ?= POSIX en_US en_GB ENABLE_BINARY_LOCALE_GENERATION ?= 1 LOCALE_UTF8_ONLY ?= 0 -DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci \ + libc-ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ + libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ + libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ + libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ + libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ + libc-posix-wchar-io libc-ipv6 should be merged with existing ipv6 DISTRO_FEATURE we do not need two keywords for same feature we also need documentation on these features and probably mention in local.conf.sample or may be a new file for adavanced configuration IMAGE_FEATURES ?= diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch new file mode 100644 index 000..dffc648 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch @@ -0,0 +1,20 @@ +When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails. +Created on Jun 1, 2011 by Kang Kai kai.k...@windriver.com + +Upstream-Status: Submitted + +Signed-off-by: Kang Kai kai.k...@windriver.com +Index: libc/elf/dl-lookup.c +=== +--- libc/elf/dl-lookup.c (revision 13356) libc/elf/dl-lookup.c (working copy) +@@ -423,7 +423,9 @@ + hash table. */ + if (__builtin_expect (tab-size, 0)) + { ++ #if __OPTION_EGLIBC_RTLD_DEBUG + assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK); ++ #endif + __rtld_lock_unlock_recursive (tab-lock); + goto success; + } diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc new file mode 100644 index 000..9214a0c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-options.inc @@ -0,0 +1,62 @@ +def eglibc_cfg(feature, features, tokens, cnf): + if type(tokens) == type(): + tokens = [tokens] + if type(features) == type([]) and feature in features: + cnf.extend([token + ' = y' for token in tokens]) + else: + for token in tokens: + cnf.extend([token + ' = n']) + if token == 'OPTION_EGLIBC_NSSWITCH': + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf]) + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions]) + +# Map distro features to eglibc options settings +def features_to_eglibc_settings(d): + cnf = ([]) + distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split() + eglibc_cfg('libc-ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf) + eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf) + eglibc_cfg('libc-big-macros',
Re: [OE-core] [PATCH] uclibc: remove PACKAGE_ARCH, fix compilation on i586
On Tue, Jun 7, 2011 at 10:48 AM, Koen Kooi k...@dominion.thruhere.net wrote: Op 7 jun 2011, om 19:43 heeft Khem Raj het volgende geschreven: On Tue, Jun 7, 2011 at 2:36 AM, Phil Blundell p...@pbcl.net wrote: Ping? Both changes are fine. change from being machine specific is futuristic it will not work for all architectures that uclibc supports but is sufficient for what we support/use in oe for now. If uclibc is *really* machine specific then everything that links against it should be machine specific as well. Since, as you say, the current configs are rather generic we should make that clear by making uclibc stop pretending to be machine specific. intention is to break that machine dependency if any. Since it used kconfig like kernel many things like tune options and some workarounds creeped in, uclibc is intended to be made clear of those and be machine independent thats why I am ok with this patch regards, Koen ___ 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] Layer index wiki page
On Tue, Jun 7, 2011 at 12:12 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi all, I've created a wiki page to provide a central index of all layers that can be used with oe-core: http://www.openembedded.org/index.php/LayerIndex This is by no means complete - I started with the list from Cliff's changelog and added a few on from there. I was also looking around for a page with the Ångström setup instructions that specifically mentions being oe-core based but I couldn't find it (Koen?) I'm still thinking about how to best represent layer repos that contain multiple layers too (e.g. meta-oe, meta-smartphone, etc.). Comments / updates / additions welcome. Looks good. I've added meta-yocto to the weekly changelog report: http://cgit.openembedded.org/cgit.cgi/openembedded-admin/commit/?id=d017dc35791f100799213cf20de58cd0423b348f Cliff -- = http://bec-systems.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Layer index wiki page
On Tue, 2011-06-07 at 14:58 -0400, Cliff Brake wrote: On Tue, Jun 7, 2011 at 12:12 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi all, I've created a wiki page to provide a central index of all layers that can be used with oe-core: http://www.openembedded.org/index.php/LayerIndex This is by no means complete - I started with the list from Cliff's changelog and added a few on from there. I was also looking around for a page with the Ångström setup instructions that specifically mentions being oe-core based but I couldn't find it (Koen?) I'm still thinking about how to best represent layer repos that contain multiple layers too (e.g. meta-oe, meta-smartphone, etc.). Comments / updates / additions welcome. Looks good. I've added meta-yocto to the weekly changelog report: http://cgit.openembedded.org/cgit.cgi/openembedded-admin/commit/?id=d017dc35791f100799213cf20de58cd0423b348f Please be careful with this one as poky is currently a fusion of bitbake, oe-core and the meta-yocto pieces and those meta-yocto pieces don't yet have their own repository. There will therefore be duplicate commit information until meta-yocto splits into its own repository. Yocto is working on layer tools and I've been holding doing anything with meta-yocto until they're ready. If there is pressure to split this out now though, we can speed up that process at some extra admin cost for me to maintain them... Cheers, 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/13] 06-June-2011
On Tue, 2011-06-07 at 00:01 -0700, Saul Wold wrote: Updates for the kernel and lots of distro tracking updates for manual based updates checking. Sau! The following changes since commit 925de3b3e74d15547840a2edaceff437e135bddd: tzcode: Update to 2011g (2011-06-06 15:52:18 +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 Bruce Ashfield (2): linux-yocto: update target/meta SRCREVs linux-yocto: make e1000e structure common [commit: bec3f1e8c] Koen Kooi (1): util-linux: package agetty seperately Phil Blundell (1): sqlite: remove dependency on tcl-native Saul Wold (4): json-glib: Update to 0.12.4 distro tracking: update Qing - Saul distro tracking: fixup some bad entries distro tracking: Manual Updates Scott Garman (5): distro-tracking: updates openssh: upgrade to v5.8p2 grep: upgrade to v2.8 tar: upgrade to v1.26 distro-tracking: update openssh, tar, and grep 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] uclibc: remove PACKAGE_ARCH, fix compilation on i586
On Tue, 2011-06-07 at 10:36 +0100, Phil Blundell wrote: Ping? I'm not against this move at all but before this patch merges we should really have a cleanup which removes the *.machine configuration files from the uclibc recipe directory along with all the machine specific overrides that are in use instead making them arch specific. Any volunteers? Cheers, Richard p. On Fri, 2011-06-03 at 12:55 +0100, Phil Blundell wrote: There is no good reason for uclibc to be machine specific. Remove local assignment to PACKAGE_ARCH so that it gets the default target architecture and bump PR for that change. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/003064.html Also replace a chunk of anonymous python with a COMPATIBLE_HOST declaration. Signed-off-by: Phil Blundell ph...@gnu.org ___ 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] [CONSOLIDATED PULL 00/20] 05-June-2011
On Sun, 2011-06-05 at 23:44 -0700, Saul Wold wrote: This pulls together a set of changes from the later part of last week, these have been built. I have updated Nitin's comment about the License change (which was adding years). This also includes Scott's User Addition code. I did not pull Bruce's change due to a known build issue with x86-64, I am expecting an update from him. Thanks Sau! The following changes since commit 2a52f806f3789f717219651b97dc64fec3881f7f: qmake_base.bbclass: fix lrelease/lupdate binary names (2011-06-02 18:26:19 +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 Khem Raj (2): allarch.bbclass: Define BASE_PACKAGE_ARCH = all util-linux_2.19.1.bb: Fix compliation on uclibc Martin Jansa (1): base.bbclass: add cleansstate task between clean and cleanall Nitin A Kamble (3): m4: upgrade from 1.4.15 to 1.4.16 autoconf: upgrade from 2.65 to 2.68 bison: upgrade from 2.4.3 to 2.5 Otavio Salvador (4): gnutls: use INC_PR on 2.12.5 version recipe gnutls: add p11tool into gnutls-bin package.bbclass: add support to split Qt translation files xf86-driver-common.inc: remove .la files to avoid unpackaged warning Phil Blundell (1): gcc-package-cross: also install the symlinks in libexec with target prefix Saul Wold (2): bitbake.conf: Create staticlibs pacakge for static libraries tzcode: Update to 2011g Scott Garman (7): shadow: recipe and patch cleanup shadow: add a -native recipe with customized utilities base-passwd: populate the target sysroot with passwd/group/login.defs useradd.bbclass: new class for managing user/group permissions useradd-example: example recipe for using inherit useradd bitbake.conf: set PSEUDO_PASSWD within FAKEROOTENV package_rpm.bbclass: make RPM use on-disk permissions I merged these except in the two cases where feedback was given or in the case of the useradd* commits from Scott as I need more time to review those. 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] uclibc: remove PACKAGE_ARCH, fix compilation on i586
On Tue, Jun 7, 2011 at 1:36 PM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Tue, 2011-06-07 at 10:36 +0100, Phil Blundell wrote: Ping? I'm not against this move at all but before this patch merges we should really have a cleanup which removes the *.machine configuration files from the uclibc recipe directory along with all the machine specific overrides that are in use instead making them arch specific. Any volunteers? Yes thats in my todo list. Cheers, Richard p. On Fri, 2011-06-03 at 12:55 +0100, Phil Blundell wrote: There is no good reason for uclibc to be machine specific. Remove local assignment to PACKAGE_ARCH so that it gets the default target architecture and bump PR for that change. See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-May/003064.html Also replace a chunk of anonymous python with a COMPATIBLE_HOST declaration. Signed-off-by: Phil Blundell ph...@gnu.org ___ 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
Re: [OE-core] [PATCH 2/2] eglibc: migrate configurability from oe
On 2011年06月07日 17:53, Phil Blundell wrote: On Tue, 2011-06-07 at 17:42 +0800, Kang Kai wrote: Hi Phil, Thanks for your comment. -DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci \ + libc-ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ I don't think it is a good idea to invent a new libc-ipv6 feature; you can just use the existing ipv6 one. This is probably true for some of your others too. eglibc needs to support ipv6 by default, but if other application such as iptables doesn't want to support ipv6, remove ipv6 will also disable eglibc ipv6 support。 If it is ok to disable or enable ipv6 at same time, I will update the patch with ipv6. +# try to fix disable charsets/locales/locale-code compile fail +if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: +bb.data.setVar('PACKAGE_NO_GCONV', '0', d) +else: +bb.data.setVar('PACKAGE_NO_GCONV', '1', d) Does that actually work? Yes, it works. I can build eglic after uncomment the line in local.extended.conf to disable all configurable options. But remove the codes above, it will fail. p. Regards, Kai ___ 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 2/2] eglibc: migrate configurability from oe
On Tue, Jun 7, 2011 at 6:59 PM, Kang Kai kai.k...@windriver.com wrote: On 2011年06月07日 17:53, Phil Blundell wrote: On Tue, 2011-06-07 at 17:42 +0800, Kang Kai wrote: Hi Phil, Thanks for your comment. -DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci \ + libc-ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ I don't think it is a good idea to invent a new libc-ipv6 feature; you can just use the existing ipv6 one. This is probably true for some of your others too. eglibc needs to support ipv6 by default, but if other application such as iptables doesn't want to support ipv6, remove ipv6 will also disable eglibc ipv6 support。 I think if one distro does not need ipv6 then having it in eglibc is not needed too If it is ok to disable or enable ipv6 at same time, I will update the patch with ipv6. + # try to fix disable charsets/locales/locale-code compile fail + if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features: + bb.data.setVar('PACKAGE_NO_GCONV', '0', d) + else: + bb.data.setVar('PACKAGE_NO_GCONV', '1', d) Does that actually work? Yes, it works. I can build eglic after uncomment the line in local.extended.conf to disable all configurable options. But remove the codes above, it will fail. p. Regards, Kai ___ 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
[OE-core] [PATCH 0/2] eglibc: migrate configurability from oe V4
From: Kang Kai kai.k...@windriver.com Hi All, Thanks for all your comments. Update to add local.extended.conf.sample instead of local.conf.sample.extended. Using existing DISTRO_FEATURES ipv6 instead of libc-ipv6 Migrate configurability from oe, try to shrink minimal image size The switch is in local.extended.conf, uncomment the line DISTRO_FEATURES = and write what options you want to enable. Regards, The following changes since commit 7f34cd1eb2a459709006ae985a14decd4d2152e6: tzcode: Update to 2011g (2011-06-06 15:58:42 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/distro http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro Kang Kai (2): bitbake: add another local configuration file eglibc: migrate configurability from oe meta-yocto/conf/local.extended.conf.sample |5 ++ meta/conf/bitbake.conf |1 + meta/conf/distro/include/default-distrovars.inc|8 ++- .../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 ++ meta/recipes-core/eglibc/eglibc-options.inc| 62 meta/recipes-core/eglibc/eglibc.inc|6 ++ meta/recipes-core/eglibc/eglibc_2.13.bb|4 +- scripts/oe-setup-builddir | 19 ++ 8 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 meta-yocto/conf/local.extended.conf.sample create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc -- 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 2/2] eglibc: migrate configurability from oe
From: Kang Kai kai.k...@windriver.com Migrate configurability from oe, try to shrink minimal image size Update to get eglibc configuration options from DISTRO_FEATURES and enable them. All the options are enabled by default. Uncomment the line in conf/local.extended.conf to define DISTRO_FEATURES, so put what options you want to enable there. Signed-off-by: Kang Kai kai.k...@windriver.com --- meta/conf/distro/include/default-distrovars.inc|8 ++- .../eglibc-2.13-fix-macro-RTLD_DEBUG.patch | 20 ++ meta/recipes-core/eglibc/eglibc-options.inc| 62 meta/recipes-core/eglibc/eglibc.inc|6 ++ meta/recipes-core/eglibc/eglibc_2.13.bb|4 +- 5 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch create mode 100644 meta/recipes-core/eglibc/eglibc-options.inc diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 4b68a0a..052f9e6 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -10,7 +10,13 @@ LIMIT_BUILT_LOCALES ?= POSIX en_US en_GB ENABLE_BINARY_LOCALE_GENERATION ?= 1 LOCALE_UTF8_ONLY ?= 0 -DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci +DISTRO_FEATURES ?= alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci \ + ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ + libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ + libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-libm-big libc-locales libc-locale-code \ + libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ + libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ + libc-posix-wchar-io IMAGE_FEATURES ?= diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch new file mode 100644 index 000..dffc648 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-2.13-fix-macro-RTLD_DEBUG.patch @@ -0,0 +1,20 @@ +When disable OPTION_EGLIBC_RTLD_DEBUG, compilation fails. +Created on Jun 1, 2011 by Kang Kai kai.k...@windriver.com + +Upstream-Status: Submitted + +Signed-off-by: Kang Kai kai.k...@windriver.com +Index: libc/elf/dl-lookup.c +=== +--- libc/elf/dl-lookup.c (revision 13356) libc/elf/dl-lookup.c (working copy) +@@ -423,7 +423,9 @@ +hash table. */ + if (__builtin_expect (tab-size, 0)) + { ++ #if __OPTION_EGLIBC_RTLD_DEBUG + assert (GLRO(dl_debug_mask) DL_DEBUG_PRELINK); ++ #endif + __rtld_lock_unlock_recursive (tab-lock); + goto success; + } diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc new file mode 100644 index 000..119ceef --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-options.inc @@ -0,0 +1,62 @@ +def eglibc_cfg(feature, features, tokens, cnf): + if type(tokens) == type(): + tokens = [tokens] + if type(features) == type([]) and feature in features: + cnf.extend([token + ' = y' for token in tokens]) + else: + for token in tokens: + cnf.extend([token + ' = n']) + if token == 'OPTION_EGLIBC_NSSWITCH': + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG = ${S}/nss/nsswitch.conf]) + cnf.extend([OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS = ${S}/nss/fixed-nsswitch.functions]) + +# Map distro features to eglibc options settings +def features_to_eglibc_settings(d): +cnf = ([]) +distro_features = (bb.data.getVar('DISTRO_FEATURES', d, True) or '').split() +eglibc_cfg('ipv6', distro_features, 'OPTION_EGLIBC_ADVANCED_INET6', cnf) +eglibc_cfg('libc-backtrace', distro_features, 'OPTION_EGLIBC_BACKTRACE', cnf) +eglibc_cfg('libc-big-macros', distro_features, 'OPTION_EGLIBC_BIG_MACROS', cnf) +eglibc_cfg('libc-bsd', distro_features, 'OPTION_EGLIBC_BSD', cnf) +eglibc_cfg('libc-cxx-tests', distro_features, 'OPTION_EGLIBC_CXX_TESTS', cnf) +eglibc_cfg('libc-catgets', distro_features, 'OPTION_EGLIBC_CATGETS', cnf) +eglibc_cfg('libc-charsets', distro_features, 'OPTION_EGLIBC_CHARSETS', cnf) +eglibc_cfg('libc-crypt',