diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-03-22 20:16:15 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-03-22 20:17:20 +0100 |
| commit | 89118da865a34ed9537a088196d81ca9e37cb983 (patch) | |
| tree | b5f87a8aa9dfe3eb20e128cfa796c5a492bed703 | |
| parent | c5e245a475b4b4c5602eae0e8f320e2b410f81ed (diff) | |
| download | upstream-89118da865a34ed9537a088196d81ca9e37cb983.tar.gz upstream-89118da865a34ed9537a088196d81ca9e37cb983.tar.bz2 upstream-89118da865a34ed9537a088196d81ca9e37cb983.zip | |
build: fix STAMP_PREPARED with quilt
quilt.mk needs to be included first, to ensure that STAMP_PREPARED does
not include the hash if quilt is used.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/host-build.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index adc61d6641..70da733d43 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -21,6 +21,7 @@ endif include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/quilt.mk BUILD_TYPES += host HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(HOST_PREPARED_DEPENDS))) @@ -31,7 +32,6 @@ HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed override MAKEFLAGS= -include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/autotools.mk _host_target:=$(if $(HOST_QUILT),,.) diff --git a/include/package.mk b/include/package.mk index ff580f5e7c..c5c335a198 100644 --- a/include/package.mk +++ b/include/package.mk @@ -39,6 +39,7 @@ include $(INCLUDE_DIR)/hardening.mk include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk +include $(INCLUDE_DIR)/quilt.mk find_library_dependencies = $(wildcard $(patsubst %,$(STAGING_DIR)/pkginfo/%.version, \ $(filter-out $(BUILD_PACKAGES),$(foreach dep, \ @@ -88,7 +89,6 @@ endif PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install -include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk include $(INCLUDE_DIR)/package-ipkg.mk |