dnsmasq: fix SRC_URI and some other minor fixes

* at least releases prior to 2.15 are only available in the archive directory
* adjust checksums.ini accordingly
* move S out of inc file and only into the affected dnsmasq-dbus recipe
* do some clever python courtey of Phil Blundell to generally define SRC_URI
  for all recipes in the inc file only

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5435986..92f2ee8 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5642,7 +5642,7 @@ sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
 md5=02aa4ffb835cbc9bdf96fcb915901cb3
 sha256=2dac596d5150174d0a2d9170db698c1d72584a8ab3b5eedf907086f53f76cc87
 
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.15.tar.gz]
+[http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-2.15.tar.gz]
 md5=72f59fa070a1dc7f664603b20134c383
 sha256=9aec45b395b6206e8eb85417f58186cdd0a307ed0f26f4b73af7031023a52225
 

diff --git a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
index d03dbdb..9aefb95 100644 (file)
--- a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
+++ b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
@@ -2,6 +2,8 @@
 
 require dnsmasq.inc
 
+S = "${WORKDIR}/dnsmasq-${PV}"
+
 DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 

diff --git a/recipes/dnsmasq/dnsmasq.inc b/recipes/dnsmasq/dnsmasq.inc
index a8b8d85..68c6337 100644 (file)
--- a/recipes/dnsmasq/dnsmasq.inc
+++ b/recipes/dnsmasq/dnsmasq.inc
@@ -1,14 +1,13 @@
-SECTION = "console/network"
 DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server."
 HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
+#at least versions 2.15 and prior are moved to the archive folder on the server
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz \
            file://init \
            file://dnsmasq.conf"
 
-S = "${WORKDIR}/dnsmasq-${PV}"
-
 inherit update-rc.d
 
 INITSCRIPT_NAME = "dnsmasq"

diff --git a/recipes/dnsmasq/dnsmasq_2.11.bb b/recipes/dnsmasq/dnsmasq_2.11.bb
index 68fa543..83aea1d 100644 (file)
--- a/recipes/dnsmasq/dnsmasq_2.11.bb
+++ b/recipes/dnsmasq/dnsmasq_2.11.bb
@@ -1,5 +1 @@
 require dnsmasq.inc
-
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-${PV}.tar.gz \
-           file://init \
-           file://dnsmasq.conf"