From 3e8776e3fc09ba11867457e0be6b4c3a4a01e2c6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Nov 2013 11:22:56 +0000 Subject: [PATCH] base/gcc-common: Ensure umask setting is consistent for shared workdir gcc has cross and target components with a shared workdir. The unpack umask settings need to match for all of these. We need to use strings in each case to ensure the sstate code matches them correctly. This patch tweaks various things to ensure the change adding the unpack umask change doesn't break the compiler builds. (From OE-Core master rev: 67162438ee9c402b23c32853af9d313949eb6e4a) Signed-off-by: Richard Purdie Signed-off-by: Robert Yang --- meta/classes/base.bbclass | 10 +++++----- meta/recipes-devtools/gcc/gcc-common.inc | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 1f3249d248..73920fde47 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -485,15 +485,15 @@ python () { # If we're building a target package we need to use fakeroot (pseudo) # in order to capture permissions, owners, groups and special files if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): - d.setVarFlag('do_unpack', 'umask', 022) - d.setVarFlag('do_configure', 'umask', 022) - d.setVarFlag('do_compile', 'umask', 022) + d.setVarFlag('do_unpack', 'umask', '022') + d.setVarFlag('do_configure', 'umask', '022') + d.setVarFlag('do_compile', 'umask', '022') d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_install', 'fakeroot', 1) - d.setVarFlag('do_install', 'umask', 022) + d.setVarFlag('do_install', 'umask', '022') d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_package', 'fakeroot', 1) - d.setVarFlag('do_package', 'umask', 022) + d.setVarFlag('do_package', 'umask', '022') d.setVarFlag('do_package_setscene', 'fakeroot', 1) d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_devshell', 'fakeroot', 1) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 4f691a090c..a5daa01691 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -89,6 +89,7 @@ do_patch[stamp-base] = "${SS}" SSCLEAN = "${TMPDIR}/stamps/work-shared/gcc-[0-9]*-*" do_fetch[stamp-base-clean] = "${SSCLEAN}" do_unpack[stamp-base-clean] = "${SSCLEAN}" +do_unpack[umask] = "022" do_patch[stamp-base-clean] = "${SSCLEAN}" # SW means Shared Work directory -- 2.40.1