mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 18:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tk/master'

Browse Source
This commit is contained in:
Joshua Lock
2010-07-08 12:45:02 +01:00
parent da9f079481 e0a1238b22
commit 4e3cb2adf5
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/siteinfo.bbclass
View File

@@ -76,7 +76,6 @@ def siteinfo_get_files(d):
# Determine which site files to look for # Determine which site files to look for
sites = get_siteinfo_list(d) sites = get_siteinfo_list(d)
sites.append("common");
# Check along bbpath for site files and append in reverse order so # Check along bbpath for site files and append in reverse order so
# the application specific sites files are last and system site # the application specific sites files are last and system site

15
meta/packages/initscripts/initscripts-1.0/populate-volatile.sh vendored
View File

@@ -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 then
sh /etc/volatile.cache sh /etc/volatile.cache
else else

2
meta/packages/initscripts/initscripts_1.0.bb
View File

@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs" DEPENDS = "makedevs"
RDEPENDS = "makedevs" RDEPENDS = "makedevs"
LICENSE = "GPLv2" LICENSE = "GPLv2"
PR = "r121" PR = "r122"
SRC_URI = "file://functions \ SRC_URI = "file://functions \
file://halt \ file://halt \