[oe-commits] org.oe.packaged-staging conf: update from .dev

rpurdie commit openembedded-commits at lists.openembedded.org
Fri Sep 29 03:33:15 UTC 2006 

conf: update from .dev

Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: 92a725f757731fffb31108f816a73f56650c962d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=92a725f757731fffb31108f816a73f56650c962d
Files:
1
conf/bitbake.conf
conf/documentation.conf
conf/local.conf.sample
conf/sanity.conf
Diffs:

#
# mt diff -rcc3d7b5a3865dbf60f2a58248d4d7c9249cf6f03 -r92a725f757731fffb31108f816a73f56650c962d
#
# 
# 
# patch "conf/bitbake.conf"
#  from [ad9b2fb26ee87133c845be83c086a819764dc914]
#    to [fd6dc697393dabff068e6ce15c3a9fed49b830c4]
# 
# patch "conf/documentation.conf"
#  from [bf21a090fd8f6ed34e4e9522d153b51402f081c3]
#    to [51b7ce2ae17c7f6a2938777f9af0a60425aa89a2]
# 
# patch "conf/local.conf.sample"
#  from [e238147ec8dcbe53f62ee3e9e7a7375b96d3facb]
#    to [cbf5c7c56d2649ff1be49cef6654a1ef9cc9b7cc]
# 
# patch "conf/sanity.conf"
#  from [e1a0325660533d638d9c8384f8fe9329befdbf4e]
#    to [00e0b4582d6a7f694fd66d9b70f91099b592a1ee]
# 
============================================================
--- conf/bitbake.conf	ad9b2fb26ee87133c845be83c086a819764dc914
+++ conf/bitbake.conf	fd6dc697393dabff068e6ce15c3a9fed49b830c4
@@ -51,12 +51,13 @@ TARGET_VENDOR = "${BUILD_VENDOR}"
 TARGET_ARCH = "INVALID"
 TARGET_OS = "INVALID"
 TARGET_VENDOR = "${BUILD_VENDOR}"
-TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
 TARGET_PREFIX = "${TARGET_SYS}-"
 TARGET_CC_ARCH = ""
 
 PACKAGE_ARCH = "${HOST_ARCH}"
 MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}"
+IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}"
 
 ##################################################################
 # Date/time variables.
@@ -90,22 +91,27 @@ LICENSE = "unknown"
 PRIORITY = "optional"
 DESCRIPTION = "Version ${PV}-${PR} of package ${PN}"
 LICENSE = "unknown"
-MAINTAINER = "OpenEmbedded Team <oe at handhelds.org>"
+MAINTAINER = "OpenEmbedded Team <openembedded-devel at lists.openembedded.org>"
 HOMEPAGE = "unknown"
 
 # Package dependencies and provides.
 
+# Ensure that -dev packages recommend the corresponding -dev packages of their
+# deps, and the same for -dbg.
+DEPCHAIN_PRE  = ""
+DEPCHAIN_POST = "-dev -dbg"
+
 DEPENDS = ""
 RDEPENDS = ""
 PROVIDES = ""
 PROVIDES_prepend = "${P} ${PF} ${PN} "
 RPROVIDES = ""
 
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 FILES = ""
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-            /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
+            /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN} \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
@@ -117,6 +123,8 @@ FILES_${PN}-locale = "${datadir}/locale"
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 /lib/*.a /lib/*.o ${datadir}/aclocal"
 FILES_${PN}-locale = "${datadir}/locale"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
+            /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
 
 # File manifest
 
@@ -134,6 +142,7 @@ CVSDIR = "${DL_DIR}/cvs"
 CACHE = "${TMPDIR}/cache"
 DL_DIR = "${TMPDIR}/downloads"
 CVSDIR = "${DL_DIR}/cvs"
+SVNDIR = "${DL_DIR}/svn"
 GITDIR = "${DL_DIR}/git"
 
 STAMP = "${TMPDIR}/stamps/${PF}"
@@ -149,6 +158,7 @@ STAGING_LOADER_DIR = "${STAGING_DIR}/${H
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
 STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
+STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 
 DEPLOY_DIR = "${TMPDIR}/deploy"
 DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
@@ -184,8 +194,6 @@ EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 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"
 
@@ -221,6 +229,7 @@ export STRIP = "${HOST_PREFIX}strip"
 export AS = "${HOST_PREFIX}as"
 export RANLIB = "${HOST_PREFIX}ranlib"
 export STRIP = "${HOST_PREFIX}strip"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
 
 export BUILD_CC = "${CCACHE}${BUILD_PREFIX}gcc ${BUILD_CC_ARCH}"
 export BUILD_CXX = "${CCACHE}${BUILD_PREFIX}g++ ${BUILD_CC_ARCH}"
@@ -236,12 +245,18 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 ##################################################################
+# Patch handling.
+##################################################################
+PATCHTOOL = 'quilt'
+PATCHRESOLVE = 'user'
+
+##################################################################
 # Build flags and options.
 ##################################################################
 
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
@@ -318,10 +333,12 @@ FETCHCOMMAND_cvs = "/usr/bin/env cvs -d$
 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}"
+FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
 RESUMECOMMAND = "ERROR, this must be a BitBake bug"
 RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
 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}"
 
 SRC_URI = "file://${FILE}"
@@ -333,12 +350,6 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
 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 -n $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:
@@ -384,7 +395,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.
@@ -404,7 +415,9 @@ require conf/sanity.conf
 # Weak variables (usually to retain backwards compatibility)
 ##################################################################
 
+IMAGE_FSTYPES ?= "jffs2"
 PCMCIA_MANAGER ?= "pcmcia-cs"
+MACHINE_TASK_PROVIDER ?= "task-bootstrap"
 
 
 ##################################################################
============================================================
--- conf/documentation.conf	bf21a090fd8f6ed34e4e9522d153b51402f081c3
+++ conf/documentation.conf	51b7ce2ae17c7f6a2938777f9af0a60425aa89a2
@@ -38,6 +38,8 @@ PACKAGE_ARCH  = "${MACHINE_ARCH}" to the
 machine dependant configuration options in your bitbake file add a \
 PACKAGE_ARCH  = "${MACHINE_ARCH}" to the file.'
 
+IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority'
+IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures'
 
 DATE[doc] = "The date the build was started Ymd"
 TIME[doc] = "The time the build was started HMS"
@@ -63,8 +65,9 @@ DEPENDS[doc]  = "Build time dependencies
 GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \
 and the resulting packages."
 DEPENDS[doc]  = "Build time dependencies, things needed to build the package. @group dependencies"
-RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies"
-PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies"
+RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run.  This is used to populate the ipkg:Depends field. @group dependencies"
+PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies"
+RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide.  This is used to populate the ipkg:Provides field. @group dependencies"
 
 
 # packaging
============================================================
--- conf/local.conf.sample	e238147ec8dcbe53f62ee3e9e7a7375b96d3facb
+++ conf/local.conf.sample	cbf5c7c56d2649ff1be49cef6654a1ef9cc9b7cc
@@ -88,9 +88,10 @@ PREFERRED_PROVIDERS += " virtual/${TARGE
 # ENABLE_BINARY_LOCALE_GENERATION = "0"
 # ASSUME_PROVIDED += "qemu-native"
 
-# Uncomment this to select a particular kernel version if supported by 
-# your MACHINE setting. Currently only supported by poodle and tosa.
-# ZKERNEL_VERSION = "2.6"
+# Uncomment this to select a particular major kernel version if the MACHINE setting
+# supports more than one major kernel version. Currently this is suported by the
+# following MACHINE types: poodle, tosa and simpad.
+# MACHINE_KERNEL_VERSION = "2.6"
 
 # Uncomment one of these to build packages during the build process.
 # This is done automatically if you set DISTRO (see above)
============================================================
--- conf/sanity.conf	e1a0325660533d638d9c8384f8fe9329befdbf4e
+++ conf/sanity.conf	00e0b4582d6a7f694fd66d9b70f91099b592a1ee
@@ -1,8 +1,8 @@
 # Sanity checks for common user misconfigurations
 #
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.3.3"
+BB_MIN_VERSION = "1.4.2"
 INHERIT += "sanity"

More information about the Openembedded-commits mailing list