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@xxxxxxxxxx> --- 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
