diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-04 20:18:35 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-07-04 20:18:35 +0000 |
| commit | c84591ffb59d5408d3efe1baf2837afb488acf42 (patch) | |
| tree | 9126b19704d974dbbae0a674e831dd4701999a29 | |
| parent | b15378cddb6c0251162081653c9e2c460e3b0a35 (diff) | |
change kernel package name to kernel-VERSION-BOARD to work around ipkg bug
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1340 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/control/kernel.control | 1 | ||||
| -rw-r--r-- | target/linux/linux-2.4/Makefile | 5 | ||||
| -rw-r--r-- | target/linux/rules.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/control/kernel.control b/target/linux/control/kernel.control index 5432d21a0..32e6fdc31 100644 --- a/target/linux/control/kernel.control +++ b/target/linux/control/kernel.control @@ -1,4 +1,3 @@ -Package: kernel Priority: optional Section: sys Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile index e1ae0b380..6f08cf67c 100644 --- a/target/linux/linux-2.4/Makefile +++ b/target/linux/linux-2.4/Makefile @@ -40,7 +40,7 @@ IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CO PKG_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules PKG_RELEASE := 1 -KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk +KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel-$(LINUX_VERSION)-$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg include $(LINUX_KCONFIG) @@ -197,7 +197,8 @@ $(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 $(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH) + echo 'Package: kernel-$(LINUX_VERSION)-$(BOARD)' >> $(KERNEL_IDIR)/CONTROL/control if [ -f ./config/$(BOARD).modules ]; then \ cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ fi diff --git a/target/linux/rules.mk b/target/linux/rules.mk index 9446c343f..75a96b4e6 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -6,9 +6,9 @@ KDEPEND_$(1):=$($(4)) endif ifeq ($$(strip $(5)),) -IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)) +IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE)) else -IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)), $(5) +IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE)), $(5) endif PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk |