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

fix extra control files for packages containing "." and allow different conffiles for multiple packages built from the same directory

Browse source 
SVN-Revision: 3985
This commit is contained in:
Felix Fietkau 2006-06-18 13:32:43 +00:00
parent 735be760e3
commit 68b9a0b76b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
openwrt/package/rules.mk
View file

@ -78,9 +78,9 @@ define Package/Default
endef endef
define BuildIPKGVariable define BuildIPKGVariable
pkg_$(subst -,_,$(1))_$(2) = $$(Package/$(1)/$(2)) pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
export pkg_$(subst -,_,$(1))_$(2) export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
COMMANDS += if [ -n "$$$$$$$$pkg_$(subst -,_,$(1))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst -,_,$(1))_$(2)" > $(2); fi; $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
endef endef
define BuildPackage define BuildPackage
@ -175,7 +175,7 @@ define BuildPackage
echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
chmod 644 $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control
(cd $$(IDIR_$(1))/CONTROL; \ (cd $$(IDIR_$(1))/CONTROL; \
$(COMMANDS) \ $($(1)_COMMANDS) \
) )
$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built