Diff of /trunk/wharfie/lib/actions.py [r48] .. [r49] Maximize Restore
Switch to unified view
| a/trunk/wharfie/lib/actions.py | b/trunk/wharfie/lib/actions.py | ||
|---|---|---|---|
... |
... |
||
| 21 | # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE |
21 | # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE |
| 22 | # OR OTHER DEALINGS IN THE SOFTWARE. |
22 | # OR OTHER DEALINGS IN THE SOFTWARE. |
| 23 | # |
23 | # |
| 24 | ################################################################################ |
24 | ################################################################################ |
| 25 | 25 | ||
| 26 | import re |
||
| 26 | from lib import makefile as make |
27 | from lib import makefile as make |
| 27 | from lib import files |
28 | from lib import files |
| 28 | 29 | ||
| 29 | g_cmdUnitCount = 0 |
30 | g_cmdUnitCount = 0 |
| 30 | g_workingDir = "/" |
31 | g_workingDir = "/" |
... |
... |
||
| 193 | }; |
194 | }; |
| 194 | return makeTarget; |
195 | return makeTarget; |
| 195 | 196 | ||
| 196 | def toolchain(name, dep, cmd): |
197 | def toolchain(name, dep, cmd): |
| 197 | myTrgCmd = ''' |
198 | myTrgCmd = ''' |
| 198 | apt-get install -y libc6-dev; |
199 | (apt-get update; apt-get install -y libc6-dev; |
| 199 | [ -d ./usr/lib/arm-linux-gnueabi*/ ] && |
200 | [ -d ./usr/lib/arm-linux-gnueabi*/ ] && |
| 200 | (cd ./usr/lib/arm-linux-gnueabi*/; ln -s crt1.o crt0.o) || true''' |
201 | (cd ./usr/lib/arm-linux-gnueabi*/; ln -s crt1.o crt0.o) || true);''' |
| 201 | myHostCmd = 'files=$(ls -1); mkdir target; mv ${files} target; mkdir host; (cd host; tar -xf ../../debian_toolchain.tar); cp ../debian_toolchain_env.sh env.sh; tar -cf ../' + cmd[1].lstrip() + ' .;' |
202 | if " " in cmd[1].lstrip(): |
| 203 | params = re.findall('^([^ ]+)[ \t]([^\n]*)', cmd[1].lstrip(), flags=re.MULTILINE) |
||
| 204 | if len(params) > 0: |
||
| 205 | myTrgCmd += params[0][1] |
||
| 206 | |||
| 207 | myHostCmd = 'files=$(ls -1); mkdir target; mv ${files} target; mkdir host; (cd host; tar -xf ../../debian_toolchain.tar); cp ../debian_toolchain_env.sh env.sh; tar -cf ../' + params[0][0] + ' .;' |
||
| 208 | else: |
||
| 209 | myHostCmd = 'files=$(ls -1); mkdir target; mv ${files} target; mkdir host; (cd host; tar -xf ../../debian_toolchain.tar); cp ../debian_toolchain_env.sh env.sh; tar -cf ../' + cmd[1].lstrip() + ' .;' |
||
| 210 | |||
| 202 | dep.append('debian_toolchain.tar') |
211 | dep.append('debian_toolchain.tar') |
| 203 | dep.append('debian_toolchain_env.sh') |
212 | dep.append('debian_toolchain_env.sh') |
| 204 | makeTarget = { |
213 | makeTarget = { |
| 205 | 'comment' : "%s %s" % (cmd[0], cmd[1]), |
214 | 'comment' : "%s %s" % (cmd[0], cmd[1]), |
| 206 | 'name': name, |
215 | 'name': name, |