diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-11-20 17:13:43 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-20 17:13:43 +0000 |
| commit | 4398b980ba11f6a76f6c863f67f174cf1dc2bef6 (patch) | |
| tree | ef35bc5c6f898f654d942f972146b3b2161f3f30 /meta/conf/bitbake.conf | |
| parent | 173b999d9585d61890bdabc4d26a784bc7758ec4 (diff) | |
| download | openembedded-core-4398b980ba11f6a76f6c863f67f174cf1dc2bef6.tar.gz openembedded-core-4398b980ba11f6a76f6c863f67f174cf1dc2bef6.tar.bz2 openembedded-core-4398b980ba11f6a76f6c863f67f174cf1dc2bef6.zip | |
conf: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@892 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/bitbake.conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2af2abe24d..d639e27b17 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -125,9 +125,9 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ /lib/*.a /lib/*.o ${datadir}/aclocal" # RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})" RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" +FILES_${PN}-locale = "${datadir}/locale" FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" -FILES_${PN}-locale = "${datadir}/locale" # File manifest @@ -161,6 +161,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_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" DEPLOY_DIR = "${TMPDIR}/deploy" @@ -193,12 +194,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" +IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" +EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" @@ -206,6 +209,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" +IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" EXTRA_IMAGEDEPENDS = "" ################################################################## @@ -316,7 +320,8 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" @@ -357,7 +362,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # a RCS, which freaks out those special folks with active Perforce clients # the following makes patch ignore RCS: -export PATCH_GET=0 +export PATCH_GET="0" # Program to be used to build ipkg packages |