diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2007-11-18 00:32:52 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2007-11-18 00:32:52 +0000 |
commit | 73c0be6148f1ccfae4a9eb53265a74090d6f68aa (patch) | |
tree | f9c9d15a6fb9239e65090db0873f253d3f970cac | |
parent | f8a9668d85c0b9c05da9abd31d3ee62b4e928b41 (diff) |
Remove meta-sdk* and replace with meta-toolchain stubs
-rw-r--r-- | packages/meta/meta-sdk-gpe.bb | 101 | ||||
-rw-r--r-- | packages/meta/meta-sdk-sbox-gpe.bb | 100 | ||||
-rw-r--r-- | packages/meta/meta-sdk-sbox.bb | 96 | ||||
-rw-r--r-- | packages/meta/meta-sdk.bb | 100 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-gpe-sbox.bb | 11 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-gpe.bb | 9 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-openmoko.bb | 1 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-sbox.bb | 6 |
8 files changed, 26 insertions, 398 deletions
diff --git a/packages/meta/meta-sdk-gpe.bb b/packages/meta/meta-sdk-gpe.bb deleted file mode 100644 index a91f3192c7..0000000000 --- a/packages/meta/meta-sdk-gpe.bb +++ /dev/null @@ -1,101 +0,0 @@ -DESCRIPTION = "Meta package for SDK including GPE" -LICENSE = "MIT" -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r1" - -inherit rootfs_ipk sdk meta - -SDK_DIR = "${WORKDIR}/sdk" -SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" - -IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}" -IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" - -HOST_INSTALL = "\ - binutils-cross-sdk \ - gcc-cross-sdk \ - gdb-cross" - -TARGET_INSTALL = "\ - task-sdk-base \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" - -RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" - -do_populate_sdk() { - set -ex - package_update_index_ipk - set +ex - - rm -rf ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - priority=1 - for arch in $ipkgarchs; do - echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf - echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${SDK_DIR}/ipkg-host.conf - priority=$(expr $priority + 5) - if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf - fi - if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then - echo "src oe-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${SDK_DIR}/ipkg-host.conf - fi - done - - rm -rf ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - ${IPKG_HOST} update - ${IPKG_HOST} -nodeps install ${HOST_INSTALL} - - ${IPKG_TARGET} update - ${IPKG_TARGET} install ${TARGET_INSTALL} - - 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/* - - mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x - - 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 - # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -rf ${SDK_OUTPUT}${libdir}/ipkg - - # remove unwanted executables - rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - - # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la - - # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} - cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-sdk-${DATE}.tar.bz2 . -} - -do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" -addtask populate_sdk before do_package_write after do_install diff --git a/packages/meta/meta-sdk-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb deleted file mode 100644 index 28317c03fe..0000000000 --- a/packages/meta/meta-sdk-sbox-gpe.bb +++ /dev/null @@ -1,100 +0,0 @@ -DESCRIPTION = "Meta package for a Scratchbox GPE SDK" -LICENSE = "MIT" -PACKAGES = "" -PR = "r0" - -inherit rootfs_ipk sdk meta - -SDK_DIR = "${WORKDIR}/sdk" -SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${DEPLOY_DIR}/sdk" -prefix = "/" -exec_prefix = "${prefix}" -base_prefix = "${exec_prefix}" -FILES_${PN} = "${prefix}" - -TARGET_INSTALL = "\ - task-sdk-base \ - task-sdk-sbox \ - task-sdk-sbox-gpe \ - task-sdk-x11 \ - task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" - -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -RDEPENDS = "${TARGET_INSTALL}" - - -IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" - -do_populate_sdk() { - set -ex - package_update_index_ipk - set +ex - - rm -rf ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - cat <<EOF >${SDK_DIR}/ipkg-target.conf -src oe file:${DEPLOY_DIR_IPK} -EOF - ipkgarchs="${PACKAGE_ARCHS}" - priority=1 - for arch in $ipkgarchs; do - echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf - priority=$(expr $priority + 5) - if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf - fi - done - - rm -r ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - ${IPKG_TARGET} update - ${IPKG_TARGET} install ${TARGET_INSTALL} - - mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include - #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 ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ - chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ - find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x - - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so - # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -rf ${SDK_OUTPUT}${libdir}/ipkg - - # remove unwanted executables - rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - - # fixup libtool files - rm ${SDK_OUTPUT}/${prefix}/usr/lib/*.la - #cd ${SDK_OUTPUT}/${prefix}/usr/lib/ - #for f in *.la ; do - # sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f" - #done - - - # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} - cd ${SDK_OUTPUT} - fakeroot tar cfz ${SDK_DEPLOY}/sbox-gpesdk-${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}.tar.gz . -} - -do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" -addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb deleted file mode 100644 index 13c9612a74..0000000000 --- a/packages/meta/meta-sdk-sbox.bb +++ /dev/null @@ -1,96 +0,0 @@ -DESCRIPTION = "Meta package for a Scratchbox SDK" -LICENSE = "MIT" -PACKAGES = "" -PR = "r6" - -inherit rootfs_ipk sdk meta - -SDK_DIR = "${WORKDIR}/sdk" -SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${DEPLOY_DIR}/sdk" -prefix = "/" -exec_prefix = "${prefix}" -base_prefix = "${exec_prefix}" -FILES_${PN} = "${prefix}" - -TARGET_INSTALL = "\ - task-sdk-bare \ - task-sdk-sbox \ - " - -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -RDEPENDS = "${TARGET_INSTALL}" - - -IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" - -do_populate_sdk() { - set -ex - package_update_index_ipk - set +ex - - rm -rf ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - cat <<EOF >${SDK_DIR}/ipkg-target.conf -src oe file:${DEPLOY_DIR_IPK} -EOF - ipkgarchs="${PACKAGE_ARCHS}" - priority=1 - for arch in $ipkgarchs; do - echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf - priority=$(expr $priority + 5) - if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf - fi - done - - rm -r ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - ${IPKG_TARGET} update - ${IPKG_TARGET} install ${TARGET_INSTALL} - - mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include - #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 ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ - chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ - find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x - - echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so - echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so - # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -rf ${SDK_OUTPUT}${libdir}/ipkg - - # remove unwanted executables - rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - - # fixup libtool files - rm ${SDK_OUTPUT}/${prefix}/usr/lib/*.la - #cd ${SDK_OUTPUT}/${prefix}/usr/lib/ - #for f in *.la ; do - # sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f" - #done - - - # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} - cd ${SDK_OUTPUT} - fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz . -} - -do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" -addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb deleted file mode 100644 index 47796603db..0000000000 --- a/packages/meta/meta-sdk.bb +++ /dev/null @@ -1,100 +0,0 @@ -DESCRIPTION = "Meta package for bare SDK package" -LICENSE = "MIT" -DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r14" - -inherit rootfs_ipk sdk meta - -SDK_DIR = "${WORKDIR}/sdk" -SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" - -IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}" -IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" - -HOST_INSTALL = "\ - binutils-cross-sdk \ - gcc-cross-sdk \ - gdb-cross" - -TARGET_INSTALL = "\ - task-sdk-bare \ - " - -RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" - -do_populate_sdk() { - set -ex - package_update_index_ipk - set +ex - - echo "Creating host.conf..." - - rm -rf ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - priority=1 - for arch in $ipkgarchs; do - echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf - echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${SDK_DIR}/ipkg-host.conf - priority=$(expr $priority + 5) - if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf - fi - if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then - echo "src oe-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${SDK_DIR}/ipkg-host.conf - fi - done - - rm -r ${SDK_OUTPUT} - mkdir -p ${SDK_OUTPUT} - - ${IPKG_HOST} update - ${IPKG_HOST} -nodeps install ${HOST_INSTALL} - - ${IPKG_TARGET} update - ${IPKG_TARGET} install ${TARGET_INSTALL} - - 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/* - - mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib - - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ - find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x - - 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 - # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -rf ${SDK_OUTPUT}${libdir}/ipkg - - # remove unwanted executables - rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - - # remove broken .la files - rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la - - # fix pkgconfig data files - cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig - for f in *.pc ; do - sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f" - done - for f in *.pc ; do - sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" - done - - mkdir -p ${SDK_DEPLOY} - cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-sdk-${DATE}.tar.bz2 . -} - -do_populate_sdk[nostamp] = "1" -do_populate_sdk[recrdeptask] = "do_package_write" -addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-toolchain-gpe-sbox.bb b/packages/meta/meta-toolchain-gpe-sbox.bb new file mode 100644 index 0000000000..d32087b964 --- /dev/null +++ b/packages/meta/meta-toolchain-gpe-sbox.bb @@ -0,0 +1,11 @@ +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" + +require meta-toolchain.bb + diff --git a/packages/meta/meta-toolchain-gpe.bb b/packages/meta/meta-toolchain-gpe.bb new file mode 100644 index 0000000000..f79ff31bb7 --- /dev/null +++ b/packages/meta/meta-toolchain-gpe.bb @@ -0,0 +1,9 @@ +TOOLCHAIN_TARGET_TASK = "\ + task-sdk-base \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe \ + task-sdk-gpephone" + +require meta-toolchain.bb + diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index 4e29180d28..90eff20259 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,5 +1,4 @@ TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" -RDEPENDS = "${TOOLCHAIN_TARGET_TASK}" require meta-toolchain.bb diff --git a/packages/meta/meta-toolchain-sbox.bb b/packages/meta/meta-toolchain-sbox.bb new file mode 100644 index 0000000000..6e31fd0d69 --- /dev/null +++ b/packages/meta/meta-toolchain-sbox.bb @@ -0,0 +1,6 @@ +TOOLCHAIN_TARGET_TASK = "\ + task-sdk-bare \ + task-sdk-sbox" + +require meta-toolchain.bb + |