diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-08-27 21:58:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-08-27 21:58:04 +0000 |
| commit | 5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45 (patch) | |
| tree | 7b47e1e90ee52ab8aa75249f2e17c84169254f98 | |
| parent | 504535f20b2580e31a660167457ee83c95f7b6e5 (diff) | |
| download | openembedded-core-5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45.tar.gz openembedded-core-5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45.tar.bz2 openembedded-core-5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45.tar.xz openembedded-core-5ad6d9a94a0c918f135b8d417a3dbf01e3d6dd45.zip | |
bitbake.conf: Sync with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@656 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/bitbake.conf | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9151ee71d..9f94bae3f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -51,7 +51,7 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}" TARGET_ARCH = "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" TARGET_PREFIX = "${TARGET_SYS}-" TARGET_CC_ARCH = "" @@ -104,9 +104,9 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ + /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" @@ -152,6 +152,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" +STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" @@ -187,7 +188,6 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" - IMAGE_ROOTFS_SIZE_ext2 = "65536" IMAGE_ROOTFS_SIZE_ext2.gz = "65536" @@ -339,7 +339,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from @@ -409,6 +409,7 @@ require conf/sanity.conf IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" +MACHINE_TASK_PROVIDER ?= "task-bootstrap" ################################################################## |