summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-25 19:45:22 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-25 19:45:22 +0000
commit65c17ca3e240ceb6b9b766cb8638d504b7638b40 (patch)
tree25bc345f15c45217c90f235cd982e57e65091d22
parent07b35a464089fddded7f4183b3721df6c70a6fd2 (diff)
fix pesky kmod-* ipkg install bug
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5639 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel.mk2
-rw-r--r--include/package.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index b8af46c2b..b5950c3f5 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -88,7 +88,7 @@ define KernelPackage
CATEGORY:=Kernel modules
DEFAULT:=$(KMOD_DEFAULT)
DESCRIPTION:=$(DESCRIPTION)
- EXTRA_DEPENDS:='kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))'
+ EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
$(call KernelPackage/$(1))
$(call KernelPackage/$(1)/$(KERNEL))
$(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
diff --git a/include/package.mk b/include/package.mk
index 4e67e7324..69606464a 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -208,11 +208,11 @@ define BuildPackage
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
( \
- DEPENDS=; \
+ DEPENDS='$(EXTRA_DEPENDS)'; \
for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
done; \
- echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+ echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
)
echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control