hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up dependency handling for autorebuilds

Browse Source 
SVN-Revision: 6956
master
Felix Fietkau 18 years ago
parent 4e7c9df1ae
commit 449a4f4079
4 changed files with 62 additions and 37 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      include/depends.mk
  2. 37
      include/host-build.mk
  3. 8
      include/package-ipkg.mk
  4. 26
      include/package.mk

28
include/depends.mk
Unescape View File

@ -0,0 +1,28 @@
#
# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# define a dependency on a subtree
# parameters:
# 1: directory
# 2: directory dependency
# 3: tempfile for file listings
# 4: find options
FINDPARAMS := -type f -not -name ".*" -and -not -path "*.svn*"
define rdep
$(foreach file,$(shell find $(1) $(FINDPARAMS) -and -not -path "*:*" $(4)),
$(2): $(file)
$(file): ;
)
ifneq ($(shell find $(1) $(FINDPARAMS) $(4) 2>/dev/null | md5s),$(shell cat $(3) 2>/dev/null))
$(2): $(3)
endif
$(3): FORCE
@find $(1) $(FINDPARAMS) $(4) 2>/dev/null | md5s > $$@
endef

37
include/host-build.mk
Unescape View File

@ -7,6 +7,11 @@
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk
include $(INCLUDE_DIR)/depends.mk
STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared
STAMP_CONFIGURED=$(PKG_BUILD_DIR)/.configured
STAMP_BUILT=$(PKG_BUILD_DIR)/.built
ifneq ($(strip $(PKG_UNPACK)),)
define Build/Prepare/Default
@ -69,34 +74,38 @@ ifneq ($(strip $(PKG_SOURCE)),)
mkdir -p $(DL_DIR)
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
$(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
endif
ifneq ($(CONFIG_AUTOREBUILD),)
define HostBuild/Autoclean
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
$(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s))
$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*")
endef
endif
define HostBuild
ifeq ($(DUMP),)
ifeq ($(CONFIG_AUTOREBUILD),y)
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
$$(info Forcing package rebuild)
$(PKG_BUILD_DIR)/.prepared: package-clean
endif
endif
$(call HostBuild/Autoclean)
endif
$(PKG_BUILD_DIR)/.prepared:
$(STAMP_PREPARED):
@-rm -rf $(PKG_BUILD_DIR)
@mkdir -p $(PKG_BUILD_DIR)
$(call Build/Prepare)
touch $$@
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
$(STAMP_CONFIGURED): $(STAMP_PREPARED)
$(call Build/Configure)
touch $$@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(STAMP_BUILT): $(STAMP_CONFIGURED)
$(call Build/Compile)
@$(MAKE) $(PKG_BUILD_DIR)/.dep_files
touch $$@
$(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
$(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)
$(call Build/Install)
mkdir -p $$(shell dirname $$@)
touch $$@
@ -111,9 +120,9 @@ define HostBuild
rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
download:
prepare: $(PKG_BUILD_DIR)/.prepared
configure: $(PKG_BUILD_DIR)/.configured
compile: $(PKG_BUILD_DIR)/.built
prepare: $(STAMP_PREPARED)
configure: $(STAMP_CONFIGURED)
compile: $(STAMP_BUILT)
install:
clean: FORCE
$(call Build/Clean)

8
include/package-ipkg.mk
Unescape View File

@ -23,14 +23,6 @@ ifeq ($(DUMP),)
ifeq ($(CONFIG_PACKAGE_$(1)),y)
install: $$(INFO_$(1))
endif
ifneq ($(MAKECMDGOALS),prereq)
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
$(PKG_BUILD_DIR)/.built: package-rebuild
$$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
endif
endif
else
compile: $(1)-disabled
$(1)-disabled:

26
include/package.mk
Unescape View File

@ -13,6 +13,7 @@ PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/prereq.mk
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk
include $(INCLUDE_DIR)/depends.mk
include $(INCLUDE_DIR)/package-defaults.mk
include $(INCLUDE_DIR)/package-dumpinfo.mk
include $(INCLUDE_DIR)/package-ipkg.mk
@ -22,6 +23,14 @@ STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
ifneq ($(CONFIG_AUTOREBUILD),)
define Build/Autoclean
$(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)
$(call rdep,${CURDIR},$(STAMP_PREPARED),$(TMP_DIR)/.packagedir_$(shell echo "${CURDIR}" | md5s))
$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*")
endef
endif
define Build/DefaultTargets
ifneq ($(strip $(PKG_SOURCE_URL)),)
download: $(DL_DIR)/$(PKG_SOURCE)
@ -33,14 +42,7 @@ define Build/DefaultTargets
$(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
endif
ifeq ($(DUMP),)
ifeq ($(CONFIG_AUTOREBUILD),y)
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
$$(info Forcing package rebuild)
$(STAMP_PREPARED): clean
endif
endif
endif
$(call Build/Autoclean)
$(STAMP_PREPARED):
@-rm -rf $(PKG_BUILD_DIR)
@ -54,13 +56,10 @@ define Build/DefaultTargets
$(STAMP_BUILT): $(STAMP_CONFIGURED)
$(Build/Compile)
@$(MAKE) $(PKG_BUILD_DIR)/.dep_files
touch $$@
ifdef Build/InstallDev
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed)
$(STAMP_BUILT): package-rebuild
endif
compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT)
mkdir -p $(STAGING_DIR)/stampfiles
@ -68,9 +67,6 @@ define Build/DefaultTargets
touch $$@
endif
package-rebuild: FORCE
@-rm -f $(STAMP_BUILT)
define Build/DefaultTargets
endef
endef

Write Preview
Loading…
Cancel
Save