[PATCH 1/2] rootfs-postcommands: don't hard-code .rootfs in manifest filename

[PATCH 1/2] rootfs-postcommands: don't hard-code .rootfs in manifest filename

[Joshua Lock]

The .rootfs suffix of a generated image can be overridden by setting
IMAGE_NAME_SUFFIX, to ensure manifest filenames match the associated
image make use of this variable in the manifest filename.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
 meta/classes/rootfs-postcommands.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index db8b551..c413389 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -15,7 +15,7 @@ ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
 ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'
 
 # Write manifest
-IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
+IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest"
 ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "
 # Set default postinst log file
 POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
-- 
2.7.4

[PATCH 2/2] openssl: prevent warnings from openssl-c_rehash.sh

[Joshua Lock]

The openssl-c_rehash.sh script reports duplicate files and files which
don't contain a certificate or CRL by echoing a WARNING to stdout.
This warning gets picked up by the log checker during rootfs and results
in several warnings getting reported to the console during an image build.

To prevent the log from being overrun by warnings related to certificates
change these messages in openssl-c_rehash.sh to be prefixed with NOTE not
WARNING.

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
 meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
index 0ea2263..f67f415 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
@@ -106,7 +106,7 @@ link_hash()
     do
 	if [ ${FINGERPRINT} = $( fingerprint ${LINKFILE} ${2} ) ]
 	then
-	    echo "WARNING: Skipping duplicate file ${1}" >&2
+	    echo "NOTE: Skipping duplicate file ${1}" >&2
 	    return 1
 	fi	
 
@@ -153,7 +153,7 @@ hash_dir()
         then
             TYPE_STR='crl'
         else
-            echo "WARNING: ${FILE} does not contain a certificate or CRL: skipping" >&2
+            echo "NOTE: ${FILE} does not contain a certificate or CRL: skipping" >&2
 	    continue
         fi
 
-- 
2.7.4

Re: [PATCH 1/2] rootfs-postcommands: don't hard-code .rootfs in manifest filename

[Joshua G Lock]

On Wed, 2016-06-22 at 11:22 +0100, Joshua Lock wrote:
> The .rootfs suffix of a generated image can be overridden by setting
> IMAGE_NAME_SUFFIX, to ensure manifest filenames match the associated
> image make use of this variable in the manifest filename.

This change will break a few external layers so probably isn't worth it
for a minor cosmetic change?

Regards,

Joshua

> 
> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
> ---
>  meta/classes/rootfs-postcommands.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/rootfs-postcommands.bbclass
> b/meta/classes/rootfs-postcommands.bbclass
> index db8b551..c413389 100644
> --- a/meta/classes/rootfs-postcommands.bbclass
> +++ b/meta/classes/rootfs-postcommands.bbclass
> @@ -15,7 +15,7 @@ ROOTFS_POSTPROCESS_COMMAND +=
> "rootfs_update_timestamp ; "
>  ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES"
> , "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'
>  
>  # Write manifest
> -IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
> +IMAGE_MANIFEST =
> "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest"
>  ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "
>  # Set default postinst log file
>  POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
> -- 
> 2.7.4
> 

Re: [PATCH 1/2] rootfs-postcommands: don't hard-code .rootfs in manifest filename

[Patrick Ohly]

On Mon, 2016-06-27 at 08:43 +0100, Joshua G Lock wrote:
> On Wed, 2016-06-22 at 11:22 +0100, Joshua Lock wrote:
> > The .rootfs suffix of a generated image can be overridden by setting
> > IMAGE_NAME_SUFFIX, to ensure manifest filenames match the associated
> > image make use of this variable in the manifest filename.
> 
> This change will break a few external layers so probably isn't worth it
> for a minor cosmetic change?

Agreed, please don't merge yet.

The problem is a bit more complicated: is IMAGE_MANIFEST the manifest
file for the entire image (as the name implies), or just of the main
partition? The two are not necessarily the same, because some image
types combine the main partition with additional content (like a boot
loader and the kernel).

This conceptual issue needs further work.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.