From d0f8d7d128418e126277a516e614066f089adfac Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 29 Mar 2007 19:35:16 +0000 Subject: meta-sdk-sbox: Start of a scratchbox based SDK. Currently creates a rootstrap which can be used after importing the crosscompiler. Compiling seems to work but running applications doesn't. --- packages/meta/meta-sdk-sbox.bb | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 packages/meta/meta-sdk-sbox.bb (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb new file mode 100644 index 0000000000..4e3151805e --- /dev/null +++ b/packages/meta/meta-sdk-sbox.bb @@ -0,0 +1,115 @@ +DESCRIPTION = "Meta package for a Scratchbox SDK" +LICENSE = "MIT" +PR = "r0" + +PACKAGES = "" +PACKAGES = "" + +inherit sdk debian + +SDK_DIR = "${WORKDIR}/sdk" +SDK_OUTPUT = "${SDK_DIR}/image" +SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +prefix = "/" +exec_prefix = "${prefix}" +base_prefix = "${exec_prefix}" +FILES_${PN} = "${prefix}" + +TARGET_INSTALL = "\ + task-sdk-base \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe" + +DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +RDEPENDS = "${TARGET_INSTALL}" +BUILD_ALL_DEPS = "1" + + +IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" + +ipk_do_indexes () { + set -x + + ipkgarchs="${PACKAGE_ARCHS}" + + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + touch ${DEPLOY_DIR_IPK}/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + fi + + for arch in $ipkgarchs; do + if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then + if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then + touch ${DEPLOY_DIR_IPK}/$arch/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ + fi + fi + done +} + +do_populate_sdk() { + ipk_do_indexes + + rm -rf ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + cat <${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 + + # remove broken .la files + #rm ${SDK_OUTPUT}/${prefix}/lib/*.la + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig + #for f in *.pc ; do + # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" + #done + 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" +addtask populate_sdk before do_build after do_install -- cgit v1.2.3 From a5ab4c711b23d99dd9d252d5c08fa60dd76c493d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 19:54:51 +0000 Subject: meta-sdk-sbox: remove hardcodes references, reuse functions instead of copy-pasting them, and we have an SCM, so no need to comment stuff --- packages/meta/meta-sdk-sbox.bb | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 4e3151805e..cf399644e3 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r0" +PR = "r1" -PACKAGES = "" PACKAGES = "" -inherit sdk debian +inherit rootfs_ipk sdk debian SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" -SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" prefix = "/" exec_prefix = "${prefix}" base_prefix = "${exec_prefix}" @@ -28,28 +27,11 @@ BUILD_ALL_DEPS = "1" IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" -ipk_do_indexes () { - set -x - - ipkgarchs="${PACKAGE_ARCHS}" - - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - touch ${DEPLOY_DIR_IPK}/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} - fi - - for arch in $ipkgarchs; do - if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then - if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then - touch ${DEPLOY_DIR_IPK}/$arch/Packages - ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ - fi - fi - done -} - do_populate_sdk() { - ipk_do_indexes + + set -ex + rootfs_ipk_do_indexes + set +ex rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT} @@ -99,9 +81,6 @@ EOF # fix pkgconfig data files cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig - #for f in *.pc ; do - # sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f" - #done for f in *.pc ; do sed -i 's%${STAGING_DIR}%/usr/%g' "$f" done -- cgit v1.2.3 From 6d495f10470afe96e3759e6e793666221961e4c6 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 2 Apr 2007 18:27:06 +0000 Subject: meta-sdk-sbox: Add G(PE)^2 dependencies as well. --- packages/meta/meta-sdk-sbox.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index cf399644e3..0642d49e0e 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r1" +PR = "r2" PACKAGES = "" @@ -18,7 +18,8 @@ TARGET_INSTALL = "\ task-sdk-base \ task-sdk-x11 \ task-sdk-x11-ext \ - task-sdk-gpe" + task-sdk-gpe \ + task-sdk-gpephone" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" -- cgit v1.2.3 From cd0eba2a4ed708a7439b36b3b2f0fef0eb451da2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Apr 2007 23:06:24 +0000 Subject: meta packages: Create a new class, clean up the code and add correct dependencies for bitbake 1.8 --- packages/meta/meta-sdk-sbox.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 0642d49e0e..a586972a94 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -2,9 +2,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PR = "r2" -PACKAGES = "" - -inherit rootfs_ipk sdk debian +inherit rootfs_ipk sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" @@ -23,8 +21,6 @@ TARGET_INSTALL = "\ DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" RDEPENDS = "${TARGET_INSTALL}" -BUILD_ALL_DEPS = "1" - IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" @@ -92,4 +88,5 @@ EOF } do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" addtask populate_sdk before do_build after do_install -- cgit v1.2.3 From 4f417a092e87d879c0d57aff1be185646878cb96 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 10:40:41 +0000 Subject: meta-sdk-sbox: Several updates - we can build binaries now and have the most important tools. Depens on debian, doctools and perl devkit --- packages/meta/meta-sdk-sbox.bb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index a586972a94..98fb6053c0 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" -PR = "r2" +PACKAGES = "" +PR = "r4" inherit rootfs_ipk sdk meta @@ -14,6 +15,7 @@ FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ task-sdk-base \ + task-sdk-sbox \ task-sdk-x11 \ task-sdk-x11-ext \ task-sdk-gpe \ @@ -22,6 +24,7 @@ TARGET_INSTALL = "\ 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() { @@ -73,8 +76,12 @@ EOF # remove unwanted executables rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc - # remove broken .la files - #rm ${SDK_OUTPUT}/${prefix}/lib/*.la + # fixup libtool files + cd ${SDK_OUTPUT}/${prefix}/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 -- cgit v1.2.3 From d979498abcf3f3f7ff19425f2e63e89d913b0418 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 12:12:05 +0000 Subject: meta-sdk, meta-sdk-sbox: these are general targets, so they should only contain a basic toolchain * attempt to make them generic instead of hardcoding 'arm-linux' --- packages/meta/meta-sdk-sbox.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 98fb6053c0..f3a19a4773 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PACKAGES = "" -PR = "r4" +PR = "r5" inherit rootfs_ipk sdk meta @@ -16,10 +16,7 @@ FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ task-sdk-base \ task-sdk-sbox \ - 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}" @@ -62,7 +59,7 @@ EOF #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/${TARGET_OS}/ ${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 -- cgit v1.2.3 From 23b4bd455100addba89dba370c947dd4bc78793c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 12:20:19 +0000 Subject: meta-sdk*: repair sed damage --- packages/meta/meta-sdk-sbox.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index f3a19a4773..1e96e76d5a 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -59,7 +59,7 @@ EOF #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/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/usr/include/ + 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 -- cgit v1.2.3 From 5fd2df1f317d6abe12bcd4e4a8eff792b1e93a6b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 10 Apr 2007 16:37:06 +0000 Subject: meta-sdk*: Update to reflect task-sdk changes. --- packages/meta/meta-sdk-sbox.bb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'packages/meta/meta-sdk-sbox.bb') diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 1e96e76d5a..c0cb27d404 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PACKAGES = "" -PR = "r5" +PR = "r6" inherit rootfs_ipk sdk meta @@ -14,7 +14,7 @@ base_prefix = "${exec_prefix}" FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ - task-sdk-base \ + task-sdk-bare \ task-sdk-sbox \ " @@ -74,11 +74,12 @@ EOF rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc # fixup libtool files - cd ${SDK_OUTPUT}/${prefix}/lib/ - for f in *.la ; do - sed -i 's%${STAGING_DIR}${TARGET_SYS}%/usr/%g' "$f" - done - + 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 -- cgit v1.2.3