fix kernel package and kernel modules dependency on it
SVN-Revision: 2492
This commit is contained in:
parent
15e214dd89
commit
5de370fbe2
4 changed files with 4 additions and 9 deletions
|
@ -1,3 +1,4 @@
|
|||
Package: kernel
|
||||
Priority: optional
|
||||
Section: sys
|
||||
Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
|
||||
|
|
|
@ -426,8 +426,7 @@ $(TARGET_MODULES_DIR):
|
|||
$(KERNEL_IPKG):
|
||||
rm -rf $(KERNEL_IDIR)
|
||||
mkdir -p $(KERNEL_IDIR)/etc
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH)
|
||||
echo 'Package: kernel-$(LINUX_VERSION)-$(BOARD)' >> $(KERNEL_IDIR)/CONTROL/control
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH)
|
||||
if [ -f ./config/$(BOARD).modules ]; then \
|
||||
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
|
||||
fi
|
||||
|
|
|
@ -444,8 +444,7 @@ $(TARGET_MODULES_DIR):
|
|||
$(KERNEL_IPKG):
|
||||
rm -rf $(KERNEL_IDIR)
|
||||
mkdir -p $(KERNEL_IDIR)/etc
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH)
|
||||
echo 'Package: kernel-$(LINUX_VERSION)-$(BOARD)' >> $(KERNEL_IDIR)/CONTROL/control
|
||||
$(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH)
|
||||
if [ -f ./config/$(BOARD).modules ]; then \
|
||||
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
|
||||
fi
|
||||
|
|
|
@ -17,11 +17,7 @@ else
|
|||
KDEPEND_$(1):=$($(4))
|
||||
endif
|
||||
|
||||
ifeq ($$(strip $(5)),)
|
||||
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE))
|
||||
else
|
||||
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE)), $(5)
|
||||
endif
|
||||
IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)) $(foreach pkg,$(5),", $(pkg)")
|
||||
|
||||
PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
|
||||
I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2)
|
||||
|
|
Loading…
Reference in a new issue