summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-14 11:47:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-16 11:28:17 +0000
commit522607e704876c67ed093bac47dde9238709ccae (patch)
tree3cda6b033dabce74adf423aaad647ff6d06920b7
parentc4ecf7c1122380cdbc74fe692aa91756dc5bdf6b (diff)
downloadpoky-522607e704876c67ed093bac47dde9238709ccae.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/baremetal-image.bbclass1
-rw-r--r--meta/classes/base.bbclass5
-rw-r--r--meta/classes/image.bbclass3
-rw-r--r--meta/classes/package_deb.bbclass1
-rw-r--r--meta/classes/package_ipk.bbclass1
-rw-r--r--meta/classes/package_rpm.bbclass1
-rw-r--r--meta/classes/patch.bbclass1
-rw-r--r--meta/classes/staging.bbclass1
8 files changed, 0 insertions, 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(){
56 56
57# Assure binaries, manifest and qemubootconf are populated on DEPLOY_DIR_IMAGE 57# Assure binaries, manifest and qemubootconf are populated on DEPLOY_DIR_IMAGE
58do_image_complete[dirs] = "${TOPDIR}" 58do_image_complete[dirs] = "${TOPDIR}"
59do_image_complete[umask] = "022"
60SSTATETASKS += "do_image_complete" 59SSTATETASKS += "do_image_complete"
61SSTATE_SKIP_CREATION_task-image-complete = '1' 60SSTATE_SKIP_CREATION_task-image-complete = '1'
62do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" 61do_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 () {
506 # in order to capture permissions, owners, groups and special files 506 # in order to capture permissions, owners, groups and special files
507 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): 507 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
508 d.appendVarFlag('do_prepare_recipe_sysroot', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 508 d.appendVarFlag('do_prepare_recipe_sysroot', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
509 d.setVarFlag('do_unpack', 'umask', '022')
510 d.setVarFlag('do_configure', 'umask', '022')
511 d.setVarFlag('do_compile', 'umask', '022')
512 d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 509 d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
513 d.setVarFlag('do_install', 'fakeroot', '1') 510 d.setVarFlag('do_install', 'fakeroot', '1')
514 d.setVarFlag('do_install', 'umask', '022')
515 d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 511 d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
516 d.setVarFlag('do_package', 'fakeroot', '1') 512 d.setVarFlag('do_package', 'fakeroot', '1')
517 d.setVarFlag('do_package', 'umask', '022')
518 d.setVarFlag('do_package_setscene', 'fakeroot', '1') 513 d.setVarFlag('do_package_setscene', 'fakeroot', '1')
519 d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 514 d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
520 d.setVarFlag('do_devshell', 'fakeroot', '1') 515 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 () {
248} 248}
249do_rootfs[dirs] = "${TOPDIR}" 249do_rootfs[dirs] = "${TOPDIR}"
250do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}" 250do_rootfs[cleandirs] += "${S} ${IMGDEPLOYDIR}"
251do_rootfs[umask] = "022"
252do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}" 251do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
253addtask rootfs after do_prepare_recipe_sysroot 252addtask rootfs after do_prepare_recipe_sysroot
254 253
@@ -261,7 +260,6 @@ fakeroot python do_image () {
261 execute_pre_post_process(d, pre_process_cmds) 260 execute_pre_post_process(d, pre_process_cmds)
262} 261}
263do_image[dirs] = "${TOPDIR}" 262do_image[dirs] = "${TOPDIR}"
264do_image[umask] = "022"
265addtask do_image after do_rootfs 263addtask do_image after do_rootfs
266 264
267fakeroot python do_image_complete () { 265fakeroot python do_image_complete () {
@@ -272,7 +270,6 @@ fakeroot python do_image_complete () {
272 execute_pre_post_process(d, post_process_cmds) 270 execute_pre_post_process(d, post_process_cmds)
273} 271}
274do_image_complete[dirs] = "${TOPDIR}" 272do_image_complete[dirs] = "${TOPDIR}"
275do_image_complete[umask] = "022"
276SSTATETASKS += "do_image_complete" 273SSTATETASKS += "do_image_complete"
277SSTATE_SKIP_CREATION_task-image-complete = '1' 274SSTATE_SKIP_CREATION_task-image-complete = '1'
278do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" 275do_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 () {
314} 314}
315do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}" 315do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}"
316do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}" 316do_package_write_deb[cleandirs] = "${PKGWRITEDIRDEB}"
317do_package_write_deb[umask] = "022"
318do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" 317do_package_write_deb[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
319addtask package_write_deb after do_packagedata do_package 318addtask package_write_deb after do_packagedata do_package
320 319
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 () {
273} 273}
274do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" 274do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}"
275do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}" 275do_package_write_ipk[cleandirs] = "${PKGWRITEDIRIPK}"
276do_package_write_ipk[umask] = "022"
277do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" 276do_package_write_ipk[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
278addtask package_write_ipk after do_packagedata do_package 277addtask package_write_ipk after do_packagedata do_package
279 278
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 () {
745 745
746do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}" 746do_package_write_rpm[dirs] = "${PKGWRITEDIRRPM}"
747do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}" 747do_package_write_rpm[cleandirs] = "${PKGWRITEDIRRPM}"
748do_package_write_rpm[umask] = "022"
749do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}" 748do_package_write_rpm[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"
750addtask package_write_rpm after do_packagedata do_package 749addtask package_write_rpm after do_packagedata do_package
751 750
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() {
160patch_do_patch[vardepsexclude] = "PATCHRESOLVE" 160patch_do_patch[vardepsexclude] = "PATCHRESOLVE"
161 161
162addtask patch after do_unpack 162addtask patch after do_unpack
163do_patch[umask] = "022"
164do_patch[dirs] = "${WORKDIR}" 163do_patch[dirs] = "${WORKDIR}"
165do_patch[depends] = "${PATCHDEPENDENCY}" 164do_patch[depends] = "${PATCHDEPENDENCY}"
166 165
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 () {
90} 90}
91 91
92do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}" 92do_populate_sysroot[dirs] = "${SYSROOT_DESTDIR}"
93do_populate_sysroot[umask] = "022"
94 93
95addtask populate_sysroot after do_install 94addtask populate_sysroot after do_install
96 95