#
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
PATCH_DIR?=./patches
+FILES_DIR?=./files
ifeq ($(MAKECMDGOALS),refresh)
override QUILT=1
endif
-define Quilt/Patch
- @for patch in $$$$( (cd $(1) && if [ -f series ]; then grep -v '^#' series; else ls; fi; ) 2>/dev/null ); do ( \
+QUILT_CMD:=quilt --quiltrc=-
+
+define filter_series
+sed -e s,\\\#.*,, $(1) | grep -E \[a-zA-Z0-9\]
+endef
+
+define PatchDir/Quilt
+ @if [ -s $(1)/series ]; then \
+ mkdir -p $(PKG_BUILD_DIR)/patches/$(2); \
+ cp $(1)/series $(PKG_BUILD_DIR)/patches/$(2); \
+ fi
+ @for patch in $$$$( (cd $(1) && if [ -f series ]; then $(call filter_series,series); else ls; fi; ) 2>/dev/null ); do ( \
cp "$(1)/$$$$patch" $(PKG_BUILD_DIR); \
cd $(PKG_BUILD_DIR); \
- quilt import -P$(2)$$$$patch -p 1 "$$$$patch"; \
- quilt push -f >/dev/null 2>/dev/null; \
+ $(QUILT_CMD) import -P$(2)$$$$patch -p 1 "$$$$patch"; \
+ $(QUILT_CMD) push -f >/dev/null 2>/dev/null; \
rm -f "$$$$patch"; \
); done
+ $(if $(2),@echo $(2) >> $(PKG_BUILD_DIR)/patches/.subdirs)
+endef
+
+define PatchDir/Default
+ @if [ -d "$(1)" -a "$$$$(ls $(1) | wc -l)" -gt 0 ]; then \
+ if [ -s "$(1)/series" ]; then \
+ $(call filter_series,$(1)/series) | xargs -n1 \
+ $(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
+ else \
+ $(PATCH) $(PKG_BUILD_DIR) "$(1)"; \
+ fi; \
+ fi
+endef
+
+define PatchDir
+$(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)))
endef
QUILT?=$(strip $(shell test -f $(PKG_BUILD_DIR)/.quilt_used && echo y))
ifneq ($(QUILT),)
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
+ STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD=
- define Build/Patch/Default
- rm -rf $(PKG_BUILD_DIR)/patches
- mkdir -p $(PKG_BUILD_DIR)/patches
- $(call Quilt/Patch,$(PATCH_DIR),)
- @echo
- touch $(PKG_BUILD_DIR)/.quilt_used
- endef
- $(STAMP_CONFIGURED): $(STAMP_PATCHED) FORCE
prepare: $(STAMP_PATCHED)
- quilt-check: $(STAMP_PATCHED)
-else
- define Build/Patch/Default
- @if [ -d $(PATCH_DIR) -a "$$$$(ls $(PATCH_DIR) | wc -l)" -gt 0 ]; then \
- $(PATCH) $(PKG_BUILD_DIR) $(PATCH_DIR); \
- fi
- endef
+ quilt-check: $(STAMP_CHECKED)
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
- $(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,$(PATCH_DIR),platform/), \
- if [ -d $(PATCH_DIR) ]; then $(PATCH) $(LINUX_DIR) $(PATCH_DIR); fi \
- )
- $(if $(strip $(QUILT)),touch $(PKG_BUILD_DIR)/.quilt_used)
+define Build/Patch/Default
+ $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
+ $(call PatchDir,$(PATCH_DIR),)
endef
-ifeq ($(TARGET_BUILD),1)
-$(STAMP_PATCHED): $(STAMP_PREPARED)
- @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
- (\
- cd $(PKG_BUILD_DIR)/patches; \
- rm -f series; \
- for file in *; do \
- if [ -f $$file/series ]; then \
- echo "Converting $$file/series"; \
- awk -v file="$$file/" '$$0 !~ /^#/ { print file $$0 }' $$file/series >> series; \
- else \
- echo "Sorting patches in $$file"; \
- find $$file/* -type f \! -name series | sort >> series; \
- fi; \
- done; \
- )
- if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
- touch $@
-else
-$(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; \
- )
- if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt push -a); fi
- touch $@
-endif
+kernel_files=$(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.)
+define Kernel/Patch/Default
+ rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
+ $(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
+ find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
+ $(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
+ $(call PatchDir,$(PATCH_DIR),platform/)
+endef
define Quilt/RefreshDir
mkdir -p $(1)
-rm -f $(1)/* 2>/dev/null >/dev/null
@( \
- for patch in $$($(if $(2),grep "^$(2)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$1}'); do \
- $(CP) -v "$(PKG_BUILD_DIR)/patches/$$patch" $(1); \
+ for patch in $$$$($(if $(2),grep "^$(2)",cat) $(PKG_BUILD_DIR)/patches/series | awk '{print $$$$1}'); do \
+ $(CP) -v "$(PKG_BUILD_DIR)/patches/$$$$patch" $(1); \
done; \
)
endef
$(call Quilt/RefreshDir,$(PATCH_DIR),platform/)
endef
-quilt-check: $(STAMP_PREPARED) FORCE
+define Quilt/Refresh
+$(if $(TARGET_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+endef
+
+define Build/Quilt
+ $(STAMP_PATCHED): $(STAMP_PREPARED)
+ @( \
+ cd $(PKG_BUILD_DIR)/patches; \
+ $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null; \
+ if [ -s ".subdirs" ]; then \
+ rm -f series; \
+ for file in $$$$(cat .subdirs); do \
+ if [ -f $$$$file/series ]; then \
+ echo "Converting $$file/series"; \
+ $$(call filter_series,$$$$file/series) | awk -v file="$$$$file/" '$$$$0 !~ /^#/ { print file $$$$0 }' | sed -e s,//,/,g >> series; \
+ else \
+ echo "Sorting patches in $$$$file"; \
+ find $$$$file/* -type f \! -name series | sed -e s,//,/,g | sort >> series; \
+ fi; \
+ done; \
+ else \
+ find * -type f \! -name series | sort > series; \
+ fi; \
+ )
+ touch $$@
+
+ $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
+ $(STAMP_CHECKED): $(STAMP_PATCHED)
+ if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); if $(QUILT_CMD) next >/dev/null 2>&1; then $(QUILT_CMD) push -a; else $(QUILT_CMD) top >/dev/null 2>&1; fi); fi
+ touch $$@
+
+ quilt-check: $(STAMP_PREPARED) FORCE
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
false; \
echo "The source directory contains no quilt patches."; \
false; \
}
- @[ "$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \
+ @[ -n "$$$$(ls $(PKG_BUILD_DIR)/patches/series)" -o "$$$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \
echo "The patches are not sorted in the right order. Please fix."; \
false; \
}
-refresh: quilt-check
- @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null
- @cd $(PKG_BUILD_DIR); while quilt next 2>/dev/null >/dev/null && quilt push; do \
- quilt refresh; \
- done; ! quilt next 2>/dev/null >/dev/null
- $(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+ refresh: quilt-check
+ @cd $(PKG_BUILD_DIR); $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null
+ @cd $(PKG_BUILD_DIR); while $(QUILT_CMD) next 2>/dev/null >/dev/null && $(QUILT_CMD) push; do \
+ QUILT_DIFF_OPTS="-p" $(QUILT_CMD) refresh -p ab --no-index --no-timestamps; \
+ done; ! $(QUILT_CMD) next 2>/dev/null >/dev/null
+ $(Quilt/Refresh)
-update: quilt-check
- $(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
+ update: quilt-check
+ $(Quilt/Refresh)
+endef
endif
projects / openwrt.git / blobdiff