From a8de4fb9f24fea095e80a3fcd5c69bd6029e39d2 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 14:02:29 +0000 Subject: move target/linux/image to target/image git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4040 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/image/x86/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 target/image/x86/Makefile (limited to 'target/image/x86/Makefile') diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile new file mode 100644 index 000000000..e4b3a9e44 --- /dev/null +++ b/target/image/x86/Makefile @@ -0,0 +1,9 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/image.mk + +define Image/Build + cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + cp $(KDIR)/vmlinux $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz +endef + +$(eval $(call BuildImage)) -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/image/x86/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/image/x86/Makefile') diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile index e4b3a9e44..d9ed29457 100644 --- a/target/image/x86/Makefile +++ b/target/image/x86/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -- cgit v1.2.3 From 28b6b57ae89f7d26dedfa4c85e9a3e4cd6b48ebe Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 25 Aug 2006 09:28:15 +0000 Subject: Override kernel template and output bzImage, not the binary file, closes #676 and #714 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4658 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/image/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/image/x86/Makefile') diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile index d9ed29457..919ccbc9f 100644 --- a/target/image/x86/Makefile +++ b/target/image/x86/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk define Image/Build cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img - cp $(KDIR)/vmlinux $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz + cp $(LINUX_DIR)/arch/i386/boot/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef $(eval $(call BuildImage)) -- cgit v1.2.3 From 5cd5287c63bd0be72b4ae00fc1af508a2b42e541 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 8 Oct 2006 15:48:56 +0000 Subject: add grub based images for x86-2.6 - still a bit hackish, but works with ext2 and jffs2 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4962 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/image/x86/Makefile | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'target/image/x86/Makefile') diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile index 919ccbc9f..b836f3ace 100644 --- a/target/image/x86/Makefile +++ b/target/image/x86/Makefile @@ -7,9 +7,48 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +ifeq ($(CONFIG_X86_GRUB_IMAGES),y) + define Build/Compile + $(MAKE) -C grub compile + endef + + define Build/Clean + $(MAKE) -C grub clean + endef + + define Image/cmdline/jffs2-64k + block2mtd.block2mtd=/dev/hda2,65536 root=/dev/mtdblock0 rootfstype=jffs2 + endef + + define Image/cmdline/jffs2-128k + block2mtd.block2mtd=/dev/hda2,131072 root=/dev/mtdblock0 rootfstype=jffs2 + endef + + define Image/cmdline/ext2 + root=/dev/hda2 rootfstype=ext2 + endef + + define Image/Build/grub + mkdir -p $(KDIR)/root.grub/boot/grub + $(CP) \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \ + $(STAGING_DIR)/usr/lib/grub/i386-pc/e2fs_stage1_5 \ + $(KDIR)/root.grub/boot/grub/ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz + sed \ + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \ + -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ + ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst + PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_X86_GRUB_FSPART) $(KDIR)/root.$(1) + endef +endif + define Image/Build - cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img + $(call Image/Build/grub,$(1)) + cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs cp $(LINUX_DIR)/arch/i386/boot/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz endef + $(eval $(call BuildImage)) -- cgit v1.2.3