projects
/
openwrt-14.07
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BB: build: improve feed handling for opkg.conf
[openwrt-14.07/.git]
/
include
/
image.mk
diff --git
a/include/image.mk
b/include/image.mk
index 9f583ca7adf703c06949e0d6adc57ed1665472c2..b3211e7cb146b2c9ad8b7cb3d9ec9f230a1b4f89 100644
(file)
--- a/
include/image.mk
+++ b/
include/image.mk
@@
-77,15
+77,10
@@
define prepare_generic_squashfs
$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
endef
$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 16 64 128 256
endef
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
- define Image/BuildKernel/Initramfs
+define Image/BuildKernel/Initramfs
cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
$(call Image/Build/Initramfs)
cp $(KDIR)/vmlinux-initramfs.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs.elf
$(call Image/Build/Initramfs)
- endef
-else
- define Image/BuildKernel/Initramfs
- endef
-endif
+endef
define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
@@
-269,7
+264,7
@@
define BuildImage
$(call Image/Prepare)
$(call Image/mkfs/prepare)
$(call Image/BuildKernel)
$(call Image/Prepare)
$(call Image/mkfs/prepare)
$(call Image/BuildKernel)
- $(
call Image/BuildKernel/Initramfs
)
+ $(
if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs)
)
$(call Image/InstallKernel)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz)
$(call Image/InstallKernel)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz)
@@
-283,7
+278,7
@@
define BuildImage
else
install: compile install-targets
$(call Image/BuildKernel)
else
install: compile install-targets
$(call Image/BuildKernel)
- $(
call Image/BuildKernel/Initramfs
)
+ $(
if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Image/BuildKernel/Initramfs)
)
$(call Image/InstallKernel)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz)
$(call Image/InstallKernel)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/targz)