summaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 17:13:43 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-20 17:13:43 +0000
commit4398b980ba11f6a76f6c863f67f174cf1dc2bef6 (patch)
treeef35bc5c6f898f654d942f972146b3b2161f3f30 /meta/conf/bitbake.conf
parent173b999d9585d61890bdabc4d26a784bc7758ec4 (diff)
downloadpoky-4398b980ba11f6a76f6c863f67f174cf1dc2bef6.tar.gz
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.conf11
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 \
125 /lib/*.a /lib/*.o ${datadir}/aclocal" 125 /lib/*.a /lib/*.o ${datadir}/aclocal"
126# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})" 126# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})"
127RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" 127RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
128FILES_${PN}-locale = "${datadir}/locale"
128FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ 129FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
129 /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" 130 /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
130FILES_${PN}-locale = "${datadir}/locale"
131 131
132# File manifest 132# File manifest
133 133
@@ -161,6 +161,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" 161STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
162STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" 162STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
163STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" 163STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
164STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware"
164STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" 165STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
165 166
166DEPLOY_DIR = "${TMPDIR}/deploy" 167DEPLOY_DIR = "${TMPDIR}/deploy"
@@ -193,12 +194,14 @@ IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.r
193IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" 194IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
194IMAGE_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" 195IMAGE_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"
195IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" 196IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
197IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
196IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 198IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
197IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." 199IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
198IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 200IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
199EXTRA_IMAGECMD = "" 201EXTRA_IMAGECMD = ""
200EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" 202EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
201EXTRA_IMAGECMD_squashfs = "-le -b 16384" 203EXTRA_IMAGECMD_squashfs = "-le -b 16384"
204EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384"
202 205
203IMAGE_DEPENDS = "" 206IMAGE_DEPENDS = ""
204IMAGE_DEPENDS_jffs2 = "mtd-utils-native" 207IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -206,6 +209,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native"
206IMAGE_DEPENDS_ext2 = "genext2fs-native" 209IMAGE_DEPENDS_ext2 = "genext2fs-native"
207IMAGE_DEPENDS_ext2.gz = "genext2fs-native" 210IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
208IMAGE_DEPENDS_squashfs = "squashfs-tools-native" 211IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
212IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
209EXTRA_IMAGEDEPENDS = "" 213EXTRA_IMAGEDEPENDS = ""
210 214
211################################################################## 215##################################################################
@@ -316,7 +320,8 @@ export palmqtdir = "/opt/QtPalmtop"
316GNU_MIRROR = "ftp://ftp.gnu.org/gnu" 320GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
317DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" 321DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
318SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" 322SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
319GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" 323GPE_MIRROR = "http://gpe.linuxtogo.org/download/source"
324GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}"
320XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" 325XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
321XORG_MIRROR = "http://xorg.freedesktop.org/releases" 326XORG_MIRROR = "http://xorg.freedesktop.org/releases"
322GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" 327GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
@@ -357,7 +362,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
357# a RCS, which freaks out those special folks with active Perforce clients 362# a RCS, which freaks out those special folks with active Perforce clients
358# the following makes patch ignore RCS: 363# the following makes patch ignore RCS:
359 364
360export PATCH_GET=0 365export PATCH_GET="0"
361 366
362# Program to be used to build ipkg packages 367# Program to be used to build ipkg packages
363 368