From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: OpenEmbedded Devel List <openembedded-devel@openembedded.org>,
David Huggins-Daines <dhuggins@cs.cmu.edu>
Subject: Re: [PATCH][STABLE] canadian-sdk: Synchronize (to some extent) canadian-sdk.bb with meta-toolchain.bb.
Date: Tue, 28 Apr 2009 13:17:46 -0700 [thread overview]
Message-ID: <20090428201746.GE26082@gmail.com> (raw)
In-Reply-To: <1240589520-1104-11-git-send-email-trini@kernel.crashing.org>
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
next prev parent reply other threads:[~2009-04-28 20:23 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Khem Raj [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090428201746.GE26082@gmail.com \
--to=raj.khem@gmail.com \
--cc=dhuggins@cs.cmu.edu \
--cc=openembedded-devel@lists.openembedded.org \
--cc=openembedded-devel@openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox