[source] build: disable CONFIG_AUTOREMOVE for packages/tools where QUILT is used
LEDE Commits
lede-commits at lists.infradead.org
Thu Jan 19 04:30:28 PST 2017
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/5aa03e16a732e81a989a9605706dc8c6bb95d03f
commit 5aa03e16a732e81a989a9605706dc8c6bb95d03f
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Jan 19 12:41:59 2017 +0100
build: disable CONFIG_AUTOREMOVE for packages/tools where QUILT is used
Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
include/host-build.mk | 8 +++++---
include/package-bin.mk | 2 +-
include/package-ipkg.mk | 2 +-
include/package.mk | 12 +++++++-----
include/quilt.mk | 2 ++
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/include/host-build.mk b/include/host-build.mk
index cf12039..6a335fc 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -35,6 +35,8 @@ override MAKEFLAGS=
include $(INCLUDE_DIR)/quilt.mk
include $(INCLUDE_DIR)/autotools.mk
+_host_target:=$(if $(HOST_QUILT),,.)
+
Host/Patch:=$(Host/Patch/Default)
ifneq ($(strip $(HOST_UNPACK)),)
define Host/Prepare/Default
@@ -176,9 +178,9 @@ ifndef DUMP
)
endif
- .host-prepare: $(HOST_STAMP_PREPARED)
- .host-configure: $(HOST_STAMP_CONFIGURED)
- .host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED)
+ $(_host_target)host-prepare: $(HOST_STAMP_PREPARED)
+ $(_host_target)host-configure: $(HOST_STAMP_CONFIGURED)
+ $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED)
host-clean: FORCE
$(call Host/Clean)
$(call Host/Uninstall)
diff --git a/include/package-bin.mk b/include/package-bin.mk
index a777ead..ee35ca1 100644
--- a/include/package-bin.mk
+++ b/include/package-bin.mk
@@ -10,7 +10,7 @@ ifeq ($(DUMP),)
ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
ifdef Package/$(1)/install
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
- .compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
+ $(_pkg_target)compile: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
compile: install-bin-$(1)
else
compile: $(1)-disabled
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 8a9c10f..d73d461 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -106,7 +106,7 @@ ifeq ($(DUMP),)
ifdef do_install
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
IPKGS += $(1)
- .compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
+ $(_pkg_target)compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
else
$(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
diff --git a/include/package.mk b/include/package.mk
index 6e24788..95b5f76 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -96,6 +96,8 @@ include $(INCLUDE_DIR)/package-ipkg.mk
include $(INCLUDE_DIR)/package-bin.mk
include $(INCLUDE_DIR)/autotools.mk
+_pkg_target:=$(if $(QUILT),,.)
+
override MAKEFLAGS=
CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
@@ -204,13 +206,13 @@ define Build/CoreTargets
touch $$@
ifdef Build/InstallDev
- .compile: $(STAMP_INSTALLED)
+ $(_pkg_target)compile: $(STAMP_INSTALLED)
endif
- .prepare: $(STAMP_PREPARED)
- .configure: $(STAMP_CONFIGURED)
- .dist: $(STAMP_CONFIGURED)
- .distcheck: $(STAMP_CONFIGURED)
+ $(_pkg_target)prepare: $(STAMP_PREPARED)
+ $(_pkg_target)configure: $(STAMP_CONFIGURED)
+ $(_pkg_target)dist: $(STAMP_CONFIGURED)
+ $(_pkg_target)distcheck: $(STAMP_CONFIGURED)
ifneq ($(CONFIG_AUTOREMOVE),)
compile:
diff --git a/include/quilt.mk b/include/quilt.mk
index 796e716..88f84f8 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -64,6 +64,7 @@ ifneq ($(PKG_BUILD_DIR),)
ifneq ($(QUILT),)
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD=
+ override CONFIG_AUTOREMOVE=
quilt-check: $(STAMP_CHECKED)
endif
endif
@@ -73,6 +74,7 @@ ifneq ($(HOST_BUILD_DIR),)
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
More information about the lede-commits
mailing list