diff options
author | Konrad Weihmann <kweihmann@outlook.com> | 2020-07-08 13:09:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-27 10:37:57 +0100 |
commit | 7d82155fd5a4718d7375327a36651413fcc47d68 (patch) | |
tree | 0f2ea5f3b2d1d11898fe22ad01751b684735bcb2 /meta/classes | |
parent | 6c2bb4a4ad097e3f24e59731a551c2e33f97d4b3 (diff) | |
download | poky-7d82155fd5a4718d7375327a36651413fcc47d68.tar.gz |
rootfs-post: remove traling blanks from tasks
remove the traling blanks before the ;-delimiter, so one could use
"_remove" to avoid running tasks like 'rootfs_update_timestamp',
which are currently hardcoded and not bound to any
configurable feature flag
(From OE-Core rev: 8c835f63c2bca0a66385eb7ea5ec021d86265777)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/rootfsdebugfiles.bbclass | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index c43b9a9823..984730ebe8 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | # Zap the root password if debug-tweaks feature is not enabled | 2 | # Zap the root password if debug-tweaks feature is not enabled |
3 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}' | 3 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password; ",d)}' |
4 | 4 | ||
5 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled | 5 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled |
6 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' | 6 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' |
@@ -12,7 +12,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb | |||
12 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' | 12 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' |
13 | 13 | ||
14 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting | 14 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting |
15 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " | 15 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " |
16 | 16 | ||
17 | # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled | 17 | # Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled |
18 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' | 18 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' |
@@ -26,7 +26,7 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only | |||
26 | APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' | 26 | APPEND_append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' |
27 | 27 | ||
28 | # Generates test data file with data store variables expanded in json format | 28 | # Generates test data file with data store variables expanded in json format |
29 | ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data ; " | 29 | ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " |
30 | 30 | ||
31 | # Write manifest | 31 | # Write manifest |
32 | IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" | 32 | IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.manifest" |
diff --git a/meta/classes/rootfsdebugfiles.bbclass b/meta/classes/rootfsdebugfiles.bbclass index e2ba4e3647..85c7ec7434 100644 --- a/meta/classes/rootfsdebugfiles.bbclass +++ b/meta/classes/rootfsdebugfiles.bbclass | |||
@@ -28,7 +28,7 @@ | |||
28 | ROOTFS_DEBUG_FILES ?= "" | 28 | ROOTFS_DEBUG_FILES ?= "" |
29 | ROOTFS_DEBUG_FILES[doc] = "Lists additional files or directories to be installed with 'cp -a' in the format 'source1 target1;source2 target2;...'" | 29 | ROOTFS_DEBUG_FILES[doc] = "Lists additional files or directories to be installed with 'cp -a' in the format 'source1 target1;source2 target2;...'" |
30 | 30 | ||
31 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_debug_files ;" | 31 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_debug_files;" |
32 | rootfs_debug_files () { | 32 | rootfs_debug_files () { |
33 | #!/bin/sh -e | 33 | #!/bin/sh -e |
34 | echo "${ROOTFS_DEBUG_FILES}" | sed -e 's/;/\n/g' | while read source target mode; do | 34 | echo "${ROOTFS_DEBUG_FILES}" | sed -e 's/;/\n/g' | while read source target mode; do |