projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f08684f
)
merge the control file and the .ipk file targets into one to prevent them from going...
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 20 Aug 2009 15:48:41 +0000
(15:48 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 20 Aug 2009 15:48:41 +0000
(15:48 +0000)
SVN-Revision: 17332
include/package-ipkg.mk
patch
|
blob
|
history
diff --git
a/include/package-ipkg.mk
b/include/package-ipkg.mk
index 245e29fa5d1d341006fbe64254ffc2015681309c..904bbd75af0afffbb24bc525a575989f63e0d243 100644
(file)
--- 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))
$(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
@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) \
)
(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)))
$(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))
mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
$(RSTRIP) $$(IDIR_$(1))