diff options
-rw-r--r-- | classes/image-hdd.bbclass | 22 | ||||
-rw-r--r-- | classes/image_types_sdcard.bbclass | 3 | ||||
-rw-r--r-- | conf/distro/include/beagleboard.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/emulator.conf | 4 | ||||
-rw-r--r-- | conf/distro/include/image_type.conf | 6 | ||||
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 3 | ||||
-rw-r--r-- | conf/machine/emulator.conf | 22 |
7 files changed, 55 insertions, 9 deletions
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass new file mode 100644 index 0000000..fc76234 --- /dev/null +++ b/classes/image-hdd.bbclass | |||
@@ -0,0 +1,22 @@ | |||
1 | # need to define the dependency and the ROOTFS for directdisk | ||
2 | do_bootdirectdisk[depends] += "${PN}:do_rootfs" | ||
3 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | ||
4 | |||
5 | SYSLINUX_ROOT = "root=/dev/hda2 " | ||
6 | SYSLINUX_PROMPT = "0" | ||
7 | SYSLINUX_TIMEOUT = "1" | ||
8 | SYSLINUX_LABELS = "boot" | ||
9 | LABELS_append = " ${SYSLINUX_LABELS} " | ||
10 | |||
11 | inherit image_types boot-directdisk | ||
12 | |||
13 | create_hdd_image () { | ||
14 | ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd | ||
15 | } | ||
16 | |||
17 | python do_hddimg() { | ||
18 | bb.build.exec_func('create_hdd_image', d) | ||
19 | } | ||
20 | |||
21 | addtask hddimg after do_bootdirectdisk before do_build | ||
22 | do_hddimg[nostamp] = "1" | ||
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 64b7726..7b11482 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass | |||
@@ -1,5 +1,8 @@ | |||
1 | inherit image_types_fsl | 1 | inherit image_types_fsl |
2 | 2 | ||
3 | IMAGE_ROOTFS_EXTRA_SPACE = "300000" | ||
4 | SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | ||
5 | |||
3 | IMAGE_CMD_sdcard_append () { | 6 | IMAGE_CMD_sdcard_append () { |
4 | parted -s ${SDCARD} set 1 boot on | 7 | parted -s ${SDCARD} set 1 boot on |
5 | } | 8 | } |
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 8586774..4932436 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf | |||
@@ -1,4 +1,5 @@ | |||
1 | include conf/distro/include/image_type.conf | 1 | IMAGE_CLASSES += "image_types_sdcard" |
2 | IMAGE_FSTYPES = "tar.gz ext3 sdcard" | ||
2 | 3 | ||
3 | BOOT_SCRIPTS = "\ | 4 | BOOT_SCRIPTS = "\ |
4 | u-boot-${MACHINE}.img:u-boot.img \ | 5 | u-boot-${MACHINE}.img:u-boot.img \ |
@@ -10,4 +11,3 @@ UBOOT_SUFFIX = "img" | |||
10 | PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" | 11 | PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3" |
11 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" | 12 | PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" |
12 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" | 13 | PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" |
13 | |||
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf new file mode 100644 index 0000000..fdef2f3 --- /dev/null +++ b/conf/distro/include/emulator.conf | |||
@@ -0,0 +1,4 @@ | |||
1 | IMAGE_CLASSES += "image-hdd" | ||
2 | IMAGE_ROOTFS_ALIGNMENT = "1048576" | ||
3 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" | ||
4 | IMAGE_FSTYPES = "ext3" | ||
diff --git a/conf/distro/include/image_type.conf b/conf/distro/include/image_type.conf deleted file mode 100644 index b98fdd1..0000000 --- a/conf/distro/include/image_type.conf +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | IMAGE_FSTYPES = "tar.gz ext3 sdcard" | ||
2 | IMAGE_CLASSES += "image_types_sdcard" | ||
3 | |||
4 | IMAGE_ROOTFS_EXTRA_SPACE = "300000" | ||
5 | SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | ||
6 | |||
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 7bfb8c2..e232667 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -1,4 +1,5 @@ | |||
1 | include conf/distro/include/image_type.conf | 1 | IMAGE_CLASSES += "image_types_sdcard" |
2 | IMAGE_FSTYPES = "tar.gz ext3 sdcard" | ||
2 | 3 | ||
3 | BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript" | 4 | BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript" |
4 | 5 | ||
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf new file mode 100644 index 0000000..e118a44 --- /dev/null +++ b/conf/machine/emulator.conf | |||
@@ -0,0 +1,22 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: virtual box emulator | ||
3 | #@DESCRIPTION: Machine configuration for running a common x86 | ||
4 | |||
5 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | ||
6 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | ||
7 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | ||
8 | |||
9 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | ||
10 | PREFERRED_VERSION_linux-yocto ?= "3.8%" | ||
11 | |||
12 | require conf/machine/include/tune-i586.inc | ||
13 | |||
14 | KERNEL_IMAGETYPE = "bzImage" | ||
15 | |||
16 | SERIAL_CONSOLE = "115200 ttyS0" | ||
17 | |||
18 | MACHINE_FEATURES += "x86" | ||
19 | |||
20 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d virtualbox-guest-additions" | ||
21 | |||
22 | MACHINE_FEATURES += "apm alsa pcmcia bluetooth irda usbgadget screen" | ||