From: Luis Chamberlain <mcgrof@kernel.org>
To: hauke@hauke-m.de, backports@vger.kernel.org, mcgrof@kernel.org
Cc: thomas@adapt-ip.com, johannes@sipsolutions.net
Subject: [PATCH 3/4] kconfig: fix backport syntax to work with linux-next next-20220204
Date: Fri, 4 Feb 2022 13:41:30 -0800 [thread overview]
Message-ID: <20220204214131.1306843-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20220204214131.1306843-1-mcgrof@kernel.org>
kconfig on next-20220204 has a few changes. First the options
stuff has been deprecated leaving only the modules option. For
variables though we can just use shell. And if we use variables
on source we just need to use parens like $(FOO).
Fix all this.
This was tested with a backport generated for v5.15.8.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
backport/Kconfig.integrate | 6 +++---
backport/Kconfig.package | 18 +++++++++---------
backport/Kconfig.sources | 18 +++++++++---------
backport/compat/Kconfig | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/backport/Kconfig.integrate b/backport/Kconfig.integrate
index 45ab3ecd..d98c371c 100644
--- a/backport/Kconfig.integrate
+++ b/backport/Kconfig.integrate
@@ -30,8 +30,8 @@ menuconfig BACKPORT_LINUX
if BACKPORT_LINUX
-source "$BACKPORT_DIR/Kconfig.versions"
-source "$BACKPORT_DIR/Kconfig.sources"
-source "$BACKPORT_DIR/Kconfig.local"
+source "$(BACKPORT_DIR)/Kconfig.versions"
+source "$(BACKPORT_DIR)/Kconfig.sources"
+source "$(BACKPORT_DIR)/Kconfig.local"
endif # BACKPORT_LINUX
diff --git a/backport/Kconfig.package b/backport/Kconfig.package
index 250cdf3e..a933ead4 100644
--- a/backport/Kconfig.package
+++ b/backport/Kconfig.package
@@ -2,24 +2,24 @@ mainmenu "Backports from $BACKPORTED_KERNEL_NAME $BACKPORTED_KERNEL_VERSION (bac
config BACKPORT_DIR
string
- option env="BACKPORT_DIR"
+ default $(shell, echo $BACKPORT_DIR)
config BACKPORTS_VERSION
string
- option env="BACKPORTS_VERSION"
+ default $(shell, echo $BACKPORTS_VERSION)
config BACKPORTED_KERNEL_VERSION
string
- option env="BACKPORTED_KERNEL_VERSION"
+ default $(shell, echo $BACKPORTED_KERNEL_VERSION)
config BACKPORTED_KERNEL_NAME
string
- option env="BACKPORTED_KERNEL_NAME"
+ default $(shell, echo $BACKPORTED_KERNEL_NAME)
# Packaging hacks
-source "$BACKPORT_DIR/Kconfig.package.hacks"
+source "$(BACKPORT_DIR)/Kconfig.package.hacks"
# Code we backport
-source "$BACKPORT_DIR/Kconfig.sources"
+source "$(BACKPORT_DIR)/Kconfig.sources"
# these will be generated
-source "$BACKPORT_DIR/Kconfig.kernel"
-source "$BACKPORT_DIR/Kconfig.versions"
-source "$BACKPORT_DIR/Kconfig.local"
+source "$(BACKPORT_DIR)/Kconfig.kernel"
+source "$(BACKPORT_DIR)/Kconfig.versions"
+source "$(BACKPORT_DIR)/Kconfig.local"
diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources
index 5fb44780..8344a9aa 100644
--- a/backport/Kconfig.sources
+++ b/backport/Kconfig.sources
@@ -1,15 +1,15 @@
# this has the configuration for the backport code
-source "$BACKPORT_DIR/compat/Kconfig"
+source "$(BACKPORT_DIR)/compat/Kconfig"
# these are copied from the kernel
-source "$BACKPORT_DIR/net/wireless/Kconfig"
-source "$BACKPORT_DIR/net/mac80211/Kconfig"
-source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
-source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
+source "$(BACKPORT_DIR)/net/wireless/Kconfig"
+source "$(BACKPORT_DIR)/net/mac80211/Kconfig"
+source "$(BACKPORT_DIR)/drivers/net/wireless/Kconfig"
+source "$(BACKPORT_DIR)/drivers/net/usb/Kconfig"
-source "$BACKPORT_DIR/drivers/ssb/Kconfig"
-source "$BACKPORT_DIR/drivers/bcma/Kconfig"
+source "$(BACKPORT_DIR)/drivers/ssb/Kconfig"
+source "$(BACKPORT_DIR)/drivers/bcma/Kconfig"
-source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
+source "$(BACKPORT_DIR)/drivers/usb/class/Kconfig"
-source "$BACKPORT_DIR/drivers/staging/Kconfig"
+source "$(BACKPORT_DIR)/drivers/staging/Kconfig"
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index 174322d8..1f690e00 100644
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -54,7 +54,7 @@
#
config BP_MODULES
- option modules
+ modules
bool
default MODULES
--
2.34.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2022-02-04 21:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 21:41 [PATCH 0/4] backports: use kconfig from git subtree Luis Chamberlain
2022-02-04 21:41 ` [PATCH 1/4] backport/kconf: remove our version of kconfig Luis Chamberlain
2022-02-04 21:41 ` [PATCH 2/4] Squashed 'backport/kconf/' content from commit 98bda615 Luis Chamberlain
2022-02-04 21:41 ` Luis Chamberlain [this message]
2022-02-04 21:41 ` [PATCH 4/4] Makefile.subtrees: document how to update kconfig Luis Chamberlain
2022-02-04 21:43 ` Johannes Berg
2022-02-04 21:44 ` Luis Chamberlain
2022-02-04 21:56 ` Luis Chamberlain
2022-02-04 21:59 ` Johannes Berg
2022-02-04 22:17 ` Luis Chamberlain
2022-02-04 21:43 ` Luis Chamberlain
2022-05-12 22:25 ` [PATCH 0/4] backports: use kconfig from git subtree Thomas Pedersen
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=20220204214131.1306843-4-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=backports@vger.kernel.org \
--cc=hauke@hauke-m.de \
--cc=johannes@sipsolutions.net \
--cc=thomas@adapt-ip.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.