diff options
| author | Matt Reimer <mattjreimer@gmail.com> | 2006-11-14 23:09:05 +0000 |
|---|---|---|
| committer | Matt Reimer <mattjreimer@gmail.com> | 2006-11-14 23:09:05 +0000 |
| commit | 5d16aa12d077d2bd9182f20c6217cc751063bcb3 (patch) | |
| tree | 40898dbcda83d0cd86f74d647a3b439748ea3af8 /conf | |
| parent | 188283505fbdd128396b366912974fc79d407d83 (diff) | |
| parent | 0b152ed05c0cd22f440c00e44357b95d470ccbf0 (diff) | |
merge of '00ee303d8d48b4b6a0a7480dea928c8d02252f80'
and '376cbb96ee80de7e5cc9e7ceff199d6f09fe42d8'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index fe5b326a05..7da0a9a28d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -381,10 +381,6 @@ export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip" export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" -# default test results for autoconf -# possible candidate for moving into autotools.oeclass -CL -export CONFIG_SITE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'site/%s-%s' % (bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('HOST_OS', d, 1)))}" - # library package naming AUTO_LIBNAME_PKGS = "${PACKAGES}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e7085e33c3..ffde56224c 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -41,6 +41,7 @@ SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" +SRCDATE_libmimedir ?= "20060804" # GNOME SRCDATE_gconf-dbus ?= "20060719" |