@@ -346,7 +346,7 @@ python base_eventhandler() {
#
# If we have multiple providers of virtual/X and a PREFERRED_PROVIDER_virtual/X is set
# skip parsing for all the other providers which will mean they get uninstalled from the
- # sysroot since they're now "unreachable". This makes switching virtual/kernel work in
+ # sysroot since they're now "unreachable". This makes switching virtual/kernel work in
# particular.
#
pn = d.getVar('PN')
@@ -24,11 +24,11 @@ def get_process_cputime(pid):
import resource
with open("/proc/%d/stat" % pid, "r") as f:
fields = f.readline().rstrip().split()
- stats = {
+ stats = {
'utime' : fields[13],
- 'stime' : fields[14],
- 'cutime' : fields[15],
- 'cstime' : fields[16],
+ 'stime' : fields[14],
+ 'cutime' : fields[15],
+ 'cstime' : fields[16],
}
iostats = {}
if os.path.isfile("/proc/%d/io" % pid):
@@ -161,7 +161,7 @@ def write_host_data(logfile, e, d, type):
bb.warn("buildstats: Collecting host data failed. BB_HEARTBEAT_EVENT interval not enough to run the specified commands. Increase value of BB_HEARTBEAT_EVENT in conf/local.conf.")
return
- # set the environment variables
+ # set the environment variables
path = d.getVar("PATH")
opath = d.getVar("BB_ORIGENV", False).getVar("PATH")
ospath = os.environ['PATH']
@@ -127,7 +127,7 @@ python debian_package_name_hook () {
add_rprovides(orig_pkg, d)
# reversed sort is needed when some package is substring of another
- # ie in ncurses we get without reverse sort:
+ # ie in ncurses we get without reverse sort:
# DEBUG: LIBNAMES: pkgname libtic5 devname libtic pkg ncurses-libtic orig_pkg ncurses-libtic debian_pn None newpkg libtic5
# and later
# DEBUG: LIBNAMES: pkgname libtic5 devname libtic pkg ncurses-libticw orig_pkg ncurses-libtic debian_pn None newpkg libticw
@@ -39,7 +39,7 @@ python () {
# can't manipulate the environment and variables here yet (see YOCTO #4795)
d.setVarFlag("do_devshell", "manualfakeroot", "1")
d.delVarFlag("do_devshell", "fakeroot")
-}
+}
def pydevshell(d):
@@ -22,7 +22,7 @@ bbplain() {
fi
}
-# Notify the user of a noteworthy condition.
+# Notify the user of a noteworthy condition.
# Output: logs
bbnote() {
if [ -p ${LOGFIFO} ] ; then
@@ -99,7 +99,7 @@ bbdebug() {
if [ $# -lt 2 ]; then
bbfatal "$USAGE"
fi
-
+
# Strip off the debug level and ensure it is an integer
DBGLVL=$1; shift
NONDIGITS=$(echo "$DBGLVL" | tr -d "[:digit:]")
@@ -8,8 +8,8 @@ python read_subpackage_metadata () {
import oe.packagedata
vars = {
- "PN" : d.getVar('PN'),
- "PE" : d.getVar('PE'),
+ "PN" : d.getVar('PN'),
+ "PE" : d.getVar('PE'),
"PV" : d.getVar('PV'),
"PR" : d.getVar('PR'),
}
@@ -11,7 +11,7 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat git bzip2 tar \
gzip gawk chrpath wget cpio perl file which"
-# Functions added to this variable MUST throw a NotImplementedError exception unless
+# Functions added to this variable MUST throw a NotImplementedError exception unless
# they successfully changed the config version in the config file. Exceptions
# are used since exec_func doesn't handle return values.
BBLAYERS_CONF_UPDATE_FUNCS += " \
@@ -28,13 +28,13 @@ python oecore_update_localconf() {
current_conf = d.getVar('CONF_VERSION')
conf_version = d.getVar('LOCALCONF_VERSION')
- failmsg = """Your version of local.conf was generated from an older/newer version of
-local.conf.sample and there have been updates made to this file. Please compare the two
+ failmsg = """Your version of local.conf was generated from an older/newer version of
+local.conf.sample and there have been updates made to this file. Please compare the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -48,13 +48,13 @@ python oecore_update_siteconf() {
current_sconf = d.getVar('SCONF_VERSION')
sconf_version = d.getVar('SITE_CONF_VERSION')
- failmsg = """Your version of site.conf was generated from an older version of
-site.conf.sample and there have been updates made to this file. Please compare the two
+ failmsg = """Your version of site.conf was generated from an older version of
+site.conf.sample and there have been updates made to this file. Please compare the two
files and merge any changes before continuing.
Matching the version numbers will remove this message.
-\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
+\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
@@ -71,7 +71,7 @@ python oecore_update_bblayers() {
failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION (has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
Please compare your file against bblayers.conf.sample and merge any changes before continuing.
-"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
+"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
is a good way to visualise the changes."""
failmsg = d.expand(failmsg)
Fix trailing whitespace in classes-global bbclass files to resolve bitbake parsing warnings. Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- meta/classes-global/base.bbclass | 2 +- meta/classes-global/buildstats.bbclass | 10 +++++----- meta/classes-global/debian.bbclass | 2 +- meta/classes-global/devshell.bbclass | 2 +- meta/classes-global/logging.bbclass | 4 ++-- meta/classes-global/packagedata.bbclass | 4 ++-- meta/classes-global/sanity.bbclass | 16 ++++++++-------- 7 files changed, 20 insertions(+), 20 deletions(-)