From 1d41dfd46f6f45ed351a677fb22eea072c6530df Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Mon, 9 Dec 2013 15:47:08 +0100
Subject: add tools/syslinux

---
 tools/syslinux/Makefile | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tools/syslinux/Makefile

(limited to 'tools/syslinux/Makefile')

diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile
new file mode 100644
index 000000000..2f44c301b
--- /dev/null
+++ b/tools/syslinux/Makefile
@@ -0,0 +1,37 @@
+# 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:=		syslinux
+PKG_VERSION:=		6.02
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		086ac1c569d226a5e2ae3d605de09a1d
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/boot/syslinux/
+
+include ../rules.mk
+WRKINST:=		${WRKBUILD}/openadk_installroot
+
+install: ${TOOLS_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	#(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' bios installer
+	touch $@
+
+$(WRKBUILD)/.installed: ${WRKBUILD}/.compiled
+	mkdir -p ${WRKINST}
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \
+		INSTALLROOT='${WRKINST}' \
+		bios install
+
+${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed
+	$(INSTALL_BIN) ${WRKINST}/sbin/extlinux \
+		${TOOLS_DIR}
+
+${STAGING_HOST_DIR}/usr/share/syslinux/.installed: ${WRKBUILD}/.installed
+	mkdir -p ${STAGING_HOST_DIR}/usr/share
+	${CP} ${WRKINST}/usr/share/syslinux ${STAGING_HOST_DIR}/usr/share
+	touch ${STAGING_HOST_DIR}/usr/share/syslinux/.installed
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


From 422fe42ea4a4f5c5f868736e17a0462e1e5c1c6b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Dec 2013 13:11:33 +0100
Subject: small fixes for iso target

---
 target/config/Config.in | 1 +
 target/x86/Makefile     | 2 +-
 tools/Makefile          | 5 ++++-
 tools/syslinux/Makefile | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools/syslinux/Makefile')

diff --git a/target/config/Config.in b/target/config/Config.in
index db04414de..99b056546 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -755,6 +755,7 @@ config ADK_TARGET_ROOTFS_ISO
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_BLK_DEV_SR
 	depends on ADK_HOST_LINUX
+	depends on ADK_LINUX_X86
 	help
 	  Use this option to create a bootable ISO image.
 
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 87d3b5806..b228810c7 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -65,8 +65,8 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
 	@echo "Start qemu with following command line:"
 	@echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
+endif
 ifeq (${ADK_TARGET_FS},iso)
 imageinstall: ${BIN_DIR}/${ROOTFSISO}
 	@echo 'ISO image is at $<'
 endif
-endif
diff --git a/tools/Makefile b/tools/Makefile
index 86eb09e22..4a5f1ec92 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,10 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools syslinux
+TARGETS:=adk mkcrypt cpio mkimage genext2fs
+ifeq ($(ADK_TARGET_ROOTFS_ISO),y)
+TARGETS+=cdrtools syslinux
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile
index 2f44c301b..1ac6ef672 100644
--- a/tools/syslinux/Makefile
+++ b/tools/syslinux/Makefile
@@ -24,6 +24,7 @@ $(WRKBUILD)/.installed: ${WRKBUILD}/.compiled
 	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \
 		INSTALLROOT='${WRKINST}' \
 		bios install
+	touch $@
 
 ${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed
 	$(INSTALL_BIN) ${WRKINST}/sbin/extlinux \
-- 
cgit v1.2.3