All of lore.kernel.org
 help / color / mirror / Atom feed
From: Benedikt Morbach <benedikt.morbach@googlemail.com>
To: wireguard@lists.zx2c4.com
Subject: [PATCH] contrib: fix out-of-tree build with jerry-rig.sh
Date: Wed, 10 May 2017 23:31:23 +0200	[thread overview]
Message-ID: <20170510213123.8147-1-benedikt.morbach@googlemail.com> (raw)

this makes the build system put the objects in ${O}/net/wireguard
instead of ${O}/../../../../../../../../../../../../../../../../../../../../../..${WG}/
(where ${WG} is the full path to wireguard/src), allowing out-of-tree
kernel builds to work with WireGuard jerry-rigged in.
---
 contrib/kernel-tree/jerry-rig.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/kernel-tree/jerry-rig.sh b/contrib/kernel-tree/jerry-rig.sh
index 3d4139a..afc1d9d 100755
--- a/contrib/kernel-tree/jerry-rig.sh
+++ b/contrib/kernel-tree/jerry-rig.sh
@@ -8,5 +8,6 @@ if [[ ! -e $K/net/Kconfig ]]; then
 	exit 1
 fi
 
-sed -i "/^if INET\$/a source \"$WG/Kconfig\"" "$K/net/Kconfig"
-echo "obj-y += ../../../../../../../../../../../../../../../../../../../../../..$WG/" >> "$K/net/Makefile"
+ln -sfT "../../../../../../../../../../../../../../../../../../../../../..$WG/" "$K/net/wireguard"
+sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$K/net/Kconfig"
+echo "obj-y += wireguard/" >> "$K/net/Makefile"
-- 
2.12.2

             reply	other threads:[~2017-05-10 21:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-10 21:31 Benedikt Morbach [this message]
2017-05-11 10:25 ` [PATCH] contrib: fix out-of-tree build with jerry-rig.sh Jason A. Donenfeld
2017-05-11 12:30   ` Benedikt Morbach
2017-05-11 19:54     ` Jason A. Donenfeld

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=20170510213123.8147-1-benedikt.morbach@googlemail.com \
    --to=benedikt.morbach@googlemail.com \
    --cc=wireguard@lists.zx2c4.com \
    /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.