EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enable quilt for host builds and add some additional checks

Browse Source 
SVN-Revision: 7473
This commit is contained in:
Felix Fietkau 2007-06-03 07:33:00 +00:00
parent 396895e6d8
commit 5e406f0a28
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/host-build.mk
View File

@ -13,12 +13,13 @@ STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell find ${CURDIR} $(PKG_FILE_DEP
STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
STAMP_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
include $(INCLUDE_DIR)/quilt.mk
Build/Patch:=$(Build/Patch/Default)
ifneq ($(strip $(PKG_UNPACK)),) ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default define Build/Prepare/Default
$(PKG_UNPACK) $(PKG_UNPACK)
@if [ -d ./patches ]; then \ $(Build/Patch)
$(PATCH) $(PKG_BUILD_DIR) ./patches; \
fi
endef endef
endif endif

11
include/quilt.mk
View File

@ -10,7 +10,7 @@ ifneq ($(QUILT),)
STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q STAMP_PREPARED:=$(strip $(STAMP_PREPARED))_q
STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched STAMP_PATCHED:=$(PKG_BUILD_DIR)/.quilt_patched
CONFIG_AUTOREBUILD= CONFIG_AUTOREBUILD=
PATCHES:=$(shell cd ./patches; ls) PATCHES:=$(shell (cd ./patches && ls) 2>/dev/null)
define Build/Patch/Default define Build/Patch/Default
rm -rf $(PKG_BUILD_DIR)/patches rm -rf $(PKG_BUILD_DIR)/patches
mkdir -p $(PKG_BUILD_DIR)/patches mkdir -p $(PKG_BUILD_DIR)/patches
@ -36,18 +36,23 @@ endif
$(STAMP_PATCHED): $(STAMP_PREPARED) $(STAMP_PATCHED): $(STAMP_PREPARED)
@cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true @cd $(PKG_BUILD_DIR); quilt pop -a -f >/dev/null 2>/dev/null || true
cd $(PKG_BUILD_DIR); quilt push -a $(if $(strip $(PATCHES)),cd $(PKG_BUILD_DIR); quilt push -a)
touch $@ touch $@
refresh: $(STAMP_PREPARED) refresh: $(STAMP_PREPARED)
@[ -f "$(PKG_BUILD_DIR)/.quilt_used" ] || { \
echo "The source directory was not unpacked using quilt. Please rebuild with QUILT=1"; \
false; \
}
@[ -f "$(PKG_BUILD_DIR)/patches/series" ] || { \ @[ -f "$(PKG_BUILD_DIR)/patches/series" ] || { \
echo "The source directory was not unpacked using quilt. Please rebuild."; \ echo "The source directory contains no quilt patches."; \
false; \ false; \
} }
@[ "$$(cat $(PKG_BUILD_DIR)/patches/series | md5sum)" = "$$(sort $(PKG_BUILD_DIR)/patches/series | md5sum)" ] || { \ @[ "$$(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."; \ echo "The patches are not sorted in the right order. Please fix."; \
false; \ false; \
} }
mkdir -p ./patches
rm -f ./patches/* 2>/dev/null >/dev/null rm -f ./patches/* 2>/dev/null >/dev/null
@( \ @( \
for patch in $$(cat $(PKG_BUILD_DIR)/patches/series); do \ for patch in $$(cat $(PKG_BUILD_DIR)/patches/series); do \

2
tools/Makefile
View File

@ -41,7 +41,7 @@ $(TOOL_HOST_INCLUDES): $(STAGING_DIR)/include-host/%.h: ./include/%.h
$(TOOL_BUILD_DIR): $(TOOL_BUILD_DIR):
@mkdir -p $@ @mkdir -p $@
%-prereq %-download %-clean: FORCE %-prereq %-download %-clean %-refresh: FORCE
$(MAKE) -C $* $(patsubst $*-%,%,$@) $(MAKE) -C $* $(patsubst $*-%,%,$@)
%-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE %-prepare: $(TOOL_HOST_INCLUDES) $(TOOL_BUILD_DIR) FORCE