* [PATCH][STABLE] Various SDK-related updates @ 2009-04-24 16:11 Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR Tom Rini 2009-04-24 18:28 ` [PATCH][STABLE] Various SDK-related updates Tom Rini 0 siblings, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List The following series brings stable up to date with dev, with respect to SDK and Canadian SDK changes. The only not directly SDK related change is the bugfix to wireless-tools so that libiw can be used. mwester said I should pull the SlugOS-related fix in myself rather than wait for him to update SlugOS stuff in stable. These changes have been build-tested for gcc 4.1.2/4.2.4/4.3.3 and at91sam9263ek qemuarm omap5912osk beagleboard vortex86sx qemux86 mpc8313e-rdb with DISTRO=angstrom-2008.1 in both dev and stable with identical results. These changes are also in the trini/stable/2009/sdk-updates branch. -- Tom Rini ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH][STABLE] binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR 2009-04-24 16:11 [PATCH][STABLE] Various SDK-related updates Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] gcc-cross-sdk: Fix relocation of the toolchain and " Tom Rini 2009-04-24 18:28 ` [PATCH][STABLE] Various SDK-related updates Tom Rini 1 sibling, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Acked-by: Florian Boor <florian.boor@kernelconcepts.de> Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/binutils/binutils-cross-sdk.inc | 2 +- recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb | 1 + recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb | 1 + recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb | 1 + recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb | 2 +- .../binutils/binutils-cross-sdk_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.18.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.19.1.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.19.bb | 2 +- recipes/binutils/binutils-cross-sdk_cvs.bb | 4 ++-- 12 files changed, 13 insertions(+), 10 deletions(-) diff --git a/recipes/binutils/binutils-cross-sdk.inc b/recipes/binutils/binutils-cross-sdk.inc index 5da1d4f..6e9cda0 100644 --- a/recipes/binutils/binutils-cross-sdk.inc +++ b/recipes/binutils/binutils-cross-sdk.inc @@ -17,7 +17,7 @@ do_install () { rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf rm ${D}${prefix}/${TARGET_SYS}/bin/* for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done # Install the libiberty header diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb index f509566..f84a61d 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb index f509566..f84a61d 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb index f84a61d..40e9889 100644 --- a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r1" +PR = "r2" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb index f509566..f84a61d 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb index 574265c..cde4e42 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb index 574265c..cde4e42 100644 --- a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb +++ b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb index 574265c..cde4e42 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.bb b/recipes/binutils/binutils-cross-sdk_2.18.bb index 574265c..cde4e42 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.1.bb b/recipes/binutils/binutils-cross-sdk_2.19.1.bb index 76dff54..f84a61d 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.bb b/recipes/binutils/binutils-cross-sdk_2.19.bb index 76dff54..f84a61d 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_cvs.bb b/recipes/binutils/binutils-cross-sdk_cvs.bb index 6886255..94d2704 100644 --- a/recipes/binutils/binutils-cross-sdk_cvs.bb +++ b/recipes/binutils/binutils-cross-sdk_cvs.bb @@ -1,4 +1,4 @@ require binutils_cvs.bb require binutils-cross-sdk.inc -PR = "r4" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" +PR = "r5" +FILESPATHPKG .= ":binutils-cvs" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] gcc-cross-sdk: Fix relocation of the toolchain and bump PR. 2009-04-24 16:11 ` [PATCH][STABLE] binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Tom Rini 0 siblings, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Acked-by: Florian Boor <florian.boor@kernelconcepts.de> Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/gcc/gcc-configure-sdk.inc | 3 +-- recipes/gcc/gcc-cross-sdk_3.3.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_3.4.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_3.4.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.0.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb | 2 +- recipes/gcc/gcc-package-sdk.inc | 3 ++- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index 7508030..d04f608 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -4,8 +4,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${prefix}/${TARGET_SYS}/${layout_includedir}/c++ \ - --with-sysroot=${prefix}/${TARGET_SYS} \ +EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb index f53c5d3..ed9c18c 100644 --- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_3.4.3.bb b/recipes/gcc/gcc-cross-sdk_3.4.3.bb index 48a7ecd..0b1f661 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb index f6dd053..e334659 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb index 5caec0b..6b6097f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb index 461008d..a6418f6 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 55c9cee..7bc2480 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 297bd8e..a326263 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index ee4ce85..297bd8e 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 3b66660..0a3af9e 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 13d3958..876c65c 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 8057608..ee4ce85 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 29ee187..7f3e146 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 361b0c1..3352e41 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc index 0dc19c7..3d9cc0c 100644 --- a/recipes/gcc/gcc-package-sdk.inc +++ b/recipes/gcc/gcc-package-sdk.inc @@ -48,7 +48,8 @@ do_install () { # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks install -d ${D}${prefix}/${TARGET_SYS}/bin/ for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + echo $l + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done ln -sf "${bindir}/${TARGET_PREFIX}gcc${EXEEXT}" "${D}${prefix}/${TARGET_SYS}/bin/cc${EXEEXT}" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR 2009-04-24 16:11 ` [PATCH][STABLE] gcc-cross-sdk: Fix relocation of the toolchain and " Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), " Tom Rini 2009-04-25 21:33 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Marcin Juszkiewicz 0 siblings, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Acked-by: Florian Boor <florian.boor@kernelconcepts.de> Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/meta/canadian-sdk.bb | 8 +++++++- recipes/meta/meta-toolchain-fso.bb | 2 +- recipes/meta/meta-toolchain-gpe-sbox.bb | 3 ++- recipes/meta/meta-toolchain-gpe.bb | 3 ++- recipes/meta/meta-toolchain-neuros.bb | 2 +- recipes/meta/meta-toolchain-openmoko.bb | 2 +- recipes/meta/meta-toolchain-opie.bb | 1 + recipes/meta/meta-toolchain-sbox.bb | 1 + recipes/meta/meta-toolchain.bb | 6 ++++++ 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 150c752..9126c7e 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native zip-native" -PR = "r2" +PR = "r3" inherit canadian-sdk meta @@ -100,6 +100,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ diff --git a/recipes/meta/meta-toolchain-fso.bb b/recipes/meta/meta-toolchain-fso.bb index fbfbb0a..4873c42 100644 --- a/recipes/meta/meta-toolchain-fso.bb +++ b/recipes/meta/meta-toolchain-fso.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" TOOLCHAIN_TARGET_TASK = "task-fso-toolchain-target" TOOLCHAIN_HOST_TASK = "task-fso-toolchain-host" diff --git a/recipes/meta/meta-toolchain-gpe-sbox.bb b/recipes/meta/meta-toolchain-gpe-sbox.bb index 74ba038..29e39c5 100644 --- a/recipes/meta/meta-toolchain-gpe-sbox.bb +++ b/recipes/meta/meta-toolchain-gpe-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-sbox \ @@ -9,4 +10,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe-sbox" \ No newline at end of file +SDK_SUFFIX = "toolchain-gpe-sbox" diff --git a/recipes/meta/meta-toolchain-gpe.bb b/recipes/meta/meta-toolchain-gpe.bb index bcfb1e1..7b962bf 100644 --- a/recipes/meta/meta-toolchain-gpe.bb +++ b/recipes/meta/meta-toolchain-gpe.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-x11 \ @@ -6,4 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe" \ No newline at end of file +SDK_SUFFIX = "toolchain-gpe" diff --git a/recipes/meta/meta-toolchain-neuros.bb b/recipes/meta/meta-toolchain-neuros.bb index f60fbf0..161231a 100644 --- a/recipes/meta/meta-toolchain-neuros.bb +++ b/recipes/meta/meta-toolchain-neuros.bb @@ -1,6 +1,6 @@ # Toolchain for neuros-osd devices -PR = "r3" +PR = "r6" TOOLCHAIN_HOST_TASK = "task-sdk-host \ qmake2-sdk uicmoc4-sdk" diff --git a/recipes/meta/meta-toolchain-openmoko.bb b/recipes/meta/meta-toolchain-openmoko.bb index b7e5626..b265615 100644 --- a/recipes/meta/meta-toolchain-openmoko.bb +++ b/recipes/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" diff --git a/recipes/meta/meta-toolchain-opie.bb b/recipes/meta/meta-toolchain-opie.bb index c72208c..9f4b9ac 100644 --- a/recipes/meta/meta-toolchain-opie.bb +++ b/recipes/meta/meta-toolchain-opie.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-opie" diff --git a/recipes/meta/meta-toolchain-sbox.bb b/recipes/meta/meta-toolchain-sbox.bb index 1283c59..0138329 100644 --- a/recipes/meta/meta-toolchain-sbox.bb +++ b/recipes/meta/meta-toolchain-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-bare \ task-sdk-sbox" diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index f892d22..b641be1 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -117,6 +117,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), bump PR 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Tom Rini 2009-04-25 21:33 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Marcin Juszkiewicz 1 sibling, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Acked-by: Florian Boor <florian.boor@kernelconcepts.de> Acked-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/meta/meta-toolchain-gpe-sbox.bb | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/meta/meta-toolchain-gpe-sbox.bb b/recipes/meta/meta-toolchain-gpe-sbox.bb index 29e39c5..679e50c 100644 --- a/recipes/meta/meta-toolchain-gpe-sbox.bb +++ b/recipes/meta/meta-toolchain-gpe-sbox.bb @@ -1,12 +1,11 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-sbox \ task-sdk-sbox-gpe \ task-sdk-x11 \ task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" + task-sdk-gpe" require meta-toolchain.bb -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, bump PR. 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), " Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot Tom Rini 2009-04-28 16:02 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Marcin Juszkiewicz 0 siblings, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc index d2a7b89..f52c3f1 100644 --- a/recipes/wireless-tools/wireless-tools.inc +++ b/recipes/wireless-tools/wireless-tools.inc @@ -31,7 +31,7 @@ do_stage() { } do_install() { - oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-static install-man install-hdr install -d ${D}${sbindir} install -m 0755 ifrename ${D}${sbindir}/ifrename install -d ${D}${sysconfdir}/network/if-pre-up.d @@ -39,13 +39,12 @@ do_install() { install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless } -PACKAGES += "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc" -FILES_libiw += "${libdir}/*.so.*" -FILES_libiw-dbg += "${libdir}/.debug/*.so.*" -FILES_libiw-dev += "${libdir}/*.a ${libdir}/*.so ${includedir}" -FILES_libiw-doc += "${mandir}/man7" -FILES_ifrename += "${sbindir}/ifrename" -FILES_ifrename-dbg += "${sbindir}/.debug/ifrename" -FILES_ifrename-doc += "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" -FILES_${PN} += "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc += "${mandir}/man8" +PACKAGES =+ "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc" +FILES_libiw = "${libdir}/*.so.*" +FILES_libiw-dbg = "${libdir}/.debug/*.so.*" +FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" +FILES_libiw-doc = "${mandir}/man7" +FILES_ifrename = "${sbindir}/ifrename" +FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" +FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" +FILES_${PN} += "${sysconfdir}/network" diff --git a/recipes/wireless-tools/wireless-tools_29.bb b/recipes/wireless-tools/wireless-tools_29.bb index 196a194..fb68127 100644 --- a/recipes/wireless-tools/wireless-tools_29.bb +++ b/recipes/wireless-tools/wireless-tools_29.bb @@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r3" +PR = "r4" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot. 2009-04-24 16:11 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR Tom Rini 2009-04-28 16:02 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Marcin Juszkiewicz 1 sibling, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- classes/canadian-sdk.bbclass | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index d73b62f..6b4fdf8 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}" # and otherwise just DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " -SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}" + +# On mingw systems we want to have the real sysroot default to c:/... and +# assume that the default install will be on the C drive. This can be changed +# by setting SDK_REALPATH_MINGW. SDK_REALPATH = "${SDK_PATH}" -SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}" +SDK_REALPATH_MINGW ?= "C:" # Path prefixes prefix = "${SDK_PATH}" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, " Tom Rini 2009-04-28 20:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use " Khem Raj 0 siblings, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/binutils/binutils-canadian-sdk_2.18.bb | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb index cf27cd0..e44e7b7 100644 --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb @@ -9,9 +9,12 @@ DEPENDS="\ " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" -EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} +# to the sysroot path. +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" +EXTRA_OECONF = "--with-sysroot=${SYSROOT} \ --program-prefix=${TARGET_PREFIX}" -PR = "r3" +PR = "r4" FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR. 2009-04-24 16:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Tom Rini 2009-04-28 20:12 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR Khem Raj 2009-04-28 20:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use " Khem Raj 1 sibling, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/gcc/gcc-canadian-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-configure-canadian-sdk.inc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index ae3245b..d78ab75 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r1" +PR = "r2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc index c95a6c4..738b120 100644 --- a/recipes/gcc/gcc-configure-canadian-sdk.inc +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc @@ -61,11 +61,12 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres" EXTRA_OECONF_DEP ?= "" EXTRA_OECONF += "" +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} +# to the sysroot path. +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" EXTRA_OECONF_PATHS = " \ - --with-local-prefix=$dollar{prefix}/local \ - --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ - --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \ + --with-sysroot=${SYSROOT} \ " do_configure () { -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils 2009-04-24 16:11 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, " Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Tom Rini 2009-04-28 20:13 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Khem Raj 2009-04-28 20:12 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR Khem Raj 1 sibling, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- classes/canadian-sdk.bbclass | 6 +----- recipes/binutils/binutils-canadian-sdk_2.18.bb | 6 +----- recipes/make/mingw-make-canadian-sdk_3.81.bb | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index 6b4fdf8..a6c5552 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -19,11 +19,7 @@ CFLAGS = "${SDK_CFLAGS}" CXXFLAGS = "${SDK_CFLAGS}" LDFLAGS = "${SDK_LDFLAGS}" -# TODO: add logic to add the following unless PN ~= gcc* -#DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " -# and otherwise just -DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " - +DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " # On mingw systems we want to have the real sysroot default to c:/... and # assume that the default install will be on the C drive. This can be changed diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb index e44e7b7..96726f8 100644 --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb @@ -2,11 +2,7 @@ SECTION = "devel" require binutils_${PV}.bb inherit canadian-sdk -DEPENDS="\ - virtual/${HOST_PREFIX}binutils \ - virtual/${HOST_PREFIX}gcc \ - flex-native bison-native \ -" +DEPENDS = "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" # On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} diff --git a/recipes/make/mingw-make-canadian-sdk_3.81.bb b/recipes/make/mingw-make-canadian-sdk_3.81.bb index 3479dad..a4b1f72 100644 --- a/recipes/make/mingw-make-canadian-sdk_3.81.bb +++ b/recipes/make/mingw-make-canadian-sdk_3.81.bb @@ -9,8 +9,6 @@ interdependent files, and, if necessary, issues commands \ to bring them up-to-date - MinGW port." HOMEPAGE = "http://www.mingw.org/" -DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc" - SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/mingw32-make-3.81-20080326-src.tar.gz" S = "${WORKDIR}/make-${PV}-patched" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb. 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Tom Rini 2009-04-28 20:17 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Khem Raj 2009-04-28 20:13 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Khem Raj 1 sibling, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List; +Cc: David Huggins-Daines From: David Huggins-Daines <dhuggins@cs.cmu.edu> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/meta/canadian-sdk.bb | 130 ++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 49 deletions(-) diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 9126c7e..809173b 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -1,25 +1,57 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native zip-native" -PR = "r3" +DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" +PR = "r4" + +# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass +# will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which +# is computed in siteinfo.bbclass) in changing if the original HOST_ARCH +# endianess differs from the new HOST_ARCH endianess. SITEINFO_ENDIANNESS +# is used in a number of places, including the construction of the +# PACKAGE_EXTRA_ARCHS list for machines that are capable of running in +# either endianess. There may be better ways to fix this. + +# Save value of PACKAGE_ARCHS (note the ":=" syntax to force immediate eval) +REAL_PACKAGE_ARCHS := "${PACKAGE_ARCHS}" inherit canadian-sdk meta +# Restore PACKAGE_ARCHS (sdk.bbclass may have caused it to change) +PACKAGE_ARCHS := "${REAL_PACKAGE_ARCHS}" + SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" -SDK_SUFFIX = "toolchain" +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" -FEED_ARCH ?= "${TARGET_ARCH}" - -IPKG_HOST = "ipkg-cl -f ${IPKGCONF_CANSDK} -o ${SDK_OUTPUT}" -IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}${prefix}" +IPKG_HOST = "opkg-cl -f ${IPKGCONF_CANSDK} -o ${SDK_OUTPUT}" +IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}" TOOLCHAIN_CANADIAN_HOST_TASK ?= "task-sdk-canadian-host" TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare" +FEED_ARCH ?= "${TARGET_ARCH}" +SDK_SUFFIX = "toolchain" +TOOLCHAIN_OUTPUTNAME ?= "${SDK_SYS}-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}" RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_CANADIAN_HOST_TASK}" +TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}" + +modify_opkg_conf () { + OUTPUT_OPKGCONF_TARGET="${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/opkg.conf" + OUTPUT_OPKGCONF_HOST="${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/opkg-canadian-sdk.conf" + OUTPUT_OPKGCONF_SDK="${SDK_OUTPUT}/${sysconfdir}/opkg-canadian-sdk.conf" + rm ${OUTPUT_OPKGCONF_TARGET} + rm ${OUTPUT_OPKGCONF_HOST} + rm ${OUTPUT_OPKGCONF_SDK} + opkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in ${opkgarchs}; do + echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET}; + echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET}; + priority=$(expr ${priority} + 5); + done +} + do_populate_sdk() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} @@ -31,41 +63,26 @@ do_populate_sdk() { revipkgarchs="$arch $revipkgarchs" done + mkdir -p ${SDK_OUTPUT}/usr/lib/opkg ${IPKG_HOST} update ${IPKG_HOST} -force-depends install ${TOOLCHAIN_CANADIAN_HOST_TASK} + mkdir -p ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}/usr/lib/opkg ${IPKG_TARGET} update ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} - mkdir -p ${SDK_OUTPUT}${prefix}/${TARGET_SYS} - cp -pPR ${SDK_OUTPUT}${prefix}/usr ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/ - rm -rf ${SDK_OUTPUT}${prefix}/usr - - cp -pPR ${SDK_OUTPUT}${prefix}/lib/* ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ - rm -rf ${SDK_OUTPUT}${prefix}/lib/* - - cp -pPR ${SDK_OUTPUT}/usr/lib/ipkg ${SDK_OUTPUT}${prefix}/lib/ - rm -rf ${SDK_OUTPUT}/usr/lib/ipkg/* - rmdir -p --ignore-fail-on-non-empty ${SDK_OUTPUT}/usr/lib/ipkg - - for fn in `ls ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/`; do - if [ -h ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn ]; then - link=`readlink ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn` - bname=`basename $link` - if [ ! -e $link -a -e ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$bame ]; then - rm ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn - ln -s $bname ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn - fi - fi - done + install -d ${SDK_OUTPUT}/${prefix}/usr/lib/opkg + mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${prefix}/usr/lib/opkg/ + rm -Rf ${SDK_OUTPUT}/usr/lib - mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}${prefix}/lib + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir} + install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_CANSDK} ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/ - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/libpthread.so - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/libc.so + install -d ${SDK_OUTPUT}/${sysconfdir} + install -m 0644 ${IPKGCONF_CANSDK} ${SDK_OUTPUT}/${sysconfdir}/ # extract and store ipks, pkgdata and shlibs data - target_pkgs=`cat ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/usr/lib/ipkg/status | grep Package: | cut -f 2 -d ' '` + target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/ mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ @@ -78,12 +95,12 @@ do_populate_sdk() { orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime - cp ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ - subpkgs=`cat ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ + subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` for subpkg in $subpkgs; do - cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ - if [ -e ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then - cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ + if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ fi if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ @@ -96,7 +113,7 @@ do_populate_sdk() { # add missing link to libgcc_s.so.1 # libgcc-dev should be responsible for that, but it's not getting built - # RP: it gets smashed up depending on the order that gcc, gcc-cross and + # RP: it gets smashed up depending on the order that gcc, gcc-cross and # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so @@ -122,21 +139,36 @@ do_populate_sdk() { for sitefile in ${CONFIG_SITE} ; do cat $sitefile >> $siteconfig done -} -do_package_sdk() { - # package it up + # Create environment setup script + script=${SDK_OUTPUT}/${prefix}/environment-setup + touch $script + echo 'export PATH=${prefix}/bin:$PATH' >> $script + echo 'export LIBTOOL_SYSROOT_PATH=${prefix}/${TARGET_SYS}' >> $script + echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script + echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script + echo 'export CONFIG_SITE=${prefix}/site-config' >> $script + echo "alias opkg='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${sysconfdir}/opkg-canadian-sdk.conf -o ${prefix}'" >> $script + echo "alias opkg-target='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${prefix}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${prefix}/${TARGET_SYS}'" >> $script + + # Add version information + versionfile=${SDK_OUTPUT}/${prefix}/version + touch $versionfile + echo 'Distro: ${DISTRO}' >> $versionfile + echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile + echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile + echo 'Timestamp: ${DATETIME}' >> $versionfile + + modify_opkg_conf + + # Package it up mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.tar.bz2 .${prefix} - rm -f ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.zip - zip -r -D ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.zip .${prefix} + fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . + rm -f ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.zip + zip -r -D ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.zip . } do_populate_sdk[nostamp] = "1" do_populate_sdk[recrdeptask] = "do_package_write" addtask populate_sdk before do_build after do_install - -do_package_sdk[nostamp] = "1" -do_package_sdk[recrdeptask] = "do_populate_sdk" -addtask package_sdk before do_build after do_populate_sdk -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Tom Rini @ 2009-04-24 16:11 ` Tom Rini 2009-04-24 16:12 ` [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components Tom Rini 2009-04-28 20:18 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Khem Raj 2009-04-28 20:17 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Khem Raj 1 sibling, 2 replies; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:11 UTC (permalink / raw) To: OpenEmbedded Devel List From: Tom Rini <trini@embeddedalley.com> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb | 4 ++-- recipes/mingw/mingw-runtime.inc | 4 ++-- recipes/mingw/mingw-w32api.inc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb index 22f9170..fd45e9f 100644 --- a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb +++ b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.mingw.org/" SECTION = "devel" LICENSE = "GPL" -DEFAULT_PREFERENCE = "0" -DEFAULT_PREFERENCE_sdk-mingw32 = "1" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mingw32 = "1" inherit autotools gettext diff --git a/recipes/mingw/mingw-runtime.inc b/recipes/mingw/mingw-runtime.inc index d984911..5820e99 100644 --- a/recipes/mingw/mingw-runtime.inc +++ b/recipes/mingw/mingw-runtime.inc @@ -5,8 +5,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial mingw-w32api" PROVIDES = "virtual/${TARGET_PREFIX}libc virtual/${TARGET_PREFIX}libc-for-gcc" -DEFAULT_PREFERENCE = "0" -DEFAULT_PREFERENCE_sdk-mingw32 = "1" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mingw32 = "1" PACKAGES = "" diff --git a/recipes/mingw/mingw-w32api.inc b/recipes/mingw/mingw-w32api.inc index ecb1cd2..ac2ede9 100644 --- a/recipes/mingw/mingw-w32api.inc +++ b/recipes/mingw/mingw-w32api.inc @@ -5,8 +5,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "mingw-w32api" -DEFAULT_PREFERENCE = "0" -DEFAULT_PREFERENCE_sdk-mingw32 = "1" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_mingw32 = "1" PACKAGES = "" -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components 2009-04-24 16:11 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Tom Rini @ 2009-04-24 16:12 ` Tom Rini 2009-04-28 20:20 ` Khem Raj 2009-04-28 20:18 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Khem Raj 1 sibling, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 16:12 UTC (permalink / raw) To: OpenEmbedded Devel List From: Mike Westerhof <mwester@dls.net> Signed-off-by: Tom Rini <trini@embeddedalley.com> --- recipes/tasks/task-slugos-toolchain-target.bb | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/recipes/tasks/task-slugos-toolchain-target.bb b/recipes/tasks/task-slugos-toolchain-target.bb index 489a412..fb0418f 100644 --- a/recipes/tasks/task-slugos-toolchain-target.bb +++ b/recipes/tasks/task-slugos-toolchain-target.bb @@ -2,31 +2,21 @@ DESCRIPTION = "Packages for a standalone SDK or external toolchain" LICENSE = "MIT" ALLOW_EMPTY = "1" -PR = "r1" +PR = "r3" PACKAGES = "${PN}" -# Stuff contained in this SDK is largely taken from task-sdk-base.bb. +DEPENDS = "task-sdk-bare" + # This is a starting point, and nothing more at present -- please fill # this out with a reasonable set of development tools for a SlugOS image. # Also feel free to remove stuff that's silly. RDEPENDS_${PN} = "\ - libgcc \ + task-sdk-bare \ linux-libc-headers-dev \ libssl \ libcrypto \ openssl-dev \ - libstdc++ \ - " - -# Not sure if we need these or not... -NOT_SURE_ABOUT = "\ - libsegfault \ - " - -# This one needs further investigation; seems to be some sort -# of naming problem that breaks the SDK when it is added directly. -ODDLY_BROKEN_PACKAGES ="\ - libz-dev \ + zlib-dev \ " -- 1.5.6.3 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components 2009-04-24 16:12 ` [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components Tom Rini @ 2009-04-28 20:20 ` Khem Raj 0 siblings, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:20 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List On (24/04/09 09:12), Tom Rini wrote: > From: Mike Westerhof <mwester@dls.net> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/tasks/task-slugos-toolchain-target.bb | 20 +++++--------------- > 1 files changed, 5 insertions(+), 15 deletions(-) > > diff --git a/recipes/tasks/task-slugos-toolchain-target.bb b/recipes/tasks/task-slugos-toolchain-target.bb > index 489a412..fb0418f 100644 > --- a/recipes/tasks/task-slugos-toolchain-target.bb > +++ b/recipes/tasks/task-slugos-toolchain-target.bb > @@ -2,31 +2,21 @@ DESCRIPTION = "Packages for a standalone SDK or external toolchain" > LICENSE = "MIT" > ALLOW_EMPTY = "1" > > -PR = "r1" > +PR = "r3" > > PACKAGES = "${PN}" > > -# Stuff contained in this SDK is largely taken from task-sdk-base.bb. > +DEPENDS = "task-sdk-bare" > + > # This is a starting point, and nothing more at present -- please fill > # this out with a reasonable set of development tools for a SlugOS image. > # Also feel free to remove stuff that's silly. > > RDEPENDS_${PN} = "\ > - libgcc \ > + task-sdk-bare \ > linux-libc-headers-dev \ > libssl \ > libcrypto \ > openssl-dev \ > - libstdc++ \ > - " > - > -# Not sure if we need these or not... > -NOT_SURE_ABOUT = "\ > - libsegfault \ > - " > - > -# This one needs further investigation; seems to be some sort > -# of naming problem that breaks the SDK when it is added directly. > -ODDLY_BROKEN_PACKAGES ="\ > - libz-dev \ > + zlib-dev \ > " > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct 2009-04-24 16:11 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Tom Rini 2009-04-24 16:12 ` [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components Tom Rini @ 2009-04-28 20:18 ` Khem Raj 1 sibling, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:18 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List On (24/04/09 09:11), Tom Rini wrote: > From: Tom Rini <trini@embeddedalley.com> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb | 4 ++-- > recipes/mingw/mingw-runtime.inc | 4 ++-- > recipes/mingw/mingw-w32api.inc | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb > index 22f9170..fd45e9f 100644 > --- a/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb > +++ b/recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb > @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.mingw.org/" > SECTION = "devel" > LICENSE = "GPL" > > -DEFAULT_PREFERENCE = "0" > -DEFAULT_PREFERENCE_sdk-mingw32 = "1" > +DEFAULT_PREFERENCE = "-1" > +DEFAULT_PREFERENCE_mingw32 = "1" > > inherit autotools gettext > > diff --git a/recipes/mingw/mingw-runtime.inc b/recipes/mingw/mingw-runtime.inc > index d984911..5820e99 100644 > --- a/recipes/mingw/mingw-runtime.inc > +++ b/recipes/mingw/mingw-runtime.inc > @@ -5,8 +5,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial mingw-w32api" > > PROVIDES = "virtual/${TARGET_PREFIX}libc virtual/${TARGET_PREFIX}libc-for-gcc" > > -DEFAULT_PREFERENCE = "0" > -DEFAULT_PREFERENCE_sdk-mingw32 = "1" > +DEFAULT_PREFERENCE = "-1" > +DEFAULT_PREFERENCE_mingw32 = "1" > > PACKAGES = "" > > diff --git a/recipes/mingw/mingw-w32api.inc b/recipes/mingw/mingw-w32api.inc > index ecb1cd2..ac2ede9 100644 > --- a/recipes/mingw/mingw-w32api.inc > +++ b/recipes/mingw/mingw-w32api.inc > @@ -5,8 +5,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" > > PROVIDES = "mingw-w32api" > > -DEFAULT_PREFERENCE = "0" > -DEFAULT_PREFERENCE_sdk-mingw32 = "1" > +DEFAULT_PREFERENCE = "-1" > +DEFAULT_PREFERENCE_mingw32 = "1" > > PACKAGES = "" > > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb. 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Tom Rini @ 2009-04-28 20:17 ` Khem Raj 1 sibling, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:17 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List, David Huggins-Daines On (24/04/09 09:11), Tom Rini wrote: > From: David Huggins-Daines <dhuggins@cs.cmu.edu> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/meta/canadian-sdk.bb | 130 ++++++++++++++++++++++++++---------------- > 1 files changed, 81 insertions(+), 49 deletions(-) > > diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb > index 9126c7e..809173b 100644 > --- a/recipes/meta/canadian-sdk.bb > +++ b/recipes/meta/canadian-sdk.bb > @@ -1,25 +1,57 @@ > DESCRIPTION = "Meta package for building a installable toolchain" > LICENSE = "MIT" > -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native zip-native" > -PR = "r3" > +DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native zip-native" > +PR = "r4" > + > +# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass > +# will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which > +# is computed in siteinfo.bbclass) in changing if the original HOST_ARCH > +# endianess differs from the new HOST_ARCH endianess. SITEINFO_ENDIANNESS > +# is used in a number of places, including the construction of the > +# PACKAGE_EXTRA_ARCHS list for machines that are capable of running in > +# either endianess. There may be better ways to fix this. > + > +# Save value of PACKAGE_ARCHS (note the ":=" syntax to force immediate eval) > +REAL_PACKAGE_ARCHS := "${PACKAGE_ARCHS}" > > inherit canadian-sdk meta > > +# Restore PACKAGE_ARCHS (sdk.bbclass may have caused it to change) > +PACKAGE_ARCHS := "${REAL_PACKAGE_ARCHS}" > + > SDK_DIR = "${WORKDIR}/sdk" > SDK_OUTPUT = "${SDK_DIR}/image" > -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" > -SDK_SUFFIX = "toolchain" > +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" > > -FEED_ARCH ?= "${TARGET_ARCH}" > - > -IPKG_HOST = "ipkg-cl -f ${IPKGCONF_CANSDK} -o ${SDK_OUTPUT}" > -IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}${prefix}" > +IPKG_HOST = "opkg-cl -f ${IPKGCONF_CANSDK} -o ${SDK_OUTPUT}" > +IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}" > > TOOLCHAIN_CANADIAN_HOST_TASK ?= "task-sdk-canadian-host" > TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare" > +FEED_ARCH ?= "${TARGET_ARCH}" > +SDK_SUFFIX = "toolchain" > +TOOLCHAIN_OUTPUTNAME ?= "${SDK_SYS}-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}" > > RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_CANADIAN_HOST_TASK}" > > +TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}" > + > +modify_opkg_conf () { > + OUTPUT_OPKGCONF_TARGET="${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/opkg.conf" > + OUTPUT_OPKGCONF_HOST="${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/opkg-canadian-sdk.conf" > + OUTPUT_OPKGCONF_SDK="${SDK_OUTPUT}/${sysconfdir}/opkg-canadian-sdk.conf" > + rm ${OUTPUT_OPKGCONF_TARGET} > + rm ${OUTPUT_OPKGCONF_HOST} > + rm ${OUTPUT_OPKGCONF_SDK} > + opkgarchs="${PACKAGE_ARCHS}" > + priority=1 > + for arch in ${opkgarchs}; do > + echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET}; > + echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET}; > + priority=$(expr ${priority} + 5); > + done > +} > + > do_populate_sdk() { > rm -rf ${SDK_OUTPUT} > mkdir -p ${SDK_OUTPUT} > @@ -31,41 +63,26 @@ do_populate_sdk() { > revipkgarchs="$arch $revipkgarchs" > done > > + mkdir -p ${SDK_OUTPUT}/usr/lib/opkg > ${IPKG_HOST} update > ${IPKG_HOST} -force-depends install ${TOOLCHAIN_CANADIAN_HOST_TASK} > > + mkdir -p ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}/usr/lib/opkg > ${IPKG_TARGET} update > ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} > > - mkdir -p ${SDK_OUTPUT}${prefix}/${TARGET_SYS} > - cp -pPR ${SDK_OUTPUT}${prefix}/usr ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/ > - rm -rf ${SDK_OUTPUT}${prefix}/usr > - > - cp -pPR ${SDK_OUTPUT}${prefix}/lib/* ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ > - rm -rf ${SDK_OUTPUT}${prefix}/lib/* > - > - cp -pPR ${SDK_OUTPUT}/usr/lib/ipkg ${SDK_OUTPUT}${prefix}/lib/ > - rm -rf ${SDK_OUTPUT}/usr/lib/ipkg/* > - rmdir -p --ignore-fail-on-non-empty ${SDK_OUTPUT}/usr/lib/ipkg > - > - for fn in `ls ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/`; do > - if [ -h ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn ]; then > - link=`readlink ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn` > - bname=`basename $link` > - if [ ! -e $link -a -e ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$bame ]; then > - rm ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn > - ln -s $bname ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/$fn > - fi > - fi > - done > + install -d ${SDK_OUTPUT}/${prefix}/usr/lib/opkg > + mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${prefix}/usr/lib/opkg/ > + rm -Rf ${SDK_OUTPUT}/usr/lib > > - mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}${prefix}/lib > + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir} > + install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_CANSDK} ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/ > > - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/libpthread.so > - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/libc.so > + install -d ${SDK_OUTPUT}/${sysconfdir} > + install -m 0644 ${IPKGCONF_CANSDK} ${SDK_OUTPUT}/${sysconfdir}/ > > # extract and store ipks, pkgdata and shlibs data > - target_pkgs=`cat ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/usr/lib/ipkg/status | grep Package: | cut -f 2 -d ' '` > + target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` > mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/ > mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ > mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ > @@ -78,12 +95,12 @@ do_populate_sdk() { > orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` > pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} > mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime > - cp ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ > - subpkgs=`cat ${TMPDIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` > + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ > + subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` > for subpkg in $subpkgs; do > - cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ > - if [ -e ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then > - cp ${TMPDIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ > + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ > + if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then > + cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ > fi > if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then > cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ > @@ -96,7 +113,7 @@ do_populate_sdk() { > > # add missing link to libgcc_s.so.1 > # libgcc-dev should be responsible for that, but it's not getting built > - # RP: it gets smashed up depending on the order that gcc, gcc-cross and > + # RP: it gets smashed up depending on the order that gcc, gcc-cross and > # gcc-cross-sdk get built :( (30/11/07) > ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so > > @@ -122,21 +139,36 @@ do_populate_sdk() { > for sitefile in ${CONFIG_SITE} ; do > cat $sitefile >> $siteconfig > done > -} > > -do_package_sdk() { > - # package it up > + # Create environment setup script > + script=${SDK_OUTPUT}/${prefix}/environment-setup > + touch $script > + echo 'export PATH=${prefix}/bin:$PATH' >> $script > + echo 'export LIBTOOL_SYSROOT_PATH=${prefix}/${TARGET_SYS}' >> $script > + echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script > + echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script > + echo 'export CONFIG_SITE=${prefix}/site-config' >> $script > + echo "alias opkg='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${sysconfdir}/opkg-canadian-sdk.conf -o ${prefix}'" >> $script > + echo "alias opkg-target='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${prefix}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${prefix}/${TARGET_SYS}'" >> $script > + > + # Add version information > + versionfile=${SDK_OUTPUT}/${prefix}/version > + touch $versionfile > + echo 'Distro: ${DISTRO}' >> $versionfile > + echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile > + echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile > + echo 'Timestamp: ${DATETIME}' >> $versionfile > + > + modify_opkg_conf > + > + # Package it up > mkdir -p ${SDK_DEPLOY} > cd ${SDK_OUTPUT} > - fakeroot tar cfj ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.tar.bz2 .${prefix} > - rm -f ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.zip > - zip -r -D ${SDK_DEPLOY}/${SDK_SYS}-sdk-${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}.zip .${prefix} > + fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . > + rm -f ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.zip > + zip -r -D ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.zip . > } > > do_populate_sdk[nostamp] = "1" > do_populate_sdk[recrdeptask] = "do_package_write" > addtask populate_sdk before do_build after do_install > - > -do_package_sdk[nostamp] = "1" > -do_package_sdk[recrdeptask] = "do_populate_sdk" > -addtask package_sdk before do_build after do_populate_sdk > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Tom Rini @ 2009-04-28 20:13 ` Khem Raj 1 sibling, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:13 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List On (24/04/09 09:11), Tom Rini wrote: > From: Tom Rini <trini@embeddedalley.com> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > classes/canadian-sdk.bbclass | 6 +----- > recipes/binutils/binutils-canadian-sdk_2.18.bb | 6 +----- > recipes/make/mingw-make-canadian-sdk_3.81.bb | 2 -- > 3 files changed, 2 insertions(+), 12 deletions(-) > > diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass > index 6b4fdf8..a6c5552 100644 > --- a/classes/canadian-sdk.bbclass > +++ b/classes/canadian-sdk.bbclass > @@ -19,11 +19,7 @@ CFLAGS = "${SDK_CFLAGS}" > CXXFLAGS = "${SDK_CFLAGS}" > LDFLAGS = "${SDK_LDFLAGS}" > > -# TODO: add logic to add the following unless PN ~= gcc* > -#DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " > -# and otherwise just > -DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " > - > +DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " > > # On mingw systems we want to have the real sysroot default to c:/... and > # assume that the default install will be on the C drive. This can be changed > diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb > index e44e7b7..96726f8 100644 > --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb > +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb > @@ -2,11 +2,7 @@ SECTION = "devel" > require binutils_${PV}.bb > inherit canadian-sdk > > -DEPENDS="\ > - virtual/${HOST_PREFIX}binutils \ > - virtual/${HOST_PREFIX}gcc \ > - flex-native bison-native \ > -" > +DEPENDS = "flex-native bison-native" > > FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" > # On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} > diff --git a/recipes/make/mingw-make-canadian-sdk_3.81.bb b/recipes/make/mingw-make-canadian-sdk_3.81.bb > index 3479dad..a4b1f72 100644 > --- a/recipes/make/mingw-make-canadian-sdk_3.81.bb > +++ b/recipes/make/mingw-make-canadian-sdk_3.81.bb > @@ -9,8 +9,6 @@ interdependent files, and, if necessary, issues commands \ > to bring them up-to-date - MinGW port." > HOMEPAGE = "http://www.mingw.org/" > > -DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc" > - > SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/mingw32-make-3.81-20080326-src.tar.gz" > > S = "${WORKDIR}/make-${PV}-patched" > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR. 2009-04-24 16:11 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Tom Rini @ 2009-04-28 20:12 ` Khem Raj 1 sibling, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:12 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List On (24/04/09 09:11), Tom Rini wrote: > From: Tom Rini <trini@embeddedalley.com> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/gcc/gcc-canadian-sdk_4.2.4.bb | 2 +- > recipes/gcc/gcc-configure-canadian-sdk.inc | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb > index ae3245b..d78ab75 100644 > --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb > +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb > @@ -1,6 +1,6 @@ > inherit canadian-sdk > > -PR = "r1" > +PR = "r2" > > FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" > > diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc > index c95a6c4..738b120 100644 > --- a/recipes/gcc/gcc-configure-canadian-sdk.inc > +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc > @@ -61,11 +61,12 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres" > EXTRA_OECONF_DEP ?= "" > > EXTRA_OECONF += "" > +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} > +# to the sysroot path. > +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" > EXTRA_OECONF_PATHS = " \ > - --with-local-prefix=$dollar{prefix}/local \ > - --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \ > --with-build-sysroot=${STAGING_DIR_TARGET} \ > - --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \ > + --with-sysroot=${SYSROOT} \ > " > > do_configure () { > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR 2009-04-24 16:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, " Tom Rini @ 2009-04-28 20:11 ` Khem Raj 1 sibling, 0 replies; 25+ messages in thread From: Khem Raj @ 2009-04-28 20:11 UTC (permalink / raw) To: openembedded-devel; +Cc: OpenEmbedded Devel List On (24/04/09 09:11), Tom Rini wrote: > From: Tom Rini <trini@embeddedalley.com> > > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/binutils/binutils-canadian-sdk_2.18.bb | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb > index cf27cd0..e44e7b7 100644 > --- a/recipes/binutils/binutils-canadian-sdk_2.18.bb > +++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb > @@ -9,9 +9,12 @@ DEPENDS="\ > " > > FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" > -EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ > +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW} > +# to the sysroot path. > +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}" > +EXTRA_OECONF = "--with-sysroot=${SYSROOT} \ > --program-prefix=${TARGET_PREFIX}" > -PR = "r3" > +PR = "r4" > > FILES_${PN}-dbg += "${prefix}/${TARGET_SYS}/bin/.debug" > > -- > 1.5.6.3 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, bump PR. 2009-04-24 16:11 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot Tom Rini @ 2009-04-28 16:02 ` Marcin Juszkiewicz 1 sibling, 0 replies; 25+ messages in thread From: Marcin Juszkiewicz @ 2009-04-28 16:02 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 370 bytes --] Dnia piątek, 24 kwietnia 2009 o 18:11:53 Tom Rini napisał(a): > From: Tom Rini <trini@embeddedalley.com> > > Signed-off-by: Tom Rini <trini@embeddedalley.com> Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Regards, -- JID: hrw@jabber.org Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 204 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), " Tom Rini @ 2009-04-25 21:33 ` Marcin Juszkiewicz 2009-04-25 22:00 ` Tom Rini 1 sibling, 1 reply; 25+ messages in thread From: Marcin Juszkiewicz @ 2009-04-25 21:33 UTC (permalink / raw) To: openembedded-devel Can populate_sdk() function in canadian-sdk.inc and meta-toolchain.bb be merged somehow? Regards, -- JID: hrw@jabber.org Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR 2009-04-25 21:33 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Marcin Juszkiewicz @ 2009-04-25 22:00 ` Tom Rini 0 siblings, 0 replies; 25+ messages in thread From: Tom Rini @ 2009-04-25 22:00 UTC (permalink / raw) To: openembedded-devel On Sat, Apr 25, 2009 at 11:33:33PM +0200, Marcin Juszkiewicz wrote: > Can populate_sdk() function in canadian-sdk.inc and meta-toolchain.bb be > merged somehow? As a longer term project, yes, they should be merged totally. In the near-term, I think that roughly the middle could be. Or perhaps making canadian include meta and just override the package function. Or always make zips. Or make it be controlable ala IMAGE_FSTYPES. Sorry, thinking aloud here :) -- Tom Rini ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] Various SDK-related updates 2009-04-24 16:11 [PATCH][STABLE] Various SDK-related updates Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR Tom Rini @ 2009-04-24 18:28 ` Tom Rini 2009-05-02 21:28 ` Tom Rini 1 sibling, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-04-24 18:28 UTC (permalink / raw) To: OpenEmbedded Devel List On Fri, Apr 24, 2009 at 09:11:48AM -0700, Tom Rini wrote: > The following series brings stable up to date with dev, with respect to > SDK and Canadian SDK changes. The only not directly SDK related change > is the bugfix to wireless-tools so that libiw can be used. mwester said > I should pull the SlugOS-related fix in myself rather than wait for him > to update SlugOS stuff in stable. These changes have been build-tested > for gcc 4.1.2/4.2.4/4.3.3 and at91sam9263ek qemuarm omap5912osk > beagleboard vortex86sx qemux86 mpc8313e-rdb with DISTRO=angstrom-2008.1 > in both dev and stable with identical results. These changes are also > in the trini/stable/2009/sdk-updates branch. Also now in http://patchwork.openembedded.org/bundle/trini/trini-stable-2009-sdk-updates/ -- Tom Rini ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] Various SDK-related updates 2009-04-24 18:28 ` [PATCH][STABLE] Various SDK-related updates Tom Rini @ 2009-05-02 21:28 ` Tom Rini 2009-05-05 20:52 ` Tom Rini 0 siblings, 1 reply; 25+ messages in thread From: Tom Rini @ 2009-05-02 21:28 UTC (permalink / raw) To: OpenEmbedded Devel List On Fri, Apr 24, 2009 at 11:28:43AM -0700, Tom Rini wrote: > On Fri, Apr 24, 2009 at 09:11:48AM -0700, Tom Rini wrote: > > The following series brings stable up to date with dev, with respect to > > SDK and Canadian SDK changes. The only not directly SDK related change > > is the bugfix to wireless-tools so that libiw can be used. mwester said > > I should pull the SlugOS-related fix in myself rather than wait for him > > to update SlugOS stuff in stable. These changes have been build-tested > > for gcc 4.1.2/4.2.4/4.3.3 and at91sam9263ek qemuarm omap5912osk > > beagleboard vortex86sx qemux86 mpc8313e-rdb with DISTRO=angstrom-2008.1 > > in both dev and stable with identical results. These changes are also > > in the trini/stable/2009/sdk-updates branch. > > Also now in > http://patchwork.openembedded.org/bundle/trini/trini-stable-2009-sdk-updates/ If I read the Stable wiki page correctly, changes like this need a maintainer ack (Khem has) and a second ack. Still looking for a second ack. -- Tom Rini ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH][STABLE] Various SDK-related updates 2009-05-02 21:28 ` Tom Rini @ 2009-05-05 20:52 ` Tom Rini 0 siblings, 0 replies; 25+ messages in thread From: Tom Rini @ 2009-05-05 20:52 UTC (permalink / raw) To: OpenEmbedded Devel List On Sat, May 02, 2009 at 02:28:47PM -0700, Tom Rini wrote: > On Fri, Apr 24, 2009 at 11:28:43AM -0700, Tom Rini wrote: > > On Fri, Apr 24, 2009 at 09:11:48AM -0700, Tom Rini wrote: > > > The following series brings stable up to date with dev, with respect to > > > SDK and Canadian SDK changes. The only not directly SDK related change > > > is the bugfix to wireless-tools so that libiw can be used. mwester said > > > I should pull the SlugOS-related fix in myself rather than wait for him > > > to update SlugOS stuff in stable. These changes have been build-tested > > > for gcc 4.1.2/4.2.4/4.3.3 and at91sam9263ek qemuarm omap5912osk > > > beagleboard vortex86sx qemux86 mpc8313e-rdb with DISTRO=angstrom-2008.1 > > > in both dev and stable with identical results. These changes are also > > > in the trini/stable/2009/sdk-updates branch. > > > > Also now in > > http://patchwork.openembedded.org/bundle/trini/trini-stable-2009-sdk-updates/ > > If I read the Stable wiki page correctly, changes like this need a > maintainer ack (Khem has) and a second ack. Still looking for a second > ack. hrw said on IRC that no, 1 ack is enough for SDK stuff, so this is being pushed now. -- Tom Rini ^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2009-05-05 20:58 UTC | newest] Thread overview: 25+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-04-24 16:11 [PATCH][STABLE] Various SDK-related updates Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] gcc-cross-sdk: Fix relocation of the toolchain and " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, " Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Tom Rini 2009-04-24 16:11 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Tom Rini 2009-04-24 16:12 ` [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components Tom Rini 2009-04-28 20:20 ` Khem Raj 2009-04-28 20:18 ` [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct Khem Raj 2009-04-28 20:17 ` [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb Khem Raj 2009-04-28 20:13 ` [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Khem Raj 2009-04-28 20:12 ` [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR Khem Raj 2009-04-28 20:11 ` [PATCH][STABLE] binutils-canadian-sdk: Use " Khem Raj 2009-04-28 16:02 ` [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, " Marcin Juszkiewicz 2009-04-25 21:33 ` [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, " Marcin Juszkiewicz 2009-04-25 22:00 ` Tom Rini 2009-04-24 18:28 ` [PATCH][STABLE] Various SDK-related updates Tom Rini 2009-05-02 21:28 ` Tom Rini 2009-05-05 20:52 ` Tom Rini
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.