summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKosta Zertsekel <zertsekel@gmail.com>2018-11-04 21:24:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-24 21:45:58 +0000
commit52db6681b25342ba3ee336a777594e0a59a84d78 (patch)
tree1df9dfc2e9e3e0e507d5230258d6c2ef51e6aad0 /meta
parent5ed5ca2f03ddb7e678b428c10674dd0b91cf64a0 (diff)
downloadpoky-52db6681b25342ba3ee336a777594e0a59a84d78.tar.gz
meta: Use double colon for chown OWNER:GROUP
Rationale - excerp from `info chown` ==================================== OWNER‘:’GROUP If the OWNER is followed by a colon and a GROUP (a group name or numeric group ID), with no spaces between them, the group ownership of the files is changed as well (to GROUP). Some older scripts may still use ‘.’ in place of the ‘:’ separator. POSIX 1003.1-2001 (*note Standards conformance::) does not require support for that, but for backward compatibility GNU ‘chown’ supports ‘.’ so long as no ambiguity results. New scripts should avoid the use of ‘.’ because it is not portable, and because it has undesirable results if the entire OWNER‘.’GROUP happens to identify a user whose name contains ‘.’. (From OE-Core rev: 185918234a07cb506d7d7464a49ac33972c7d963) (From OE-Core rev: 8105b6384042e04d8bdfaa881370616c6e46acfa) Signed-off-by: Kosta Zertsekel <zertsekel@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb6
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh4
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb2
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index 1e78f4f9c1..6cb679a6e9 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -77,7 +77,7 @@ fakeroot do_populate_poky_src () {
77 echo "# export ALL_PROXY=https://proxy.example.com:8080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc 77 echo "# export ALL_PROXY=https://proxy.example.com:8080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
78 echo "# export ALL_PROXY=socks://socks.example.com:1080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc 78 echo "# export ALL_PROXY=socks://socks.example.com:1080" >> ${IMAGE_ROOTFS}/home/builder/.bashrc
79 79
80 chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/poky 80 chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/poky
81 chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky 81 chmod -R ug+rw ${IMAGE_ROOTFS}/home/builder/poky
82 82
83 # Assume we will need CDROM to install guest additions 83 # Assume we will need CDROM to install guest additions
@@ -105,8 +105,8 @@ fakeroot do_populate_poky_src () {
105 pip3_install_params="${pip3_install_params} --proxy ${http_proxy}" 105 pip3_install_params="${pip3_install_params} --proxy ${http_proxy}"
106 fi 106 fi
107 pip3 install ${pip3_install_params} 107 pip3 install ${pip3_install_params}
108 chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/.local 108 chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.local
109 chown -R builder.builder ${IMAGE_ROOTFS}/home/builder/.cache 109 chown -R builder:builder ${IMAGE_ROOTFS}/home/builder/.cache
110} 110}
111 111
112IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; " 112IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 35316ec2ba..3cf3243cf0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -37,7 +37,7 @@ create_file() {
37 } 37 }
38 EXEC=" 38 EXEC="
39 ${EXEC} 39 ${EXEC}
40 chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 40 chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1;
41 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 41 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
42 42
43 test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build 43 test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
@@ -60,7 +60,7 @@ create_file() {
60mk_dir() { 60mk_dir() {
61 EXEC=" 61 EXEC="
62 mkdir -p \"$1\"; 62 mkdir -p \"$1\";
63 chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 63 chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1;
64 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 64 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
65 65
66 test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build 66 test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index ad65819b2d..89b1b69d37 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -104,6 +104,6 @@ do_install () {
104 install -d ${D}${sysconfdir}/default/volatiles 104 install -d ${D}${sysconfdir}/default/volatiles
105 install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles 105 install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles
106 106
107 chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown 107 chown root:shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown
108 chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown 108 chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown
109} 109}