From: Shiji Yang Date: Mon, 13 Apr 2026 23:59:03 +0000 (+0800) Subject: kernel: lantiq: convert Makefile EXTRA_CFLAGS to ccflags-y X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=267ee3dc722944b16453b8d96280e80e9b12eded;p=thirdparty%2Fopenwrt.git kernel: lantiq: convert Makefile EXTRA_CFLAGS to ccflags-y EXTRA_CFLAGS was removed since Linux 6.15 kernel. Link: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.15.y&id=e966ad0edd0056c7491b8f23992c11734ab61ddf Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/22921 Signed-off-by: Robert Marko --- diff --git a/package/kernel/lantiq/ltq-adsl/patches/413-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-adsl/patches/413-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..a3635569c0b --- /dev/null +++ b/package/kernel/lantiq/ltq-adsl/patches/413-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -313,7 +313,7 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO + @echo "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(PKGFIX_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild ++ @echo "ccflags-y := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(PKGFIX_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-ifxos/patches/102-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-ifxos/patches/102-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..052e2913f16 --- /dev/null +++ b/package/kernel/lantiq/ltq-ifxos/patches/102-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -640,7 +640,7 @@ drv_ifxos.ko$(EXEEXT): $(drv_ifxos_SOURC + @echo "# drv_ifxos: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_ifxos_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild ++ @echo "ccflags-y := -DHAVE_CONFIG_H $(drv_ifxos_CFLAGS) $(DSL_DRIVER_INCL_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild + + # Kernel Makefile exports LDFLAGS, which might pull-in wrong settings + LDFLAGS= \ diff --git a/package/kernel/lantiq/ltq-tapi/patches/618-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-tapi/patches/618-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..ba774aec8e4 --- /dev/null +++ b/package/kernel/lantiq/ltq-tapi/patches/618-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -161,7 +161,7 @@ drv_tapi.ko: $(drv_tapi_SOURCES) $(EXTRA + @echo "# drv_tapi: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_tapi_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_tapi_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild ++ @echo "ccflags-y := -DHAVE_CONFIG_H $(drv_tapi_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/135-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/135-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..0c207cd3ceb --- /dev/null +++ b/package/kernel/lantiq/ltq-vdsl-vr11-mei/patches/135-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -377,7 +377,7 @@ drv_mei_cpe.ko: $(drv_mei_cpe_SOURCES) + @echo -e "# drv_mei_cpe: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo -e "$(subst .ko,,$@)-y := $(drv_mei_cpe_OBJS)" >> $(PWD)/Kbuild +- @echo -e "EXTRA_CFLAGS := $(drv_mei_cpe_CFLAGS) -I@abs_srcdir@ -I@abs_srcdir@/auto_header $(IFXOS_INCLUDE_PATH)" >> $(PWD)/Kbuild ++ @echo -e "ccflags-y := $(drv_mei_cpe_CFLAGS) -I@abs_srcdir@ -I@abs_srcdir@/auto_header $(IFXOS_INCLUDE_PATH)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-vdsl-vr11/patches/302-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-vdsl-vr11/patches/302-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..6263f1337e6 --- /dev/null +++ b/package/kernel/lantiq/ltq-vdsl-vr11/patches/302-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -348,7 +348,7 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO + @echo -e "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo -e "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)" >> $(PWD)/Kbuild +- @echo -e "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/$(VRX_HEADER_DIR) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild ++ @echo -e "ccflags-y := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/$(VRX_HEADER_DIR) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-vdsl-vr9-mei/patches/408-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-vdsl-vr9-mei/patches/408-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..01e1abe5e5f --- /dev/null +++ b/package/kernel/lantiq/ltq-vdsl-vr9-mei/patches/408-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -353,7 +353,7 @@ drv_mei_cpe.ko: $(drv_mei_cpe_SOURCES) + @echo -e "# drv_mei_cpe: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo -e "$(subst .ko,,$@)-y := $(drv_mei_cpe_OBJS)" >> $(PWD)/Kbuild +- @echo -e "EXTRA_CFLAGS := $(drv_mei_cpe_CFLAGS) -I@abs_srcdir@ -I@abs_srcdir@/auto_header $(IFXOS_INCLUDE_PATH)" >> $(PWD)/Kbuild ++ @echo -e "ccflags-y := $(drv_mei_cpe_CFLAGS) -I@abs_srcdir@ -I@abs_srcdir@/auto_header $(IFXOS_INCLUDE_PATH)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-vdsl-vr9/patches/304-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-vdsl-vr9/patches/304-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..408fba82362 --- /dev/null +++ b/package/kernel/lantiq/ltq-vdsl-vr9/patches/304-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -308,7 +308,7 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO + @echo -e "# drv_dsl_cpe_api: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo -e "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo -e "$(subst .ko,,$@)-y := $(drv_dsl_cpe_api_OBJS)" >> $(PWD)/Kbuild +- @echo -e "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild ++ @echo -e "ccflags-y := -DHAVE_CONFIG_H $(drv_dsl_cpe_api_CFLAGS) $(DSL_DRIVER_INCL_PATH) $(IFXOS_INCLUDE_PATH) -I@abs_srcdir@/include -I$(PWD)/include" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: diff --git a/package/kernel/lantiq/ltq-vmmc/patches/609-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch b/package/kernel/lantiq/ltq-vmmc/patches/609-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch new file mode 100644 index 00000000000..dc5e4084841 --- /dev/null +++ b/package/kernel/lantiq/ltq-vmmc/patches/609-convert-Makefile-EXTRA_CFLAGS-to-ccflags-y.patch @@ -0,0 +1,19 @@ +From: Shiji Yang +Date: Tue, 14 Apr 2026 07:59:03 +0800 +Subject: [PATCH] convert Makefile EXTRA_CFLAGS to ccflags-y + +EXTRA_CFLAGS was removed since Linux 6.15 kernel. + +Signed-off-by: Shiji Yang + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -245,7 +245,7 @@ drv_vmmc.ko: $(drv_vmmc_SOURCES) $(EXTRA + @echo "# drv_vmmc: Generated to build Linux 2.6.x kernel object" > $(PWD)/Kbuild + @echo "obj-m := $(subst .ko,.o,$@)" >> $(PWD)/Kbuild + @echo "$(subst .ko,,$@)-y := $(drv_vmmc_OBJS)" >> $(PWD)/Kbuild +- @echo "EXTRA_CFLAGS := -DHAVE_CONFIG_H $(drv_vmmc_CFLAGS) $(PKGFIX_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild ++ @echo "ccflags-y := -DHAVE_CONFIG_H $(drv_vmmc_CFLAGS) $(PKGFIX_CFLAGS) $(INCLUDES)" >> $(PWD)/Kbuild + $(MAKE) ARCH=@KERNEL_ARCH@ -C @KERNEL_BUILD_PATH@ O=@KERNEL_BUILD_PATH@ M=$(PWD) modules + + clean-generic: