olsrd: introduce MAJ_VER variable. Downloads are split into MAJ_VER directories.

diff --git a/packages/olsr/olsrd.inc b/packages/olsr/olsrd.inc
index 990d8a16782f14e1d4ed3b2451d4a1b8d801dc00..e668f11847e8cfbf89c18d1bcea66db966cbaa30 100644 (file)
--- a/packages/olsr/olsrd.inc
+++ b/packages/olsr/olsrd.inc
@@ -5,7 +5,8 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
        file://init \
        file://olsrd.conf"
 

diff --git a/packages/olsr/olsrd_0.4.8.bb b/packages/olsr/olsrd_0.4.8.bb
index 98a6344fb770dff532cc96006b13b229b40100fa..c2b9c825b6a22d962a55c0fd36c324f452909e25 100644 (file)
--- a/packages/olsr/olsrd_0.4.8.bb
+++ b/packages/olsr/olsrd_0.4.8.bb
@@ -5,7 +5,8 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
        file://init \
        file://olsrd.conf"
 

diff --git a/packages/olsr/olsrd_0.5.3.bb b/packages/olsr/olsrd_0.5.3.bb
index 5bc448a12602513657c9c3fa4b00935f31fae27f..34f20f64f803ba3d061a0281ef8f54892990e01a 100644 (file)
--- a/packages/olsr/olsrd_0.5.3.bb
+++ b/packages/olsr/olsrd_0.5.3.bb
@@ -1,7 +1,8 @@
 require olsrd.inc
+
 PR = "r0"
 
-SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
         file://init \
         file://olsrd.conf \
         file://unbreak-makefile.patch;patch=1"