jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-10 03:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: zImage target no longer available on x86

Browse Source 
The legacy zImage target for x86 was removed from the kernel in 2.6.30,
and we state in Config.in that we'll use bzImage if BR2_PACKAGE_LINUX_FORMAT
isn't set, so ensure we do so for x86.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-05-28 12:03:56 +02:00
parent 170b3d3d05
commit 98de259aee
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/Makefile.in
View File

@ -10,7 +10,7 @@ ifeq ($(DOWNLOAD_LINUX26_VERSION),)
# User did not define linux version, try using headers # User did not define linux version, try using headers
ifeq ($(LINUX_HEADERS_VERSION),) ifeq ($(LINUX_HEADERS_VERSION),)
# We did not have headers (this is for real???) # We did not have headers (this is for real???)
# Version of linuc before patches # Version of linux before patches
DOWNLOAD_LINUX26_VERSION=2.6.22.1 DOWNLOAD_LINUX26_VERSION=2.6.22.1
# Version of Linux after applying any patches # Version of Linux after applying any patches
LINUX26_VERSION=2.6.22.1 LINUX26_VERSION=2.6.22.1
@ -44,9 +44,14 @@ ifndef LINUX26_FORMAT
ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),) ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
LINUX26_FORMAT=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)) LINUX26_FORMAT=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
else else
ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
# zImage target no longer available on x86 since 2.6.30
LINUX26_FORMAT=bzImage
else
LINUX26_FORMAT=zImage LINUX26_FORMAT=zImage
endif endif
endif endif
endif
# Has to be set by the target/device # Has to be set by the target/device
ifndef LINUX26_BINLOC ifndef LINUX26_BINLOC

5
target/linux/Makefile.in.advanced
View File

@ -111,9 +111,14 @@ ifndef LINUX26_FORMAT
ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),) ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
LINUX26_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)) LINUX26_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
else else
ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
# zImage target no longer available on x86 since 2.6.30
LINUX26_FORMAT=bzImage
else
LINUX26_FORMAT:=zImage LINUX26_FORMAT:=zImage
endif endif
endif endif
endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Has to be set by the target/device # Has to be set by the target/device