clean up a few things in image build makefiles and fix unnecessary grub rebuilds
SVN-Revision: 6360
This commit is contained in:
parent
738ca6f657
commit
653f61fb3e
6 changed files with 18 additions and 43 deletions
|
@ -20,7 +20,7 @@ IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
|
|||
download: $(patsubst %,%-download,$(TARGETS-y))
|
||||
prepare: linux-prepare
|
||||
compile: linux-compile image_compile
|
||||
install: image_clean linux-install image_install
|
||||
install: linux-install image_install
|
||||
|
||||
ifeq ($(CONFIG_SDK),y)
|
||||
install: sdk_install
|
||||
|
|
|
@ -7,21 +7,18 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/image.mk
|
||||
|
||||
define Build/Compile
|
||||
rm -f $(KDIR)/loader.gz
|
||||
$(MAKE) -C lzma-loader \
|
||||
BUILD_DIR="$(KDIR)" \
|
||||
TARGET="$(KDIR)" \
|
||||
install
|
||||
echo -ne "\\x00" >> $(KDIR)/loader.gz
|
||||
endef
|
||||
|
||||
define Build/Clean
|
||||
$(MAKE) -C lzma-loader clean
|
||||
endef
|
||||
|
||||
define Image/Prepare
|
||||
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
|
||||
rm -f $(KDIR)/loader.gz
|
||||
$(MAKE) -C lzma-loader \
|
||||
BUILD_DIR="$(KDIR)" \
|
||||
TARGET="$(KDIR)" \
|
||||
clean install
|
||||
echo -ne "\\x00" >> $(KDIR)/loader.gz
|
||||
endef
|
||||
|
||||
ifneq ($(KERNEL),2.4)
|
||||
|
|
|
@ -23,7 +23,7 @@ endef
|
|||
|
||||
define Image/Prepare
|
||||
cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
|
||||
$(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) compile
|
||||
$(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile
|
||||
endef
|
||||
|
||||
define Image/Build
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/image.mk
|
||||
|
||||
define Build/Clean
|
||||
endef
|
||||
|
||||
define Image/Prepare
|
||||
cp $(LINUX_DIR)/arch/ppc/boot/images/uImage $(KDIR)/uImage
|
||||
endef
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/image.mk
|
||||
|
||||
define Build/Clean
|
||||
endef
|
||||
|
||||
define Image/Prepare
|
||||
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
|
||||
endef
|
||||
|
|
|
@ -23,34 +23,19 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/grub-$(PKG_VERSION)
|
|||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
ifeq ($(HOST_ARCH),x86_64)
|
||||
define Build/Configure
|
||||
(cd $(PKG_BUILD_DIR); \
|
||||
LDFLAGS="-static" \
|
||||
./configure \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
--build=$(GNU_HOST_NAME) \
|
||||
--program-prefix="" \
|
||||
--program-suffix="" \
|
||||
--prefix=/usr \
|
||||
--exec-prefix=/usr \
|
||||
--bindir=/usr/bin \
|
||||
--sbindir=/usr/sbin \
|
||||
--libexecdir=/usr/lib \
|
||||
--sysconfdir=/etc \
|
||||
--datadir=/usr/share \
|
||||
--localstatedir=/var \
|
||||
--mandir=/usr/man \
|
||||
--infodir=/usr/info \
|
||||
$(DISABLE_NLS) \
|
||||
--disable-auto-linux-mem-opt \
|
||||
)
|
||||
endef
|
||||
CONFIGURE_FLAGS:= \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
--build=$(GNU_HOST_NAME)
|
||||
else
|
||||
define Build/Configure
|
||||
CONFIGURE_FLAGS:=
|
||||
endif
|
||||
|
||||
define Build/Configure
|
||||
(cd $(PKG_BUILD_DIR); \
|
||||
LDFLAGS="-static" \
|
||||
./configure \
|
||||
$(CONFIGURE_FLAGS) \
|
||||
--program-prefix="" \
|
||||
--program-suffix="" \
|
||||
--prefix=/usr \
|
||||
|
@ -66,8 +51,7 @@ else
|
|||
$(DISABLE_NLS) \
|
||||
--disable-auto-linux-mem-opt \
|
||||
)
|
||||
endef
|
||||
endif
|
||||
endef
|
||||
|
||||
#
|
||||
# ./configure detects whether the host compiler supports
|
||||
|
|
Loading…
Reference in a new issue