mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
change kernel package name to kernel-VERSION-BOARD to work around ipkg bug
SVN-Revision: 1340
This commit is contained in:
parent
600414fa8b
commit
dcef53bba2
@ -1,4 +1,3 @@
|
|||||||
Package: kernel
|
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: sys
|
Section: sys
|
||||||
Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
|
Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
|
||||||
|
@ -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_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules
|
||||||
PKG_RELEASE := 1
|
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
|
KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg
|
||||||
|
|
||||||
include $(LINUX_KCONFIG)
|
include $(LINUX_KCONFIG)
|
||||||
@ -197,7 +197,8 @@ $(TARGET_MODULES_DIR):
|
|||||||
$(KERNEL_IPKG):
|
$(KERNEL_IPKG):
|
||||||
rm -rf $(KERNEL_IDIR)
|
rm -rf $(KERNEL_IDIR)
|
||||||
mkdir -p $(KERNEL_IDIR)/etc
|
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 \
|
if [ -f ./config/$(BOARD).modules ]; then \
|
||||||
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
|
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
|
||||||
fi
|
fi
|
||||||
|
@ -6,9 +6,9 @@ KDEPEND_$(1):=$($(4))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($$(strip $(5)),)
|
ifeq ($$(strip $(5)),)
|
||||||
IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE))
|
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE))
|
||||||
else
|
else
|
||||||
IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)), $(5)
|
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE)), $(5)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
|
PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)_$(ARCH).ipk
|
||||||
|
Loading…
Reference in New Issue
Block a user