From 80d843397ccde0754bd1c40c7a06fe4d853d0869 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 11 May 2017 18:35:10 +0200 Subject: jerry-rig: symlinks are better for tree patching Use a symlink instead of lots of ../../.. Suggested-by: Benedikt Morbach --- contrib/kernel-tree/create-patch.sh | 2 +- contrib/kernel-tree/jerry-rig.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'contrib/kernel-tree') diff --git a/contrib/kernel-tree/create-patch.sh b/contrib/kernel-tree/create-patch.sh index 3f913ae..de3d888 100755 --- a/contrib/kernel-tree/create-patch.sh +++ b/contrib/kernel-tree/create-patch.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")" diff --git a/contrib/kernel-tree/jerry-rig.sh b/contrib/kernel-tree/jerry-rig.sh index 3d4139a..fe309a5 100755 --- a/contrib/kernel-tree/jerry-rig.sh +++ b/contrib/kernel-tree/jerry-rig.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash K="$1" WG="$(readlink -f "$(dirname "$(readlink -f "$0")")/../../src/")" @@ -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 "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" "$K/net/Makefile" +sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$K/net/Kconfig" -- cgit v1.2.3-59-g8ed1b