summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-09-30 21:54:47 +0000
committerRichard Purdie <richard@openedhand.com>2008-09-30 21:54:47 +0000
commit979f987c44928f2d47d319cf5fc34e7f3d2113b7 (patch)
treeb49dca768f15cc67c1fa2ff499552a2c67baa7c1
parente2d321075a6c1aecd09a705d97f2347863a685f9 (diff)
downloadpoky-979f987c44928f2d47d319cf5fc34e7f3d2113b7.tar.gz
bitbake cache.py: When SRCREV autorevisioning for a recipe is in use, don't cache the recipe. Based on work from Heikki Paajanen
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5352 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake-dev/ChangeLog1
-rw-r--r--bitbake-dev/lib/bb/cache.py11
-rw-r--r--bitbake-dev/lib/bb/fetch/__init__.py2
-rw-r--r--bitbake/ChangeLog1
-rw-r--r--bitbake/lib/bb/cache.py11
-rw-r--r--bitbake/lib/bb/fetch/__init__.py2
-rw-r--r--meta/classes/poky.bbclass6
-rw-r--r--meta/packages/base-files/base-files_3.0.14.bb7
-rw-r--r--meta/packages/fontconfig/fontconfig_2.6.0.bb1
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_svn.bb1
-rw-r--r--meta/packages/ncurses/ncurses-native_5.6.bb4
-rw-r--r--meta/packages/ncurses/ncurses-sdk_5.6.bb3
-rw-r--r--meta/packages/ncurses/ncurses.inc2
-rw-r--r--meta/packages/ncurses/ncurses_5.6.bb11
-rw-r--r--meta/packages/rpm/rpm_4.4.2.3.bb2
-rw-r--r--meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb4
-rw-r--r--meta/packages/tasks/task-poky-tools.bb4
-rw-r--r--meta/packages/tasks/task-poky.bb5
18 files changed, 70 insertions, 8 deletions
diff --git a/bitbake-dev/ChangeLog b/bitbake-dev/ChangeLog
index a0018d1519..6f068be19f 100644
--- a/bitbake-dev/ChangeLog
+++ b/bitbake-dev/ChangeLog
@@ -154,6 +154,7 @@ Changes in Bitbake 1.9.x:
154 all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be 154 all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be
155 used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used 155 used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used
156 to extend the internal whitelist. 156 to extend the internal whitelist.
157 - When SRCREV autorevisioning for a recipe is in use, don't cache the recipe
157 158
158Changes in Bitbake 1.8.0: 159Changes in Bitbake 1.8.0:
159 - Release 1.7.x as a stable series 160 - Release 1.7.x as a stable series
diff --git a/bitbake-dev/lib/bb/cache.py b/bitbake-dev/lib/bb/cache.py
index fe38ea0aee..e0ba1de38e 100644
--- a/bitbake-dev/lib/bb/cache.py
+++ b/bitbake-dev/lib/bb/cache.py
@@ -259,6 +259,7 @@ class Cache:
259 Save the cache 259 Save the cache
260 Called from the parser when complete (or exiting) 260 Called from the parser when complete (or exiting)
261 """ 261 """
262 import copy
262 263
263 if not self.has_cache: 264 if not self.has_cache:
264 return 265 return
@@ -271,8 +272,14 @@ class Cache:
271 version_data['CACHE_VER'] = __cache_version__ 272 version_data['CACHE_VER'] = __cache_version__
272 version_data['BITBAKE_VER'] = bb.__version__ 273 version_data['BITBAKE_VER'] = bb.__version__
273 274
275 cache_data = copy.deepcopy(self.depends_cache)
276 for fn in self.depends_cache:
277 if '__BB_DONT_CACHE' in self.depends_cache[fn] and self.depends_cache[fn]['__BB_DONT_CACHE']:
278 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn)
279 del cache_data[fn]
280
274 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 ) 281 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
275 p.dump([self.depends_cache, version_data]) 282 p.dump([cache_data, version_data])
276 283
277 def mtime(self, cachefile): 284 def mtime(self, cachefile):
278 return bb.parse.cached_mtime_noerror(cachefile) 285 return bb.parse.cached_mtime_noerror(cachefile)
@@ -373,6 +380,8 @@ class Cache:
373 if not self.getVar('BROKEN', file_name, True) and not self.getVar('EXCLUDE_FROM_WORLD', file_name, True): 380 if not self.getVar('BROKEN', file_name, True) and not self.getVar('EXCLUDE_FROM_WORLD', file_name, True):
374 cacheData.possible_world.append(file_name) 381 cacheData.possible_world.append(file_name)
375 382
383 # Touch this to make sure its in the cache
384 self.getVar('__BB_DONT_CACHE', file_name, True)
376 385
377 def load_bbfile( self, bbfile , config): 386 def load_bbfile( self, bbfile , config):
378 """ 387 """
diff --git a/bitbake-dev/lib/bb/fetch/__init__.py b/bitbake-dev/lib/bb/fetch/__init__.py
index 721eb4d646..9300d0c234 100644
--- a/bitbake-dev/lib/bb/fetch/__init__.py
+++ b/bitbake-dev/lib/bb/fetch/__init__.py
@@ -232,6 +232,8 @@ def get_srcrev(d):
232 bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI") 232 bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI")
233 raise ParameterError 233 raise ParameterError
234 234
235 bb.data.setVar('__BB_DONT_CACHE','1', d)
236
235 if len(scms) == 1: 237 if len(scms) == 1:
236 return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d) 238 return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d)
237 239
diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index ceb7e648b7..2d50c0e364 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -59,6 +59,7 @@ Changes in BitBake 1.8.x:
59 all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be 59 all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be
60 used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used 60 used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used
61 to extend the internal whitelist. 61 to extend the internal whitelist.
62 - When SRCREV autorevisioning for a recipe is in use, don't cache the recipe
62 63
63Changes in BitBake 1.8.10: 64Changes in BitBake 1.8.10:
64 - Psyco is available only for x86 - do not use it on other architectures. 65 - Psyco is available only for x86 - do not use it on other architectures.
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index fe38ea0aee..e0ba1de38e 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -259,6 +259,7 @@ class Cache:
259 Save the cache 259 Save the cache
260 Called from the parser when complete (or exiting) 260 Called from the parser when complete (or exiting)
261 """ 261 """
262 import copy
262 263
263 if not self.has_cache: 264 if not self.has_cache:
264 return 265 return
@@ -271,8 +272,14 @@ class Cache:
271 version_data['CACHE_VER'] = __cache_version__ 272 version_data['CACHE_VER'] = __cache_version__
272 version_data['BITBAKE_VER'] = bb.__version__ 273 version_data['BITBAKE_VER'] = bb.__version__
273 274
275 cache_data = copy.deepcopy(self.depends_cache)
276 for fn in self.depends_cache:
277 if '__BB_DONT_CACHE' in self.depends_cache[fn] and self.depends_cache[fn]['__BB_DONT_CACHE']:
278 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn)
279 del cache_data[fn]
280
274 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 ) 281 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
275 p.dump([self.depends_cache, version_data]) 282 p.dump([cache_data, version_data])
276 283
277 def mtime(self, cachefile): 284 def mtime(self, cachefile):
278 return bb.parse.cached_mtime_noerror(cachefile) 285 return bb.parse.cached_mtime_noerror(cachefile)
@@ -373,6 +380,8 @@ class Cache:
373 if not self.getVar('BROKEN', file_name, True) and not self.getVar('EXCLUDE_FROM_WORLD', file_name, True): 380 if not self.getVar('BROKEN', file_name, True) and not self.getVar('EXCLUDE_FROM_WORLD', file_name, True):
374 cacheData.possible_world.append(file_name) 381 cacheData.possible_world.append(file_name)
375 382
383 # Touch this to make sure its in the cache
384 self.getVar('__BB_DONT_CACHE', file_name, True)
376 385
377 def load_bbfile( self, bbfile , config): 386 def load_bbfile( self, bbfile , config):
378 """ 387 """
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index 721eb4d646..9300d0c234 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -232,6 +232,8 @@ def get_srcrev(d):
232 bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI") 232 bb.msg.error(bb.msg.domain.Fetcher, "SRCREV was used yet no valid SCM was found in SRC_URI")
233 raise ParameterError 233 raise ParameterError
234 234
235 bb.data.setVar('__BB_DONT_CACHE','1', d)
236
235 if len(scms) == 1: 237 if len(scms) == 1:
236 return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d) 238 return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d)
237 239
diff --git a/meta/classes/poky.bbclass b/meta/classes/poky.bbclass
index ba81f9e22c..ffda5c0a15 100644
--- a/meta/classes/poky.bbclass
+++ b/meta/classes/poky.bbclass
@@ -1,3 +1,9 @@
1PREMIRRORS_append () {
2ftp://.*/.* http://pokylinux.org/sources/
3http://.*/.* http://pokylinux.org/sources/
4https://.*/.* http://pokylinux.org/sources/
5}
6
1MIRRORS_append () { 7MIRRORS_append () {
2ftp://.*/.* http://pokylinux.org/sources/ 8ftp://.*/.* http://pokylinux.org/sources/
3http://.*/.* http://pokylinux.org/sources/ 9http://.*/.* http://pokylinux.org/sources/
diff --git a/meta/packages/base-files/base-files_3.0.14.bb b/meta/packages/base-files/base-files_3.0.14.bb
index aa61a1d39a..b4e2b665de 100644
--- a/meta/packages/base-files/base-files_3.0.14.bb
+++ b/meta/packages/base-files/base-files_3.0.14.bb
@@ -47,7 +47,8 @@ dirs755 = "/bin /boot /dev ${sysconfdir} ${sysconfdir}/default \
47 /mnt /media /media/card /media/cf /media/net /media/ram \ 47 /mnt /media /media/card /media/cf /media/net /media/ram \
48 /media/union /media/realroot /media/hdd \ 48 /media/union /media/realroot /media/hdd \
49 /media/mmc1" 49 /media/mmc1"
50volatiles = "cache run log lock tmp" 50volatiles = "log lock tmp"
51volatiles2 = "cache run"
51conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 52conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
52 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ 53 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \
53 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ 54 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
@@ -75,6 +76,10 @@ do_install () {
75 for d in ${volatiles}; do 76 for d in ${volatiles}; do
76 ln -sf volatile/$d ${D}/${localstatedir}/$d 77 ln -sf volatile/$d ${D}/${localstatedir}/$d
77 done 78 done
79 for d in ${volatiles2}; do
80 install -d ${D}/${localstatedir}/$d
81 done
82
78 for d in card cf net ram; do 83 for d in card cf net ram; do
79 ln -sf /media/$d ${D}/mnt/$d 84 ln -sf /media/$d ${D}/mnt/$d
80 done 85 done
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index 3f7eca4b4e..f3b11b2c76 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -72,5 +72,6 @@ do_configure_append () {
72 72
73do_install () { 73do_install () {
74 autotools_do_install 74 autotools_do_install
75 rm -fr ${D}/var/cache
75} 76}
76 77
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
index 1b79e09942..b4b137325e 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -2,7 +2,6 @@ SECTION = "x11/wm"
2DESCRIPTION = "Matchbox window manager" 2DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf" 4DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf"
5PROVIDES = "matchbox-wm"
6 5
7PV = "1.2+svnr${SRCREV}" 6PV = "1.2+svnr${SRCREV}"
8PR = "r4" 7PR = "r4"
diff --git a/meta/packages/ncurses/ncurses-native_5.6.bb b/meta/packages/ncurses/ncurses-native_5.6.bb
new file mode 100644
index 0000000000..310a4bb27c
--- /dev/null
+++ b/meta/packages/ncurses/ncurses-native_5.6.bb
@@ -0,0 +1,4 @@
1require ncurses_${PV}.bb
2inherit native
3EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
4DEPENDS = ""
diff --git a/meta/packages/ncurses/ncurses-sdk_5.6.bb b/meta/packages/ncurses/ncurses-sdk_5.6.bb
new file mode 100644
index 0000000000..fb69c1ec7d
--- /dev/null
+++ b/meta/packages/ncurses/ncurses-sdk_5.6.bb
@@ -0,0 +1,3 @@
1require ncurses_${PV}.bb
2inherit sdk
3EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index fd0885356b..b4ec69d92b 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/packages/ncurses/ncurses.inc
@@ -15,7 +15,7 @@ inherit autotools
15# clear/reset are in already busybox 15# clear/reset are in already busybox
16FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack " 16FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack "
17FILES_ncurses-terminfo = "${datadir}/terminfo" 17FILES_ncurses-terminfo = "${datadir}/terminfo"
18FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo" 18FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* /usr/share/tabset /etc/terminfo"
19 19
20PARALLEL_MAKE="" 20PARALLEL_MAKE=""
21 21
diff --git a/meta/packages/ncurses/ncurses_5.6.bb b/meta/packages/ncurses/ncurses_5.6.bb
new file mode 100644
index 0000000000..f09de84653
--- /dev/null
+++ b/meta/packages/ncurses/ncurses_5.6.bb
@@ -0,0 +1,11 @@
1PR = "r0"
2
3SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
4 file://makefile_tweak.patch;patch=1 \
5 file://configure_fix.patch;patch=1"
6# file://visibility.patch;patch=1"
7S = "${WORKDIR}/ncurses-${PV}"
8
9DEFAULT_PREFERENCE = "-1"
10
11require ncurses.inc
diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb
index ef6087893c..8a783c7b72 100644
--- a/meta/packages/rpm/rpm_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
2HOMEPAGE = "http://rpm.org/" 2HOMEPAGE = "http://rpm.org/"
3LICENSE = "LGPL GPL" 3LICENSE = "LGPL GPL"
4DEPENDS = "zlib beecrypt file popt python" 4DEPENDS = "zlib beecrypt file popt python"
5PR = "r9" 5PR = "r8"
6 6
7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ 7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
8 file://external-tools.patch;patch=1 \ 8 file://external-tools.patch;patch=1 \
diff --git a/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb b/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
index 0959cb25d6..d063bf4f34 100644
--- a/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
+++ b/meta/packages/shared-mime-info/shared-mime-info-native_0.51.bb
@@ -1,5 +1,9 @@
1require shared-mime-info.inc 1require shared-mime-info.inc
2 2
3PR = "r1"
4
3inherit native 5inherit native
4 6
7DEPENDS = "libxml2-native intltool-native glib-2.0-native"
8
5S = "${WORKDIR}/shared-mime-info-${PV}" 9S = "${WORKDIR}/shared-mime-info-${PV}"
diff --git a/meta/packages/tasks/task-poky-tools.bb b/meta/packages/tasks/task-poky-tools.bb
index f3f30c0b39..2fc922d179 100644
--- a/meta/packages/tasks/task-poky-tools.bb
+++ b/meta/packages/tasks/task-poky-tools.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Tools tasks for Poky" 5DESCRIPTION = "Tools tasks for Poky"
6PR = "r1" 6PR = "r2"
7 7
8PACKAGES = "\ 8PACKAGES = "\
9 task-poky-tools-debug \ 9 task-poky-tools-debug \
@@ -55,3 +55,5 @@ RDEPENDS_task-poky-tools-testapps = "\
55 xwininfo \ 55 xwininfo \
56 xprop \ 56 xprop \
57 xvideo-tests" 57 xvideo-tests"
58
59RDEPENDS_task-poky-tools-testapps_append_beagleboard = " omapfbplay ffmpeg"
diff --git a/meta/packages/tasks/task-poky.bb b/meta/packages/tasks/task-poky.bb
index 4e4204345c..1c1507bfe3 100644
--- a/meta/packages/tasks/task-poky.bb
+++ b/meta/packages/tasks/task-poky.bb
@@ -3,7 +3,7 @@
3# 3#
4 4
5DESCRIPTION = "Tasks for OpenedHand Poky" 5DESCRIPTION = "Tasks for OpenedHand Poky"
6PR = "r30" 6PR = "r31"
7 7
8PACKAGES = "\ 8PACKAGES = "\
9 task-poky-apps-console \ 9 task-poky-apps-console \
@@ -38,6 +38,9 @@ RDEPENDS_task-poky-apps-console = "\
38RDEPENDS_task-poky-x11-base = "\ 38RDEPENDS_task-poky-x11-base = "\
39 dbus \ 39 dbus \
40 pointercal \ 40 pointercal \
41 fontconfig \
42 freetype \
43 shared-mime-info \
41 matchbox-wm \ 44 matchbox-wm \
42 matchbox-keyboard \ 45 matchbox-keyboard \
43 matchbox-keyboard-applet \ 46 matchbox-keyboard-applet \