diff options
| author |   Roman I Khimov <khimov@altell.ru> | 2010-07-06 15:04:06 +0400 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-07-29 20:21:00 +0400 |
| commit | fdde749316e27f559fddc3e67c9cb5ba8ad22556 (patch) | |
| tree | 2623cd3bb8c51a70b8b9b446a3b6d59153fb4b3f | |
| parent | eb6293b2f61bf5b8b23b5bed45a9b0d456c880a7 (diff) | |
| download | openembedded-fdde749316e27f559fddc3e67c9cb5ba8ad22556.tar.gz | |
squid: remove SQUID_MAJOR, determine SRC_URI path from PV
Signed-off-by: Roman I Khimov <khimov@altell.ru>
| -rw-r--r-- | recipes/squid/squid.inc | 5 | ||||
| -rw-r--r-- | recipes/squid/squid_2.6.STABLE14.bb | 1 | ||||
| -rw-r--r-- | recipes/squid/squid_2.7.STABLE8.bb | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/recipes/squid/squid.inc b/recipes/squid/squid.inc index a392ccd5e4..22fbbe69a4 100644 --- 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 670ea133ce..8534a1f527 100644 --- 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 3385b4973f..8e5adf40e1 100644 --- 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 |