From 522607e704876c67ed093bac47dde9238709ccae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Feb 2021 11:47:13 +0000 Subject: classes: Drop now unneeded umask flags Now that 022 is the default in BB_DEFAULT_UMASK in bitbake.conf, we don't need any of these task flags, clean up. (From OE-Core rev: 816fca781943a7dbf40391d9db34c7bf12711962) Signed-off-by: Richard Purdie --- meta/classes/baremetal-image.bbclass | 1 - meta/classes/base.bbclass | 5 ----- meta/classes/image.bbclass | 3 --- meta/classes/package_deb.bbclass | 1 - meta/classes/package_ipk.bbclass | 1 - meta/classes/package_rpm.bbclass | 1 - meta/classes/patch.bbclass | 1 - meta/classes/staging.bbclass | 1 - 8 files changed, 14 deletions(-) diff --git a/meta/classes/baremetal-image.bbclass b/meta/classes/baremetal-image.bbclass index 90d58f2615..b0f5e885b5 100644 --- a/meta/classes/baremetal-image.bbclass +++ b/meta/classes/baremetal-image.bbclass @@ -56,7 +56,6 @@ python do_rootfs(){ # Assure binaries, manifest and qemubootconf are populated on DEPLOY_DIR_IMAGE do_image_complete[dirs] = "${TOPDIR}" -do_image_complete[umask] = "022" SSTATETASKS += "do_image_complete" SSTATE_SKIP_CREATION_task-image-complete = '1' do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d287065e08..b4160402f0 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -506,15 +506,10 @@ python () { # 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.appendVarFlag('do_prepare_recipe_sysroot', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') - 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.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_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/classes/image.bbclass b/meta/classes/image.bbclass index 3239d5cf5e..cda866cc81 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -248,7 +248,6 @@ fakeroot python do_rootfs () { } do_rootfs[dirs] = "${TOPDIR}" do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" -do_rootfs[umask] = "022" do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" addtask rootfs after do_prepare_recipe_sysroot @@ -261,7 +260,6 @@ fakeroot python do_image () { execute_pre_post_process(d, pre_process_cmds) } do_image[dirs] = "${TOPDIR}" -do_image[umask] = "022" addtask do_image after do_rootfs fakeroot python do_image_complete () { @@ -272,7 +270,6 @@ fakeroot python do_image_complete () { execute_pre_post_process(d, post_process_cmds) } do_image_complete[dirs] = "${TOPDIR}" -do_image_complete[umask] = "022" SSTATETASKS += "do_image_complete" SSTATE_SKIP_CREATION_task-image-complete = '1' do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index cb723fc1d6..b3d8ce330e 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -314,7 +314,6 @@ python do_package_write_deb () { } do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" -do_package_write_deb[umask] = "022" do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_deb after do_packagedata do_package diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index d31dba0c8f..600b3ac90c 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -273,7 +273,6 @@ python do_package_write_ipk () { } do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" -do_package_write_ipk[umask] = "022" do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_ipk after do_packagedata do_package diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 43a825ad42..c48bece742 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -745,7 +745,6 @@ python do_package_write_rpm () { do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" -do_package_write_rpm[umask] = "022" do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" addtask package_write_rpm after do_packagedata do_package diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 25ec089ae1..cd491a563d 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -160,7 +160,6 @@ python patch_do_patch() { patch_do_patch[vardepsexclude] = "PATCHRESOLVE" addtask patch after do_unpack -do_patch[umask] = "022" do_patch[dirs] = "${WORKDIR}" do_patch[depends] = "${PATCHDEPENDENCY}" diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index bbe8cff9b1..806a85773a 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -90,7 +90,6 @@ python sysroot_strip () { } do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}" -do_populate_sysroot[umask] = "022" addtask populate_sysroot after do_install -- cgit v1.2.3-54-g00ecf