From: | armin76@g.o |
---|---|
To: | releng@g.o, gentoo-releng-autobuilds@l.g.o |
Subject: | [gentoo-releng-autobuilds] [alpha-auto] Catalyst build error - pre_build |
Date: | Sat, 12 Jan 2013 02:15:07 |
Message-Id: | E1Ttqcg-00082m-UF@monolith.freenet-rz.de |
1 | Your pre_build function sucks |
2 | |
3 | |
4 | M ChangeLog |
5 | M releases/weekly/specs/x86/hardened/admincd-stage1.spec |
6 | M tools-uclibc/run-armv7a.sh |
7 | M tools-uclibc/run-mips32r2.sh |
8 | U tools-uclibc/run.sh |
9 | M tools/catalyst-auto |
10 | Pull is not possible because you have unmerged files. |
11 | Please, fix them up in the work tree, and then use 'git add/rm <file>' |
12 | as appropriate to mark resolution, or use 'git commit -a'. |
13 | |
14 | |
15 | |
16 | Full build log at /tmp/catalyst-auto.30807/log/pre_build.log |