From 822615cb6b189377f8cdbe326f6a32dc8b3bd386 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 20 Aug 2009 15:48:41 +0000
Subject: [PATCH] merge the control file and the .ipk file targets into one to
prevent them from going out of sync
SVN-Revision: 17332
---
include/package-ipkg.mk | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 245e29fa5d..904bbd75af 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -57,7 +57,14 @@ ifeq ($(DUMP),)
$(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm))
- $$(IDIR_$(1))/CONTROL/control: $(STAMP_BUILT)
+
+ $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
+ mkdir -p $(STAGING_DIR_ROOT)/stamp
+ $(call Package/$(1)/install,$(STAGING_DIR_ROOT))
+ $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT))
+ touch $$@
+
+ $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)
@rm -f $(PACKAGE_DIR)/$(1)_*
rm -rf $$(IDIR_$(1))
mkdir -p $$(IDIR_$(1))/CONTROL
@@ -82,16 +89,7 @@ ifeq ($(DUMP),)
(cd $$(IDIR_$(1))/CONTROL; \
$($(1)_COMMANDS) \
)
-
- $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
- mkdir -p $(STAGING_DIR_ROOT)/stamp
- $(call Package/$(1)/install,$(STAGING_DIR_ROOT))
- $(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT))
- touch $$@
-
- $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT) $$(IDIR_$(1))/CONTROL/control
$(call Package/$(1)/install,$$(IDIR_$(1)))
- mkdir -p $$(IDIR_$(1))/CONTROL
mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
$(RSTRIP) $$(IDIR_$(1))
--
GitLab