Various SDK-related updates
PATCH 1/1 Various SDK-related updates
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.
Signature · 1 line
Tom Rini
PATCH 1/1 binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR
From: Tom Rini <[email protected]>
--- 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(-)
recipes/binutils/binutils-cross-sdk.inc +1 -1
@@ -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
recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb +1 -0
@@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1"
recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb +1 -0
@@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1"
recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r1" +PR = "r2"
recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb +1 -0
@@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1"
recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5"
recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5"
recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5"
recipes/binutils/binutils-cross-sdk_2.18.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5"
recipes/binutils/binutils-cross-sdk_2.19.1.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1"
recipes/binutils/binutils-cross-sdk_2.19.bb +1 -1
@@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1"
recipes/binutils/binutils-cross-sdk_cvs.bb +2 -2
@@ -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"
Signature · 1 line
1.5.6.3
PATCH 1/1 gcc-cross-sdk: Fix relocation of the toolchain and bump PR.
From: Tom Rini <[email protected]>
--- 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(-)
recipes/gcc/gcc-configure-sdk.inc +1 -2
@@ -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}"
recipes/gcc/gcc-cross-sdk_3.3.4.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk
recipes/gcc/gcc-cross-sdk_3.4.3.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc
recipes/gcc/gcc-cross-sdk_3.4.4.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc
recipes/gcc/gcc-cross-sdk_4.1.0.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc
recipes/gcc/gcc-cross-sdk_4.1.1.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc
recipes/gcc/gcc-cross-sdk_4.1.2.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross-sdk.inc
recipes/gcc/gcc-cross-sdk_4.2.2.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" inherit sdk
recipes/gcc/gcc-cross-sdk_4.2.3.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk
recipes/gcc/gcc-cross-sdk_4.2.4.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk
recipes/gcc/gcc-cross-sdk_4.3.1.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" inherit sdk
recipes/gcc/gcc-cross-sdk_4.3.2.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" inherit sdk
recipes/gcc/gcc-cross-sdk_4.3.3.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk
recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk
recipes/gcc/gcc-package-sdk.inc +2 -1
@@ -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}"
Signature · 1 line
1.5.6.3
PATCH 1/1 meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR
From: Tom Rini <[email protected]>
--- 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(-)
recipes/meta/canadian-sdk.bb +7 -1
@@ -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" \
recipes/meta/meta-toolchain-fso.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" TOOLCHAIN_TARGET_TASK = "task-fso-toolchain-target" TOOLCHAIN_HOST_TASK = "task-fso-toolchain-host"
recipes/meta/meta-toolchain-gpe-sbox.bb +2 -1
@@ -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" +SDK_SUFFIX = "toolchain-gpe-sbox"
recipes/meta/meta-toolchain-gpe.bb +2 -1
@@ -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" +SDK_SUFFIX = "toolchain-gpe"
recipes/meta/meta-toolchain-neuros.bb +1 -1
@@ -1,6 +1,6 @@ # Toolchain for neuros-osd devices -PR = "r3" +PR = "r6" TOOLCHAIN_HOST_TASK = "task-sdk-host \ qmake2-sdk uicmoc4-sdk"
recipes/meta/meta-toolchain-openmoko.bb +1 -1
@@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host"
recipes/meta/meta-toolchain-opie.bb +1 -0
@@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-opie"
recipes/meta/meta-toolchain-sbox.bb +1 -0
@@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-bare \ task-sdk-sbox"
recipes/meta/meta-toolchain.bb +6 -0
@@ -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" \
Signature · 1 line
1.5.6.3
PATCH 1/1 meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), bump PR
From: Tom Rini <[email protected]>
--- recipes/meta/meta-toolchain-gpe-sbox.bb | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
recipes/meta/meta-toolchain-gpe-sbox.bb +2 -3
@@ -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
Signature · 1 line
1.5.6.3
PATCH 1/1 wireless-tools: Fix libiw/ifrename packages, bump PR.
From: Tom Rini <[email protected]>
--- recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-)
recipes/wireless-tools/wireless-tools.inc +10 -11
@@ -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"
recipes/wireless-tools/wireless-tools_29.bb +1 -1
@@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r3" +PR = "r4"
Signature · 1 line
1.5.6.3
PATCH 1/1 canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot.
From: Tom Rini <[email protected]>
--- classes/canadian-sdk.bbclass | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
classes/canadian-sdk.bbclass +5 -2
@@ -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}"
Signature · 1 line
1.5.6.3
PATCH 1/1 binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR
From: Tom Rini <[email protected]>
--- recipes/binutils/binutils-canadian-sdk_2.18.bb | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
recipes/binutils/binutils-canadian-sdk_2.18.bb +5 -2
@@ -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"
Signature · 1 line
1.5.6.3
PATCH 1/1 gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR.
From: Tom Rini <[email protected]>
--- 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(-)
recipes/gcc/gcc-canadian-sdk_4.2.4.bb +1 -1
@@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r1" +PR = "r2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
recipes/gcc/gcc-configure-canadian-sdk.inc +4 -3
@@ -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 () {
Signature · 1 line
1.5.6.3
PATCH 1/1 canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils
From: Tom Rini <[email protected]>
--- 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(-)
classes/canadian-sdk.bbclass +1 -5
@@ -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
recipes/binutils/binutils-canadian-sdk_2.18.bb +1 -5
@@ -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}
recipes/make/mingw-make-canadian-sdk_3.81.bb +0 -2
@@ -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"
Signature · 1 line
1.5.6.3
PATCH 1/1 canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb.
From: David Huggins-Daines <[email protected]>
--- recipes/meta/canadian-sdk.bb | 130 ++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 49 deletions(-)
recipes/meta/canadian-sdk.bb +81 -49
@@ -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
Signature · 1 line
1.5.6.3
PATCH 1/1 mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct
From: Tom Rini <[email protected]>
--- 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(-)
recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb +2 -2
@@ -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
recipes/mingw/mingw-runtime.inc +2 -2
@@ -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 = ""
recipes/mingw/mingw-w32api.inc +2 -2
@@ -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 = ""
Signature · 1 line
1.5.6.3
PATCH 1/1 SlugOS: toolchain/sdk - add a number of missing components
From: Mike Westerhof <[email protected]>
--- recipes/tasks/task-slugos-toolchain-target.bb | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-)
recipes/tasks/task-slugos-toolchain-target.bb +5 -15
@@ -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 \ "
Signature · 1 line
1.5.6.3
Re: [PATCH][STABLE] SlugOS: toolchain/sdk - add a number of missing components
Quoted 4 lines · Tom Rini
From: Mike Westerhof <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 53 lines
--- recipes/tasks/task-slugos-toolchain-target.bb | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-)recipes/tasks/task-slugos-toolchain-target.bb +5
-15@@ -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 \ "Signature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] mingw-gcc, mingw-runtime, mingw-w32api: Fix DEFAULT_PREFERENCES to be correct
In reply to Tom RiniQuoted 4 lines · Tom Rini
From: Tom Rini <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 59 lines
--- 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(-)recipes/gcc/mingw-gcc_3.4.5-20060117-2.bb +2
-2@@ -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 gettextrecipes/mingw/mingw-runtime.inc +2
-2@@ -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 = ""recipes/mingw/mingw-w32api.inc +2
-2@@ -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 = ""Signature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb.
In reply to Tom RiniQuoted 4 lines · Tom Rini
From: David Huggins-Daines <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 208 lines
--- recipes/meta/canadian-sdk.bb | 130 ++++++++++++++++++++++++++---------------- 1 files changed, 81 insertions(+), 49 deletions(-)recipes/meta/canadian-sdk.bb +81
-49@@ -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_sdkSignature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils
In reply to Tom RiniQuoted 4 lines · Tom Rini
From: Tom Rini <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 61 lines
--- 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(-)classes/canadian-sdk.bbclass +1
-5@@ -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 changedrecipes/binutils/binutils-canadian-sdk_2.18.bb +1
-5@@ -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}recipes/make/mingw-make-canadian-sdk_3.81.bb +0
-2@@ -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"Signature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR.
In reply to Tom RiniQuoted 4 lines · Tom Rini
From: Tom Rini <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 45 lines
--- 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(-)recipes/gcc/gcc-canadian-sdk_4.2.4.bb +1
-1@@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "r1" +PR = "r2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"recipes/gcc/gcc-configure-canadian-sdk.inc +4
-3@@ -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 () {Signature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] binutils-canadian-sdk: Use add SYSROOT, use SDK_REALPATH_MINGW, bump PR
In reply to Tom RiniQuoted 4 lines · Tom Rini
From: Tom Rini <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 31 lines
--- recipes/binutils/binutils-canadian-sdk_2.18.bb | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)recipes/binutils/binutils-canadian-sdk_2.18.bb +5
-2@@ -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"Signature · 7 lines
1.5.6.3 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH][STABLE] wireless-tools: Fix libiw/ifrename packages, bump PR.
In reply to Tom RiniDnia piątek, 24 kwietnia 2009 o 18:11:53 Tom Rini napisał(a):
Quoted 3 lines
From: Tom Rini <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Regards,
Signature · 3 lines
JID: [email protected] Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
Re: [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR
In reply to Tom RiniCan populate_sdk() function in canadian-sdk.inc and meta-toolchain.bb be merged somehow?
Regards,
Signature · 3 lines
JID: [email protected] Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
Re: [PATCH][STABLE] meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR
Quoted 2 lines · Marcin Juszkiewicz
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 :)
Signature · 1 line
Tom Rini
Quoted 9 lines · Tom Rini
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/
Signature · 1 line
Tom Rini
Quoted 11 lines · Tom Rini
Quoted 9 lines · Tom Rini
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.
Quoted 2 lines
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.
Signature · 1 line
Tom Rini
Quoted 12 lines · Tom Rini
Quoted 11 lines · Tom Rini
Quoted 9 lines · Tom Rini
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.
Quoted 6 lines
Quoted 2 lines
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.
Signature · 1 line
Tom Rini