From: bugzilla-daemon@bugzilla.kernel.org
To: backports@vger.kernel.org
Subject: [Bug 94811] Backport kernel integration fails
Date: Thu, 12 Mar 2015 20:06:41 +0000 [thread overview]
Message-ID: <bug-94811-58281-e1c6R8K4rU@https.bugzilla.kernel.org/> (raw)
In-Reply-To: <bug-94811-58281@https.bugzilla.kernel.org/>
https://bugzilla.kernel.org/show_bug.cgi?id=94811
--- Comment #1 from Mike McElroy <mikem388@gmail.com> ---
My mistake. I didn't have the backports tree set to the right tag. Now I have
the backports tree and the linux-next tree set to the same tag. All the patches
get applied but it still fails on the main Makefile.
ike@mikes-laptop:~/backports$ ./gentree.py --integrate --clean --gitdebug
~/devel/integrate/linux-next/ ~/devel/integrate/linux-stable/
Copy original source files ...
Applying patches from patches to
/home/mike/devel/integrate/linux-stable/backports/ ...
Modify Kconfig tree ...
Rewrite Makefiles and Kconfig files ...
Applying patches from integration-patches/ to
/home/mike/devel/integrate/linux-stable/ ...
Failed to apply changes from
001-enable-backports/0001-enable-backports-built-in.patch
> patching file Makefile
> Hunk #1 succeeded at 506 (offset -36 lines).
> Hunk #2 succeeded at 715 (offset -106 lines).
> Hunk #3 FAILED at 841.
> 1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
Traceback (most recent call last):
File "./gentree.py", line 1091, in <module>
ret = _main()
File "./gentree.py", line 724, in _main
logwrite=logwrite)
File "./gentree.py", line 1078, in process
bpid.project_dir, logwrite)
File "./gentree.py", line 552, in apply_patches
raise Exception('Patch failed')
Exception: Patch failed
On the backports tree:
detached from backports-20150129
integration-patches/0001-enable-backports
0001-enable-backports-built-in.patch
@@ -837,7 +841,7 @@ libs-y := $(libs-y1) $(libs-y2)
# Externally visible symbols (used by link-vmlinux.sh)
export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
-export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
+export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
$(backports-y)
export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
export LDFLAGS_vmlinux
# used by scripts/pacmage/Makefile
This doesn't exist in the linux-3.4.t Makefile.
--
You are receiving this mail because:
You are the assignee for the bug.
next prev parent reply other threads:[~2015-03-12 20:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-12 17:42 [Bug 94811] New: Backport kernel integration fails bugzilla-daemon
2015-03-12 20:06 ` bugzilla-daemon [this message]
2015-03-12 20:07 ` [Bug 94811] " bugzilla-daemon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bug-94811-58281-e1c6R8K4rU@https.bugzilla.kernel.org/ \
--to=bugzilla-daemon@bugzilla.kernel.org \
--cc=backports@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.