Rename 'refresh' to 'update' and make the new 'refresh' actually refresh all the patches.
Also added a target package/refresh which will do this to all packages in the buildroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7488 3c298f89-4303-0410-b956-a3cf2f4a3e73
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -34,6 +34,7 @@
endef
$(STAMP_CONFIGURED): $(STAMP_PATCHED)
prepare: $(STAMP_PATCHED)
+ quilt-check: $(STAMP_PATCHED)
else
define Build/Patch/Default
@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
@@ -82,7 +83,7 @@
$(call Quilt/RefreshDir,./patches,platform/)
endef
-refresh: $(STAMP_PREPARED)
+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; \
@@ -95,6 +96,15 @@
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))
+
+update: quilt-check
$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
--- a/package/Makefile
+++ b/package/Makefile
@@ -26,11 +26,15 @@
%-compile %-install: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
-%-prepare %-prereq %-download %-clean %-refresh: FORCE
+%-prepare %-prereq %-download %-clean: FORCE
else
-%-prepare %-prereq %-download %-clean %-compile %-install %-refresh: FORCE
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
endif
$(MAKE) -C $* $(patsubst $*-%,%,$@)
+
+%-refresh %-update:
+ -$(MAKE) -C $* $(patsubst $*-%,%,$@)
+
# .IGNORE: $(COMPILE_PACKAGES)
@@ -42,6 +46,9 @@
prereq: $(PREREQ_PACKAGES)
download: $(DOWNLOAD_PACKAGES)
compile: $(COMPILE_PACKAGES)
+ifneq ($(QUILT),)
+ refresh: $(patsubst %,%-refresh,$(package-y) $(package-m) $(package-))
+endif
install-targets: $(INSTALL_PACKAGES)
install:
--- a/target/Makefile
+++ b/target/Makefile
@@ -51,6 +51,6 @@
imagebuilder_install: image_install
$(MAKE) -C imagebuilder install
-%-prereq %-prepare %-download %-clean %-compile %-install %-refresh: FORCE
+%-prereq %-prepare %-download %-clean %-compile %-install %-refresh %-update: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -7,24 +7,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
-download:
- $(MAKE) -C $(BOARD)-$(KERNEL) download
+clean download prepare compile install menuconfig update refresh: FORCE
+ $(MAKE) -C $(BOARD)-$(KERNEL) $@
-prepare:
- $(MAKE) -C $(BOARD)-$(KERNEL) prepare
-compile:
- $(MAKE) -C $(BOARD)-$(KERNEL) compile
-
-install:
- $(MAKE) -C $(BOARD)-$(KERNEL) install
-
-refresh:
- $(MAKE) -C $(BOARD)-$(KERNEL) refresh
-
-menuconfig:
- $(MAKE) -C $(BOARD)-$(KERNEL) menuconfig
-
-clean:
- $(MAKE) -C $(BOARD)-$(KERNEL) clean
-