From ffeaf39fd456d83022f31c64c931aa54b9269668 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 25 Nov 2006 19:45:22 +0000 Subject: fix pesky kmod-* ipkg install bug git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5639 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 2 +- include/package.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index b8af46c2b8..b5950c3f5d 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 4e67e73246..69606464ae 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 -- cgit v1.2.3