From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: backports@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, yann.morin.1998@free.fr,
mmarek@suse.cz, sassmann@kpanic.de,
"Luis R. Rodriguez" <mcgrof@suse.com>
Subject: [PATCH v1 04/11] backports: replace BACKPORT_PWD with BACKPORT_DIR
Date: Tue, 4 Nov 2014 00:42:55 -0800 [thread overview]
Message-ID: <1415090582-14129-5-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1415090582-14129-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This will also be used for built-in kernel integration, by
using this we can share more code with the built-in kernel
approach.
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
backport/Makefile | 6 +++---
backport/Makefile.build | 4 ++--
backport/Makefile.real | 2 +-
backport/scripts/uninstall.sh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/backport/Makefile b/backport/Makefile
index ea3982b..fcf2f01 100644
--- a/backport/Makefile
+++ b/backport/Makefile
@@ -6,7 +6,7 @@ ifeq ($(KERNELRELEASE),)
MAKEFLAGS += --no-print-directory
SHELL := /bin/bash
-BACKPORT_PWD := $(shell pwd)
+BACKPORT_DIR := $(shell pwd)
KMODDIR ?= updates
ifneq ($(origin KLIB), undefined)
@@ -20,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_BUILD BACKPORT_PWD KMODDIR KMODPATH_ARG
+export KLIB KLIB_BUILD BACKPORT_DIR KMODDIR KMODPATH_ARG
# disable built-in rules for this file
.SUFFIXES:
@@ -159,5 +159,5 @@ help: defconfig-help
@echo ""
@echo "Execute "make" or "make all" to build all targets marked with [*]"
else
-include $(BACKPORT_PWD)/Makefile.kernel
+include $(BACKPORT_DIR)/Makefile.kernel
endif
diff --git a/backport/Makefile.build b/backport/Makefile.build
index d209041..a848b37 100644
--- a/backport/Makefile.build
+++ b/backport/Makefile.build
@@ -3,8 +3,8 @@ export
.PHONY: modules
modules:
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) modules
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) modules
.PHONY: clean
clean:
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) clean
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) clean
diff --git a/backport/Makefile.real b/backport/Makefile.real
index f60d5ca..a0f4916 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -89,7 +89,7 @@ modules: backport-include/backport/autoconf.h
.PHONY: install
install: modules
- @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \
INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
modules_install
@./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
diff --git a/backport/scripts/uninstall.sh b/backport/scripts/uninstall.sh
index 1eb42b0..b46d3fe 100755
--- a/backport/scripts/uninstall.sh
+++ b/backport/scripts/uninstall.sh
@@ -10,8 +10,8 @@ else
compr=""
fi
-for driver in $(find ${BACKPORT_PWD} -type f -name *.ko); do
- mod_name=${driver/${BACKPORT_PWD}/${KLIB}${KMODDIR}}${compr}
+for driver in $(find ${BACKPORT_DIR} -type f -name *.ko); do
+ mod_name=${driver/${BACKPORT_DIR}/${KLIB}${KMODDIR}}${compr}
echo " uninstall" $mod_name
rm -f $mod_name
done
--
2.1.1
next prev parent reply other threads:[~2014-11-04 8:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-04 8:42 [PATCH v1 00/11] backports: add kernel integration support Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 01/11] backports: move legacy and SmPL patch application into helper Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 02/11] backports: extend module_init() module_exit() for built-in Luis R. Rodriguez
2014-11-04 10:02 ` Johannes Berg
2014-11-04 8:42 ` [PATCH v1 03/11] backports: allow for different backport prefix Luis R. Rodriguez
2014-11-04 10:05 ` Johannes Berg
2014-11-04 21:45 ` Luis R. Rodriguez
2014-11-04 8:42 ` Luis R. Rodriguez [this message]
2014-11-04 8:42 ` [PATCH v1 05/11] backports: use BACKPORT_DIR prefix on kconfig sources Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 06/11] backports: update dependencies map file Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 07/11] backports: split Kconfig into Kconfig.package and Kconfig.sources Luis R. Rodriguez
2014-11-04 8:42 ` [PATCH v1 08/11] backports: move version file generation to run earlier Luis R. Rodriguez
2014-11-04 8:43 ` [PATCH v1 09/11] backports: use Kconfig for backport version information Luis R. Rodriguez
2014-11-04 10:13 ` Johannes Berg
2014-11-04 21:51 ` Luis R. Rodriguez
2014-11-04 23:33 ` Luis R. Rodriguez
2014-11-04 8:43 ` [PATCH v1 10/11] backports: prefix c-file / h-file auto backport with BPAUTO Luis R. Rodriguez
2014-11-04 10:14 ` Johannes Berg
2014-11-04 21:50 ` Luis R. Rodriguez
2014-11-04 21:50 ` Johannes Berg
2014-11-05 0:21 ` Luis R. Rodriguez
2014-11-05 7:29 ` Johannes Berg
2014-11-05 8:02 ` Luis R. Rodriguez
2014-11-05 8:12 ` Johannes Berg
2014-11-05 8:20 ` Luis R. Rodriguez
2014-11-04 8:43 ` [PATCH v1 11/11] backports: add full kernel integration support Luis R. Rodriguez
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=1415090582-14129-5-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=backports@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=mmarek@suse.cz \
--cc=sassmann@kpanic.de \
--cc=yann.morin.1998@free.fr \
/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