diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image.bbclass | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 27165a1f35..45cfe91f5b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -45,17 +45,17 @@ python () { | |||
45 | # is searched for in the BBPATH (same as the old version.) | 45 | # is searched for in the BBPATH (same as the old version.) |
46 | # | 46 | # |
47 | def get_devtable_list(d): | 47 | def get_devtable_list(d): |
48 | import bb | 48 | import bb |
49 | devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) | 49 | devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) |
50 | if devtable != None: | 50 | if devtable != None: |
51 | return devtable | 51 | return devtable |
52 | str = "" | 52 | str = "" |
53 | devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) | 53 | devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) |
54 | if devtables == None: | 54 | if devtables == None: |
55 | devtables = 'files/device_table-minimal.txt' | 55 | devtables = 'files/device_table-minimal.txt' |
56 | for devtable in devtables.split(): | 56 | for devtable in devtables.split(): |
57 | str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) | 57 | str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) |
58 | return str | 58 | return str |
59 | 59 | ||
60 | IMAGE_POSTPROCESS_COMMAND ?= "" | 60 | IMAGE_POSTPROCESS_COMMAND ?= "" |
61 | MACHINE_POSTPROCESS_COMMAND ?= "" | 61 | MACHINE_POSTPROCESS_COMMAND ?= "" |
@@ -86,7 +86,7 @@ fakeroot do_rootfs () { | |||
86 | 86 | ||
87 | rootfs_${IMAGE_PKGTYPE}_do_rootfs | 87 | rootfs_${IMAGE_PKGTYPE}_do_rootfs |
88 | 88 | ||
89 | insert_feed_uris | 89 | insert_feed_uris |
90 | 90 | ||
91 | ${IMAGE_PREPROCESS_COMMAND} | 91 | ${IMAGE_PREPROCESS_COMMAND} |
92 | 92 | ||
@@ -117,19 +117,19 @@ fakeroot do_rootfs () { | |||
117 | insert_feed_uris () { | 117 | insert_feed_uris () { |
118 | 118 | ||
119 | echo "Building feeds for [${DISTRO}].." | 119 | echo "Building feeds for [${DISTRO}].." |
120 | 120 | ||
121 | for line in ${FEED_URIS} | 121 | for line in ${FEED_URIS} |
122 | do | 122 | do |
123 | # strip leading and trailing spaces/tabs, then split into name and uri | 123 | # strip leading and trailing spaces/tabs, then split into name and uri |
124 | line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" | 124 | line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" |
125 | feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" | 125 | feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" |
126 | feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" | 126 | feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" |
127 | 127 | ||
128 | echo "Added $feed_name feed with URL $feed_uri" | 128 | echo "Added $feed_name feed with URL $feed_uri" |
129 | 129 | ||
130 | # insert new feed-sources | 130 | # insert new feed-sources |
131 | echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf | 131 | echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf |
132 | done | 132 | done |
133 | } | 133 | } |
134 | 134 | ||
135 | log_check() { | 135 | log_check() { |
@@ -146,7 +146,7 @@ log_check() { | |||
146 | else | 146 | else |
147 | echo "Cannot find logfile [$lf_path]" | 147 | echo "Cannot find logfile [$lf_path]" |
148 | fi | 148 | fi |
149 | echo "Logfile is clean" | 149 | echo "Logfile is clean" |
150 | done | 150 | done |
151 | 151 | ||
152 | set -x | 152 | set -x |
@@ -157,7 +157,7 @@ log_check() { | |||
157 | 157 | ||
158 | zap_root_password () { | 158 | zap_root_password () { |
159 | sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new | 159 | sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new |
160 | mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd | 160 | mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd |
161 | } | 161 | } |
162 | 162 | ||
163 | create_etc_timestamp() { | 163 | create_etc_timestamp() { |