summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-07-08 12:45:02 +0100
committerJoshua Lock <josh@linux.intel.com>2010-07-08 12:45:02 +0100
commit4e3cb2adf518240d11d6c149dea075be086aeda1 (patch)
treee9a9138eab0701b06c6c728de1b0644e3a42e26e
parentda9f079481ed65d541cf5b95b47b3b1db6d79c5e (diff)
parente0a1238b227e3e846c220f218c614c52300b3f7a (diff)
downloadopenembedded-core-4e3cb2adf518240d11d6c149dea075be086aeda1.tar.gz
openembedded-core-4e3cb2adf518240d11d6c149dea075be086aeda1.tar.bz2
openembedded-core-4e3cb2adf518240d11d6c149dea075be086aeda1.tar.xz
openembedded-core-4e3cb2adf518240d11d6c149dea075be086aeda1.zip
Merge branch 'tk/master'
-rw-r--r--meta/classes/siteinfo.bbclass1
-rwxr-xr-xmeta/packages/initscripts/initscripts-1.0/populate-volatile.sh15
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
3 files changed, 15 insertions, 3 deletions
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 8b7d3dfcf..506a7aa1d 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -76,7 +76,6 @@ def siteinfo_get_files(d):
# Determine which site files to look for
sites = get_siteinfo_list(d)
- sites.append("common");
# Check along bbpath for site files and append in reverse order so
# the application specific sites files are last and system site
diff --git a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 8742dbfc6..1813fd124 100755
--- a/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -168,7 +168,20 @@ apply_cfgfile() {
}
-if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate"
+clearcache=0
+exec 9</proc/cmdline
+while read line <&9
+do
+ case "$line" in
+ *clearcache*) clearcache=1
+ ;;
+ *) continue
+ ;;
+ esac
+done
+exec 9>&-
+
+if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" -a "x$1" != "xupdate" -a "x$clearcache" = "x0"
then
sh /etc/volatile.cache
else
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 20503e1c6..0d79b53a8 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPLv2"
-PR = "r121"
+PR = "r122"
SRC_URI = "file://functions \
file://halt \