diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
| commit | 24db4fb9b27f4ea87b3ecdf8fd4dd07b62ba9514 (patch) | |
| tree | cec2d85b768a617ae371837eec7069e7f155e568 /target | |
| parent | f377248abda877e2a945f4152e3e57bbaaeec1ca (diff) | |
| parent | 7260a427d88f1cbfcd8534c5f7805b4b56efb544 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 11 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 6 | ||||
| -rw-r--r-- | target/x86/Makefile | 4 |
4 files changed, 23 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index c02461819..db04414de 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -669,7 +669,6 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK ADK_LINUX_X86_64 || \ ADK_LINUX_NATIVE depends on !ADK_HARDWARE_VBOX - depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_KERNEL_EXT2_FS help create an read-only initramfs system. @@ -749,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 |