diff options
| author |   Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2010-01-17 01:26:24 +0100 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2010-01-17 01:33:35 +0100 |
| commit | a65c4747e1f3eefcbbe3205a6e9394a6899b822b (patch) | |
| tree | fdb3d0728d0974c44be6d4155ba49cba269de1c6 | |
| parent | 709c94aaea7e00ddf26034581f5dcd78ee9139b9 (diff) | |
| download | openembedded-a65c4747e1f3eefcbbe3205a6e9394a6899b822b.tar.gz | |
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
| -rw-r--r-- | conf/checksums.ini | 2 | ||||
| -rw-r--r-- | recipes/dnsmasq/dnsmasq-dbus_2.47.bb | 2 | ||||
| -rw-r--r-- | recipes/dnsmasq/dnsmasq.inc | 7 | ||||
| -rw-r--r-- | recipes/dnsmasq/dnsmasq_2.11.bb | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 543598672b..92f2ee826b 100644 --- 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 d03dbdb06e..9aefb95ada 100644 --- 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 a8b8d85c50..68c6337306 100644 --- 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 68fa543210..83aea1d299 100644 --- 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" |