qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-17 21:57:10 +02:00
Code

put LINUX_KARCH in .kernel.mk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5013 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-10-10 13:41:00 +00:00
parent b8885f1f93
commit bd97e26b6a
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/kernel-build.mk
View File

@ -17,6 +17,15 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS
TARGETS += $(KERNEL_IPKG) TARGETS += $(KERNEL_IPKG)
INSTALL_TARGETS += $(KERNEL_IPKG) INSTALL_TARGETS += $(KERNEL_IPKG)
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/mipsel/mips/' \
-e 's/mipseb/mips/' \
-e 's/powerpc/ppc/' \
-e 's/sh[234]/sh/' \
-e 's/armeb/arm/' \
)
$(TARGETS): $(PACKAGE_DIR) $(TARGETS): $(PACKAGE_DIR)
$(PACKAGE_DIR): $(PACKAGE_DIR):
@ -98,6 +107,7 @@ $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
echo "CONFIG_KERNEL:=$(KERNEL)" >> $@ echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@ echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
echo "CONFIG_LINUX_KARCH:=$(LINUX_KARCH)" >> $@
pkg-install: FORCE pkg-install: FORCE
@for pkg in $(INSTALL_TARGETS); do \ @for pkg in $(INSTALL_TARGETS); do \

9
include/kernel.mk
View File

@ -17,6 +17,7 @@ else
ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL))
LINUX_VERSION:=$(CONFIG_LINUX_VERSION) LINUX_VERSION:=$(CONFIG_LINUX_VERSION)
LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE) LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE)
LINUX_KARCH:=$(CONFIG_LINUX_KARCH)
else else
# oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces)
$(warning rebuilding .kernel.mk) $(warning rebuilding .kernel.mk)
@ -30,14 +31,6 @@ else
LINUX_KMOD_SUFFIX=o LINUX_KMOD_SUFFIX=o
endif endif
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/mipsel/mips/' \
-e 's/mipseb/mips/' \
-e 's/powerpc/ppc/' \
-e 's/sh[234]/sh/' \
-e 's/armeb/arm/' \
)
KERNELNAME= KERNELNAME=
ifneq (,$(findstring x86,$(BOARD))) ifneq (,$(findstring x86,$(BOARD)))
KERNELNAME="bzImage" KERNELNAME="bzImage"

2
include/package.mk
View File

@ -16,7 +16,7 @@ define Build/DefaultTargets
ifeq ($(DUMP),) ifeq ($(DUMP),)
ifeq ($(CONFIG_AUTOREBUILD),y) ifeq ($(CONFIG_AUTOREBUILD),y)
_INFO:= _INFO:=
ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
$(PKG_BUILD_DIR)/.prepared: package-clean $(PKG_BUILD_DIR)/.prepared: package-clean
endif endif