squid: remove SQUID_MAJOR, determine SRC_URI path from PV

Signed-off-by: Roman I Khimov <khimov@altell.ru>

diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc
index a392ccd..22fbbe6 100644 (file)
--- a/recipes/squid/squid.inc
+++ b/recipes/squid/squid.inc
@@ -3,7 +3,10 @@ LICENSE = "GPLv2"
 INC_PR = "r8"
 DEPENDS = "openssl openssl-native openldap"
 
-SRC_URI = "http://www.squid-cache.org/Versions/v2/${SQUID_MAJOR}/squid-${PV}.tar.bz2;name=squid-${PV} \
+SQ_MAJ = "${@bb.data.getVar('PV',d,1).split('.')[0]}"
+SQ_MIN = "${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "http://www.squid-cache.org/Versions/v${SQ_MAJ}/${SQ_MAJ}.${SQ_MIN}/squid-${PV}.tar.bz2;name=squid-${PV} \
            file://fix_epoll_check.patch \
           file://squidv2-build-cf_gen.patch \
            file://squid.init \

diff --git a/recipes/squid/squid_2.6.STABLE14.bb b/recipes/squid/squid_2.6.STABLE14.bb
index 670ea13..8534a1f 100644 (file)
--- a/recipes/squid/squid_2.6.STABLE14.bb
+++ b/recipes/squid/squid_2.6.STABLE14.bb
@@ -1,5 +1,4 @@
 PR = "${INC_PR}.0"
-SQUID_MAJOR = "2.6"
 
 include squid.inc
 SRC_URI[squid-2.6.STABLE14.md5sum] = "eadb138d48320df8b99349121159c6bf"

diff --git a/recipes/squid/squid_2.7.STABLE8.bb b/recipes/squid/squid_2.7.STABLE8.bb
index 3385b49..8e5adf4 100644 (file)
--- a/recipes/squid/squid_2.7.STABLE8.bb
+++ b/recipes/squid/squid_2.7.STABLE8.bb
@@ -1,5 +1,4 @@
 PR = "${INC_PR}.0"
-SQUID_MAJOR = "2.7"
 
 include squid.inc