From: Thomas Pedersen <thomas@eero.com>
To: backports@vger.kernel.org
Cc: hauke@hauke-m.de, Thomas Pedersen <thomas@eero.com>
Subject: [PATCH 2/2] remove KMODPATH_ARG
Date: Tue, 22 Nov 2016 07:59:55 -0800 [thread overview]
Message-ID: <20161122155955.1038-2-thomas@eero.com> (raw)
In-Reply-To: <20161122155955.1038-1-thomas@eero.com>
This interferes with module install when specifying KLIB.
According to kernel docs, INSTALL_MOD_PATH is the module
install path prefix:
INSTALL_MOD_PATH
--------------------------------------------------
INSTALL_MOD_PATH specifies a prefix to MODLIB for
module directory relocations required by build
roots. This is not defined in the makefile but
the argument can be passed to make if needed.
Which causes modules to be installed in
/lib/modules/$KLIB_VERSION/lib/modules/$KLIB_VERSION.
Signed-off-by: Thomas Pedersen <thomas@eero.com>
---
backport/Makefile | 4 +---
backport/Makefile.real | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/backport/Makefile b/backport/Makefile
index edd36b7..8cf1096 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -10,11 +10,9 @@ BACKPORT_DIR := $(shell pwd)
KMODDIR ?= updates
ifneq ($(origin KLIB), undefined)
-KMODPATH_ARG := "INSTALL_MOD_PATH=$(KLIB)"
KLIB_VERSION := $(shell basename $(KLIB))
else
KLIB_VERSION := $(shell uname -r)
-KMODPATH_ARG :=
KLIB := /lib/modules/$(KLIB_VERSION)/
endif
KLIB_BUILD ?= $(KLIB)/build/
@@ -22,7 +20,7 @@ KERNEL_CONFIG := $(KLIB_BUILD)/.config
KERNEL_MAKEFILE := $(KLIB_BUILD)/Makefile
CONFIG_MD5 := $(shell md5sum $(KERNEL_CONFIG) 2>/dev/null | sed 's/\s.*//')
-export KLIB KLIB_VERSION KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG
+export KLIB KLIB_VERSION KLIB_BUILD BACKPORT_DIR KMODDIR
# disable built-in rules for this file
.SUFFIXES:
diff --git a/backport/Makefile.real b/backport/Makefile.real
index 5ec133e..b65474b 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -90,7 +90,7 @@ modules: backport-include/backport/autoconf.h
.PHONY: install
install: modules
@$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
- INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
+ INSTALL_MOD_DIR=$(KMODDIR) \
modules_install
@./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
@./scripts/compress_modules.sh $(KLIB)/$(KMODDIR)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe backports" in
prev parent reply other threads:[~2016-11-22 16:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 15:59 [PATCH 1/2] export KLIB_VERSION during make install Thomas Pedersen
2016-11-22 15:59 ` Thomas Pedersen [this message]
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=20161122155955.1038-2-thomas@eero.com \
--to=thomas@eero.com \
--cc=backports@vger.kernel.org \
--cc=hauke@hauke-m.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox