OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 92... Line 92...
92 $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) 92 $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
93 endef 93 endef
Line 94... Line 94...
94   94  
95 kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) 95 kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
96 define Kernel/Patch/Default 96 define Kernel/Patch/Default
97 $(if $(QUILT),rm -rf $(LINUX_DIR)/patches; mkdir -p $(LINUX_DIR)/patches) 97 $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
98 $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/) 98 $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
99 find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f 99 find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
100 if [ -d $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) ]; then \ 100 if [ -d $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) ]; then \
101 echo "generic patches directory is present. please move your patches to the pending directory" ; \ 101 echo "generic patches directory is present. please move your patches to the pending directory" ; \
102 exit 1; \ 102 exit 1; \
103 fi 103 fi
104 $(call PatchDir,$(LINUX_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/) 104 $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
105 $(call PatchDir,$(LINUX_DIR),$(GENERIC_PATCH_DIR),generic/) 105 $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
106 $(call PatchDir,$(LINUX_DIR),$(GENERIC_HACK_DIR),generic-hack/) 106 $(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/)
107 $(call PatchDir,$(LINUX_DIR),$(PATCH_DIR),platform/) 107 $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
Line 108... Line 108...
108 endef 108 endef
109   109  
110 define Quilt/RefreshDir 110 define Quilt/RefreshDir