diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-08-30 09:44:22 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-08-30 09:44:22 +0000 |
| commit | 5b7b79c16d9547471842bc26719b3c4bfa75181e (patch) | |
| tree | 47ccfb41043f759590269d788c097ca06d45b505 /conf/bitbake.conf | |
| parent | 3d7729be91fd12330e2163f4ec1cd4c756bdaaae (diff) | |
| parent | f9633f75d64fa1df42abd2415cee22695b556e00 (diff) | |
merge of '82565cfcf6fec66996d36d4605c34faa7d256c15'
and 'da7632a154580311895110a4f07328ec4c6ed8fe'
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 0a141f883e..2e3cb0f980 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -188,8 +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_FSTYPE = "jffs2" -IMAGE_FSTYPES = "${IMAGE_FSTYPE}" IMAGE_ROOTFS_SIZE_ext2 = "65536" IMAGE_ROOTFS_SIZE_ext2.gz = "65536" @@ -241,6 +239,12 @@ export MAKE = "make" EXTRA_OEMAKE = "-e MAKEFLAGS=" ################################################################## +# Patch handling. +################################################################## +PATCHTOOL = 'quilt' +PATCHRESOLVE = 'user' + +################################################################## # Build flags and options. ################################################################## @@ -338,12 +342,6 @@ SRC_URI = "file://${FILE}" MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}" 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 -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 # a RCS, which freaks out those special folks with active Perforce clients # the following makes patch ignore RCS: @@ -389,7 +387,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # This works for functions as well, they are really just environment variables. #OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" # Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon -OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast" +OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ################################################################## # Include the rest of the config files. @@ -409,7 +407,9 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" +MACHINE_TASK_PROVIDER ?= "task-bootstrap" ################################################################## |