[oe-commits] org.oe.dev image.bbclass: Cleanup whitespace (from poky)
rpurdie commit
oe at amethyst.openembedded.net
Wed May 21 21:04:15 UTC 2008
image.bbclass: Cleanup whitespace (from poky)
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: cf7676f19d6ce927ad0dbd34d8cc7bbd2431dd2e
ViewMTN: http://monotone.openembedded.org/revision/info/cf7676f19d6ce927ad0dbd34d8cc7bbd2431dd2e
Files:
1
classes/image.bbclass
Diffs:
#
# mt diff -rc7529018d7ed8b65b1eb33c0ab14cddc48a7d87a -rcf7676f19d6ce927ad0dbd34d8cc7bbd2431dd2e
#
#
#
# patch "classes/image.bbclass"
# from [4ce2b3c777b457b63352a87b70b325fc84e10644]
# to [be54499da0718fd360b7af35804066fef7280f59]
#
============================================================
--- classes/image.bbclass 4ce2b3c777b457b63352a87b70b325fc84e10644
+++ classes/image.bbclass be54499da0718fd360b7af35804066fef7280f59
@@ -45,17 +45,17 @@ def get_devtable_list(d):
# is searched for in the BBPATH (same as the old version.)
#
def get_devtable_list(d):
- import bb
- devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
- if devtable != None:
- return devtable
- str = ""
- devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
- if devtables == None:
- devtables = 'files/device_table-minimal.txt'
- for devtable in devtables.split():
- str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
- return str
+ import bb
+ devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
+ if devtable != None:
+ return devtable
+ str = ""
+ devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
+ if devtables == None:
+ devtables = 'files/device_table-minimal.txt'
+ for devtable in devtables.split():
+ str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
+ return str
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""
@@ -86,10 +86,10 @@ fakeroot do_rootfs () {
rootfs_${IMAGE_PKGTYPE}_do_rootfs
- insert_feed_uris
+ insert_feed_uris
${IMAGE_PREPROCESS_COMMAND}
-
+
export TOPDIR=${TOPDIR}
export DISTRO=${USERDISTRO}
export MACHINE=${MACHINE}
@@ -122,19 +122,19 @@ insert_feed_uris () {
insert_feed_uris () {
echo "Building feeds for [${DISTRO}].."
-
+
for line in ${FEED_URIS}
do
# strip leading and trailing spaces/tabs, then split into name and uri
line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
- feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
+ feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
echo "Added $feed_name feed with URL $feed_uri"
# insert new feed-sources
echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf
- done
+ done
# Allow to use package deploy directory contents as quick devel-testing
# feed. This creates individual feed configs for each arch subdir of those
@@ -162,7 +162,7 @@ log_check() {
else
echo "Cannot find logfile [$lf_path]"
fi
- echo "Logfile is clean"
+ echo "Logfile is clean"
done
set -x
@@ -173,7 +173,7 @@ zap_root_password () {
zap_root_password () {
sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
- mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
+ mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
}
create_etc_timestamp() {
More information about the Openembedded-commits
mailing list