summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2010-04-11 00:37:35 +0200
committerPhil Sutter <phil@nwl.cc>2010-06-20 16:17:30 +0200
commit4897a9b15a1cbd741ace1ce3a844e93ce10cd1a1 (patch)
tree48e310e8044c7476306c3e86f8b5075ef0399eb8
parent7310c677852c7a925c55922481052ad0ff7c8310 (diff)
ipkg doesn't like underscores in package names
But as there are packages with names containing them, and other package managers probably have less problems with that, fix this issue at the most specific place.
-rw-r--r--mk/package.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/package.mk b/mk/package.mk
index b4b02d8a5..4baa73bf0 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -160,7 +160,7 @@ IDEPEND_$(1):= $$(strip $(4))
_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control
ICONTROL_$(1)?= $(WRKDIR)/.$(2).control
$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
- @echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+ @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control
@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
@@ -177,7 +177,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
comma=", "; \
last=$$$$dep; \
done; \
- echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
+ echo "Depends: $$$$deps" | tr '_' '-' >>$${IDIR_$(1)}/CONTROL/control; \
fi
@for file in conffiles preinst postinst prerm postrm; do \
[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \