Skip to content

Commit

Permalink
don't execute blacklist/depmod on modules-install
Browse files Browse the repository at this point in the history
these operations are not needed for cross-compiled modules

Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
  • Loading branch information
eyalreizer authored and elp committed Sep 15, 2013
1 parent f8214f9 commit 7da60d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
17 changes: 4 additions & 13 deletions Makefile
Expand Up @@ -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/
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -238,19 +232,16 @@ 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/
@rm -rf $(KLIB)/$(KMODDIR)/drivers/net/atl*
@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:
Expand Down
6 changes: 0 additions & 6 deletions config.mk
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 7da60d6

Please sign in to comment.