image.bbclass: Fix whitespace
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4525 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
240f40317f
commit
f7dd25d3f3
|
@ -45,17 +45,17 @@ python () {
|
||||||
# is searched for in the BBPATH (same as the old version.)
|
# is searched for in the BBPATH (same as the old version.)
|
||||||
#
|
#
|
||||||
def get_devtable_list(d):
|
def get_devtable_list(d):
|
||||||
import bb
|
import bb
|
||||||
devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
|
devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
|
||||||
if devtable != None:
|
if devtable != None:
|
||||||
return devtable
|
return devtable
|
||||||
str = ""
|
str = ""
|
||||||
devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
|
devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
|
||||||
if devtables == None:
|
if devtables == None:
|
||||||
devtables = 'files/device_table-minimal.txt'
|
devtables = 'files/device_table-minimal.txt'
|
||||||
for devtable in devtables.split():
|
for devtable in devtables.split():
|
||||||
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
|
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
|
||||||
return str
|
return str
|
||||||
|
|
||||||
IMAGE_POSTPROCESS_COMMAND ?= ""
|
IMAGE_POSTPROCESS_COMMAND ?= ""
|
||||||
MACHINE_POSTPROCESS_COMMAND ?= ""
|
MACHINE_POSTPROCESS_COMMAND ?= ""
|
||||||
|
@ -86,7 +86,7 @@ fakeroot do_rootfs () {
|
||||||
|
|
||||||
rootfs_${IMAGE_PKGTYPE}_do_rootfs
|
rootfs_${IMAGE_PKGTYPE}_do_rootfs
|
||||||
|
|
||||||
insert_feed_uris
|
insert_feed_uris
|
||||||
|
|
||||||
${IMAGE_PREPROCESS_COMMAND}
|
${IMAGE_PREPROCESS_COMMAND}
|
||||||
|
|
||||||
|
@ -117,19 +117,19 @@ fakeroot do_rootfs () {
|
||||||
insert_feed_uris () {
|
insert_feed_uris () {
|
||||||
|
|
||||||
echo "Building feeds for [${DISTRO}].."
|
echo "Building feeds for [${DISTRO}].."
|
||||||
|
|
||||||
for line in ${FEED_URIS}
|
for line in ${FEED_URIS}
|
||||||
do
|
do
|
||||||
# strip leading and trailing spaces/tabs, then split into name and uri
|
# strip leading and trailing spaces/tabs, then split into name and uri
|
||||||
line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
|
line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
|
||||||
feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
|
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"
|
echo "Added $feed_name feed with URL $feed_uri"
|
||||||
|
|
||||||
# insert new feed-sources
|
# insert new feed-sources
|
||||||
echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf
|
echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
log_check() {
|
log_check() {
|
||||||
|
@ -146,7 +146,7 @@ log_check() {
|
||||||
else
|
else
|
||||||
echo "Cannot find logfile [$lf_path]"
|
echo "Cannot find logfile [$lf_path]"
|
||||||
fi
|
fi
|
||||||
echo "Logfile is clean"
|
echo "Logfile is clean"
|
||||||
done
|
done
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
@ -157,7 +157,7 @@ log_check() {
|
||||||
|
|
||||||
zap_root_password () {
|
zap_root_password () {
|
||||||
sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
|
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() {
|
create_etc_timestamp() {
|
||||||
|
|
Loading…
Reference in New Issue