On Thu, Aug 18, 2011 at 8:00 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi all, > > The powerpc allyesconfig build still fails today. > > Changes since 20110817: > > The sound-asoc tree lost its build failure. > > The tip tree gained a conflict against Linus' tree. > > The moduleh tree lost 2 of its merge fixups, but I added another. > > ---------------------------------------------------------------------------- > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you > are tracking the linux-next tree using git, you should not use "git pull" > to do so as that will try to merge the new linux-next release with the > old one. You should use "git fetch" as mentioned in the FAQ on the wiki > (see below). > Just FYI: Yesterday and today, I had the same problem when applying the linux-next single patch (see attached ErrMsg text file). I am using a slightly modified kernel-buildsystem from Debian Kernel Team (so not building out of a GIT repository). The GNU/patch I have installed from Debian/sid does not include symlink-support for git-diff [1]. Jonathan gave me the pointer to install patch package from Debian/experimental. After reading its Changelog [2] and Debian-bug #243309 [3] I installed the recommended version. Indeed, it fixes the issue. Cristoph, can we have a backport of [1] to patch/sid? Thanks Jonathan! - Sedat - [1] http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f9db7450fa2788377c4567b5d0565b0ddfc1015c [2] http://packages.debian.org/changelogs/pool/main/p/patch/patch_2.6.1.85-423d-3/changelog [3] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=243309
[ patch-v3.1-rc2-next-20110818 ] ... diff --git a/tools/power/cpupower/debug/x86_64/Makefile b/tools/power/cpupower/debug/x86_64/Makefile index dbf1399..3326217 100644 --- a/tools/power/cpupower/debug/x86_64/Makefile +++ b/tools/power/cpupower/debug/x86_64/Makefile @@ -1,10 +1,10 @@ default: all -centrino-decode: centrino-decode.c - $(CC) $(CFLAGS) -o centrino-decode centrino-decode.c +centrino-decode: ../i386/centrino-decode.c + $(CC) $(CFLAGS) -o $@ $< -powernow-k8-decode: powernow-k8-decode.c - $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c +powernow-k8-decode: ../i386/powernow-k8-decode.c + $(CC) $(CFLAGS) -o $@ $< all: centrino-decode powernow-k8-decode diff --git a/tools/power/cpupower/debug/x86_64/centrino-decode.c b/tools/power/cpupower/debug/x86_64/centrino-decode.c deleted file mode 120000 index 26fb3f1..0000000 --- a/tools/power/cpupower/debug/x86_64/centrino-decode.c +++ /dev/null @@ -1 +0,0 @@ -../i386/centrino-decode.c \ No newline at end of file diff --git a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c b/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c deleted file mode 120000 index eb30c79..0000000 --- a/tools/power/cpupower/debug/x86_64/powernow-k8-decode.c +++ /dev/null @@ -1 +0,0 @@ -../i386/powernow-k8-decode.c \ No newline at end of file ... $ LC_ALL=C fakeroot make -f debian/rules.gen setup_i386_none_686-small 2>&1 | tee ../setup.log make -f debian/rules.real setup-flavour ABINAME='-next20110818.3' ARCH='i386' COMPILER='gcc-4.6' FEATURESET='none' FLAVOUR='686-small' KCONFIG='debian/config/config debian/config/kernelarch-x86/config debian/config/kernelarch-x86/config-arch-32 debian/config/i386/none/config.686-iniza debian/config/custom-x86/config-debug debian/config/custom-x86/config-fs debian/config/custom-x86/config-infiniband debian/config/custom-x86/config-isa debian/config/custom-x86/config-isdn debian/config/custom-x86/config-multimedia debian/config/custom-x86/config-pseudofs debian/config/custom-x86/config-staging debian/config/i386/none/config.686-small' KERNEL_ARCH='x86' LOCALVERSION='-686-small' LOCALVERSION_HEADERS='' LOCALVERSION_IMAGE='-686-small' MODULES='True' SOURCEVERSION='3.1.0~rc2-1~next20110818.dileks3' TYPE='plain' UPSTREAMVERSION='3.1.0-rc2' VERSION='3.1.0' make[1]: Entering directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2' rm -rf 'debian/build/source' mkdir -p 'debian/build/source' cp -al COPYING CREDITS Documentation Kbuild Kconfig MAINTAINERS Makefile README REPORTING-BUGS arch block crypto drivers firmware fs include init ipc kernel lib mm net samples scripts security sound tools usr virt .gitignore .mailmap 'debian/build/source' cd 'debian/build/source'; python '/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/bin/patch.apply' --overwrite-home='/mnt/sdb3/linux-kernel/linux-3.1-rc2/debian/patches' Warning: No version.Debian file, assuming Debian Linux 3.1.0~rc2 1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/centrino-decode.c.rej 1 out of 1 hunk FAILED -- saving rejects to file tools/power/cpupower/debug/x86_64/powernow-k8-decode.c.rej Error: Patch failed --> Try to apply base. (+) FAIL linux-next/patch-v3.1-rc2-next-20110818 make[1]: *** [debian/stamps/source] Error 1 make[1]: Leaving directory `/mnt/sdb3/linux-kernel/linux-3.1-rc2' make: *** [setup_i386_none_686-small_real] Error 2 -dileks // 18-Aug-2011
