KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: disable CONFIG_AUTOREMOVE for packages/tools where QUILT is used

Browse source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2017-01-19 12:41:59 +01:00
parent bc73a7fd98
commit 5aa03e16a7
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/host-build.mk
View file

@ -35,6 +35,8 @@ override MAKEFLAGS=
include $(INCLUDE_DIR)/quilt.mk include $(INCLUDE_DIR)/quilt.mk
include $(INCLUDE_DIR)/autotools.mk include $(INCLUDE_DIR)/autotools.mk
_host_target:=$(if $(HOST_QUILT),,.)
Host/Patch:=$(Host/Patch/Default) Host/Patch:=$(Host/Patch/Default)
ifneq ($(strip $(HOST_UNPACK)),) ifneq ($(strip $(HOST_UNPACK)),)
define Host/Prepare/Default define Host/Prepare/Default
@ -176,9 +178,9 @@ ifndef DUMP
) )
endif endif
.host-prepare: $(HOST_STAMP_PREPARED) $(_host_target)host-prepare: $(HOST_STAMP_PREPARED)
.host-configure: $(HOST_STAMP_CONFIGURED) $(_host_target)host-configure: $(HOST_STAMP_CONFIGURED)
.host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED) $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED)
host-clean: FORCE host-clean: FORCE
$(call Host/Clean) $(call Host/Clean)
$(call Host/Uninstall) $(call Host/Uninstall)

2
include/package-bin.mk
View file

@ -10,7 +10,7 @@ ifeq ($(DUMP),)
ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT)) ifeq ($(if $(VARIANT),$(BUILD_VARIANT)),$(VARIANT))
ifdef Package/$(1)/install ifdef Package/$(1)/install
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) 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) compile: install-bin-$(1)
else else
compile: $(1)-disabled compile: $(1)-disabled

2
include/package-ipkg.mk
View file

@ -106,7 +106,7 @@ ifeq ($(DUMP),)
ifdef do_install ifdef do_install
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
IPKGS += $(1) 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 compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
else else
$(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected)) $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))

12
include/package.mk
View file

@ -96,6 +96,8 @@ include $(INCLUDE_DIR)/package-ipkg.mk
include $(INCLUDE_DIR)/package-bin.mk include $(INCLUDE_DIR)/package-bin.mk
include $(INCLUDE_DIR)/autotools.mk include $(INCLUDE_DIR)/autotools.mk
_pkg_target:=$(if $(QUILT),,.)
override MAKEFLAGS= override MAKEFLAGS=
CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH) CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST))) CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
@ -204,13 +206,13 @@ define Build/CoreTargets
touch $$@ touch $$@
ifdef Build/InstallDev ifdef Build/InstallDev
.compile: $(STAMP_INSTALLED) $(_pkg_target)compile: $(STAMP_INSTALLED)
endif endif
.prepare: $(STAMP_PREPARED) $(_pkg_target)prepare: $(STAMP_PREPARED)
.configure: $(STAMP_CONFIGURED) $(_pkg_target)configure: $(STAMP_CONFIGURED)
.dist: $(STAMP_CONFIGURED) $(_pkg_target)dist: $(STAMP_CONFIGURED)
.distcheck: $(STAMP_CONFIGURED) $(_pkg_target)distcheck: $(STAMP_CONFIGURED)
ifneq ($(CONFIG_AUTOREMOVE),) ifneq ($(CONFIG_AUTOREMOVE),)
compile: compile:

2
include/quilt.mk
View file

@ -64,6 +64,7 @@ ifneq ($(PKG_BUILD_DIR),)
ifneq ($(QUILT),) ifneq ($(QUILT),)
STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked STAMP_CHECKED:=$(PKG_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD= override CONFIG_AUTOREBUILD=
override CONFIG_AUTOREMOVE=
quilt-check: $(STAMP_CHECKED) quilt-check: $(STAMP_CHECKED)
endif endif
endif endif
@ -73,6 +74,7 @@ ifneq ($(HOST_BUILD_DIR),)
ifneq ($(HOST_QUILT),) ifneq ($(HOST_QUILT),)
HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked HOST_STAMP_CHECKED:=$(HOST_BUILD_DIR)/.quilt_checked
override CONFIG_AUTOREBUILD= override CONFIG_AUTOREBUILD=
override CONFIG_AUTOREMOVE=
host-quilt-check: $(HOST_STAMP_CHECKED) host-quilt-check: $(HOST_STAMP_CHECKED)
endif endif
endif endif