summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-12-18 15:04:06 +0000
committerRichard Purdie <richard@openedhand.com>2007-12-18 15:04:06 +0000
commit34927dfa61c696442f297c284d546e443ed21485 (patch)
tree64f1c54a57ec1aebb1abb1cee682759d6581e04b
parentce30130b7c9b12a44368a3db4678e31fdc3adca4 (diff)
downloadpoky-34927dfa61c696442f297c284d546e443ed21485.tar.gz
Sync various tweaks from OE, change default SRCREV policy to not auto increment rather than hitting the network.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3345 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf23
-rw-r--r--meta/packages/autoconf/autoconf_2.61.bb8
-rw-r--r--meta/site/common-glibc7
3 files changed, 27 insertions, 11 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 218e80301c..20425d8050 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -109,7 +109,18 @@ DATETIME = "${DATE}${TIME}"
109 109
110# python-native should be here but python relies on building 110# python-native should be here but python relies on building
111# its own in staging 111# its own in staging
112ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native util-linux-native grep-native" 112ASSUME_PROVIDED = "\
113 bzip2-native \
114 cvs-native \
115 grep-native \
116 diffstat-native \
117 patch-native \
118 perl-native-runtime \
119 python-native-runtime \
120 svn-native \
121 texinfo-native \
122 util-linux-native \
123 "
113 124
114################################################################## 125##################################################################
115# Package default variables. 126# Package default variables.
@@ -438,7 +449,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug"
438UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" 449UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
439UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" 450UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
440SRCDATE = "${DATE}" 451SRCDATE = "${DATE}"
441SRCREV = "${@bb.fetch.get_srcrev(d)}" 452SRCREV = "1"
442AUTOREV = "${@bb.fetch.get_srcrev(d)}" 453AUTOREV = "${@bb.fetch.get_srcrev(d)}"
443 454
444SRC_URI = "file://${FILE}" 455SRC_URI = "file://${FILE}"
@@ -511,9 +522,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
511# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. 522# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything.
512# 523#
513# This works for functions as well, they are really just environment variables. 524# This works for functions as well, they are really just environment variables.
514#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" 525# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
515# Alternative OVERRIDES to make compilation fail fast, we will enable it by default soon
516OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" 526OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
527# Alternative OVERRIDES definition without "fail fast", usually only for native building and Scratchbox toolchains.
528#OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}"
517 529
518################################################################## 530##################################################################
519# Include the rest of the config files. 531# Include the rest of the config files.
@@ -536,7 +548,8 @@ require conf/sanity.conf
536DL_DIR ?= "${TMPDIR}/downloads" 548DL_DIR ?= "${TMPDIR}/downloads"
537IMAGE_FSTYPES ?= "jffs2" 549IMAGE_FSTYPES ?= "jffs2"
538PCMCIA_MANAGER ?= "pcmcia-cs" 550PCMCIA_MANAGER ?= "pcmcia-cs"
539MACHINE_TASK_PROVIDER ?= "task-base" 551DEFAULT_TASK_PROVIDER ?= "task-base"
552MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
540IMAGE_ROOTFS_SIZE_ext2 ?= "65536" 553IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
541IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" 554IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
542IMAGE_ROOTFS_SIZE_ext3 ?= "65536" 555IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
diff --git a/meta/packages/autoconf/autoconf_2.61.bb b/meta/packages/autoconf/autoconf_2.61.bb
index fe210a1003..6b92dc8120 100644
--- a/meta/packages/autoconf/autoconf_2.61.bb
+++ b/meta/packages/autoconf/autoconf_2.61.bb
@@ -2,6 +2,8 @@ require autoconf.inc
2 2
3PR = "r1" 3PR = "r1"
4 4
5PARALLEL_MAKE = ""
6
5DEPENDS += "m4-native" 7DEPENDS += "m4-native"
6RDEPENDS_${PN} = "m4 gnu-config" 8RDEPENDS_${PN} = "m4 gnu-config"
7 9
@@ -12,9 +14,3 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
12 file://autoheader-nonfatal-warnings.patch;patch=1 \ 14 file://autoheader-nonfatal-warnings.patch;patch=1 \
13 file://config-site.patch;patch=1 \ 15 file://config-site.patch;patch=1 \
14 ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}" 16 ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
15
16#
17# without it build break:
18# | make[1]: *** No rule to make target `../bin/autom4te', needed by `autoconf.in'. Stop.
19#
20PARALLEL_MAKE = ""
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index 362fe538cd..0ec53423f1 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -37,3 +37,10 @@ ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes}
37ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes} 37ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes}
38ac_cv_func_memcpy=${ac_cv_func_memcpy=yes} 38ac_cv_func_memcpy=${ac_cv_func_memcpy=yes}
39ac_cv_func_strerror=${ac_cv_func_strerror=yes} 39ac_cv_func_strerror=${ac_cv_func_strerror=yes}
40
41# squid
42ac_cv_af_unix_large_dgram=${ac_cv_af_unix_large_dgram=yes}
43ac_cv_func_setresuid=${ac_cv_func_setresuid=yes}
44ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
45ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
46ac_cv_epoll_works=${ac_cv_epoll_works=yes}