[6/7] squashfs-tools: clean up compile/install tasks

Message ID 20191031105518.7716-6-ross.burton@intel.com
State Accepted
Commit 6f65dd3164a6f523de82cb30e67ec3d180e45c2e
Headers show
Series
  • [1/7] qemu-helper-native: add missing option to getopt() call
Related show

Commit Message

Ross Burton Oct. 31, 2019, 10:55 a.m.
The makefile can do the right thing now.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 .../recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

-- 
2.20.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
index 0e1be6bc1ff..4fd33f80482 100644
--- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
+++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
@@ -28,13 +28,11 @@  PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd"
 PACKAGECONFIG[reproducible] = "REPRODUCIBLE_DEFAULT=1,REPRODUCIBLE_DEFAULT=0,"
 
 do_compile() {
-	oe_runmake mksquashfs unsquashfs
+	oe_runmake all
 }
 
-do_install () {
-	install -d ${D}${sbindir}
-	install -m 0755 mksquashfs ${D}${sbindir}/
-	install -m 0755 unsquashfs ${D}${sbindir}/
+do_install() {
+	oe_runmake install INSTALL_DIR=${D}${sbindir}
 }
 
 ARM_INSTRUCTION_SET_armv4 = "arm"