[PATCH] beaglebone: add beaglebone.wks

[PATCH] beaglebone: add beaglebone.wks

[Ed Bartosh]

Currently beaglebone machine uses sdimage-bootpart.wks from
scripts/lib/wic/canned-wks. It'd be easier to find this file
if it's name contains machine name and it's located in the same
layer.

Added beaglebone.wks to meta-yocto-bsp/wic/ to make it independent
on changes in oe-core and easier to maintain.

[YOCTO #8719]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 meta-yocto-bsp/conf/machine/beaglebone.conf | 2 +-
 meta-yocto-bsp/wic/beaglebone.wks           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 meta-yocto-bsp/wic/beaglebone.wks

diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf
index 24a95b4..9286d1b 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone.conf
@@ -16,7 +16,7 @@ include conf/machine/include/tune-cortexa8.inc
 
 IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
-WKS_FILE = "sdimage-bootpart.wks"
+WKS_FILE ?= "beaglebone.wks"
 IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
 do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
 
diff --git a/meta-yocto-bsp/wic/beaglebone.wks b/meta-yocto-bsp/wic/beaglebone.wks
new file mode 100644
index 0000000..0c09a95
--- /dev/null
+++ b/meta-yocto-bsp/wic/beaglebone.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image for Beaglebone
+# long-description: Creates a partitioned SD card image for Beaglebone.
+# Boot files are located in the first vfat partition.
+
+part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4
-- 
2.1.4

Re: [PATCH] beaglebone: add beaglebone.wks

[Ed Bartosh]

Hi,

This patch depends on oe-core
patch:http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130585.html

please merge it after oe-core patch is merged.

Thanks,
Ed

On Thu, Dec 22, 2016 at 11:14:57PM +0200, Ed Bartosh wrote:
> Currently beaglebone machine uses sdimage-bootpart.wks from
> scripts/lib/wic/canned-wks. It'd be easier to find this file
> if it's name contains machine name and it's located in the same
> layer.
> 
> Added beaglebone.wks to meta-yocto-bsp/wic/ to make it independent
> on changes in oe-core and easier to maintain.
> 
> [YOCTO #8719]
> 
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
>  meta-yocto-bsp/conf/machine/beaglebone.conf | 2 +-
>  meta-yocto-bsp/wic/beaglebone.wks           | 6 ++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
>  create mode 100644 meta-yocto-bsp/wic/beaglebone.wks
> 
> diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf
> index 24a95b4..9286d1b 100644
> --- a/meta-yocto-bsp/conf/machine/beaglebone.conf
> +++ b/meta-yocto-bsp/conf/machine/beaglebone.conf
> @@ -16,7 +16,7 @@ include conf/machine/include/tune-cortexa8.inc
>  
>  IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
>  EXTRA_IMAGECMD_jffs2 = "-lnp "
> -WKS_FILE = "sdimage-bootpart.wks"
> +WKS_FILE ?= "beaglebone.wks"
>  IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
>  do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
>  
> diff --git a/meta-yocto-bsp/wic/beaglebone.wks b/meta-yocto-bsp/wic/beaglebone.wks
> new file mode 100644
> index 0000000..0c09a95
> --- /dev/null
> +++ b/meta-yocto-bsp/wic/beaglebone.wks
> @@ -0,0 +1,6 @@
> +# short-description: Create SD card image for Beaglebone
> +# long-description: Creates a partitioned SD card image for Beaglebone.
> +# Boot files are located in the first vfat partition.
> +
> +part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4 --size 16
> +part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4
> -- 
> 2.1.4
> 

-- 
--
Regards,
Ed

Re: [PATCH] beaglebone: add beaglebone.wks

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 724 bytes --]

On 22 December 2016 at 21:14, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:

> Currently beaglebone machine uses sdimage-bootpart.wks from
> scripts/lib/wic/canned-wks. It'd be easier to find this file
> if it's name contains machine name and it's located in the same
> layer.
>
> Added beaglebone.wks to meta-yocto-bsp/wic/ to make it independent
> on changes in oe-core and easier to maintain.
>

This broke on the autobuilder in ross/mut:

DEBUG: Executing shell function do_image_wic
ERROR: No kickstart files from WKS_FILES were found: beaglebone.wks
core-image-minimal.wks. Please set WKS_FILE or WKS_FILES appropriately.

(The image_types patch extending the search path is already merged)

Ross

[-- Attachment #2: Type: text/html, Size: 1370 bytes --]

Re: [PATCH] beaglebone: add beaglebone.wks

[Ed Bartosh]

On Fri, Jan 06, 2017 at 11:49:06AM +0000, Burton, Ross wrote:
> On 22 December 2016 at 21:14, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> 
> > Currently beaglebone machine uses sdimage-bootpart.wks from
> > scripts/lib/wic/canned-wks. It'd be easier to find this file
> > if it's name contains machine name and it's located in the same
> > layer.
> >
> > Added beaglebone.wks to meta-yocto-bsp/wic/ to make it independent
> > on changes in oe-core and easier to maintain.
> >
> 
> This broke on the autobuilder in ross/mut:
> 
> DEBUG: Executing shell function do_image_wic
> ERROR: No kickstart files from WKS_FILES were found: beaglebone.wks
> core-image-minimal.wks. Please set WKS_FILE or WKS_FILES appropriately.
> 
> (The image_types patch extending the search path is already merged)

This patch depends on oe-core
patch:http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130585.html

please merge it after oe-core patch is merged.

--
Regards,
Ed

Re: [PATCH] beaglebone: add beaglebone.wks

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

On 8 January 2017 at 20:05, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:

> This patch depends on oe-core
> patch:http://lists.openembedded.org/pipermail/openembedded-core/2016-
> December/130585.html
>
> please merge it after oe-core patch is merged.
>

I knew that, and checked that it was merged, but not it appears that it
wasn't.  Christmas brain?

Thanks,
Ross

[-- Attachment #2: Type: text/html, Size: 943 bytes --]