diff options
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 81 |
1 files changed, 64 insertions, 17 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9f6814e526..dc3378fd95 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. @@ -109,23 +110,33 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -SECTION_${PN}-doc = "doc" + FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" -SECTION_${PN}-dev = "devel" +SECTION_${PN}-doc = "doc" + FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" -FILES_${PN}-locale = "${datadir}/locale" +SECTION_${PN}-dev = "devel" +ALLOW_EMPTY_${PN}-dev = "1" +RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" +SECTION_${PN}-dbg = "devel" +ALLOW_EMPTY_${PN}-dbg = "1" +RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + +FILES_${PN}-locale = "${datadir}/locale" # File manifest @@ -141,7 +152,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -DL_DIR = "${TMPDIR}/downloads" CVSDIR = "${DL_DIR}/cvs" SVNDIR = "${DL_DIR}/svn" GITDIR = "${DL_DIR}/git" @@ -198,15 +208,15 @@ IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_ IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.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 = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." 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 ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz)" EXTRA_IMAGECMD = "" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -EXTRA_IMAGECMD_squashfs = "-le -b 16384" -EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" +EXTRA_IMAGECMD_jffs2 = "" +EXTRA_IMAGECMD_squashfs = "" +EXTRA_IMAGECMD_squashfs-lzma = "" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" @@ -245,6 +255,7 @@ export RANLIB = "${HOST_PREFIX}ranlib" export STRIP = "${HOST_PREFIX}strip" export OBJCOPY = "${HOST_PREFIX}objcopy" export OBJDUMP = "${HOST_PREFIX}objdump" +PYTHON = "${@sys.executable}" export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}" export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}" @@ -263,7 +274,7 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" # Patch handling. ################################################################## PATCHTOOL = 'quilt' -PATCHRESOLVE = 'user' +PATCHRESOLVE = 'noop' ################################################################## # Build flags and options. @@ -318,8 +329,8 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = "" export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2" export QPEDIR = "${STAGING_DIR}/${HOST_SYS}" export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}" -export palmtopdir = "/opt/QtPalmtop" -export palmqtdir = "/opt/QtPalmtop" +export palmtopdir = "${libdir}/opie" +export palmqtdir = "${palmtopdir}" ################################################################## # Download locations and utilities. @@ -347,9 +358,12 @@ KERNELORG_MIRROR = "http://kernel.org/" # You can use the mirror of your country to get faster downloads by putting # export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool" -# export SOURCEFORGE_MIRROR = "http://belnet.dl.sourceforge.net/sourceforge" # into your local.conf +FETCHCMD_svn = "/usr/bin/env svn" +FETCHCMD_cvs = "/usr/bin/env cvs" +FETCHCMD_wget = "/usr/bin/env wget -t 5" + FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}" @@ -360,10 +374,30 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" +SRCREV = "${@base_get_srcrev(d)}" SRC_URI = "file://${FILE}" ################################################################## +# UI/Interaction Configuration +################################################################## + +SHELLRCCMD = "bash --rcfile $TERMRCFILE" +# Some common terminal programs to choose from +GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' +GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLRCCMD}' +SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' +SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLRCCMD}' +XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' +XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLRCCMD}' +KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' +KONSOLE_TERMCMDRUN = '${KCONSOLE_TERMCMD} -e ${SHELLRCCMD}' + +# Set a default +TERMCMD ?= "${GNOME_TERMCMD}" +TERMCMDRUN ?= "${GNOME_TERMCMDRUN}" + +################################################################## # Miscellaneous utilities. ################################################################## @@ -389,7 +423,8 @@ SLOT = "0" # Other -export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" @@ -431,6 +466,7 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +DL_DIR ?= "${TMPDIR}/downloads" IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" MACHINE_TASK_PROVIDER ?= "task-base" @@ -439,13 +475,17 @@ IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" IMAGE_ROOTFS_SIZE_ext3 ?= "65536" IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536" +# Forcefully set CACHE now so future changes to things like +# MACHINE don't change the path to the cache +CACHE := "${CACHE}" + ################################################################## # Magic Cookie for SANITY CHECK ################################################################## OES_BITBAKE_CONF = "1" ################################################################## -# Task-base stuff +# Machine properties and task-base stuff ################################################################## MACHINE_FEATURES ?= "kernel26" @@ -454,7 +494,13 @@ DISTRO_FEATURES ?= "" # This is used to limit what packages goes into images built, so set big by default ROOT_FLASH_SIZE ?= "256" -GUI_MACHINE_CLASS ?= "smallscreen" +MACHINE_GUI_CLASS ?= "smallscreen" +# GUI_MACHINE_CLASS is deprecated, please use MACHINE_GUI_CLASS instead +GUI_MACHINE_CLASS ?= "${MACHINE_GUI_CLASS}" +MACHINE_DISPLAY_WIDTH_PIXELS ?= "240" +MACHINE_DISPLAY_HEIGHT_PIXELS ?= "320" +MACHINE_DISPLAY_ORIENTATION ?= "0" +MACHINE_DISPLAY_BPP ?= "16" DISTRO_EXTRA_RDEPENDS ?= "" DISTRO_EXTRA_RRECOMMENDS ?= "" @@ -471,5 +517,6 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" |