diff mbox series

[3/3] utils: create_cmdline_shebang_wrapper preserve permission and ownership

Message ID 20220703114114.2313369-3-ptsneves@gmail.com
State Accepted, archived
Commit 47973fd4f3fbb0af1a0d1bc2c39f2900a963177d
Headers show
Series [1/3] utils: create_cmdline_shebang_wrapper whitespace and sed refactor | expand

Commit Message

Paulo Neves July 3, 2022, 11:41 a.m. UTC 
The .real command was not given the same permissions and ownership as
the original pre-wrap file and this is now fixed.

A situation where the original pre-wrap file did not have write
permissions would cause a failure in the wrapping is also fixed.

Test update also included.

Signed-off-by: Paulo Neves <ptsneves@gmail.com>
---
 .../wrapper/cmdline-shebang-wrapper-test.bb           | 11 ++++++++++-
 meta/classes/utils.bbclass                            |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
index c4126a41fc..c3d3548d4a 100644
--- a/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
+++ b/meta-selftest/recipes-test/wrapper/cmdline-shebang-wrapper-test.bb
@@ -8,7 +8,10 @@  SRC_URI += "file://test.awk"
 EXCLUDE_FROM_WORLD = "1"
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/test.awk ${D}${bindir}/test
+    # was not able to make ownership preservation check
+    install -m 0400 ${WORKDIR}/test.awk ${D}${bindir}/test
+
+    perm_old="$(stat --format='%a' ${D}${bindir}/test)"
     sed -i -e 's|@AWK_BIN@|${bindir}/awk|g' ${D}${bindir}/test
     create_cmdline_shebang_wrapper ${D}${bindir}/test
     if [ $(${D}${bindir}/test) != "Don't Panic!" ]; then
@@ -16,6 +19,12 @@  do_install() {
     else
         bbnote "Wrapper is good"
     fi
+
+    perm_new="$(stat --format='%a' ${D}${bindir}/test.real)"
+
+    if [ "$perm_new" != "$perm_old" ]; then
+        bbfatal "Wrapper permissions for ${D}${bindir}/test.real not preserved. Found $perm_new but expected $perm_old"
+    fi
 }
 
 BBCLASSEXTEND = "native"
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index b58c22771f..e6f7f95d80 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -202,6 +202,9 @@  create_cmdline_shebang_wrapper () {
 	argument="$(sed -ne 's/^#! *//p;q' $cmd)"
 	# strip the shebang from the real script as we do not want it to be usable anyway
 	tail -n +2 $cmd > $cmd.real
+	chown --reference=$cmd $cmd.real
+	chmod --reference=$cmd $cmd.real
+	rm -f $cmd
 	cmdname=$(basename $cmd)
 	dirname=$(dirname $cmd)
 	cmdoptions=$@