[oe-commits] Otavio Salvador : squashfs-tools: allow setting of SRC_URI before loading . inc

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 2f15c139108411520a235708e3a3b697eb12b497
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2f15c139108411520a235708e3a3b697eb12b497

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Sat Nov 21 19:51:05 2009 -0200

squashfs-tools: allow setting of SRC_URI before loading .inc

Without this change bitbake due a fetcher failure because SRC_URI is
then cached and later changed.

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

---

 recipes/squashfs-tools/squashfs-tools.inc    |    4 ++--
 recipes/squashfs-tools/squashfs-tools_4.0.bb |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc
index aa75eaa..fb5a648 100644
--- a/recipes/squashfs-tools/squashfs-tools.inc
+++ b/recipes/squashfs-tools/squashfs-tools.inc
@@ -2,14 +2,14 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
 SECTION = "base"
 LICENSE = "GPLv2"
 DEPENDS = "zlib"
-INC_PR = "r2"
+INC_PR = "r3"
 
 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"
+SRC_URI ?= "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz"
 
 prefix = ""
 
diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb
index 29d82a8..886c095 100644
--- a/recipes/squashfs-tools/squashfs-tools_4.0.bb
+++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb
@@ -1,9 +1,10 @@
-require squashfs-tools.inc
-PR = "${INC_PR}.2"
-
 # This override is required since this has not yet been released
 SRC_URI  = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module=squashfs;date=${SRCDATE} \
             http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
+
+require squashfs-tools.inc
+PR = "${INC_PR}.2"
+
 S = "${WORKDIR}/squashfs/squashfs-tools"
 
 EXTRA_OEMAKE += "LZMA_SUPPORT=1 LZMA_DIR=../.."