domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 7488
This commit is contained in:
Felix Fietkau
2007-06-04 11:14:08 +00:00
parent f082d1fddf
commit 9abbe7a033
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/quilt.mk
View File

@@ -34,6 +34,7 @@ ifneq ($(QUILT),)
endef endef
$(STAMP_CONFIGURED): $(STAMP_PATCHED) $(STAMP_CONFIGURED): $(STAMP_PATCHED)
prepare: $(STAMP_PATCHED) prepare: $(STAMP_PATCHED)
quilt-check: $(STAMP_PATCHED)
else else
define Build/Patch/Default define Build/Patch/Default
@if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \ @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \
@@ -82,7 +83,7 @@ define Quilt/Refresh/Kernel
$(call Quilt/RefreshDir,./patches,platform/) $(call Quilt/RefreshDir,./patches,platform/)
endef endef
refresh: $(STAMP_PREPARED) quilt-check: $(STAMP_PREPARED) FORCE
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \ @[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \ echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
false; \ false; \
@@ -95,5 +96,14 @@ refresh: $(STAMP_PREPARED)
echo "The patches are not sorted in the right order. Please fix."; \ echo "The patches are not sorted in the right order. Please fix."; \
false; \ 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)) $(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))

11
package/Makefile
View File

@@ -26,12 +26,16 @@ ifeq ($(QUIET),1)
%-compile %-install: FORCE %-compile %-install: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; } $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }
%-prepare %-prereq %-download %-clean %-refresh: FORCE %-prepare %-prereq %-download %-clean: FORCE
else else
%-prepare %-prereq %-download %-clean %-compile %-install %-refresh: FORCE %-prepare %-prereq %-download %-clean %-compile %-install: FORCE
endif endif
$(MAKE) -C $* $(patsubst $*-%,%,$@) $(MAKE) -C $* $(patsubst $*-%,%,$@)
%-refresh %-update:
-$(MAKE) -C $* $(patsubst $*-%,%,$@)
# .IGNORE: $(COMPILE_PACKAGES) # .IGNORE: $(COMPILE_PACKAGES)
$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo $(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
@@ -42,6 +46,9 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
prereq: $(PREREQ_PACKAGES) prereq: $(PREREQ_PACKAGES)
download: $(DOWNLOAD_PACKAGES) download: $(DOWNLOAD_PACKAGES)
compile: $(COMPILE_PACKAGES) compile: $(COMPILE_PACKAGES)
ifneq ($(QUILT),)
refresh: $(patsubst %,%-refresh,$(package-y) $(package-m) $(package-))
endif
install-targets: $(INSTALL_PACKAGES) install-targets: $(INSTALL_PACKAGES)
install: install:

2
target/Makefile
View File

@@ -51,5 +51,5 @@ image_install: image_compile
imagebuilder_install: image_install imagebuilder_install: image_install
$(MAKE) -C imagebuilder 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 $*-%,%,$@) $(MAKE) -C $* $(patsubst $*-%,%,$@)

21
target/linux/Makefile
View File

@@ -7,23 +7,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
download: clean download prepare compile install menuconfig update refresh: FORCE
$(MAKE) -C $(BOARD)-$(KERNEL) download $(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