From a6694ffffff879b1255332e3b03e00b61630fa52 Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Tue, 13 May 2014 14:47:38 -0500
Subject: [PATCH] kmod: install core module to "extra" subdir

To be more consistent with other out-of-tree modules, install the core
module to /usr[/local]/lib/modules/`uname -r`/extra/kpatch/kpatch.ko.
---
 kmod/Makefile             | 6 +++---
 kpatch-build/kpatch-build | 2 +-
 kpatch/kpatch             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kmod/Makefile b/kmod/Makefile
index 7cb34e0..47c9941 100644
--- a/kmod/Makefile
+++ b/kmod/Makefile
@@ -4,9 +4,9 @@ all: clean
 	$(MAKE) -C core
 
 install:
-	$(INSTALL) -d $(MODULESDIR)/$(shell uname -r)/kpatch
-	$(INSTALL) -m 644 core/kpatch.ko $(MODULESDIR)/$(shell uname -r)/kpatch
-	$(INSTALL) -m 644 core/Module.symvers $(MODULESDIR)/$(shell uname -r)/kpatch
+	$(INSTALL) -d $(MODULESDIR)/$(shell uname -r)/extra/kpatch
+	$(INSTALL) -m 644 core/kpatch.ko $(MODULESDIR)/$(shell uname -r)/extra/kpatch
+	$(INSTALL) -m 644 core/Module.symvers $(MODULESDIR)/$(shell uname -r)/extra/kpatch
 	$(INSTALL) -d $(DATADIR)/patch
 	$(INSTALL) -m 644 patch/* $(DATADIR)/patch
 
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index 30890cb..df3ded8 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -75,7 +75,7 @@ find_dirs() {
 		# installation path
 		TOOLSDIR="$(readlink -f $SCRIPTDIR/../libexec/kpatch)"
 		DATADIR="$(readlink -f $SCRIPTDIR/../share/kpatch)"
-		SYMVERSFILE="$(readlink -f $SCRIPTDIR/../lib/modules/$(uname -r)/kpatch/Module.symvers)"
+		SYMVERSFILE="$(readlink -f $SCRIPTDIR/../lib/modules/$(uname -r)/extra/kpatch/Module.symvers)"
 		return
 	fi
 
diff --git a/kpatch/kpatch b/kpatch/kpatch
index 86a91af..5fcbf8e 100755
--- a/kpatch/kpatch
+++ b/kpatch/kpatch
@@ -83,10 +83,10 @@ find_core_module() {
 	COREMOD="$SCRIPTDIR"/../kmod/core/kpatch.ko
 	[[ -f "$COREMOD" ]] && return
 
-	COREMOD="/usr/local/lib/modules/$(uname -r)/kpatch/kpatch.ko"
+	COREMOD="/usr/local/lib/modules/$(uname -r)/extra/kpatch/kpatch.ko"
 	[[ -f "$COREMOD" ]] && return
 
-	COREMOD="/usr/lib/modules/$(uname -r)/kpatch/kpatch.ko"
+	COREMOD="/usr/lib/modules/$(uname -r)/extra/kpatch/kpatch.ko"
 	[[ -f "$COREMOD" ]] && return
 
 	return 1