KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix kernel package and kernel modules dependency on it

Browse source 
SVN-Revision: 2492
This commit is contained in:
Nicolas Thill 2005-11-15 08:23:42 +00:00
parent 15e214dd89
commit 5de370fbe2
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
openwrt/target/linux/control/kernel.control
View file

@ -1,3 +1,4 @@
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>

3
openwrt/target/linux/linux-2.4/Makefile
View file

@ -426,8 +426,7 @@ $(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 $(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(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

3
openwrt/target/linux/linux-2.6/Makefile
View file

@ -444,8 +444,7 @@ $(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 $(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(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
openwrt/target/linux/rules.mk
View file

@ -17,11 +17,7 @@ else
KDEPEND_$(1):=$($(4)) KDEPEND_$(1):=$($(4))
endif endif
ifeq ($$(strip $(5)),) IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)) $(foreach pkg,$(5),", $(pkg)")
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE))
else
IDEPEND_$(1):=kernel-$(LINUX_VERSION)-$(BOARD) ($(PKG_RELEASE)), $(5)
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
I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2) I_$(1) := $(PKG_BUILD_DIR)/ipkg/$(2)