[oe-commits] org.oe.dev meta-sdk-gpe: Update to support new sdk arch names and splitted package directories.
florian commit
openembedded-commits at lists.openembedded.org
Wed Jul 4 13:04:19 UTC 2007
meta-sdk-gpe: Update to support new sdk arch names and splitted package directories.
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 62723979ced03010e85e9d1a17c18d07acc40760
ViewMTN: http://monotone.openembedded.org/revision.psp?id=62723979ced03010e85e9d1a17c18d07acc40760
Files:
1
packages/meta/meta-sdk-gpe.bb
Diffs:
#
# mt diff -r78d4b34c6287acb9fbc2589ac0b7f3442083df51 -r62723979ced03010e85e9d1a17c18d07acc40760
#
#
#
# patch "packages/meta/meta-sdk-gpe.bb"
# from [47ea869e6d4ac18d47ca62a018ebea80da185c55]
# to [911556373f204b869c56247be3aa3b40fc1f128a]
#
============================================================
--- packages/meta/meta-sdk-gpe.bb 47ea869e6d4ac18d47ca62a018ebea80da185c55
+++ packages/meta/meta-sdk-gpe.bb 911556373f204b869c56247be3aa3b40fc1f128a
@@ -1,9 +1,9 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for SDK including GPE"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r0"
+PR = "r1"
-inherit sdk meta
+inherit rootfs_ipk sdk meta
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
@@ -26,29 +26,34 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
+sdk_do_indexes () {
+ set -ex
+ rootfs_ipk_do_indexes
+ sdk_ipk_do_indexes
+ set +ex
+}
+
do_populate_sdk() {
- 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}
-
+ sdk_do_indexes
+
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}
- cat <<EOF >${SDK_DIR}/ipkg-host.conf
-src oe file:${DEPLOY_DIR_IPK}
-arch ${BUILD_ARCH} 1
-EOF
- 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
+ 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}
+ rm -rf ${SDK_OUTPUT}
+ mkdir -p ${SDK_OUTPUT}
${IPKG_HOST} update
${IPKG_HOST} -nodeps install ${HOST_INSTALL}
@@ -73,19 +78,19 @@ EOF
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_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ 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_ARCH}-${TARGET_OS}/lib/*.la
+ rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
# fix pkgconfig data files
- cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
+ cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
for f in *.pc ; do
- sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
+ 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"
@@ -98,4 +103,4 @@ do_populate_sdk[recrdeptask] = "do_packa
do_populate_sdk[nostamp] = "1"
do_populate_sdk[recrdeptask] = "do_package_write"
+addtask populate_sdk before do_package_write after do_install
-addtask populate_sdk before do_build after do_install
More information about the Openembedded-commits
mailing list