From 7da60d66cc2a10cdefc65077e0f58065da8d6299 Mon Sep 17 00:00:00 2001 From: Eyal Reizer Date: Sun, 15 Sep 2013 12:37:52 +0300 Subject: [PATCH] don't execute blacklist/depmod on modules-install these operations are not needed for cross-compiled modules Signed-off-by: Eyal Reizer Signed-off-by: Eliad Peller --- Makefile | 17 ++++------------- config.mk | 6 ------ 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 525afdd5..9505bc20 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,6 @@ NOSTDINC_FLAGS := \ obj-y := compat/ obj-$(CONFIG_COMPAT_RFKILL) += net/rfkill/ -obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/gpu/drm/ #obj-$(CONFIG_COMPAT_MEDIA_MODULES) += drivers/media/v4l2-core/ #obj-$(CONFIG_COMPAT_MEDIA_MODULES) += drivers/media/usb/uvc/ @@ -50,22 +49,14 @@ ifeq ($(BT),) obj-$(CONFIG_COMPAT_WIRELESS) += net/wireless/ net/mac80211/ obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += drivers/net/wireless/ -obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/ -obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/atheros/ -obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/broadcom/ -obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/ssb/ -obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/bcma/ -obj-$(CONFIG_COMPAT_VAR_MODULES) += drivers/misc/eeprom/ ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),) endif endif -obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/ -obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/ else @@ -164,9 +155,12 @@ install: uninstall install-modules install-scripts install-modules: modules $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \ modules_install - @./scripts/update-initramfs + + @echo "Skipping blacklist,depmod, etc." +ifeq (0,1) @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) @/sbin/depmod -a +endif install-scripts: @# All the scripts we can use @@ -238,7 +232,6 @@ uninstall: @rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/ @rm -rf $(KLIB)/$(KMODDIR)/net/rfkill/ @rm -rf $(KLIB)/$(KMODDIR)/net/wireless/ - @rm -rf $(KLIB)/$(KMODDIR)/drivers/ssb/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/usb/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/wireless/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/staging/ @@ -246,11 +239,9 @@ uninstall: @find $(KLIB)/$(KMODDIR)/drivers/net/ -name "alx*.ko" -o -name "atl*.ko" 2>/dev/null |xargs rm -f @# Lets only remove the stuff we are sure we are providing @# on the misc directory. - @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom/eeprom_93cx6.ko* @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko* @rm -f $(KLIB)/$(KMODDIR)/drivers/net/b44.ko* @/sbin/depmod -a - @./scripts/update-initramfs @echo clean: diff --git a/config.mk b/config.mk index c2af6608..3bb0735d 100644 --- a/config.mk +++ b/config.mk @@ -728,7 +728,6 @@ endif #CONFIG_COMPAT_KERNEL_2_6_31 # tests have only started on 3.2. ifndef CONFIG_COMPAT_KERNEL_3_2 # Basic DRM support -export CONFIG_COMPAT_VIDEO_MODULES=y export CONFIG_COMPAT_DRM=m export CONFIG_COMPAT_DRM_TTM=m export CONFIG_COMPAT_DRM_KMS_HELPER=m @@ -749,9 +748,4 @@ export CONFIG_USB_VIDEO_CLASS=y endif #CONFIG_COMPAT_KERNEL_3_2 ifndef CONFIG_COMPAT_KERNEL_3_2 -export CONFIG_COMPAT_MEDIA_MODULES=y -export CONFIG_COMPAT_VIDEO_V4L2=m -export CONFIG_COMPAT_VIDEOBUF2_CORE=m -export CONFIG_COMPAT_VIDEOBUF2_VMALLOC=m -export CONFIG_COMPAT_VIDEOBUF2_MEMOPS=m endif #CONFIG_COMPAT_KERNEL_3_2