squashfs-tools: Switch to BBCLASSEXTEND, drop legacy staging, bump PR

Signed-off-by: Tom Rini <tom_rini@mentor.com>

diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
deleted file mode 100644 (file)
index 1a82323..0000000
--- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require squashfs-tools_${PV}.bb
-PR = "${INC_PR}.1"
-
-inherit native
-
-PACKAGES = ""
-
-do_stage () {
-       install -m 0755 mksquashfs ${STAGING_BINDIR}/
-}

diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
deleted file mode 100644 (file)
index 1789417..0000000
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require squashfs-tools_4.0.bb
-
-inherit native
-
-DEPENDS = "attr-native zlib-native"
-
-PACKAGES = ""
-
-do_stage () {
-       install -m 0755 mksquashfs ${STAGING_BINDIR}/
-}
-

diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc
index a1f778d..ceb0256 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools.inc
+++ b/recipes/squashfs-tools/squashfs-tools.inc
@@ -2,10 +2,13 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
 DEPENDS = "attr zlib"
-INC_PR = "r4"
+INC_PR = "r5"
 
 S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools"
 
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"
+
 # required to share same place with -lzma specific packages
 FILESPATHPKG =. "squashfs-tools-${PV}:"
 

diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb
index 7883ca1..fd2783f 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb
@@ -1,4 +1,4 @@
 require squashfs-tools.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 SRC_URI += " file://Makefile.patch"

diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index cf33c0d..b476dc4 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -6,7 +6,7 @@ SRC_URI  = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module
 SRC_URI += " file://Makefile.patch"
 
 require squashfs-tools.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
 
 S = "${WORKDIR}/squashfs/squashfs-tools"