diff options
| author | Gerry Rozema <gerryr@rozeware.com> | 2006-08-17 07:20:08 +0000 |
|---|---|---|
| committer | Gerry Rozema <gerryr@rozeware.com> | 2006-08-17 07:20:08 +0000 |
| commit | fe3afc62e8f898b265ec2243982837ef8ecffb57 (patch) | |
| tree | d136e5335a677d35a4a4c9aa54af082945374dda | |
| parent | 5995b4287e1520890ce61122c0eec369c17673c0 (diff) | |
| download | master-187ad058-fe3afc62e8f898b265ec2243982837ef8ecffb57.tar.gz master-187ad058-fe3afc62e8f898b265ec2243982837ef8ecffb57.tar.bz2 master-187ad058-fe3afc62e8f898b265ec2243982837ef8ecffb57.zip | |
Build bzImage for x86 builds - allow ext2 images even if initramfs used, they are needed for creating boot images
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4579 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/image.mk | 12 | ||||
| -rw-r--r-- | include/kernel-build.mk | 2 | ||||
| -rw-r--r-- | include/kernel.mk | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/include/image.mk b/include/image.mk index 660734c9f7..903c27ba63 100644 --- a/include/image.mk +++ b/include/image.mk @@ -45,15 +45,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) endef endif - ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) - define Image/mkfs/ext2 + +endif + +ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + define Image/mkfs/ext2 $(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) - endef - endif - + endef endif + define Image/mkfs/prepare/default find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 665f0ff744..8400bd2f1e 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -63,7 +63,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ diff --git a/include/kernel.mk b/include/kernel.mk index 7b959eaeaa..4b5fe72f00 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -38,6 +38,11 @@ else -e 's/armeb/arm/' \ ) + KERNELNAME="" + ifneq (,$(findstring x86,$(BOARD))) + KERNELNAME="bzImage" + endif + ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH:=um KERNEL_CC:=$(HOSTCC) |