diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 59 |
1 files changed, 45 insertions, 14 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9fbb0a77e..66c6901c7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -133,7 +133,6 @@ FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${lib /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -# RRECOMMENDS_${PN}-dbg = "${PN} (>= ${PV})" RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" FILES_${PN}-locale = "${datadir}/locale" @@ -152,6 +151,7 @@ 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" @@ -179,6 +179,8 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" +DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" SDK_NAME = "${DISTRO}/${TARGET_ARCH}" SDK_PREFIX = "/usr/local/${SDK_NAME}" @@ -194,7 +196,6 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel" # Specific image creation and rootfs population info. ################################################################## -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" IMAGE_ROOTFS = "${TMPDIR}/rootfs" IMAGE_BASENAME = "rootfs" IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" @@ -217,8 +218,8 @@ IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_ 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_squashfs = "" +EXTRA_IMAGECMD_squashfs-lzma = "" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" @@ -256,6 +257,7 @@ export AS = "${HOST_PREFIX}as" 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}" @@ -330,8 +332,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. @@ -339,9 +341,12 @@ 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" +SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone" GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" +GPE_EXTRA_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=${PN}" +GPEPHONE_SVN = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;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" @@ -356,7 +361,6 @@ 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" @@ -373,12 +377,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 = "${@bb.fetch.get_srcrev(d)}" -SRCREV = "${@base_get_srcrev(d)}" +SRCREV = "${@bb.fetch.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. ################################################################## @@ -447,22 +469,25 @@ 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-bootstrap" +MACHINE_TASK_PROVIDER ?= "task-base" IMAGE_ROOTFS_SIZE_ext2 ?= "65536" 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" @@ -471,7 +496,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 ?= "" |