* [PATCH 0/7] uclibc update and misc fixes.
@ 2012-01-24 17:42 Khem Raj
2012-01-24 17:42 ` [PATCH 1/7] ltp: Update recipe and fix building on uclibc Khem Raj
` (7 more replies)
0 siblings, 8 replies; 14+ messages in thread
From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw)
To: openembedded-core
Hi
Follwing patches have been tested on uclibc using all qemu
machines.
The following changes since commit a4a98b6d6273d4e716afbff0880d0ac2ff7be0a9:
gcc-common.inc: Fix comment (2012-01-24 14:38:31 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/misc-fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes
Khem Raj (7):
ltp: Update recipe and fix building on uclibc
gdb-common: Drop elfutils from DEPENDS
task-core-tools: Divide it into 3 recipes
uclibc: Dont package all .a in uclibc-dev
eglibc-2.15: Add upstream status for x86_fenv.patch
uclibc-git: Update to latest RC
util-linux: Change SRC_URI to a fetchable location
.../conf/distro/include/distro_tracking_fields.inc | 26 ++-
meta/conf/multilib.conf | 4 +-
.../recipes-core/eglibc/eglibc-2.15/x86_fenv.patch | 7 +
meta/recipes-core/tasks/task-core-tools-debug.bb | 26 +++
...sk-core-tools.bb => task-core-tools-profile.bb} | 81 +++------
.../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++
.../uclibc/uclibc-git/argp-headers.patch | 2 +
.../uclibc/uclibc-git/argp-support.patch | 3 +
.../uclibc-git/compile-arm-fork-with-O2.patch | 2 +-
.../uclibc/uclibc-git/cross_compile_check.patch | 13 --
.../recipes-core/uclibc/uclibc-git/fix_libdl.patch | 83 ---------
.../uclibc/uclibc-git/orign_path.patch | 185 ++++++++++++++++++++
.../uclibc-git/remove_attribute_optimize_Os.patch | 12 --
.../uclibc/uclibc-git/uclibc-arm-ftruncate64.patch | 18 --
meta/recipes-core/uclibc/uclibc.inc | 3 +-
meta/recipes-core/uclibc/uclibc_git.bb | 8 +-
meta/recipes-core/util-linux/util-linux.inc | 2 +-
meta/recipes-devtools/gdb/gdb-common.inc | 6 +-
.../ltp/ltp/uclibc-getcontext.patch | 78 ++++++++
.../ltp/{ltp_20110915.bb => ltp_20120104.bb} | 10 +-
20 files changed, 408 insertions(+), 207 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb
rename meta/recipes-core/tasks/{task-core-tools.bb => task-core-tools-profile.bb} (48%)
create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-git/orign_path.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch
create mode 100644 meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch
rename meta/recipes-extended/ltp/{ltp_20110915.bb => ltp_20120104.bb} (93%)
--
1.7.8.3
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 1/7] ltp: Update recipe and fix building on uclibc 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj @ 2012-01-24 17:42 ` Khem Raj 2012-01-24 17:42 ` [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS Khem Raj ` (6 subsequent siblings) 7 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../ltp/ltp/uclibc-getcontext.patch | 78 ++++++++++++++++++++ .../ltp/{ltp_20110915.bb => ltp_20120104.bb} | 10 +- 2 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch rename meta/recipes-extended/ltp/{ltp_20110915.bb => ltp_20120104.bb} (93%) diff --git a/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch b/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch new file mode 100644 index 0000000..310e2d4 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/uclibc-getcontext.patch @@ -0,0 +1,78 @@ +Fix building disabled getcontext and profil01 tests for uclibc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending + +Index: ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c +=================================================================== +--- ltp-20110915.orig/testcases/kernel/syscalls/getcontext/getcontext01.c 2012-01-19 16:39:24.391012507 -0800 ++++ ltp-20110915/testcases/kernel/syscalls/getcontext/getcontext01.c 2012-01-19 16:39:24.459012510 -0800 +@@ -34,6 +34,10 @@ + **********************************************************/ + + #include <features.h> ++#include "test.h" ++#include "usctest.h" ++char *TCID = "getcontext01"; /* Test program identifier. */ ++ + #if !defined(__UCLIBC__) + + #include <stdio.h> +@@ -41,13 +45,9 @@ + #include <errno.h> + #include <ucontext.h> + +-#include "test.h" +-#include "usctest.h" +- + void setup(); + void cleanup(); + +-char *TCID = "getcontext01"; /* Test program identifier. */ + int TST_TOTAL = 1; /* Total number of test cases. */ + + int exp_enos[] = { 0 }; /* must be a 0 terminated list */ +@@ -102,4 +102,4 @@ + { + tst_brkm(TCONF, NULL, "system doesn't have getcontext support"); + } +-#endif +\ No newline at end of file ++#endif +Index: ltp-20110915/testcases/kernel/syscalls/profil/profil01.c +=================================================================== +--- ltp-20110915.orig/testcases/kernel/syscalls/profil/profil01.c 2012-01-19 16:39:55.975014036 -0800 ++++ ltp-20110915/testcases/kernel/syscalls/profil/profil01.c 2012-01-19 16:40:23.475015322 -0800 +@@ -41,6 +41,8 @@ + #endif + + #include <features.h> ++#include "test.h" ++char *TCID = "profil01"; + #ifndef __UCLIBC__ + + #ifdef __arm__ +@@ -58,7 +60,6 @@ + #include <errno.h> + #include <sys/types.h> + #include <sys/wait.h> +-#include "test.h" + #include "usctest.h" + #define FAILED 0 + #define PASSED 1 +@@ -73,7 +74,6 @@ + //char progname[]= "profil1()"; + + /***** LTP Port *****/ +-char *TCID = "profil01"; + int local_flag = PASSED; + int block_number; + FILE *temp; +@@ -310,4 +310,4 @@ + /* uClibc does not have profiling support */ + tst_exit(); + } +-#endif +\ No newline at end of file ++#endif diff --git a/meta/recipes-extended/ltp/ltp_20110915.bb b/meta/recipes-extended/ltp/ltp_20120104.bb similarity index 93% rename from meta/recipes-extended/ltp/ltp_20110915.bb rename to meta/recipes-extended/ltp/ltp_20120104.bb index f1e58b2..07e1fcc 100644 --- a/meta/recipes-extended/ltp/ltp_20110915.bb +++ b/meta/recipes-extended/ltp/ltp_20120104.bb @@ -3,8 +3,6 @@ DESCRIPTION = "The Linux Test Project is a joint project with SGI, IBM, OSDL, an HOMEPAGE = "http://ltp.sourceforge.net" SECTION = "console/utils" -PR = "r1" - LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://testcases/kernel/mce-test/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ @@ -21,10 +19,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ " -SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ + file://uclibc-getcontext.patch \ + " -SRC_URI[md5sum] = "582fb78d7bf78a624a4387f29327d166" -SRC_URI[sha256sum] = "013f7f2f6fdf46b7d73216533c3d4c2d91f0a2cec522bf026f7c8920ede83d2c" +SRC_URI[md5sum] = "ac183bbdac67139f049b3755fda37179" +SRC_URI[sha256sum] = "11b149b821d709e3351ac66f028f1b0dd5337ee9073dc20019ccffdac42d5c2e" export prefix = "/opt/ltp" export exec_prefix = "/opt/ltp" -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj 2012-01-24 17:42 ` [PATCH 1/7] ltp: Update recipe and fix building on uclibc Khem Raj @ 2012-01-24 17:42 ` Khem Raj 2012-01-25 12:32 ` Richard Purdie 2012-01-24 17:42 ` [PATCH 3/7] task-core-tools: Divide it into 3 recipes Khem Raj ` (5 subsequent siblings) 7 siblings, 1 reply; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/gdb/gdb-common.inc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc index d728139..930a71b 100644 --- a/meta/recipes-devtools/gdb/gdb-common.inc +++ b/meta/recipes-devtools/gdb/gdb-common.inc @@ -2,7 +2,7 @@ DESCRIPTION = "gdb - GNU debugger" HOMEPAGE = "http://www.gnu.org/software/gdb/" LICENSE="GPLv3+" SECTION = "devel" -DEPENDS = "ncurses readline elfutils ${LTTNGUST}" +DEPENDS = "ncurses readline ${LTTNGUST}" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" @@ -11,7 +11,7 @@ LTTNGUST_mipsel = "" LTTNGUST_mips64 = "" LTTNGUST_mips64el = "" -INC_PR = "r4" +INC_PR = "r5" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ @@ -40,7 +40,7 @@ EXPAT = "--without-expat" EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ --with-curses --disable-multilib --with-system-readline --disable-sim \ - ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \ + ${GDBPROPREFIX} ${EXPAT} \ ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ " -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS 2012-01-24 17:42 ` [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS Khem Raj @ 2012-01-25 12:32 ` Richard Purdie 2012-01-25 14:58 ` Khem Raj 0 siblings, 1 reply; 14+ messages in thread From: Richard Purdie @ 2012-01-25 12:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2012-01-24 at 09:42 -0800, Khem Raj wrote: > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-devtools/gdb/gdb-common.inc | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc > index d728139..930a71b 100644 > --- a/meta/recipes-devtools/gdb/gdb-common.inc > +++ b/meta/recipes-devtools/gdb/gdb-common.inc > @@ -2,7 +2,7 @@ DESCRIPTION = "gdb - GNU debugger" > HOMEPAGE = "http://www.gnu.org/software/gdb/" > LICENSE="GPLv3+" > SECTION = "devel" > -DEPENDS = "ncurses readline elfutils ${LTTNGUST}" > +DEPENDS = "ncurses readline ${LTTNGUST}" > > LTTNGUST = "lttng-ust" > LTTNGUST_libc-uclibc = "" > @@ -11,7 +11,7 @@ LTTNGUST_mipsel = "" > LTTNGUST_mips64 = "" > LTTNGUST_mips64el = "" > > -INC_PR = "r4" > +INC_PR = "r5" > > LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ > file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ > @@ -40,7 +40,7 @@ EXPAT = "--without-expat" > > EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ > --with-curses --disable-multilib --with-system-readline --disable-sim \ > - ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \ > + ${GDBPROPREFIX} ${EXPAT} \ > ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ > " very good, but why? Cheers, Richard ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS 2012-01-25 12:32 ` Richard Purdie @ 2012-01-25 14:58 ` Khem Raj 0 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-25 14:58 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Wed, Jan 25, 2012 at 4:32 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Tue, 2012-01-24 at 09:42 -0800, Khem Raj wrote: >> Signed-off-by: Khem Raj <raj.khem@gmail.com> >> --- >> meta/recipes-devtools/gdb/gdb-common.inc | 6 +++--- >> 1 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc >> index d728139..930a71b 100644 >> --- a/meta/recipes-devtools/gdb/gdb-common.inc >> +++ b/meta/recipes-devtools/gdb/gdb-common.inc >> @@ -2,7 +2,7 @@ DESCRIPTION = "gdb - GNU debugger" >> HOMEPAGE = "http://www.gnu.org/software/gdb/" >> LICENSE="GPLv3+" >> SECTION = "devel" >> -DEPENDS = "ncurses readline elfutils ${LTTNGUST}" >> +DEPENDS = "ncurses readline ${LTTNGUST}" >> >> LTTNGUST = "lttng-ust" >> LTTNGUST_libc-uclibc = "" >> @@ -11,7 +11,7 @@ LTTNGUST_mipsel = "" >> LTTNGUST_mips64 = "" >> LTTNGUST_mips64el = "" >> >> -INC_PR = "r4" >> +INC_PR = "r5" >> >> LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ >> file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ >> @@ -40,7 +40,7 @@ EXPAT = "--without-expat" >> >> EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ >> --with-curses --disable-multilib --with-system-readline --disable-sim \ >> - ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \ >> + ${GDBPROPREFIX} ${EXPAT} \ >> ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ >> " > > very good, but why? Nitin added it to overcome a build break in 7.1 there seem to be no other reason to have it in if 7.3 builds ok without it. Since libelf does not build with uclibc this was breaking target gdb builds with uclibc. I could make it conditional like ust too but it seems to be not needed. > > Cheers, > > Richard > > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/7] task-core-tools: Divide it into 3 recipes 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj 2012-01-24 17:42 ` [PATCH 1/7] ltp: Update recipe and fix building on uclibc Khem Raj 2012-01-24 17:42 ` [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS Khem Raj @ 2012-01-24 17:42 ` Khem Raj 2012-01-25 1:08 ` Saul Wold 2012-01-24 17:42 ` [PATCH 4/7] uclibc: Dont package all .a in uclibc-dev Khem Raj ` (4 subsequent siblings) 7 siblings, 1 reply; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw) To: openembedded-core task-core-tools-debug, task-core-tools-profile, task-core-tools-testapps otherwise if we choose one through PACKAGE_GROUPS all packages are built since they are in same recipe. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../conf/distro/include/distro_tracking_fields.inc | 26 +++++-- meta/conf/multilib.conf | 4 +- meta/recipes-core/tasks/task-core-tools-debug.bb | 26 ++++++ ...sk-core-tools.bb => task-core-tools-profile.bb} | 81 ++++++-------------- .../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++++++++ 5 files changed, 119 insertions(+), 64 deletions(-) create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb rename meta/recipes-core/tasks/{task-core-tools.bb => task-core-tools-profile.bb} (48%) create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc index ce88b2e..5c47fcf 100644 --- a/meta/conf/distro/include/distro_tracking_fields.inc +++ b/meta/conf/distro/include/distro_tracking_fields.inc @@ -2467,12 +2467,26 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a" RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>" -RECIPE_STATUS_pn-task-core-tools="green" -RECIPE_LATEST_VERSION_pn-task-core-tools="1.0" -RECIPE_NO_OF_PATCHES_pn-task-core-tools="0" -RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a" -RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-tools-debug="green" +RECIPE_LATEST_VERSION_pn-task-core-tools-debug="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-tools-debug="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-debug="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-debug="n/a" +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>" + +RECIPE_STATUS_pn-task-core-tools-profile="green" +RECIPE_LATEST_VERSION_pn-task-core-tools-profile="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-tools-profile="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-profile="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-profile="n/a" +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>" + +RECIPE_STATUS_pn-task-core-tools-testapps="green" +RECIPE_LATEST_VERSION_pn-task-core-tools-testapps="1.0" +RECIPE_NO_OF_PATCHES_pn-task-core-tools-testapps="0" +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-testapps="n/a" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-testapps="n/a" +RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Dongxiao Xu <dongxiao.xu@intel.com>" RECIPE_STATUS_pn-gst-meta-base="green" DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10" diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 9554519..d366fd3 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -393,7 +393,9 @@ BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-task-core-tools-debug = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-task-core-tools-profile = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-task-core-tools-testapps = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb new file mode 100644 index 0000000..3c92f3f --- /dev/null +++ b/meta/recipes-core/tasks/task-core-tools-debug.bb @@ -0,0 +1,26 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "Debug tools tasks for OE-Core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGES = "\ + ${PN} \ + ${PN}-dbg \ + ${PN}-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} = "\ + gdb \ + gdbserver \ + tcf-agent \ + rsync \ + strace \ + " diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools-profile.bb similarity index 48% rename from meta/recipes-core/tasks/task-core-tools.bb rename to meta/recipes-core/tasks/task-core-tools-profile.bb index 1a42f15..254d3f5 100644 --- a/meta/recipes-core/tasks/task-core-tools.bb +++ b/meta/recipes-core/tasks/task-core-tools-profile.bb @@ -2,42 +2,30 @@ # Copyright (C) 2008 OpenedHand Ltd. # -DESCRIPTION = "Tools tasks for OE-Core" +DESCRIPTION = "Profile tools tasks for OE-Core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r15" PACKAGES = "\ - task-core-tools-debug \ - task-core-tools-debug-dbg \ - task-core-tools-debug-dev \ - task-core-tools-profile \ - task-core-tools-profile-dbg \ - task-core-tools-profile-dev \ - task-core-tools-testapps \ - task-core-tools-testapps-dbg \ - task-core-tools-testapps-dev \ + ${PN} \ + ${PN}-dbg \ + ${PN}-dev \ " PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" -# kexec-tools doesn't work on Mips -KEXECTOOLS ?= "kexec" -KEXECTOOLS_mips ?= "" -KEXECTOOLS_mipsel ?= "" -KEXECTOOLS_powerpc ?= "" - -RDEPENDS_task-core-tools-debug = "\ - gdb \ - gdbserver \ - tcf-agent \ - rsync \ - strace" +RRECOMMENDS_${PN} = "\ + perf \ + trace-cmd \ + kernel-module-oprofile \ + blktrace \ + sysprof \ + " -RDEPENDS_task-core-tools-profile = "\ +PROFILETOOLS = "\ oprofile \ oprofileui-server \ powertop \ @@ -45,14 +33,6 @@ RDEPENDS_task-core-tools-profile = "\ lttng-control \ lttng-viewer" -RRECOMMENDS_task-core-tools-profile = "\ - perf \ - trace-cmd \ - kernel-module-oprofile \ - blktrace \ - sysprof \ - " - # systemtap needs elfutils which is not fully buildable on uclibc # hence we exclude it from uclibc based builds SYSTEMTAP = "systemtap" @@ -66,6 +46,13 @@ SYSTEMTAP_libc-uclibc = "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" +LTTNGUST_mips = "" + +# valgrind does not work on mips + +VALGRIND = "valgrind" +VALGRIND_libc-uclibc = "" +VALGRIND_mips = "" # exmap-console # exmap-server @@ -74,29 +61,9 @@ LTTNGUST_libc-uclibc = "" # qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu # (which is required by lttng-ust) may not build on other platforms, like # MIPS. -RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}" -RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}" -RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}" -RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} ${SYSTEMTAP}" - -RDEPENDS_task-core-tools-testapps = "\ - blktool \ - fstests \ - tslib-calibrate \ - tslib-tests \ - lrzsz \ - ${KEXECTOOLS} \ - alsa-utils-amixer \ - alsa-utils-aplay \ - owl-video \ - gst-meta-video \ - gst-meta-audio \ - mesa-demos \ - x11perf \ - xrestop \ - xwininfo \ - xprop \ - xvideo-tests \ - clutter-box2d \ - ltp \ +RDEPENDS_${PN} = "\ + ${PROFILETOOLS} \ + ${LTTNGUST} \ + ${SYSTEMTAP} \ + ${VALGRIND} \ " diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/tasks/task-core-tools-testapps.bb new file mode 100644 index 0000000..b5847f8 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb @@ -0,0 +1,46 @@ +# +# Copyright (C) 2008 OpenedHand Ltd. +# + +DESCRIPTION = "Test apps task for OE-Core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGES = "\ + ${PN} \ + ${PN}-dbg \ + ${PN}-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +# kexec-tools doesn't work on Mips +KEXECTOOLS ?= "kexec" +KEXECTOOLS_mips ?= "" +KEXECTOOLS_mipsel ?= "" +KEXECTOOLS_powerpc ?= "" + +RDEPENDS_${PN} = "\ + blktool \ + fstests \ + tslib-calibrate \ + tslib-tests \ + lrzsz \ + ${KEXECTOOLS} \ + alsa-utils-amixer \ + alsa-utils-aplay \ + owl-video \ + gst-meta-video \ + gst-meta-audio \ + mesa-demos \ + x11perf \ + xrestop \ + xwininfo \ + xprop \ + xvideo-tests \ + clutter-box2d \ + ltp \ + " -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 3/7] task-core-tools: Divide it into 3 recipes 2012-01-24 17:42 ` [PATCH 3/7] task-core-tools: Divide it into 3 recipes Khem Raj @ 2012-01-25 1:08 ` Saul Wold 2012-01-25 1:26 ` Khem Raj 0 siblings, 1 reply; 14+ messages in thread From: Saul Wold @ 2012-01-25 1:08 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 01/24/2012 09:42 AM, Khem Raj wrote: > task-core-tools-debug, task-core-tools-profile, task-core-tools-testapps > otherwise if we choose one through PACKAGE_GROUPS all packages > are built since they are in same recipe. > > Signed-off-by: Khem Raj<raj.khem@gmail.com> > --- > .../conf/distro/include/distro_tracking_fields.inc | 26 +++++-- > meta/conf/multilib.conf | 4 +- > meta/recipes-core/tasks/task-core-tools-debug.bb | 26 ++++++ > ...sk-core-tools.bb => task-core-tools-profile.bb} | 81 ++++++-------------- > .../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++++++++ > 5 files changed, 119 insertions(+), 64 deletions(-) > create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb > rename meta/recipes-core/tasks/{task-core-tools.bb => task-core-tools-profile.bb} (48%) This breaks meta-yocto which has a task-core-tools.bbappend Sau! > create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb > > diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc > index ce88b2e..5c47fcf 100644 > --- a/meta/conf/distro/include/distro_tracking_fields.inc > +++ b/meta/conf/distro/include/distro_tracking_fields.inc > @@ -2467,12 +2467,26 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a" > RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a" > RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu<dongxiao.xu@intel.com>" > > -RECIPE_STATUS_pn-task-core-tools="green" > -RECIPE_LATEST_VERSION_pn-task-core-tools="1.0" > -RECIPE_NO_OF_PATCHES_pn-task-core-tools="0" > -RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a" > -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a" > -RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu<dongxiao.xu@intel.com>" > +RECIPE_STATUS_pn-task-core-tools-debug="green" > +RECIPE_LATEST_VERSION_pn-task-core-tools-debug="1.0" > +RECIPE_NO_OF_PATCHES_pn-task-core-tools-debug="0" > +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-debug="n/a" > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-debug="n/a" > +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu<dongxiao.xu@intel.com>" > + > +RECIPE_STATUS_pn-task-core-tools-profile="green" > +RECIPE_LATEST_VERSION_pn-task-core-tools-profile="1.0" > +RECIPE_NO_OF_PATCHES_pn-task-core-tools-profile="0" > +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-profile="n/a" > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-profile="n/a" > +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu<dongxiao.xu@intel.com>" > + > +RECIPE_STATUS_pn-task-core-tools-testapps="green" > +RECIPE_LATEST_VERSION_pn-task-core-tools-testapps="1.0" > +RECIPE_NO_OF_PATCHES_pn-task-core-tools-testapps="0" > +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-testapps="n/a" > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-testapps="n/a" > +RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Dongxiao Xu<dongxiao.xu@intel.com>" > > RECIPE_STATUS_pn-gst-meta-base="green" > DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10" > diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf > index 9554519..d366fd3 100644 > --- a/meta/conf/multilib.conf > +++ b/meta/conf/multilib.conf > @@ -393,7 +393,9 @@ BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" > -BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" > +BBCLASSEXTEND_append_pn-task-core-tools-debug = " ${MULTILIBS}" > +BBCLASSEXTEND_append_pn-task-core-tools-profile = " ${MULTILIBS}" > +BBCLASSEXTEND_append_pn-task-core-tools-testapps = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" > BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" > diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb > new file mode 100644 > index 0000000..3c92f3f > --- /dev/null > +++ b/meta/recipes-core/tasks/task-core-tools-debug.bb > @@ -0,0 +1,26 @@ > +# > +# Copyright (C) 2008 OpenedHand Ltd. > +# > + > +DESCRIPTION = "Debug tools tasks for OE-Core" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ > + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > + > +PACKAGES = "\ > + ${PN} \ > + ${PN}-dbg \ > + ${PN}-dev \ > + " > + > +PACKAGE_ARCH = "${MACHINE_ARCH}" > + > +ALLOW_EMPTY = "1" > + > +RDEPENDS_${PN} = "\ > + gdb \ > + gdbserver \ > + tcf-agent \ > + rsync \ > + strace \ > + " > diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools-profile.bb > similarity index 48% > rename from meta/recipes-core/tasks/task-core-tools.bb > rename to meta/recipes-core/tasks/task-core-tools-profile.bb > index 1a42f15..254d3f5 100644 > --- a/meta/recipes-core/tasks/task-core-tools.bb > +++ b/meta/recipes-core/tasks/task-core-tools-profile.bb > @@ -2,42 +2,30 @@ > # Copyright (C) 2008 OpenedHand Ltd. > # > > -DESCRIPTION = "Tools tasks for OE-Core" > +DESCRIPTION = "Profile tools tasks for OE-Core" > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ > file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > -PR = "r15" > > PACKAGES = "\ > - task-core-tools-debug \ > - task-core-tools-debug-dbg \ > - task-core-tools-debug-dev \ > - task-core-tools-profile \ > - task-core-tools-profile-dbg \ > - task-core-tools-profile-dev \ > - task-core-tools-testapps \ > - task-core-tools-testapps-dbg \ > - task-core-tools-testapps-dev \ > + ${PN} \ > + ${PN}-dbg \ > + ${PN}-dev \ > " > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > ALLOW_EMPTY = "1" > > -# kexec-tools doesn't work on Mips > -KEXECTOOLS ?= "kexec" > -KEXECTOOLS_mips ?= "" > -KEXECTOOLS_mipsel ?= "" > -KEXECTOOLS_powerpc ?= "" > - > -RDEPENDS_task-core-tools-debug = "\ > - gdb \ > - gdbserver \ > - tcf-agent \ > - rsync \ > - strace" > +RRECOMMENDS_${PN} = "\ > + perf \ > + trace-cmd \ > + kernel-module-oprofile \ > + blktrace \ > + sysprof \ > + " > > -RDEPENDS_task-core-tools-profile = "\ > +PROFILETOOLS = "\ > oprofile \ > oprofileui-server \ > powertop \ > @@ -45,14 +33,6 @@ RDEPENDS_task-core-tools-profile = "\ > lttng-control \ > lttng-viewer" > > -RRECOMMENDS_task-core-tools-profile = "\ > - perf \ > - trace-cmd \ > - kernel-module-oprofile \ > - blktrace \ > - sysprof \ > - " > - > # systemtap needs elfutils which is not fully buildable on uclibc > # hence we exclude it from uclibc based builds > SYSTEMTAP = "systemtap" > @@ -66,6 +46,13 @@ SYSTEMTAP_libc-uclibc = "" > > LTTNGUST = "lttng-ust" > LTTNGUST_libc-uclibc = "" > +LTTNGUST_mips = "" > + > +# valgrind does not work on mips > + > +VALGRIND = "valgrind" > +VALGRIND_libc-uclibc = "" > +VALGRIND_mips = "" > > # exmap-console > # exmap-server > @@ -74,29 +61,9 @@ LTTNGUST_libc-uclibc = "" > # qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu > # (which is required by lttng-ust) may not build on other platforms, like > # MIPS. > -RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}" > -RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}" > -RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}" > -RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} ${SYSTEMTAP}" > - > -RDEPENDS_task-core-tools-testapps = "\ > - blktool \ > - fstests \ > - tslib-calibrate \ > - tslib-tests \ > - lrzsz \ > - ${KEXECTOOLS} \ > - alsa-utils-amixer \ > - alsa-utils-aplay \ > - owl-video \ > - gst-meta-video \ > - gst-meta-audio \ > - mesa-demos \ > - x11perf \ > - xrestop \ > - xwininfo \ > - xprop \ > - xvideo-tests \ > - clutter-box2d \ > - ltp \ > +RDEPENDS_${PN} = "\ > + ${PROFILETOOLS} \ > + ${LTTNGUST} \ > + ${SYSTEMTAP} \ > + ${VALGRIND} \ > " > diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/tasks/task-core-tools-testapps.bb > new file mode 100644 > index 0000000..b5847f8 > --- /dev/null > +++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb > @@ -0,0 +1,46 @@ > +# > +# Copyright (C) 2008 OpenedHand Ltd. > +# > + > +DESCRIPTION = "Test apps task for OE-Core" > +LICENSE = "MIT" > +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ > + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > + > +PACKAGES = "\ > + ${PN} \ > + ${PN}-dbg \ > + ${PN}-dev \ > + " > + > +PACKAGE_ARCH = "${MACHINE_ARCH}" > + > +ALLOW_EMPTY = "1" > + > +# kexec-tools doesn't work on Mips > +KEXECTOOLS ?= "kexec" > +KEXECTOOLS_mips ?= "" > +KEXECTOOLS_mipsel ?= "" > +KEXECTOOLS_powerpc ?= "" > + > +RDEPENDS_${PN} = "\ > + blktool \ > + fstests \ > + tslib-calibrate \ > + tslib-tests \ > + lrzsz \ > + ${KEXECTOOLS} \ > + alsa-utils-amixer \ > + alsa-utils-aplay \ > + owl-video \ > + gst-meta-video \ > + gst-meta-audio \ > + mesa-demos \ > + x11perf \ > + xrestop \ > + xwininfo \ > + xprop \ > + xvideo-tests \ > + clutter-box2d \ > + ltp \ > + " ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/7] task-core-tools: Divide it into 3 recipes 2012-01-25 1:08 ` Saul Wold @ 2012-01-25 1:26 ` Khem Raj 2012-01-25 10:20 ` Paul Eggleton 0 siblings, 1 reply; 14+ messages in thread From: Khem Raj @ 2012-01-25 1:26 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On Tue, Jan 24, 2012 at 5:08 PM, Saul Wold <sgw@linux.intel.com> wrote: > On 01/24/2012 09:42 AM, Khem Raj wrote: >> >> task-core-tools-debug, task-core-tools-profile, task-core-tools-testapps >> otherwise if we choose one through PACKAGE_GROUPS all packages >> are built since they are in same recipe. >> >> Signed-off-by: Khem Raj<raj.khem@gmail.com> >> --- >> .../conf/distro/include/distro_tracking_fields.inc | 26 +++++-- >> meta/conf/multilib.conf | 4 +- >> meta/recipes-core/tasks/task-core-tools-debug.bb | 26 ++++++ >> ...sk-core-tools.bb => task-core-tools-profile.bb} | 81 >> ++++++-------------- >> .../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++++++++ >> 5 files changed, 119 insertions(+), 64 deletions(-) >> create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb >> rename meta/recipes-core/tasks/{task-core-tools.bb => >> task-core-tools-profile.bb} (48%) > > This breaks meta-yocto which has a task-core-tools.bbappend that bbappend is redundant. You should just delete it anyway from meta-yocto > > Sau! > > >> create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb >> >> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc >> b/meta/conf/distro/include/distro_tracking_fields.inc >> index ce88b2e..5c47fcf 100644 >> --- a/meta/conf/distro/include/distro_tracking_fields.inc >> +++ b/meta/conf/distro/include/distro_tracking_fields.inc >> @@ -2467,12 +2467,26 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a" >> RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a" >> RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu<dongxiao.xu@intel.com>" >> >> -RECIPE_STATUS_pn-task-core-tools="green" >> -RECIPE_LATEST_VERSION_pn-task-core-tools="1.0" >> -RECIPE_NO_OF_PATCHES_pn-task-core-tools="0" >> -RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a" >> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a" >> -RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao >> Xu<dongxiao.xu@intel.com>" >> +RECIPE_STATUS_pn-task-core-tools-debug="green" >> +RECIPE_LATEST_VERSION_pn-task-core-tools-debug="1.0" >> +RECIPE_NO_OF_PATCHES_pn-task-core-tools-debug="0" >> +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-debug="n/a" >> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-debug="n/a" >> +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao >> Xu<dongxiao.xu@intel.com>" >> + >> +RECIPE_STATUS_pn-task-core-tools-profile="green" >> +RECIPE_LATEST_VERSION_pn-task-core-tools-profile="1.0" >> +RECIPE_NO_OF_PATCHES_pn-task-core-tools-profile="0" >> +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-profile="n/a" >> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-profile="n/a" >> +RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao >> Xu<dongxiao.xu@intel.com>" >> + >> +RECIPE_STATUS_pn-task-core-tools-testapps="green" >> +RECIPE_LATEST_VERSION_pn-task-core-tools-testapps="1.0" >> +RECIPE_NO_OF_PATCHES_pn-task-core-tools-testapps="0" >> +RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-testapps="n/a" >> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-testapps="n/a" >> +RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Dongxiao >> Xu<dongxiao.xu@intel.com>" >> >> RECIPE_STATUS_pn-gst-meta-base="green" >> DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer >> OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 >> Debian=gstreamer0.10" >> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf >> index 9554519..d366fd3 100644 >> --- a/meta/conf/multilib.conf >> +++ b/meta/conf/multilib.conf >> @@ -393,7 +393,9 @@ BBCLASSEXTEND_append_pn-task-core-lsb = " >> ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" >> -BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" >> +BBCLASSEXTEND_append_pn-task-core-tools-debug = " ${MULTILIBS}" >> +BBCLASSEXTEND_append_pn-task-core-tools-profile = " ${MULTILIBS}" >> +BBCLASSEXTEND_append_pn-task-core-tools-testapps = " ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" >> BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" >> diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb >> b/meta/recipes-core/tasks/task-core-tools-debug.bb >> new file mode 100644 >> index 0000000..3c92f3f >> --- /dev/null >> +++ b/meta/recipes-core/tasks/task-core-tools-debug.bb >> @@ -0,0 +1,26 @@ >> +# >> +# Copyright (C) 2008 OpenedHand Ltd. >> +# >> + >> +DESCRIPTION = "Debug tools tasks for OE-Core" >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = >> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ >> + >> file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >> + >> +PACKAGES = "\ >> + ${PN} \ >> + ${PN}-dbg \ >> + ${PN}-dev \ >> + " >> + >> +PACKAGE_ARCH = "${MACHINE_ARCH}" >> + >> +ALLOW_EMPTY = "1" >> + >> +RDEPENDS_${PN} = "\ >> + gdb \ >> + gdbserver \ >> + tcf-agent \ >> + rsync \ >> + strace \ >> + " >> diff --git a/meta/recipes-core/tasks/task-core-tools.bb >> b/meta/recipes-core/tasks/task-core-tools-profile.bb >> similarity index 48% >> rename from meta/recipes-core/tasks/task-core-tools.bb >> rename to meta/recipes-core/tasks/task-core-tools-profile.bb >> index 1a42f15..254d3f5 100644 >> --- a/meta/recipes-core/tasks/task-core-tools.bb >> +++ b/meta/recipes-core/tasks/task-core-tools-profile.bb >> @@ -2,42 +2,30 @@ >> # Copyright (C) 2008 OpenedHand Ltd. >> # >> >> -DESCRIPTION = "Tools tasks for OE-Core" >> +DESCRIPTION = "Profile tools tasks for OE-Core" >> LICENSE = "MIT" >> LIC_FILES_CHKSUM = >> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ >> >> file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >> -PR = "r15" >> >> PACKAGES = "\ >> - task-core-tools-debug \ >> - task-core-tools-debug-dbg \ >> - task-core-tools-debug-dev \ >> - task-core-tools-profile \ >> - task-core-tools-profile-dbg \ >> - task-core-tools-profile-dev \ >> - task-core-tools-testapps \ >> - task-core-tools-testapps-dbg \ >> - task-core-tools-testapps-dev \ >> + ${PN} \ >> + ${PN}-dbg \ >> + ${PN}-dev \ >> " >> >> PACKAGE_ARCH = "${MACHINE_ARCH}" >> >> ALLOW_EMPTY = "1" >> >> -# kexec-tools doesn't work on Mips >> -KEXECTOOLS ?= "kexec" >> -KEXECTOOLS_mips ?= "" >> -KEXECTOOLS_mipsel ?= "" >> -KEXECTOOLS_powerpc ?= "" >> - >> -RDEPENDS_task-core-tools-debug = "\ >> - gdb \ >> - gdbserver \ >> - tcf-agent \ >> - rsync \ >> - strace" >> +RRECOMMENDS_${PN} = "\ >> + perf \ >> + trace-cmd \ >> + kernel-module-oprofile \ >> + blktrace \ >> + sysprof \ >> + " >> >> -RDEPENDS_task-core-tools-profile = "\ >> +PROFILETOOLS = "\ >> oprofile \ >> oprofileui-server \ >> powertop \ >> @@ -45,14 +33,6 @@ RDEPENDS_task-core-tools-profile = "\ >> lttng-control \ >> lttng-viewer" >> >> -RRECOMMENDS_task-core-tools-profile = "\ >> - perf \ >> - trace-cmd \ >> - kernel-module-oprofile \ >> - blktrace \ >> - sysprof \ >> - " >> - >> # systemtap needs elfutils which is not fully buildable on uclibc >> # hence we exclude it from uclibc based builds >> SYSTEMTAP = "systemtap" >> @@ -66,6 +46,13 @@ SYSTEMTAP_libc-uclibc = "" >> >> LTTNGUST = "lttng-ust" >> LTTNGUST_libc-uclibc = "" >> +LTTNGUST_mips = "" >> + >> +# valgrind does not work on mips >> + >> +VALGRIND = "valgrind" >> +VALGRIND_libc-uclibc = "" >> +VALGRIND_mips = "" >> >> # exmap-console >> # exmap-server >> @@ -74,29 +61,9 @@ LTTNGUST_libc-uclibc = "" >> # qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream >> liburcu >> # (which is required by lttng-ust) may not build on other platforms, like >> # MIPS. >> -RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust >> ${SYSTEMTAP}" >> -RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} >> ${SYSTEMTAP}" >> -RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} >> ${SYSTEMTAP}" >> -RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} >> ${SYSTEMTAP}" >> - >> -RDEPENDS_task-core-tools-testapps = "\ >> - blktool \ >> - fstests \ >> - tslib-calibrate \ >> - tslib-tests \ >> - lrzsz \ >> - ${KEXECTOOLS} \ >> - alsa-utils-amixer \ >> - alsa-utils-aplay \ >> - owl-video \ >> - gst-meta-video \ >> - gst-meta-audio \ >> - mesa-demos \ >> - x11perf \ >> - xrestop \ >> - xwininfo \ >> - xprop \ >> - xvideo-tests \ >> - clutter-box2d \ >> - ltp \ >> +RDEPENDS_${PN} = "\ >> + ${PROFILETOOLS} \ >> + ${LTTNGUST} \ >> + ${SYSTEMTAP} \ >> + ${VALGRIND} \ >> " >> diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb >> b/meta/recipes-core/tasks/task-core-tools-testapps.bb >> new file mode 100644 >> index 0000000..b5847f8 >> --- /dev/null >> +++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb >> @@ -0,0 +1,46 @@ >> +# >> +# Copyright (C) 2008 OpenedHand Ltd. >> +# >> + >> +DESCRIPTION = "Test apps task for OE-Core" >> +LICENSE = "MIT" >> +LIC_FILES_CHKSUM = >> "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ >> + >> file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" >> + >> +PACKAGES = "\ >> + ${PN} \ >> + ${PN}-dbg \ >> + ${PN}-dev \ >> + " >> + >> +PACKAGE_ARCH = "${MACHINE_ARCH}" >> + >> +ALLOW_EMPTY = "1" >> + >> +# kexec-tools doesn't work on Mips >> +KEXECTOOLS ?= "kexec" >> +KEXECTOOLS_mips ?= "" >> +KEXECTOOLS_mipsel ?= "" >> +KEXECTOOLS_powerpc ?= "" >> + >> +RDEPENDS_${PN} = "\ >> + blktool \ >> + fstests \ >> + tslib-calibrate \ >> + tslib-tests \ >> + lrzsz \ >> + ${KEXECTOOLS} \ >> + alsa-utils-amixer \ >> + alsa-utils-aplay \ >> + owl-video \ >> + gst-meta-video \ >> + gst-meta-audio \ >> + mesa-demos \ >> + x11perf \ >> + xrestop \ >> + xwininfo \ >> + xprop \ >> + xvideo-tests \ >> + clutter-box2d \ >> + ltp \ >> + " ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/7] task-core-tools: Divide it into 3 recipes 2012-01-25 1:26 ` Khem Raj @ 2012-01-25 10:20 ` Paul Eggleton 0 siblings, 0 replies; 14+ messages in thread From: Paul Eggleton @ 2012-01-25 10:20 UTC (permalink / raw) To: openembedded-core On Tuesday 24 January 2012 17:26:42 Khem Raj wrote: > On Tue, Jan 24, 2012 at 5:08 PM, Saul Wold <sgw@linux.intel.com> wrote: > > On 01/24/2012 09:42 AM, Khem Raj wrote: > >> task-core-tools-debug, task-core-tools-profile, task-core-tools-testapps > >> otherwise if we choose one through PACKAGE_GROUPS all packages > >> are built since they are in same recipe. > >> > >> Signed-off-by: Khem Raj<raj.khem@gmail.com> > >> --- > >> .../conf/distro/include/distro_tracking_fields.inc | 26 +++++-- > >> meta/conf/multilib.conf | 4 +- > >> meta/recipes-core/tasks/task-core-tools-debug.bb | 26 ++++++ > >> ...sk-core-tools.bb => task-core-tools-profile.bb} | 81 > >> ++++++-------------- > >> .../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++++++++ > >> 5 files changed, 119 insertions(+), 64 deletions(-) > >> create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb > >> rename meta/recipes-core/tasks/{task-core-tools.bb => > >> task-core-tools-profile.bb} (48%) > > > > This breaks meta-yocto which has a task-core-tools.bbappend > > that bbappend is redundant. You should just delete it anyway from meta-yocto Amusingly I was thinking "who the heck put that in there?" and, wouldn't you know it, it turned out to be me... I think at the time I was concerned only with moving pieces out of OE-Core that were hardware-specific without making any judgements about whether they were worthwhile or not. I'd have to defer to someone who knows more about these tools, but if the concern is that systemtap and lttng-ust might not be suitable for all machines, we could simply use RRECOMMENDS in OE-Core and then set COMPATIBLE_MACHINE for them in BSPs. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/7] uclibc: Dont package all .a in uclibc-dev 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj ` (2 preceding siblings ...) 2012-01-24 17:42 ` [PATCH 3/7] task-core-tools: Divide it into 3 recipes Khem Raj @ 2012-01-24 17:42 ` Khem Raj 2012-01-24 17:42 ` [PATCH 5/7] eglibc-2.15: Add upstream status for x86_fenv.patch Khem Raj ` (3 subsequent siblings) 7 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw) To: openembedded-core only *_nonshared.a are to be packaged in uclibc-dev rest can go into uclibc-staticdev Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/uclibc/uclibc.inc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 0779221..5e9e2e9 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -13,7 +13,7 @@ SECTION = "libs" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \ file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960" -INC_PR = "r4" +INC_PR = "r5" require uclibc-config.inc STAGINGCC = "gcc-cross-intermediate" @@ -75,7 +75,6 @@ FILES_${PN}-dev_append = "\ ${libdir}/*_nonshared.a \ ${libdir}/[S]*crt[1in].o \ ${libdir}/crtreloc*.o \ - ${libdir}/lib*.a \ ${includedir}/*.h ${includedir}/*/*.h \ " FILES_uclibc-utils = "${bindir} ${sbindir}" -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/7] eglibc-2.15: Add upstream status for x86_fenv.patch 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj ` (3 preceding siblings ...) 2012-01-24 17:42 ` [PATCH 4/7] uclibc: Dont package all .a in uclibc-dev Khem Raj @ 2012-01-24 17:42 ` Khem Raj 2012-01-24 17:43 ` [PATCH 6/7] uclibc-git: Update to latest RC Khem Raj ` (2 subsequent siblings) 7 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:42 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../recipes-core/eglibc/eglibc-2.15/x86_fenv.patch | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-2.15/x86_fenv.patch b/meta/recipes-core/eglibc/eglibc-2.15/x86_fenv.patch index 40c1c4d..7193f98 100644 --- a/meta/recipes-core/eglibc/eglibc-2.15/x86_fenv.patch +++ b/meta/recipes-core/eglibc/eglibc-2.15/x86_fenv.patch @@ -1,3 +1,10 @@ +Without this patch it fails to inline that function +since we do not have __SSE_MATH__ in OE build. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate [OE-specific] + --- a/sysdeps/x86_64/fpu/bits/fenv.h +++ b/sysdeps/x86_64/fpu/bits/fenv.h @@ -112,16 +112,24 @@ __NTH (feraiseexcept (int __excepts)) -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 6/7] uclibc-git: Update to latest RC 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj ` (4 preceding siblings ...) 2012-01-24 17:42 ` [PATCH 5/7] eglibc-2.15: Add upstream status for x86_fenv.patch Khem Raj @ 2012-01-24 17:43 ` Khem Raj 2012-01-24 17:43 ` [PATCH 7/7] util-linux: Change SRC_URI to a fetchable location Khem Raj 2012-01-25 14:36 ` [PATCH 0/7] uclibc update and misc fixes Richard Purdie 7 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:43 UTC (permalink / raw) To: openembedded-core Document the patches Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../uclibc/uclibc-git/argp-headers.patch | 2 + .../uclibc/uclibc-git/argp-support.patch | 3 + .../uclibc-git/compile-arm-fork-with-O2.patch | 2 +- .../uclibc/uclibc-git/cross_compile_check.patch | 13 -- .../recipes-core/uclibc/uclibc-git/fix_libdl.patch | 83 --------- .../uclibc/uclibc-git/orign_path.patch | 185 ++++++++++++++++++++ .../uclibc-git/remove_attribute_optimize_Os.patch | 12 -- .../uclibc/uclibc-git/uclibc-arm-ftruncate64.patch | 18 -- meta/recipes-core/uclibc/uclibc_git.bb | 8 +- 9 files changed, 194 insertions(+), 132 deletions(-) delete mode 100644 meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch delete mode 100644 meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch create mode 100644 meta/recipes-core/uclibc/uclibc-git/orign_path.patch delete mode 100644 meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch diff --git a/meta/recipes-core/uclibc/uclibc-git/argp-headers.patch b/meta/recipes-core/uclibc/uclibc-git/argp-headers.patch index 7fd148f..b31b991 100644 --- a/meta/recipes-core/uclibc/uclibc-git/argp-headers.patch +++ b/meta/recipes-core/uclibc/uclibc-git/argp-headers.patch @@ -8,6 +8,8 @@ Signed-off-by: Salvatore Cro <salvatore.cro at st.com> create mode 100644 include/argp.h create mode 100644 libc/argp/argp-fmtstream.h +Upstream-Status: Pending + Index: git/include/argp.h =================================================================== --- /dev/null diff --git a/meta/recipes-core/uclibc/uclibc-git/argp-support.patch b/meta/recipes-core/uclibc/uclibc-git/argp-support.patch index 04a3c78..3e9680f 100644 --- a/meta/recipes-core/uclibc/uclibc-git/argp-support.patch +++ b/meta/recipes-core/uclibc/uclibc-git/argp-support.patch @@ -13,6 +13,9 @@ it doesn't need to link libuargp.so explicitely. Signed-off-by: Salvatore Cro <salvatore.cro at st.com> Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono at st.com> Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com> + +Upstream-Status: Pending + --- Makefile.in | 8 + Makerules | 8 +- diff --git a/meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch b/meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch index 429f27d..15ee0ca 100644 --- a/meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch +++ b/meta/recipes-core/uclibc/uclibc-git/compile-arm-fork-with-O2.patch @@ -1,5 +1,5 @@ When compiling in thumb mode for arm with -Os gcc gives up since it can not find registers -to spill. So we use -O2 option for compiling fork.c It may be addressable is gcc. +to spill. So we use -O2 option for compiling fork.c It may be addressable in gcc. Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch b/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch deleted file mode 100644 index f009cb9..0000000 --- a/meta/recipes-core/uclibc/uclibc-git/cross_compile_check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Rules.mak b/Rules.mak -index 84baa97..571da05 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -158,7 +158,7 @@ endif - comma:=, - space:= # - --ifndef CROSS_COMPILE -+ifeq ($(CROSS_COMPILE),) - CROSS_COMPILE=$(call qstrip,$(CROSS_COMPILER_PREFIX)) - endif - diff --git a/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch b/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch deleted file mode 100644 index 16e48b1..0000000 --- a/meta/recipes-core/uclibc/uclibc-git/fix_libdl.patch +++ /dev/null @@ -1,83 +0,0 @@ -Defer removal of the local scope of a dl-opened library after -all the destructors (of itself and related dependencies) are actually -get unloaded, otherwise any function registered via atexit() -won't be resolved. - -Signed-off-by: Khem Raj <raj.khem at gmail.com> -Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono at st.com> -Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com> ---- - ldso/libdl/libdl.c | 33 +++++++++++++++++++++------------ - 1 files changed, 21 insertions(+), 12 deletions(-) - - -Upstream-Status: Pending - -Index: git/ldso/libdl/libdl.c -=================================================================== ---- git.orig/ldso/libdl/libdl.c 2012-01-17 17:38:44.930821794 -0800 -+++ git/ldso/libdl/libdl.c 2012-01-17 17:39:02.754822656 -0800 -@@ -780,7 +780,9 @@ - struct dyn_elf *handle; - unsigned int end = 0, start = 0xffffffff; - unsigned int i, j; -- struct r_scope_elem *ls; -+ struct r_scope_elem *ls, *ls_next = NULL; -+ struct elf_resolve **handle_rlist; -+ - #if defined(USE_TLS) && USE_TLS - bool any_tls = false; - size_t tls_free_start = NO_TLS_OFFSET; -@@ -813,6 +815,19 @@ - free(handle); - return 0; - } -+ -+ /* Store the handle's local scope array for later removal */ -+ handle_rlist = handle->dyn->symbol_scope.r_list; -+ -+ /* Store references to the local scope entries for later removal */ -+ for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next) -+ if (ls->next->r_list[0] == handle->dyn) { -+ break; -+ } -+ /* ls points to the previous local symbol scope */ -+ if(ls && ls->next) -+ ls_next = ls->next->next; -+ - /* OK, this is a valid handle - now close out the file */ - for (j = 0; j < handle->init_fini.nlist; ++j) { - tpnt = handle->init_fini.init_fini[j]; -@@ -974,16 +989,6 @@ - } - } - -- if (handle->dyn == tpnt) { -- /* Unlink the local scope from global one */ -- for (ls = &_dl_loaded_modules->symbol_scope; ls; ls = ls->next) -- if (ls->next->r_list[0] == tpnt) { -- _dl_if_debug_print("removing symbol_scope: %s\n", tpnt->libname); -- break; -- } -- ls->next = ls->next->next; -- } -- - /* Next, remove tpnt from the global symbol table list */ - if (_dl_symbol_tables) { - if (_dl_symbol_tables->dyn == tpnt) { -@@ -1005,10 +1010,14 @@ - } - } - free(tpnt->libname); -- free(tpnt->symbol_scope.r_list); - free(tpnt); - } - } -+ /* Unlink and release the handle's local scope from global one */ -+ if(ls) -+ ls->next = ls_next; -+ free(handle_rlist); -+ - for (rpnt1 = handle->next; rpnt1; rpnt1 = rpnt1_tmp) { - rpnt1_tmp = rpnt1->next; - free(rpnt1); diff --git a/meta/recipes-core/uclibc/uclibc-git/orign_path.patch b/meta/recipes-core/uclibc/uclibc-git/orign_path.patch new file mode 100644 index 0000000..c9c15a3 --- /dev/null +++ b/meta/recipes-core/uclibc/uclibc-git/orign_path.patch @@ -0,0 +1,185 @@ +Patch is backported from +http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html + +Upstream-Status: Pending + +Index: git/ldso/ldso/dl-elf.c +=================================================================== +--- git.orig/ldso/ldso/dl-elf.c 2012-01-23 19:18:58.000000000 -0800 ++++ git/ldso/ldso/dl-elf.c 2012-01-23 21:52:06.144646590 -0800 +@@ -133,53 +133,60 @@ + * in uClibc/ldso/util/ldd.c */ + static struct elf_resolve * + search_for_named_library(const char *name, unsigned rflags, const char *path_list, +- struct dyn_elf **rpnt) ++ struct dyn_elf **rpnt, const char* origin) + { +- char *path, *path_n, *mylibname; ++ char *mylibname; ++ const char *p, *pn; + struct elf_resolve *tpnt; +- int done; ++ int plen; + + if (path_list==NULL) + return NULL; + +- /* We need a writable copy of this string, but we don't +- * need this allocated permanently since we don't want +- * to leak memory, so use alloca to put path on the stack */ +- done = _dl_strlen(path_list); +- path = alloca(done + 1); +- + /* another bit of local storage */ + mylibname = alloca(2050); + +- _dl_memcpy(path, path_list, done+1); +- + /* Unlike ldd.c, don't bother to eliminate double //s */ + + /* Replace colons with zeros in path_list */ + /* : at the beginning or end of path maps to CWD */ + /* :: anywhere maps CWD */ + /* "" maps to CWD */ +- done = 0; +- path_n = path; +- do { +- if (*path == 0) { +- *path = ':'; +- done = 1; ++ for (p = path_list; p != NULL; p = pn) { ++ pn = _dl_strchr(p + 1, ':'); ++ if (pn != NULL) { ++ plen = pn - p; ++ pn++; ++ } else ++ plen = _dl_strlen(p); ++ ++ if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) { ++ int olen; ++ if (rflags && plen != 7) ++ continue; ++ if (origin == NULL) ++ continue; ++ for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--) ++ ; ++ if (olen <= 0) ++ continue; ++ _dl_memcpy(&mylibname[0], origin, olen); ++ _dl_memcpy(&mylibname[olen], p + 7, plen - 7); ++ mylibname[olen + plen - 7] = 0; ++ } else if (plen != 0) { ++ _dl_memcpy(mylibname, p, plen); ++ mylibname[plen] = 0; ++ } else { ++ _dl_strcpy(mylibname, "."); + } +- if (*path == ':') { +- *path = 0; +- if (*path_n) +- _dl_strcpy(mylibname, path_n); +- else +- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */ +- _dl_strcat(mylibname, "/"); +- _dl_strcat(mylibname, name); +- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL) +- return tpnt; +- path_n = path+1; +- } +- path++; +- } while (!done); ++ _dl_strcat(mylibname, "/"); ++ _dl_strcat(mylibname, name); ++ ++ tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname); ++ if (tpnt != NULL) ++ return tpnt; ++ } ++ + return NULL; + } + +@@ -231,8 +238,10 @@ + if (pnt) { + pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; + _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt); +- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) ++ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, ++ tpnt->libname)) != NULL) + return tpnt1; ++ + } + #endif + +@@ -240,7 +249,7 @@ + /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */ + if (_dl_library_path) { + _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path); +- if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt)) != NULL) ++ if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt, NULL)) != NULL) + { + return tpnt1; + } +@@ -254,7 +263,7 @@ + if (pnt) { + pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB]; + _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt); +- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) ++ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) + return tpnt1; + } + #endif +@@ -288,7 +297,7 @@ + /* Look for libraries wherever the shared library loader + * was installed */ + _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath); +- tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt); ++ tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt, NULL); + if (tpnt1 != NULL) + return tpnt1; + #endif +@@ -301,7 +310,7 @@ + #ifndef __LDSO_CACHE_SUPPORT__ + ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" + #endif +- , rpnt); ++ , rpnt, NULL); + if (tpnt1 != NULL) + return tpnt1; + +Index: git/ldso/ldso/ldso.c +=================================================================== +--- git.orig/ldso/ldso/ldso.c 2012-01-23 19:18:58.000000000 -0800 ++++ git/ldso/ldso/ldso.c 2012-01-23 21:34:11.152594621 -0800 +@@ -407,6 +407,20 @@ + return p - list; + } + ++static void _dl_setup_progname(const char *argv0) ++{ ++ char image[PATH_MAX]; ++ ssize_t s; ++ ++ s = _dl_readlink("/proc/self/exe", image, sizeof(image)); ++ if (s > 0 && image[0] == '/') { ++ image[s] = 0; ++ _dl_progname = _dl_strdup(image); ++ } else if (argv0) { ++ _dl_progname = argv0; ++ } ++} ++ + void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, + ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv + DL_GET_READY_TO_RUN_EXTRA_PARMS) +@@ -458,9 +472,7 @@ + * been fixed up by now. Still no function calls outside of this + * library, since the dynamic resolver is not yet ready. + */ +- if (argv[0]) { +- _dl_progname = argv[0]; +- } ++ _dl_setup_progname(argv[0]); + + #ifndef __LDSO_STANDALONE_SUPPORT__ + if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) { diff --git a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch index 90fd3db..bee251c 100644 --- a/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch +++ b/meta/recipes-core/uclibc/uclibc-git/remove_attribute_optimize_Os.patch @@ -3,18 +3,6 @@ Dont support localised optimizations this helps to have a global -O level Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: git/include/features.h -=================================================================== ---- git.orig/include/features.h -+++ git/include/features.h -@@ -186,7 +186,6 @@ - # define __need_uClibc_config_h - # include <bits/uClibc_config.h> - # undef __need_uClibc_config_h -- - /* For uClibc, always optimize for size -- this should disable - * a lot of expensive inlining... - * TODO: this is wrong! __OPTIMIZE_SIZE__ is an indicator of Index: git/libpthread/nptl/pthread_mutex_timedlock.c =================================================================== --- git.orig/libpthread/nptl/pthread_mutex_timedlock.c diff --git a/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch b/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch deleted file mode 100644 index 05a394d..0000000 --- a/meta/recipes-core/uclibc/uclibc-git/uclibc-arm-ftruncate64.patch +++ /dev/null @@ -1,18 +0,0 @@ -ftruncate64 has 4 args on arm - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h -=================================================================== ---- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h -+++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h -@@ -38,4 +38,8 @@ - /* define if target supports IEEE signed zero floats */ - #define __UCLIBC_HAVE_SIGNED_ZERO__ - -+#ifdef __ARM_EABI__ -+# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__ -+#endif -+ - #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb index ee1b5e0..0088152 100644 --- a/meta/recipes-core/uclibc/uclibc_git.bb +++ b/meta/recipes-core/uclibc/uclibc_git.bb @@ -1,4 +1,4 @@ -SRCREV="a4421e60526d3420a9c0bd55bfa4a25a746cbc8e" +SRCREV="eb72efd81e0d5be6c836c5a084cc65b9734f544d" require uclibc.inc @@ -11,10 +11,9 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}" -SRC_URI = "git://busybox.osuosl.org/uClibc.git;branch=master;protocol=git \ +SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://uClibc.machine \ file://uClibc.distro \ - file://uclibc-arm-ftruncate64.patch \ file://uclibc_enable_log2_test.patch \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \ file://powerpc_copysignl.patch \ @@ -23,8 +22,7 @@ SRC_URI = "git://busybox.osuosl.org/uClibc.git;branch=master;protocol=git \ file://remove_attribute_optimize_Os.patch \ file://compile-arm-fork-with-O2.patch \ file://uclibc-execvpe.patch \ - file://fix_libdl.patch \ - file://cross_compile_check.patch \ + file://orign_path.patch \ " S = "${WORKDIR}/git" -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 7/7] util-linux: Change SRC_URI to a fetchable location 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj ` (5 preceding siblings ...) 2012-01-24 17:43 ` [PATCH 6/7] uclibc-git: Update to latest RC Khem Raj @ 2012-01-24 17:43 ` Khem Raj 2012-01-25 14:36 ` [PATCH 0/7] uclibc update and misc fixes Richard Purdie 7 siblings, 0 replies; 14+ messages in thread From: Khem Raj @ 2012-01-24 17:43 UTC (permalink / raw) To: openembedded-core Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/util-linux/util-linux.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index b6d44ab..f60f33b 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -17,7 +17,7 @@ inherit autotools gettext pkgconfig DEPENDS = "zlib ncurses" DEPENDS_virtclass-native = " lzo-native" -SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ file://MCONFIG \ file://swapargs.h \ file://defines.h \ -- 1.7.8.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 0/7] uclibc update and misc fixes. 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj ` (6 preceding siblings ...) 2012-01-24 17:43 ` [PATCH 7/7] util-linux: Change SRC_URI to a fetchable location Khem Raj @ 2012-01-25 14:36 ` Richard Purdie 7 siblings, 0 replies; 14+ messages in thread From: Richard Purdie @ 2012-01-25 14:36 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Tue, 2012-01-24 at 09:42 -0800, Khem Raj wrote: > Hi > > Follwing patches have been tested on uclibc using all qemu > machines. > > The following changes since commit a4a98b6d6273d4e716afbff0880d0ac2ff7be0a9: > > gcc-common.inc: Fix comment (2012-01-24 14:38:31 +0000) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib kraj/misc-fixes > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc-fixes > > Khem Raj (7): > ltp: Update recipe and fix building on uclibc > gdb-common: Drop elfutils from DEPENDS > task-core-tools: Divide it into 3 recipes > uclibc: Dont package all .a in uclibc-dev > eglibc-2.15: Add upstream status for x86_fenv.patch > uclibc-git: Update to latest RC > util-linux: Change SRC_URI to a fetchable location For the gdb-common change there is no indication of why the change is being made. I've also held off the task-core-tools change right now until we figure out what the .bbappend is doing and why. I merged the others, thanks. Richard ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-01-25 15:06 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-24 17:42 [PATCH 0/7] uclibc update and misc fixes Khem Raj 2012-01-24 17:42 ` [PATCH 1/7] ltp: Update recipe and fix building on uclibc Khem Raj 2012-01-24 17:42 ` [PATCH 2/7] gdb-common: Drop elfutils from DEPENDS Khem Raj 2012-01-25 12:32 ` Richard Purdie 2012-01-25 14:58 ` Khem Raj 2012-01-24 17:42 ` [PATCH 3/7] task-core-tools: Divide it into 3 recipes Khem Raj 2012-01-25 1:08 ` Saul Wold 2012-01-25 1:26 ` Khem Raj 2012-01-25 10:20 ` Paul Eggleton 2012-01-24 17:42 ` [PATCH 4/7] uclibc: Dont package all .a in uclibc-dev Khem Raj 2012-01-24 17:42 ` [PATCH 5/7] eglibc-2.15: Add upstream status for x86_fenv.patch Khem Raj 2012-01-24 17:43 ` [PATCH 6/7] uclibc-git: Update to latest RC Khem Raj 2012-01-24 17:43 ` [PATCH 7/7] util-linux: Change SRC_URI to a fetchable location Khem Raj 2012-01-25 14:36 ` [PATCH 0/7] uclibc update and misc fixes Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.