squashfs-tools: refactor 3.3 and 4.0 recipes and use INC_PR

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
index 5858bb18d68f7c22ab58d8b027ade77c9879a242..1a82323951002bca286deb95b9a1455de76f18cd 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb
@@ -1,5 +1,5 @@
 require squashfs-tools_${PV}.bb
-PR = "r0"
+PR = "${INC_PR}.1"
 
 inherit native
 

diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
index 5858bb18d68f7c22ab58d8b027ade77c9879a242..1a82323951002bca286deb95b9a1455de76f18cd 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb
@@ -1,5 +1,5 @@
 require squashfs-tools_${PV}.bb
-PR = "r0"
+PR = "${INC_PR}.1"
 
 inherit native
 

diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc
index f27d9ec79aee9bfa4e419af0588d74616db3c980..d06e1e52ec47784cd6830319015c824ab59e62c6 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools.inc
+++ b/recipes/squashfs-tools/squashfs-tools.inc
@@ -1,11 +1,16 @@
 DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
-
 DEPENDS = "zlib"
+INC_PR = "r1"
 
 S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools"
 
+# required to share same place with -lzma specific packages
+FILESPATHPKG = "squashfs-tools-${PV}:squashfs-tools:files"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz"
+
 prefix = ""
 
 do_compile() {

diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb
index 2bf0a98ccb429ac0bcd1af0a2486af72320c2394..ce6b7ce0f36c6c67a0f428c964b64bfff090f403 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools_3.3.bb
+++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb
@@ -1,8 +1,4 @@
 require squashfs-tools.inc
-PR = "r0"
-
-# some release have .tgz, some have .tar.gz, so keep that outside the .inc file
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tgz \
-file://Makefile.patch;patch=1"
+PR = "${INC_PR}.1"
 
+SRC_URI += " file://Makefile.patch;patch=1"

diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index 8299cd6fdf1d669c160c61e153598d1e4418c683..0de5794b95ee27e4eee0c8e4caede275f12f0283 100644 (file)
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -1,12 +1,5 @@
 require squashfs-tools.inc
-PR = "r0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
-
-# some release have .tgz, some have .tar.gz, so keep that outside the .inc file
-
-#http://ovh.dl.sourceforge.net/sourceforge/squashfs/squashfs4.0.tar.gz
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
-file://Makefile.patch;patch=1"
-
+SRC_URI += " file://Makefile.patch;patch=1"