diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/image.mk | 13 | ||||
| -rw-r--r-- | mk/rootfs.mk | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index 0b3d2cc73..ad2d42b40 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -36,6 +36,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ + ADK_PACKAGE_OPENAFS=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ @@ -572,8 +573,9 @@ release: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; break;fi \ done + if [ -f .exit ];then rm .exit;exit 1;fi # build all target architecture, target systems and libc combinations bulk: 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 |