diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 12:57:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-09 22:14:41 +0100 |
commit | 6fd8af0d30e555da55e5ca954009f32a84ced4a6 (patch) | |
tree | a8f0f66819459f548a9631161adc366bdc0da908 /meta/classes-recipe/rootfs-postcommands.bbclass | |
parent | 32c98e6a8cd60aa5d2e60ab7b573ec6abae85ed4 (diff) | |
download | poky-6fd8af0d30e555da55e5ca954009f32a84ced4a6.tar.gz |
classes: Drop ';' delimiter from ROOTFS/IMAGE*COMMAND variables
Originally these were shell functions but they have long since been processed by
bb.build.exec_func(). Since we no longer need shell syntax, we can drop the ';'
delimiters and just use a space separated string.
This cleans up the variable and quietly removes any stray ';' that do happen to
still make it in.
(From OE-Core rev: c3365dfd9ddd7fbe70b62e0f11166e57a8ca6f73)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/rootfs-postcommands.bbclass')
-rw-r--r-- | meta/classes-recipe/rootfs-postcommands.bbclass | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass index 4492c9c0aa..06388b72fb 100644 --- a/meta/classes-recipe/rootfs-postcommands.bbclass +++ b/meta/classes-recipe/rootfs-postcommands.bbclass | |||
@@ -5,25 +5,25 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | # Zap the root password if debug-tweaks and empty-root-password features are not enabled | 7 | # Zap the root password if debug-tweaks and empty-root-password features are not enabled |
8 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password; ",d)}' | 8 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ",d)}' |
9 | 9 | ||
10 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled | 10 | # Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled |
11 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}' | 11 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password ", "",d)}' |
12 | 12 | ||
13 | # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled | 13 | # Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled |
14 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}' | 14 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login ", "",d)}' |
15 | 15 | ||
16 | # Autologin the root user on the serial console, if empty-root-password and serial-autologin-root are active | 16 | # Autologin the root user on the serial console, if empty-root-password and serial-autologin-root are active |
17 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", [ 'empty-root-password', 'serial-autologin-root' ], "serial_autologin_root; ", "",d)}' | 17 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", [ 'empty-root-password', 'serial-autologin-root' ], "serial_autologin_root ", "",d)}' |
18 | 18 | ||
19 | # Enable postinst logging if debug-tweaks or post-install-logging is enabled | 19 | # Enable postinst logging if debug-tweaks or post-install-logging is enabled |
20 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' | 20 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging ", "",d)}' |
21 | 21 | ||
22 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting | 22 | # Create /etc/timestamp during image construction to give a reasonably sane default time setting |
23 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp; " | 23 | ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp " |
24 | 24 | ||
25 | # Tweak files in /etc if read-only-rootfs is enabled | 25 | # Tweak files in /etc if read-only-rootfs is enabled |
26 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' | 26 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook ", "",d)}' |
27 | 27 | ||
28 | # We also need to do the same for the kernel boot parameters, | 28 | # We also need to do the same for the kernel boot parameters, |
29 | # otherwise kernel or initramfs end up mounting the rootfs read/write | 29 | # otherwise kernel or initramfs end up mounting the rootfs read/write |
@@ -34,20 +34,20 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only | |||
34 | APPEND:append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' | 34 | APPEND:append = '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", " ro", "", d)}' |
35 | 35 | ||
36 | # Generates test data file with data store variables expanded in json format | 36 | # Generates test data file with data store variables expanded in json format |
37 | ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data; " | 37 | ROOTFS_POSTPROCESS_COMMAND += "write_image_test_data " |
38 | 38 | ||
39 | # Write manifest | 39 | # Write manifest |
40 | IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}.manifest" | 40 | IMAGE_MANIFEST = "${IMGDEPLOYDIR}/${IMAGE_NAME}.manifest" |
41 | ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " | 41 | ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest" |
42 | # Set default postinst log file | 42 | # Set default postinst log file |
43 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" | 43 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" |
44 | # Set default target for systemd images | 44 | # Set default target for systemd images |
45 | SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "graphical.target", "multi-user.target", d)}' | 45 | SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "graphical.target", "multi-user.target", d)}' |
46 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_sysusers_check;", "", d)}' | 46 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target systemd_sysusers_check", "", d)}' |
47 | 47 | ||
48 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' | 48 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile' |
49 | 49 | ||
50 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check; overlayfs_postprocess;", "", d)}' | 50 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "overlayfs", "overlayfs_qa_check overlayfs_postprocess", "", d)}' |
51 | 51 | ||
52 | inherit image-artifact-names | 52 | inherit image-artifact-names |
53 | 53 | ||
@@ -63,10 +63,10 @@ inherit image-artifact-names | |||
63 | # systemd_sysusers_create and set_user_group. Using :append is not | 63 | # systemd_sysusers_create and set_user_group. Using :append is not |
64 | # enough for that, set_user_group is added that way and would end | 64 | # enough for that, set_user_group is added that way and would end |
65 | # up running after us. | 65 | # up running after us. |
66 | SORT_PASSWD_POSTPROCESS_COMMAND ??= " tidy_shadowutils_files; " | 66 | SORT_PASSWD_POSTPROCESS_COMMAND ??= "tidy_shadowutils_files" |
67 | python () { | 67 | python () { |
68 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', '${SORT_PASSWD_POSTPROCESS_COMMAND}') | 68 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' ${SORT_PASSWD_POSTPROCESS_COMMAND}') |
69 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', 'rootfs_reproducible;') | 69 | d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' rootfs_reproducible') |
70 | } | 70 | } |
71 | 71 | ||
72 | # Resolve the ID as described in the sysusers.d(5) manual: ID can be a numeric | 72 | # Resolve the ID as described in the sysusers.d(5) manual: ID can be a numeric |