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

add a staging directory for unstripped package files, useful for debugging, will be used for mklibs integration later

Browse source 
SVN-Revision: 17167
This commit is contained in:
Felix Fietkau 2009-08-07 21:58:35 +00:00
parent 0c2142d309
commit 4169a2e834
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/package-ipkg.mk
View file

@ -38,7 +38,7 @@ ifeq ($(DUMP),)
ifdef Package/$(1)/install ifdef Package/$(1)/install
ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),) ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),)
compile: $$(IPKG_$(1)) compile: $$(IPKG_$(1)) $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
ifeq ($(CONFIG_PACKAGE_$(1)),y) ifeq ($(CONFIG_PACKAGE_$(1)),y)
install: $$(INFO_$(1)) install: $$(INFO_$(1))
@ -82,6 +82,11 @@ ifeq ($(DUMP),)
$($(1)_COMMANDS) \ $($(1)_COMMANDS) \
) )
$(STAGING_DIR_ROOT)/stamp/.$(1)_installed:
mkdir -p $(STAGING_DIR_ROOT)/stamp
$(call Package/$(1)/install,$(STAGING_DIR_ROOT))
touch $$@
$$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
$(call Package/$(1)/install,$$(IDIR_$(1))) $(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)

2
package/Makefile
View file

@ -23,7 +23,7 @@ endif
$(curdir)/install:=$(curdir)/install-cleanup $(curdir)/install:=$(curdir)/install-cleanup
$(curdir)/cleanup: $(TMP_DIR)/.build $(curdir)/cleanup: $(TMP_DIR)/.build
rm -rf $(TARGET_DIR) rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT)
$(curdir)/rootfs-prepare: $(TMP_DIR)/.build $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
@-$(MAKE) package/preconfig @-$(MAKE) package/preconfig

1
rules.mk
View file

@ -63,6 +63,7 @@ STAMP_DIR:=$(BUILD_DIR)/stamp
STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR)) TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD) TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD)
STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD) DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD)
BUILD_LOG_DIR:=$(TOPDIR)/logs BUILD_LOG_DIR:=$(TOPDIR)/logs