summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-10-31 19:51:33 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-10-31 19:51:33 +0100
commit8f5add1754284c4e0f6162797b20b5d08b2e2882 (patch)
treeefdbb6e29576ae5347acb7c85aa7064f3eef1b80 /target
parent119fb7326416a7d22f2aa89cc3c3b9d686030f43 (diff)
rework installation scripts for block devices
Avoid sfdisk, parted and chroot to be more portable. Compile Host grub in target/tools, only used for ibmx40 target right now. Add pt - partition table manager from OpenWrt with some additions and portability fixes. Cfgfs support missing, coming soon.
Diffstat (limited to 'target')
-rw-r--r--target/ibmx40/Makefile8
-rw-r--r--target/tools/grub/Makefile24
2 files changed, 31 insertions, 1 deletions
diff --git a/target/ibmx40/Makefile b/target/ibmx40/Makefile
index 3c95fc2d1..b50a864fc 100644
--- a/target/ibmx40/Makefile
+++ b/target/ibmx40/Makefile
@@ -7,6 +7,12 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
+$(TOOLS_BUILD_DIR):
+ mkdir -p $(TOOLS_BUILD_DIR)
+
+tools-compile: $(TOOLS_BUILD_DIR)
+ $(MAKE) -C ../tools/grub prepare compile install
+
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
createinitcrypt:
@@ -26,7 +32,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
endif
ifeq ($(FS),usb)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "To install everything to USB use scripts/install.sh"
endif
diff --git a/target/tools/grub/Makefile b/target/tools/grub/Makefile
new file mode 100644
index 000000000..95d7b2397
--- /dev/null
+++ b/target/tools/grub/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= grub
+PKG_VERSION:= 1.98
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c0bcf60e524739bb64e3a2d4e3732a59
+PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/
+
+include ../rules.mk
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+ cd $(WRKBUILD) && ./configure --prefix=$(TOPDIR)/bin/tools
+ $(MAKE) -C $(WRKBUILD)
+ touch $@
+
+$(TOPDIR)/bin/tools/bin/grub-install: $(WRKBUILD)/.compiled
+ $(MAKE) -C $(WRKBUILD) install
+
+install: $(TOPDIR)/bin/tools/bin/grub-install
+
+include $(TOPDIR)/mk/tools.mk