1*4882a593SmuzhiyunFrom dc0a646a460e6da10ddbe7bf02794051d76f8751 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 4 Nov 2021 17:30:06 +0100 4*4882a593SmuzhiyunSubject: [PATCH] drivers/dahdi/Kbuild: fix HOTPLUG_FIRMWARE definition 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunHOTPLUG_FIRMWARE is used before being defined resulting in the following 7*4882a593Smuzhiyunbuild failure since version 2.7.0 and 8*4882a593Smuzhiyunhttps://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=commit;h=e2f492595c9191ba6d556ccac1bde4c1bb892938: 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun MODPOST /home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/Module.symvers 11*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcaxx.ko] undefined! 12*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcaxx.ko] undefined! 13*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_128_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! 14*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_064_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! 15*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_128_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! 16*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_064_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte43x.ko] undefined! 17*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_start" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte13xp.ko] undefined! 18*4882a593SmuzhiyunERROR: modpost: "_binary_dahdi_fw_oct6114_032_bin_size" [/home/fabrice/buildroot/output/build/dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8/drivers/dahdi/wcte13xp.ko] undefined! 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 21*4882a593Smuzhiyun[Upstream status: sent to "Shaun Ruffell <sruffell@sruffell.net>"] 22*4882a593Smuzhiyun--- 23*4882a593Smuzhiyun drivers/dahdi/Kbuild | 18 +++++++++--------- 24*4882a593Smuzhiyun 1 file changed, 9 insertions(+), 9 deletions(-) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyundiff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild 27*4882a593Smuzhiyunindex 855e5bf..b1a8481 100644 28*4882a593Smuzhiyun--- a/drivers/dahdi/Kbuild 29*4882a593Smuzhiyun+++ b/drivers/dahdi/Kbuild 30*4882a593Smuzhiyun@@ -13,6 +13,15 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/ 31*4882a593Smuzhiyun obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/ 32*4882a593Smuzhiyun obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE13XP) += wcte13xp.o 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun+ifndef HOTPLUG_FIRMWARE 35*4882a593Smuzhiyun+ifneq (,$(filter y m,$(CONFIG_FW_LOADER))) 36*4882a593Smuzhiyun+HOTPLUG_FIRMWARE := yes 37*4882a593Smuzhiyun+else 38*4882a593Smuzhiyun+HOTPLUG_FIRMWARE := no 39*4882a593Smuzhiyun+endif 40*4882a593Smuzhiyun+export HOTPLUG_FIRMWARE 41*4882a593Smuzhiyun+endif 42*4882a593Smuzhiyun+ 43*4882a593Smuzhiyun wcte13xp-objs := wcte13xp-base.o wcxb_spi.o wcxb.o wcxb_flash.o 44*4882a593Smuzhiyun CFLAGS_wcte13xp-base.o += -I$(src)/oct612x -I$(src)/oct612x/include -I$(src)/oct612x/octdeviceapi -I$(src)/oct612x/octdeviceapi/oct6100api 45*4882a593Smuzhiyun ifeq ($(HOTPLUG_FIRMWARE),yes) 46*4882a593Smuzhiyun@@ -61,15 +70,6 @@ endif 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src) -Wno-format-truncation 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun-ifndef HOTPLUG_FIRMWARE 51*4882a593Smuzhiyun-ifneq (,$(filter y m,$(CONFIG_FW_LOADER))) 52*4882a593Smuzhiyun-HOTPLUG_FIRMWARE := yes 53*4882a593Smuzhiyun-else 54*4882a593Smuzhiyun-HOTPLUG_FIRMWARE := no 55*4882a593Smuzhiyun-endif 56*4882a593Smuzhiyun-export HOTPLUG_FIRMWARE 57*4882a593Smuzhiyun-endif 58*4882a593Smuzhiyun- 59*4882a593Smuzhiyun # fix typo present in CentOS and RHEL 2.6.9 kernels 60*4882a593Smuzhiyun BAD_KERNELS_VERS := 22 34 34.0.1 34.0.2 61*4882a593Smuzhiyun BAD_KERNELS := $(foreach ver,$(BAD_KERNELS_VERS),2.6.9-$(ver).EL 2.6.9-$(ver).ELsmp) 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun2.33.0 64*4882a593Smuzhiyun 65