Skip to contentSkip to conversation

create-spdx.bbclass: Remove an unnecessary path from do_create_spdx[dirs]

PATCH New Peter Kjellerstedt 1 participant 5 messages Mar 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 create-spdx.bbclass: Remove an unnecessary path from do_create_spdx[dirs]

From: Peter Kjellerstedt <[email protected]>

There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]).

---
 meta/classes/create-spdx.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/create-spdx.bbclass +1 -1
index 5375ef3e34..daf99ca676 100644
@@ -600,7 +600,7 @@ python do_create_spdx_setscene () {
 }
 addtask do_create_spdx_setscene
 
-do_create_spdx[dirs] = "${SPDXDEPLOY} ${SPDXWORK}"
+do_create_spdx[dirs] = "${SPDXWORK}"
 do_create_spdx[cleandirs] = "${SPDXDEPLOY} ${SPDXWORK}"
 do_create_spdx[depends] += "${PATCHDEPENDENCY}"
 do_create_spdx[deptask] = "do_create_spdx"
#1 lore raw

PATCH 2/5 deploy.bbclass: Remove an unnecessary path from do_deploy[dirs]

From: Peter Kjellerstedt <[email protected]>

There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]).

---
 meta/classes/deploy.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/deploy.bbclass +1 -1
index 737c26122b..7fbffe996b 100644
@@ -7,6 +7,6 @@ python do_deploy_setscene () {
     sstate_setscene(d)
 }
 addtask do_deploy_setscene
-do_deploy[dirs] = "${DEPLOYDIR} ${B}"
+do_deploy[dirs] = "${B}"
 do_deploy[cleandirs] = "${DEPLOYDIR}"
 do_deploy[stamp-extra-info] = "${MACHINE_ARCH}"
#2 lore raw

PATCH 3/5 image.bbclass: Remove two unnecessary paths from do_rootfs[dirs]

In reply to Peter Kjellerstedt

From: Peter Kjellerstedt <[email protected]>

There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]).

---
 meta/classes/image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image.bbclass +1 -1
index eb192057c2..7f1f6f80a4 100644
@@ -252,7 +252,7 @@ fakeroot python do_rootfs () {
 
     progress_reporter.finish()
 }
-do_rootfs[dirs] = "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${TOPDIR}"
+do_rootfs[dirs] = "${TOPDIR}"
 do_rootfs[cleandirs] += "${IMAGE_ROOTFS} ${IMGDEPLOYDIR} ${S}"
 do_rootfs[file-checksums] += "${POSTINST_INTERCEPT_CHECKSUMS}"
 addtask rootfs after do_prepare_recipe_sysroot
#3 lore raw

PATCH 4/5 package.bbclass: Remove an unnecessary path from do_package[dirs]

In reply to Peter Kjellerstedt

From: Peter Kjellerstedt <[email protected]>

There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]).

---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/package.bbclass +1 -1
index f822258150..e71daafe94 100644
@@ -2464,7 +2464,7 @@ python do_package () {
     oe.qa.exit_if_errors(d)
 }
 
-do_package[dirs] = "${SHLIBSWORKDIR} ${PKGDESTWORK} ${D}"
+do_package[dirs] = "${SHLIBSWORKDIR} ${D}"
 do_package[vardeps] += "${PACKAGEBUILDPKGD} ${PACKAGESPLITFUNCS} ${PACKAGEFUNCS} ${@gen_packagevar(d)}"
 addtask package after do_install
 
#4 lore raw

PATCH 5/5 go: Remove three unnecessary paths from do_compile[dirs]

In reply to Peter Kjellerstedt

From: Peter Kjellerstedt <[email protected]>

There is no reason to include a path in foo[dirs] if it is also in foo[cleandirs] (except if it is the last path in foo[dirs]).

---
 meta/recipes-devtools/go/go-cross-canadian.inc | 1 -
 meta/recipes-devtools/go/go-cross.inc          | 1 -
 meta/recipes-devtools/go/go-crosssdk.inc       | 1 -
 meta/recipes-devtools/go/go-native_1.17.8.bb   | 1 -
 meta/recipes-devtools/go/go-runtime.inc        | 1 -
 meta/recipes-devtools/go/go-target.inc         | 1 -
 6 files changed, 6 deletions(-)
meta/recipes-devtools/go/go-cross-canadian.inc +0 -1
index d49250a8e2..c1aa987427 100644
@@ -27,7 +27,6 @@ do_compile() {
 	./make.bash --host-only --no-banner
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
 
 
meta/recipes-devtools/go/go-cross.inc +0 -1
index 3d5803bf07..a0fbdbe3b9 100644
@@ -17,7 +17,6 @@ do_compile() {
 	./make.bash --host-only --no-banner
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
 
 make_wrapper() {
meta/recipes-devtools/go/go-crosssdk.inc +0 -1
index f0bec79719..cd23cca2fe 100644
@@ -13,7 +13,6 @@ do_compile() {
 	./make.bash --host-only --no-banner
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
 
 make_wrapper() {
meta/recipes-devtools/go/go-native_1.17.8.bb +0 -1
index ffe4ef3523..76c0ab73a6 100644
@@ -27,7 +27,6 @@ do_compile() {
 	./make.bash ${GOMAKEARGS}
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin"
 
 make_wrapper() {
meta/recipes-devtools/go/go-runtime.inc +0 -1
index ccb86d4fe9..e18339cddb 100644
@@ -38,7 +38,6 @@ do_compile() {
 	fi
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
 
 do_install() {
meta/recipes-devtools/go/go-target.inc +0 -1
index b0d487ae1c..d085643036 100644
@@ -29,7 +29,6 @@ do_compile() {
 	./make.bash --target-only --no-banner
 	cd ${B}
 }
-do_compile[dirs] =+ "${GOTMPDIR} ${B}/bin ${B}/pkg"
 do_compile[cleandirs] += "${GOTMPDIR} ${B}/bin ${B}/pkg"
 
 do_install() {