diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 61 |
1 files changed, 40 insertions, 21 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index b5ff2766b3..f361ea6120 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -71,6 +71,7 @@ BUILD_VENDOR = "" BUILD_SYS = "${BUILD_ARCH}${BUILD_VENDOR}-${BUILD_OS}" BUILD_PREFIX = "" BUILD_CC_ARCH = "" +BUILD_EXEEXT = "" HOST_ARCH = "${TARGET_ARCH}" HOST_OS = "${TARGET_OS}" @@ -78,6 +79,7 @@ HOST_VENDOR = "${TARGET_VENDOR}" HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" +HOST_EXEEXT = "" TARGET_ARCH = "INVALID" TARGET_OS = "INVALID" @@ -178,10 +180,12 @@ MULTI_PROVIDER_WHITELIST = "virtual/libintl" SOLIBS = ".so.*" SOLIBS_darwin = ".*.dylib" SOLIBS_darwin8 = ".*.dylib" +SOLIBS_darwin9 = ".*.dylib" SOLIBSDEV = ".so" SOLIBSDEV_darwin = ".dylib" SOLIBSDEV_darwin8 = ".dylib" +SOLIBSDEV_darwin9 = ".dylib" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" PACKAGES_DYNAMIC = "${PN}-locale-*" @@ -189,7 +193,9 @@ FILES = "" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/* \ + ${base_bindir}/* ${base_sbindir}/* \ + ${base_libdir}/*${SOLIBS} \ + ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" @@ -234,7 +240,7 @@ CVSDIR = "${CO_DIR}/cvs" SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" -HGDIR = "${CO_DIR}/hg" +HGDIR = "${CO_DIR}/hg" STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" @@ -269,7 +275,9 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" # specific packages - hack around it for now. STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" -DEPLOY_DIR = "${TMPDIR}/deploy" +# Setting DEPLOY_DIR outside of TMPDIR is helpful, when you are using +# packaged staging and/or multimachine. +DEPLOY_DIR ?= "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" @@ -314,12 +322,18 @@ IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_ 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)" +IMAGE_CMD_ubi = "echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg" +IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}" EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_yaffs2 = "1" EXTRA_IMAGECMD_squashfs = "" EXTRA_IMAGECMD_squashfs-lzma = "" +EXTRA_IMAGECMD_cpio = "" +EXTRA_IMAGECMD_cpio.gz = "" +EXTRA_IMAGECMD_ubi = "" +EXTRA_IMAGECMD_ubifs = "" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" @@ -331,6 +345,8 @@ IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" +IMAGE_DEPENDS_ubi = "mtd-utils-native" +IMAGE_DEPENDS_ubifs = "mtd-utils-native" EXTRA_IMAGEDEPENDS = "" @@ -452,26 +468,28 @@ export palmqtdir = "${palmtopdir}" # Download locations and utilities. ################################################################## -GNU_MIRROR = "ftp://ftp.gnu.org/gnu" +ADOBE_MIRROR = "http://fpdownload.macromedia.com/get/flashplayer/current/" +APACHE_MIRROR = "http://www.apache.org/dist" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" -SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" +E_URI = "http://enlightenment.freedesktop.org/files" +FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" +FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" +FREESMARTPHONE_GIT = "git://git.freesmartphone.org" +GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles" +GNOME_GIT = "git://git.gnome.org" +GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" +GNU_MIRROR = "ftp://ftp.gnu.org/gnu" 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}" +GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" +GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone" GPEPHONE_SVN = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source;module=${PN}" +HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +KERNELORG_MIRROR = "http://kernel.org" +SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" -GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" -FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" -HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" -E_CVS = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e" -E_URI = "http://enlightenment.freedesktop.org/files" -FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" -FREESMARTPHONE_GIT = "git://git.freesmartphone.org" -GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" -APACHE_MIRROR = "http://www.apache.org/dist" -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" @@ -508,13 +526,13 @@ SHELLRCCMD = "bash --rcfile $TERMRCFILE" export SHELLCMDS = "${SHELLRCCMD}" # Some common terminal programs to choose from GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' -GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' +GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x ${SHELLCMDS}' SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' -SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS' +SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} ${SHELLCMDS}' XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' -XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS' +XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e ${SHELLCMDS}' KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' -KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS' +KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e ${SHELLCMDS}' # Set a default TERMCMD ?= "${GNOME_TERMCMD}" @@ -648,6 +666,7 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ |