jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 07:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad linux kernel name

Browse Source
This commit is contained in:
Ulf Samuelsson 2008-04-16 22:45:47 +00:00
parent ed638f6feb
commit f5e9fe17b2
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/device/Atmel/Makefile.in
View File

@ -37,7 +37,7 @@ LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config
# This should be part of target/linux/Makefile.in # This should be part of target/linux/Makefile.in
LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR) LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR)
LINUX26_BINLOC=$(LINUX26_FORMAT) #LINUX26_BINLOC=$(LINUX26_FORMAT)
#LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL) #LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL)
ifeq ($(strip $(BR2_avr32)),y) ifeq ($(strip $(BR2_avr32)),y)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT)

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

@ -134,11 +134,7 @@ endif
# -------------- # --------------
# UIMAGE # UIMAGE
ifeq ($(LINUX26_FORMAT),uImage) ifeq ($(LINUX26_FORMAT),uImage)
ifeq ($(BR2_avr32),y)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_FORMAT)
else
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
endif
KERNEL_EXT:=.gz KERNEL_EXT:=.gz
endif endif
@ -153,28 +149,15 @@ endif
# BZIMAGE # BZIMAGE
ifeq ($(LINUX26_FORMAT),bzImage) ifeq ($(LINUX26_FORMAT),bzImage)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage
KERNEL_EXT:= KERNEL_EXT:=.bz
endif endif
endif endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# File name for the Linux kernel binary # File name for the Linux kernel binary
ifeq ($(LINUX26_FORMAT),uImage)
LINUX26_KERNEL_NAME:="uImage"
endif
ifeq ($(LINUX26_FORMAT),bzImage)
LINUX26_KERNEL_NAME:="bzImage"
endif
ifeq ($(LINUX26_FORMAT),vmlinux)
LINUX26_KERNEL_NAME:="vmlinux"
endif
ifeq ($(LINUX26_FORMAT),zImage)
LINUX26_KERNEL_NAME:="zImage"
endif
ifeq ($(LINUX26_FORMAT),custom)
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT) LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
endif
ifeq ($(BOARD_NAME),) ifeq ($(BOARD_NAME),)
BOARD_NAME=$(ARCH) BOARD_NAME=$(ARCH)
@ -387,10 +370,12 @@ $(LINUX26_DIR)/.depend_done: $(LINUX26_DIR)/.configured
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
touch $@ touch $@
$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \ $(LINUX26_DIR)/$(LINUX26_BINLOC): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
$(LINUX26_DIR)/.depend_done $(LINUX26_DIR)/.depend_done
$(MAKE) $(LINUX26_MAKE_FLAGS) \ $(MAKE) $(LINUX26_MAKE_FLAGS) \
-C $(LINUX26_DIR) $(LINUX26_FORMAT) -C $(LINUX26_DIR) $(LINUX26_FORMAT)
$(LINUX26_KERNEL): $(LINUX26_DIR)/$(LINUX26_BINLOC)
cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL) cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
touch -c $@ touch -c $@