On Sat, Apr 13, 2013 at 03:29:31PM +0200, Martin Jansa wrote: > Signed-off-by: Martin Jansa <[email protected]> > --- > meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc | 14 ++++++++++++-- > .../dnsmasq/dnsmasq/dnsmasq.service | 0 > meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb | 2 ++ > .../recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 > ------------------ > 4 files changed, 14 insertions(+), 20 deletions(-) > rename {meta-systemd/meta-oe => > meta-oe}/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service (100%) > delete mode 100644 > meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
this breaks dnsmasq-dbus which is using the same .inc. dnsmasq-dbus removal is in separate patch. > > diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc > b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc > index d6f3a54..ef99f48 100644 > --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc > +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc > @@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ > #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(d.getVar('PV',1).split('.')[1]) > > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ > file://init \ > - file://dnsmasq.conf" > + file://dnsmasq.conf \ > + file://dnsmasq.service \ > +" > > -inherit update-rc.d > +inherit update-rc.d systemd > > INITSCRIPT_NAME = "dnsmasq" > INITSCRIPT_PARAMS = "defaults" > @@ -24,6 +26,14 @@ do_install () { > install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d > ${D}${sysconfdir}/dnsmasq.d > install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ > install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq > + > + install -d ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/dnsmasq.service > ${D}${systemd_unitdir}/system > } > > CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" > + > +RPROVIDES_${PN} += "${PN}-systemd" > +RREPLACES_${PN} += "${PN}-systemd" > +RCONFLICTS_${PN} += "${PN}-systemd" > +SYSTEMD_SERVICE_${PN} = "dnsmasq.service" > diff --git > a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service > b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service > similarity index 100% > rename from > meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service > rename to meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service > diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb > b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb > index 5f87704..ae37db7 100644 > --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb > +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb > @@ -1,4 +1,6 @@ > require dnsmasq.inc > > +PR = "r3" > + > SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a" > SRC_URI[dnsmasq-2.55.sha256sum] = > "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929" > diff --git > a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend > b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend > deleted file mode 100644 > index 148586e..0000000 > --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend > +++ /dev/null > @@ -1,18 +0,0 @@ > -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > - > -PRINC := "${@int(PRINC) + 2}" > - > -inherit systemd > - > -SRC_URI += "file://dnsmasq.service" > - > -RPROVIDES_${PN} += "${PN}-systemd" > -RREPLACES_${PN} += "${PN}-systemd" > -RCONFLICTS_${PN} += "${PN}-systemd" > -SYSTEMD_SERVICE_${PN} = "dnsmasq.service" > - > -do_install_append() { > - install -d ${D}${systemd_unitdir}/system > - install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system > -} > - > -- > 1.8.1.5 > -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
