update wlcompat for new ioctl interface (fixes #1357)

[openwrt.git] / include / quilt.mk

diff --git a/include/quilt.mk b/include/quilt.mk
index 395f64e..c1f7bac 100644 (file)
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -8,6 +8,7 @@
 ifeq ($(KERNEL_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif
 ifeq ($(KERNEL_BUILD),1)
   PKG_BUILD_DIR:=$(LINUX_DIR)
 endif

+PATCH_DIR?=./patches

 
 define Quilt/Patch
        @for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \
 
 define Quilt/Patch
        @for patch in $$$$( (cd $(1) && ls) 2>/dev/null ); do ( \


@@ -28,7 +29,7 @@ ifneq ($(QUILT),)
   define Build/Patch/Default
        rm -rf $(PKG_BUILD_DIR)/patches
        mkdir -p $(PKG_BUILD_DIR)/patches
   define Build/Patch/Default
        rm -rf $(PKG_BUILD_DIR)/patches
        mkdir -p $(PKG_BUILD_DIR)/patches

-       $(call Quilt/Patch,./patches,)
+       $(call Quilt/Patch,$(PATCH_DIR),)

        @echo
        touch $(PKG_BUILD_DIR)/.quilt_used
   endef
        @echo
        touch $(PKG_BUILD_DIR)/.quilt_used
   endef


@@ -37,8 +38,8 @@ ifneq ($(QUILT),)
   quilt-check: $(STAMP_PATCHED)
 else
   define Build/Patch/Default
   quilt-check: $(STAMP_PATCHED)
 else
   define Build/Patch/Default

-       @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
-               $(PATCH) $(PKG_BUILD_DIR) ./patches; \
+       @if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
+               $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \

        fi
   endef
 endif
        fi
   endef
 endif


@@ -46,17 +47,21 @@ endif
 define Kernel/Patch/Default
        if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
        if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
 define Kernel/Patch/Default
        if [ -d $(GENERIC_PLATFORM_DIR)/files ]; then $(CP) $(GENERIC_PLATFORM_DIR)/files/* $(LINUX_DIR)/; fi
        if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi

-       $(if $(strip $(QUILT)),$(call Quilt/Patch,$(GENERIC_PLATFORM_DIR)/patches,generic/), \
-               if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi \
+       $(if $(strip $(QUILT)),$(call Quilt/Patch,$(GENERIC_PATCH_DIR),generic/), \
+               if [ -d $(GENERIC_PATCH_DIR) ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PATCH_DIR); fi \

        )
        )

-       $(if $(strip $(QUILT)),$(call Quilt/Patch,./patches,platform/), \
-               if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi \
+       $(if $(strip $(QUILT)),$(call Quilt/Patch,$(PATCH_DIR),platform/), \
+               if [ -d $(PATCH_DIR) ]; then $(PATCH) $(LINUX_DIR) $(PATCH_DIR); fi \

        )
        $(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
 $(STAMP_PATCHED): $(STAMP_PREPARED)
        @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
        )
        $(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
 $(STAMP_PATCHED): $(STAMP_PREPARED)
        @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true

+       (\
+               cd $(PKG_BUILD_DIR)/patches; \
+               find * -type f \! -name series | sort > series; \
+       )

        [ -f "$(PKG_BUILD_DIR)/patches/series" ] && cd $(PKG_BUILD_DIR); quilt push -a
        touch $@
 
        [ -f "$(PKG_BUILD_DIR)/patches/series" ] && cd $(PKG_BUILD_DIR); quilt push -a
        touch $@
 


@@ -71,7 +76,7 @@ define Quilt/RefreshDir
 endef
 
 define Quilt/Refresh/Package
 endef
 
 define Quilt/Refresh/Package

-       $(call Quilt/RefreshDir,./patches)
+       $(call Quilt/RefreshDir,$(PATCH_DIR))

 endef
 
 define Quilt/Refresh/Kernel
 endef
 
 define Quilt/Refresh/Kernel


@@ -79,8 +84,8 @@ define Quilt/Refresh/Kernel
                echo "All kernel patches must start with either generic/ or platform/"; \
                false; \
        }
                echo "All kernel patches must start with either generic/ or platform/"; \
                false; \
        }

-       $(call Quilt/RefreshDir,$(GENERIC_PLATFORM_DIR)/patches,generic/)
-       $(call Quilt/RefreshDir,./patches,platform/)
+       $(call Quilt/RefreshDir,$(GENERIC_PATCH_DIR),generic/)
+       $(call Quilt/RefreshDir,$(PATCH_DIR),platform/)

 endef
 
 quilt-check: $(STAMP_PREPARED) FORCE
 endef
 
 quilt-check: $(STAMP_PREPARED) FORCE