-#
+#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
ifeq ($(MAKECMDGOALS),refresh)
override QUILT=1
+ override HOST_QUILT=1
endif
QUILT_CMD:=quilt --quiltrc=-
endef
define PatchDir/Default
- @if [ -d "$(2)" -a "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
+ @if [ -d "$(2)" ] && [ "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
export PATCH="$(PATCH)"; \
if [ -s "$(2)/series" ]; then \
$(call filter_series,$(2)/series) | xargs -n1 \
ifneq ($(QUILT),)
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD=
+ override CONFIG_AUTOREMOVE=
quilt-check: $(STAMP_CHECKED)
endif
endif
ifneq ($(HOST_QUILT),)
HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD=
+ override CONFIG_AUTOREMOVE=
host-quilt-check: $(HOST_STAMP_CHECKED)
endif
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 $(QUILT),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,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
endef
define Quilt/Template
- $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED) FORCE
+ $($(2)STAMP_CONFIGURED): $($(2)STAMP_CHECKED)
+ $(if $(NO_RECONFIGURE),$($(2)STAMP_BUILT),$($(2)STAMP_CONFIGURED)): FORCE
$($(2)STAMP_CHECKED): $($(2)STAMP_PREPARED)
if [ -s "$(1)/patches/series" ]; then \
(cd "$(1)"; \
echo "The source directory contains no quilt patches."; \
false; \
}
- @[ -n "$$$$(ls $(1)/patches/series)" -o "$$$$(cat $(1)/patches/series | md5sum)" = "$$(sort $(1)/patches/series | md5sum)" ] || { \
+ @[ -n "$$$$(ls $(1)/patches/series)" -o \
+ "$$$$(cat $(1)/patches/series | mkhash md5)" = "$$(sort $(1)/patches/series | mkhash md5)" ] || { \
echo "The patches are not sorted in the right order. Please fix."; \
false; \
}