| 1 |
Your pre_build function sucks |
| 2 |
|
| 3 |
|
| 4 |
M ChangeLog |
| 5 |
M releases/weekly/ChangeLog |
| 6 |
M releases/weekly/specs/arm/armv4tl/stage1.spec |
| 7 |
M releases/weekly/specs/arm/armv4tl/stage2.spec |
| 8 |
M releases/weekly/specs/arm/armv4tl/stage3.spec |
| 9 |
M releases/weekly/specs/arm/armv5tel/stage1.spec |
| 10 |
M releases/weekly/specs/arm/armv5tel/stage2.spec |
| 11 |
M releases/weekly/specs/arm/armv5tel/stage3.spec |
| 12 |
M releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec |
| 13 |
M releases/weekly/specs/arm/armv6j/hardfloat/stage2.spec |
| 14 |
M releases/weekly/specs/arm/armv6j/hardfloat/stage3.spec |
| 15 |
M releases/weekly/specs/arm/armv6j/stage1.spec |
| 16 |
M releases/weekly/specs/arm/armv6j/stage2.spec |
| 17 |
M releases/weekly/specs/arm/armv6j/stage3.spec |
| 18 |
M releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec |
| 19 |
M releases/weekly/specs/arm/armv7a/hardfloat/stage2.spec |
| 20 |
M releases/weekly/specs/arm/armv7a/hardfloat/stage3.spec |
| 21 |
M releases/weekly/specs/arm/armv7a/stage1.spec |
| 22 |
M releases/weekly/specs/arm/armv7a/stage2.spec |
| 23 |
M releases/weekly/specs/arm/armv7a/stage3.spec |
| 24 |
M releases/weekly/specs/x86/hardened/admincd-stage1.spec |
| 25 |
A tools-hardened/clean.sh |
| 26 |
A tools-hardened/run-armv7a.sh |
| 27 |
A tools-hardened/stage1-armv7a_hardfp-hardened.conf.template |
| 28 |
A tools-hardened/stage2-armv7a_hardfp-hardened.conf.template |
| 29 |
A tools-hardened/stage3-armv7a_hardfp-hardened.conf.template |
| 30 |
M tools-uclibc/run-armv7a.sh |
| 31 |
M tools-uclibc/run-mips32r2.sh |
| 32 |
U tools-uclibc/run.sh |
| 33 |
M tools/catalyst-auto |
| 34 |
Pull is not possible because you have unmerged files. |
| 35 |
Please, fix them up in the work tree, and then use 'git add/rm <file>' |
| 36 |
as appropriate to mark resolution, or use 'git commit -a'. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
Full build log at /tmp/catalyst-auto.535/log/pre_build.log |
Archives