From 5de370fbe29d3d20ca8a79b5b61045d3c5cdc375 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 15 Nov 2005 08:23:42 +0000 Subject: [PATCH] fix kernel package and kernel modules dependency on it SVN-Revision: 2492 --- openwrt/target/linux/control/kernel.control | 1 + openwrt/target/linux/linux-2.4/Makefile | 3 +-- openwrt/target/linux/linux-2.6/Makefile | 3 +-- openwrt/target/linux/rules.mk | 6 +----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/openwrt/target/linux/control/kernel.control b/openwrt/target/linux/control/kernel.control index 32e6fdc313..5432d21a0f 100644 --- a/openwrt/target/linux/control/kernel.control +++ b/openwrt/target/linux/control/kernel.control @@ -1,3 +1,4 @@ +Package: kernel Priority: optional Section: sys Maintainer: Felix Fietkau diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index d487446209..39828963eb 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -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 diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile index ce49930470..212a4a76ab 100644 --- a/openwrt/target/linux/linux-2.6/Makefile +++ b/openwrt/target/linux/linux-2.6/Makefile @@ -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 diff --git a/openwrt/target/linux/rules.mk b/openwrt/target/linux/rules.mk index be151ea10f..8871fa442e 100644 --- a/openwrt/target/linux/rules.mk +++ b/openwrt/target/linux/rules.mk @@ -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) -- 2.25.1