[oe-commits] org.oe.dev merge of '3620da360f4c3047638547a32ec53f597dc16e88'
koen commit
openembedded-commits at lists.openembedded.org
Sat Sep 1 20:51:07 UTC 2007
merge of '3620da360f4c3047638547a32ec53f597dc16e88'
and '9bb287f6e7dc270c87e574dd4fceb90b60a065e0'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dfc4cd0554f0208bf640020f60e17b63b5f2843b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dfc4cd0554f0208bf640020f60e17b63b5f2843b
Files:
1
packages/glibc/eglibc_svn.bb
packages/meta/meta-toolchain.bb
classes/rootfs_deb.bbclass
Diffs:
#
# mt diff -r3620da360f4c3047638547a32ec53f597dc16e88 -rdfc4cd0554f0208bf640020f60e17b63b5f2843b
#
#
#
# patch "packages/glibc/eglibc_svn.bb"
# from [334ae8b71bcd61a32433aa783d962a5d622087fb]
# to [cd8b10a70cd837f149b9e619b7003d2a1883c43d]
#
# patch "packages/meta/meta-toolchain.bb"
# from [ca2ccff3d82a5e6a923c19b222aa84965840c740]
# to [48a3aaddce0b598da2095884bd7e92354b5f5213]
#
============================================================
--- packages/glibc/eglibc_svn.bb 334ae8b71bcd61a32433aa783d962a5d622087fb
+++ packages/glibc/eglibc_svn.bb cd8b10a70cd837f149b9e619b7003d2a1883c43d
@@ -46,7 +46,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST
--without-selinux \
${GLIBC_EXTRA_OECONF}"
-EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+EXTRA_OECONF += "${@get_eglibc_fpu_setting(bb, d)}"
do_configure_prepend() {
if test -d ${WORKDIR}/trunk/ports ; then
============================================================
--- packages/meta/meta-toolchain.bb ca2ccff3d82a5e6a923c19b222aa84965840c740
+++ packages/meta/meta-toolchain.bb 48a3aaddce0b598da2095884bd7e92354b5f5213
@@ -1,10 +1,13 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r0"
inherit rootfs_ipk sdk meta
+PACKAGES = ""
+
+do_build[recrdeptask] = "do_build"
+
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
@@ -29,31 +32,34 @@ do_populate_sdk() {
}
do_populate_sdk() {
- sdk_ipk_do_indexes
+ sdk_ipk_do_indexes
rm -rf ${SDK_OUTPUT}
mkdir -p ${SDK_OUTPUT}
- echo "Creating host.conf..."
-
cat <<EOF >${SDK_DIR}/ipkg-host.conf
src oe file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}
arch ${BUILD_ARCH} 1
EOF
- echo "done."
- 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
+ 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)
+ revipkgarchs="$arch $revipkgarchs"
+ 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_HOST} update
- ${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+ ${IPKG_HOST} -force-depends install ${HOST_INSTALL}
${IPKG_TARGET} update
${IPKG_TARGET} install ${TARGET_INSTALL}
@@ -62,9 +68,20 @@ EOF
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}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
+ rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
+ 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
+
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/
@@ -72,17 +89,54 @@ EOF
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
+ 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
+ rm -Rf ${SDK_OUTPUT}${libdir}/ipkg
+ mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
+ rm -Rf ${SDK_OUTPUT}/usr/lib
+ # extract and store ipks, pkgdata, pkgmaps and shlibs data
+ 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}/pkgmaps/debian/
+ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+ for pkg in $target_pkgs ; do
+ for arch in $revipkgarchs; do
+ if [ -e ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ]; then
+ echo "Found ${DEPLOY_DIR_IPK}/${pkg}_$arch.ipk"
+ cp ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/
+ orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/${pkg}_*_$arch.ipk | 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 ${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 ${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}/pkgmaps/debian/$subpkg ]; then
+ cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/
+ fi
+ if [ -e ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.list ]; then
+ cp ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+ fi
+ done
+ break
+ fi
+ done
+ done
+
+
# 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
+ rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
# fix pkgconfig data files
cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
@@ -95,7 +149,7 @@ EOF
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-toolchain.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
#
# mt diff -r9bb287f6e7dc270c87e574dd4fceb90b60a065e0 -rdfc4cd0554f0208bf640020f60e17b63b5f2843b
#
#
#
# patch "classes/rootfs_deb.bbclass"
# from [fb9e28d3e3b80de398d3568baccc39312196f8da]
# to [721dd852a06abb344a5af38514cf89deeaa73f78]
#
============================================================
--- classes/rootfs_deb.bbclass fb9e28d3e3b80de398d3568baccc39312196f8da
+++ classes/rootfs_deb.bbclass 721dd852a06abb344a5af38514cf89deeaa73f78
@@ -112,10 +112,18 @@ fakeroot rootfs_deb_do_rootfs () {
if [ -e ${IMAGE_ROOTFS}/usr/dpkg/alternatives ]; then
rmdir ${IMAGE_ROOTFS}/usr/dpkg/alternatives
fi
- ln -s /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
- ln -s /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info
- ln -s /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status
+ if [ ! -e ${IMAGE_ROOTFS}/usr/lib/ipkg ] ; then
+ mkdir -p ${IMAGE_ROOTFS}/usr/lib/ipkg
+ fi
+ if [ ! -e ${IMAGE_ROOTFS}/etc/ipkg ] ; then
+ mkdir -p ${IMAGE_ROOTFS}/etc/ipkg
+ fi
+
+ ln -sf /usr/lib/ipkg/alternatives ${IMAGE_ROOTFS}/usr/dpkg/alternatives
+ ln -sf /usr/dpkg/info ${IMAGE_ROOTFS}/usr/lib/ipkg/info
+ ln -sf /usr/dpkg/status ${IMAGE_ROOTFS}/usr/lib/ipkg/status
+
${ROOTFS_POSTPROCESS_COMMAND}
log_check rootfs
More information about the Openembedded-commits
mailing list