fix pesky kmod-* ipkg install bug

SVN-Revision: 5639
owl
Felix Fietkau 2006-11-25 19:45:22 +00:00
parent 9b6e2862b6
commit 1c9fe80ed4
2 changed files with 3 additions and 3 deletions

View File

@ -88,7 +88,7 @@ define KernelPackage
CATEGORY:=Kernel modules CATEGORY:=Kernel modules
DEFAULT:=$(KMOD_DEFAULT) DEFAULT:=$(KMOD_DEFAULT)
DESCRIPTION:=$(DESCRIPTION) DESCRIPTION:=$(DESCRIPTION)
EXTRA_DEPENDS:='kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
$(call KernelPackage/$(1)) $(call KernelPackage/$(1))
$(call KernelPackage/$(1)/$(KERNEL)) $(call KernelPackage/$(1)/$(KERNEL))
$(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)) $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))

View File

@ -208,11 +208,11 @@ define BuildPackage
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
( \ ( \
DEPENDS=; \ DEPENDS='$(EXTRA_DEPENDS)'; \
for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
done; \ 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 "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control