qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 10:04:36 +02:00
Code

fix issues if kernel config is changed after the compile has started

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4570 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2006-08-16 00:35:30 +00:00
parent 5fceb48d52
commit 7c79debf2c
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/kernel-build.mk
View File

@ -94,10 +94,11 @@ $(KERNEL_IPKG):
fi fi
$(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
$(TOPDIR)/.kernel.mk: $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
echo "BOARD:=$(BOARD)" > $@ echo "CONFIG_BOARD:=$(BOARD)" > $@
echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
pkg-install: FORCE pkg-install: FORCE
@for pkg in $(INSTALL_TARGETS); do \ @for pkg in $(INSTALL_TARGETS); do \

22
include/kernel.mk
View File

@ -9,15 +9,25 @@ ifeq ($(DUMP),1)
BOARD:=<BOARD> BOARD:=<BOARD>
LINUX_VERSION:=<LINUX_VERSION> LINUX_VERSION:=<LINUX_VERSION>
else else
-include $(TOPDIR)/.kernel.mk
ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) include $(TOPDIR)/.kernel.mk
KERNEL:=2.4 include $(INCLUDE_DIR)/target.mk
LINUX_KMOD_SUFFIX=o
# check to see if .kernel.mk matches target.mk
ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
RELEASE:=$(CONFIG_RELEASE)
else
# oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
$(warning rebuilding .kernel.mk)
$(TOPDIR)/.kernel.mk: FORCE
@$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null
endif endif
ifneq (,$(findstring 2.6.,$(LINUX_VERSION)))
KERNEL:=2.6 ifeq ($(KERNEL),2.6)
LINUX_KMOD_SUFFIX=ko LINUX_KMOD_SUFFIX=ko
else
LINUX_KMOD_SUFFIX=o
endif endif
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \