Changeset 13010


Ignore:
Timestamp:
2008-10-18T23:43:30+02:00 (8 years ago)
Author:
nbd
Message:

change the way ./files* and the generic kernel files are applied. ./files now applies to *ALL* kernel versions, and is copied along with ./files-* - this gets rid of quite a bit of redundancy in the extra kernel drivers.

Location:
trunk
Files:
28 added
40 deleted
3 edited
82 moved

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel.mk

    r12503 r13010  
    3232 
    3333  PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) 
    34   FILES_DIR ?= ./files$(shell [ -d "./files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) 
     34  FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)") 
    3535  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) 
    3636  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) 
  • trunk/include/quilt.mk

    r12938 r13010  
    6969define Kernel/Patch/Default 
    7070        rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches 
    71         if [ -d $(GENERIC_FILES_DIR) ]; then $(CP) $(GENERIC_FILES_DIR)/* $(LINUX_DIR)/; fi 
    72         if [ -d $(FILES_DIR) ]; then \ 
    73                 $(CP) $(FILES_DIR)/* $(LINUX_DIR)/; \ 
    74                 find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \ 
    75         fi 
     71        $(CP) $(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) $(LINUX_DIR)/ 
     72        find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f 
    7673        $(call PatchDir,$(GENERIC_PATCH_DIR),generic/) 
    7774        $(call PatchDir,$(PATCH_DIR),platform/) 
  • trunk/include/target.mk

    r12870 r13010  
    109109GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL) 
    110110GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) 
    111 GENERIC_FILES_DIR := $(GENERIC_PLATFORM_DIR)/files$(shell [ -d "$(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true ) 
     111GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") 
    112112 
    113113GENERIC_LINUX_CONFIG?=$(firstword $(wildcard $(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER) $(GENERIC_PLATFORM_DIR)/config-default)) 
Note: See TracChangeset for help on using the changeset viewer.