From fea1ac4d8bfa77b30cc3ce3162da85393118ee1a Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Fri, 27 Jan 2023 11:49:33 +0100 Subject: [PATCH 1/2] refactor: rename coreos-image-full-cmdline to coreos-image-demo coreos-image-full-cmdline contains more than command line utils. It's the image that we usually use for our demo so let's use that name. --- documentation/quick-build.rst | 8 ++++---- documentation/ref-manual/images.rst | 6 +++--- ...{coreos-image-full-cmdline.bb => coreos-image-demo.bb} | 3 +-- templates/conf-notes.txt | 5 ++--- 4 files changed, 10 insertions(+), 12 deletions(-) rename layers/meta-belden-coreos/recipes-core/images/{coreos-image-full-cmdline.bb => coreos-image-demo.bb} (63%) diff --git a/documentation/quick-build.rst b/documentation/quick-build.rst index 904a233..4731281 100644 --- a/documentation/quick-build.rst +++ b/documentation/quick-build.rst @@ -99,11 +99,11 @@ the machine is set to `cn9130-cf-pro` but you can use any other MACHINE listed i occurrences of `cn9130-cf-pro` to your machine when executing a command. For an image that contains a lot of developer tools, the best image to build -is `coreos-image-full-cmdline`. +is `coreos-image-demo`. .. code-block:: sh - ~/img-build/build$ bitbake coreos-image-full-cmdline + ~/img-build/build$ bitbake coreos-image-demo After a long time, the build system will return. You can list all the artifacts produced by `bitbake` using `ls`: @@ -118,7 +118,7 @@ be found with this command: .. code-block:: sh ~/coreos/build$ find tmp/deploy/images/${MACHINE} -type l -name "*.wic.xz" - tmp/deploy/images/cn9130-cf-pro/coreos-image-full-cmdline-cn9130-cf-pro.wic.xz + tmp/deploy/images/cn9130-cf-pro/coreos-image-demo-cn9130-cf-pro.wic.xz .. hint:: @@ -166,6 +166,6 @@ Now, flash the image file to the your card: .. code-block:: sh - ~/coreos/build$ bmaptool copy tmp/deploy/images/cn9130-cf-pro/coreos-image-full-cmdline-cn9130-cf-pro.wic.xz /dev/ + ~/coreos/build$ bmaptool copy tmp/deploy/images/cn9130-cf-pro/coreos-image-demo-cn9130-cf-pro.wic.xz /dev/ You have to replace `` by the name of your SD Card device. diff --git a/documentation/ref-manual/images.rst b/documentation/ref-manual/images.rst index 64debb8..f7032f0 100644 --- a/documentation/ref-manual/images.rst +++ b/documentation/ref-manual/images.rst @@ -4,12 +4,12 @@ Images The CoreOS build system provides several examples image: -.. index:: coreos-image-full-cmdline +.. index:: coreos-image-demo -``coreos-image-full-cmdline`` +``coreos-image-demo`` ============================= - A console-only image with more full-featured Linux system functionality installed. + A image with most of the optional feature of CoreOS. .. index:: coreos-image-minimal diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb similarity index 63% rename from layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb rename to layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb index 21f6690..b613576 100644 --- a/layers/meta-belden-coreos/recipes-core/images/coreos-image-full-cmdline.bb +++ b/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb @@ -1,5 +1,4 @@ -DESCRIPTION = "A console-only image with more full-featured Linux system \ -functionality installed." +DESCRIPTION = "An image that come with most of the feature available in CoreOS" inherit coreos-image diff --git a/templates/conf-notes.txt b/templates/conf-notes.txt index 1d0e5f6..ec56139 100644 --- a/templates/conf-notes.txt +++ b/templates/conf-notes.txt @@ -11,15 +11,14 @@ You can now run 'bitbake ' Common targets are: coreos-image-minimal - coreos-image-full-cmdline - meta-toolchain - meta-ide-support + coreos-image-demo You can also run generated qemu images with a command like 'runqemu qemuarm64'. Other commonly useful commands are: - 'devtool' and 'recipetool' handle common recipe tasks - 'bitbake-layers' handles common layer tasks + - 'bitbake-getvar' query the value of a variable - 'oe-pkgdata-util' handles common target package tasks You can open the CoreOS documentation by running the 'coreos-doc' command. From 0b3e395862d9dea90a9c170c3a48a12fd985e3c6 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Fri, 27 Jan 2023 11:53:38 +0100 Subject: [PATCH 2/2] chore(coreos-image-minimal-dev): delete the recipes --- .../recipes-core/images/coreos-image-minimal-dev.bb | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 layers/meta-belden-coreos/recipes-core/images/coreos-image-minimal-dev.bb diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-minimal-dev.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-minimal-dev.bb deleted file mode 100644 index a94e8dd..0000000 --- a/layers/meta-belden-coreos/recipes-core/images/coreos-image-minimal-dev.bb +++ /dev/null @@ -1,6 +0,0 @@ -require coreos-image-minimal.bb - -DESCRIPTION = "A small image just capable of allowing a device to boot and \ -is suitable for development work." - -IMAGE_FEATURES += "dev-pkgs dev-tools"