7 files changed, 47 insertions, 12 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index cde0b02..66ddcf1 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -46,3 +46,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
 COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
 
+MACHINE_EXTRA_INSTALL ?= ""
+
+LICENSE_CREATE_PACKAGE = "1"
+COPY_LIC_MANIFEST = "1"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 5799db7..6772a2a 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index dab0c5a..dab9c68 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -20,15 +20,13 @@
 ##
 #############################################################################
 
-IMAGE_CLASSES += "image_types_sdcard"
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
+IMAGE_FSTYPES = "tar.gz"
 
-BOOT_SCRIPTS = "\
-        u-boot-${MACHINE}.img:u-boot.img \
-        MLO-${MACHINE}:MLO \
-        "
-SDCARD_GENERATION_COMMAND = "generate_imx_sdcard"
-UBOOT_SUFFIX = "img"
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
 
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index ba13aaa..376e3c6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -17,6 +17,15 @@
 ############################################################################
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    uEnv-${MACHINE}.txt:uEnv.txt \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
+
 PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
 
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index d83f6b4..a7099a5 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,6 +22,12 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
 MACHINE_EXTRA_INSTALL = "\
         amd-gpu-bin-mx51 \
         "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index b761ddd..2a64026 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -20,10 +20,16 @@
 ##
 #############################################################################
 
-IMAGE_CLASSES += "image_types_sdcard"
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
+IMAGE_FSTYPES = "tar.gz"
 
-BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    6x_bootscript-${MACHINE}:6x_bootscript \
+    6x_upgrade-${MACHINE}:6x_upgrade \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 97513a8..61cebb4 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,7 +20,13 @@
 ##
 #############################################################################
 
-IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg"
+IMAGE_FSTYPES = "tar.gz"
+
+BOOTFS_CONTENT = "\
+    bcm2835-bootfiles/*: \
+    ${KERNEL_IMAGETYPE}:kernel.img \
+    "
+BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
 
 PREFERRED_PROVIDER_virtual/libgles1 = "userland"