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

---
 tools/Makefile          |  2 +-
 tools/cdrtools/Makefile | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 tools/cdrtools/Makefile

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index ee096db61..e78a7fe42 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio mkimage genext2fs
+TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile
new file mode 100644
index 000000000..6b54d0eac
--- /dev/null
+++ b/tools/cdrtools/Makefile
@@ -0,0 +1,25 @@
+# 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:=		cdrtools
+PKG_VERSION:=		3.00
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b7b6361bcce2cedff1ae437fadafe53b
+PKG_SITES:=		ftp://ftp.berlios.de/pub/cdrecord/
+
+include ../rules.mk
+
+install: ${TOOLS_DIR}/mkisofs
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	#(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${TOOLS_DIR}/mkisofs: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \
+		${TOOLS_DIR}
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3


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/Makefile          |  2 +-
 tools/syslinux/Makefile | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tools/syslinux/Makefile

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index e78a7fe42..86eb09e22 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools
+TARGETS:=adk mkcrypt cpio mkimage genext2fs cdrtools syslinux
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
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 0e14700702f06f09f25bc861e2642a6d42da982b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 15 Dec 2013 14:09:00 +0100
Subject: need to merge third patch from Phil manually. disable on non Linux
 hosts

---
 mk/image.mk                         | 13 +++++++++++++
 mk/rootfs.mk                        |  1 +
 target/config/Config.in             | 10 ++++++++++
 target/linux/config/Config.in.block |  4 ++++
 target/linux/config/Config.in.fs    |  6 +++++-
 target/x86/Makefile                 |  4 ++++
 tools/cdrtools/Makefile             |  2 +-
 7 files changed, 38 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/mk/image.mk b/mk/image.mk
index 2273b4af7..7c519d7f5 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -121,12 +121,14 @@ INITRAMFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 else
 TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel
 INITRAMFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
 ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+ROOTFSISO=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso
 endif
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
@@ -197,5 +199,16 @@ endif
 	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE)
 
+${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
+	mkdir -p ${TARGET_DIR}/boot/syslinux
+	cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \
+		${TARGET_DIR}/boot/syslinux
+	echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \
+		${TARGET_DIR}/boot/syslinux/isolinux.cfg
+	${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
+		-b boot/syslinux/isolinux.bin \
+		-c boot/syslinux/boot.cat -no-emul-boot \
+		-boot-load-size 4 -boot-info-table ${TARGET_DIR}
+
 imageclean:
 	rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-*
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 283c87aa7..18d4f83dc 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -52,5 +52,6 @@ $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS)))
 $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init))
 $(eval $(call rootfs_template,encrypted,ENCRYPTED))
+$(eval $(call rootfs_template,iso,ISO))
 
 export ADK_TARGET_FS
diff --git a/target/config/Config.in b/target/config/Config.in
index f551e21a0..7ddc7b83c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -748,6 +748,16 @@ config ADK_TARGET_ROOTFS_MMC
 	  Use this option if you have a MMC/SDCARD based system.
 	  (ext2 filesystem is used.)
 
+config ADK_TARGET_ROOTFS_ISO
+	bool "ISO image"
+	select ADK_KERNEL_ISO9660_FS
+	select ADK_KERNEL_JOLIET
+	select ADK_KERNEL_SCSI
+	select ADK_KERNEL_BLK_DEV_SR
+	depends on ADK_HOST_LINUX
+	help
+	  Use this option to create a bootable ISO image.
+
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
 	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index bbd9ce745..fb5bf080f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI
 config ADK_KERNEL_BLK_DEV_SD
 	boolean
 
+config ADK_KERNEL_BLK_DEV_SR
+	boolean
+
 config ADK_KERNEL_ISCSI_TCP
 	boolean
 
@@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
 config ADK_KPACKAGE_KMOD_BLK_DEV_SR
 	prompt "kmod-scsi-cdrom................... SCSI CDROM support"
 	depends on !ADK_KERNEL_SCSI
+	depends on !ADK_KERNEL_BLK_DEV_SR
 	depends on ADK_KPACKAGE_KMOD_SCSI
 	tristate
 	help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ab048805e..9bdc6b9e5 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS
 	  fuse-utils.
 
 config ADK_KERNEL_JOLIET
-	bool 
+	boolean 
+	default n
+
+config ADK_KERNEL_ISO9660_FS
+	boolean
 	default n
 
 config ADK_KPACKAGE_KMOD_ISO9660_FS
diff --git a/target/x86/Makefile b/target/x86/Makefile
index a3dc8ae70..87d3b5806 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -65,4 +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
+ifeq (${ADK_TARGET_FS},iso)
+imageinstall: ${BIN_DIR}/${ROOTFSISO}
+	@echo 'ISO image is at $<'
+endif
 endif
diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile
index 6b54d0eac..965e3553d 100644
--- a/tools/cdrtools/Makefile
+++ b/tools/cdrtools/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		cdrtools
 PKG_VERSION:=		3.00
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b7b6361bcce2cedff1ae437fadafe53b
+PKG_MD5SUM:=		bb21cefefcfbb76cf249120e8978ffdd
 PKG_SITES:=		ftp://ftp.berlios.de/pub/cdrecord/
 
 include ../rules.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')

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


From 0fc1d605ffc85952238ddda017f79158a36a0826 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 17 Dec 2013 15:10:18 +0100
Subject: add gperf to tools, required for eglibc builds. do not ask the user
 to install it

---
 package/pacemaker-mgmt/Makefile |  2 +-
 scripts/scan-pkgs.sh            | 22 ----------------------
 tools/Makefile                  |  3 +++
 tools/gperf/Makefile            | 25 +++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 tools/gperf/Makefile

(limited to 'tools')

diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile
index a762af376..9dad6eba6 100644
--- a/package/pacemaker-mgmt/Makefile
+++ b/package/pacemaker-mgmt/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		be16a38588d1c518f53e64e7e48e1c90
 PKG_DESCR:=		Pacemaker management daemon
 PKG_SECTION:=		ha
-PKG_BUILDDEP:=		pacemaker gnutls pam python2
+PKG_BUILDDEP:=		swig-host pacemaker gnutls pam python2
 PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
 PKG_SITES:=		http://openadk.org/distfiles/
 
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 4c201560a..c94d01138 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -97,14 +97,6 @@ if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
-if [[ -n $ADK_PACKAGE_PACEMAKER_MGMTD ]]; then
-	NEED_SWIG="$NEED_SWIG pacemaker-mgmtd"
-fi
-
-if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
-	NEED_GPERF="$NEED_GPERF eglibc"
-fi
-
 if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
 fi
@@ -246,20 +238,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_SWIG ]]; then
-	if ! which swig >/dev/null 2>&1; then
-		echo >&2 You need swig to build $NEED_SWIG
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_GPERF ]]; then
-	if ! which gperf >/dev/null 2>&1; then
-		echo >&2 You need gperf to build $NEED_GPERF
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_GXX ]]; then
 	if ! which g++ >/dev/null 2>&1; then
 		echo >&2 You need GNU c++ compiler to build $NEED_GXX
diff --git a/tools/Makefile b/tools/Makefile
index 4a5f1ec92..e644efbb1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,6 +7,9 @@ TARGETS:=adk mkcrypt cpio mkimage genext2fs
 ifeq ($(ADK_TARGET_ROOTFS_ISO),y)
 TARGETS+=cdrtools syslinux
 endif
+ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
+TARGETS+=gperf
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/gperf/Makefile b/tools/gperf/Makefile
new file mode 100644
index 000000000..2d811932b
--- /dev/null
+++ b/tools/gperf/Makefile
@@ -0,0 +1,25 @@
+# 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:=		gperf
+PKG_VERSION:=		3.0.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c1f1db32fb6598d6a93e6e88796a8632
+PKG_SITES:=		http://ftp.gnu.org/pub/gnu/gperf/
+
+include ../rules.mk
+
+install: ${TOOLS_DIR}/gperf
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${TOOLS_DIR}/gperf: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/src/gperf \
+		${TOOLS_DIR}
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3