From patchwork Tue Jan 6 15:05:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kim.hansen@prevas.dk X-Patchwork-Id: 425699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 717A5140082 for ; Wed, 7 Jan 2015 02:05:54 +1100 (AEDT) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 055583FDC8 for ; Tue, 6 Jan 2015 16:05:51 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 1CAD93FDC8 for ; Tue, 6 Jan 2015 16:05:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=5196; q=dns/txt; s=ironport1; t=1420556749; x=1452092749; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=6y3G5yd4bLNjdShjEiT8mYfl75TMEl1cl00xhrE4YSM=; b=Lnivf9cb66MoJ+VtN1X68JWNEEC1+U250+jCoiltuS9cqOS4u3VQsAr/ SISAJdt+Td+kCg6uwU47YKYAjR0ivdwJj1FySBaQGPHup5fdilHQJV8YO /cyTk2zOuNyXkiZl0ml1+xaafnUKtEiPHYsuntKjVTkLqdo7q/i5KkGZK w=; X-IronPort-AV: E=Sophos;i="5.07,708,1413237600"; d="scan'208";a="5475229" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 06 Jan 2015 16:05:48 +0100 Received: from VMPREVAS2.prevas.se ([fe80::ddc4:1ca4:65e1:d098]) by VMPREVAS3.prevas.se ([172.16.8.103]) with mapi id 14.02.0387.000; Tue, 6 Jan 2015 16:05:48 +0100 From: =?iso-8859-1?Q?Kim_H=F8jgaard-Hansen?= To: =?iso-8859-1?Q?Kim_B=F8ndergaard_Poulsen?= , "dev@oe-lite.org" Subject: SV: [PATCH 6/7] dnsmasq: New recipe Thread-Topic: [PATCH 6/7] dnsmasq: New recipe Thread-Index: AQHP1ivaVXZ443NIHU29KwKyg4neipyz1/j+ Date: Tue, 6 Jan 2015 15:05:48 +0000 Message-ID: References: , In-Reply-To: Accept-Language: da-DK, sv-SE, en-US Content-Language: da-DK X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.11.37] MIME-Version: 1.0 Cc: =?iso-8859-1?Q?Kim_B=F8ndergaard?= X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Hi Kim, Could you resubmit this on github without the commented out line and run packageqa? Otherwise it looks fine /Kim diff --git a/recipes/dnsmasq/dnsmasq.inc b/recipes/dnsmasq/dnsmasq.inc new file mode 100644 index 0000000..a4ed159 --- /dev/null +++ b/recipes/dnsmasq/dnsmasq.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "dnsmasq" +HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" +LICENSE = "GPL-3" + +SRC_URI = "http://www.thekelleys.org.uk/${PN}/${PN}-${PV}.tar.gz" +SRC_URI += "file://dnsmasq" +SRC_URI += "file://makefile.patch" + +inherit c make sysvinit pkgconfig + +RECIPE_FLAGS += "dnsmasq_sysvinit_start" +DEFAULT_USE_dnsmasq_sysvinit_start = "97" +DEFAULT_USE_dnsmasq_sysvinit_stop = "0" +SYSVINIT_SCRIPT_dnsmasq = "dnsmasq" + +do_install[postfuncs] =+ " do_install_dnsmasq_extra" +do_install_dnsmasq_extra() { + install -d 755 ${D}${bindir} ${D}${sysconfdir}/init.d + + install -m 755 ${SRCDIR}/dnsmasq ${D}${sysconfdir}/init.d + #install -m 755 ${S}/src/dnsmasq ${D}${bindir}/ + install -m 755 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/ +} + +FILES_${PN} += " ${sysconfdir} ${bindir}" diff --git a/recipes/dnsmasq/dnsmasq_2.71.oe b/recipes/dnsmasq/dnsmasq_2.71.oe new file mode 100644 index 0000000..8a5b07c --- /dev/null +++ b/recipes/dnsmasq/dnsmasq_2.71.oe @@ -0,0 +1,2 @@ +require dnsmasq.inc + diff --git a/recipes/dnsmasq/dnsmasq_2.71.oe.sig b/recipes/dnsmasq/dnsmasq_2.71.oe.sig new file mode 100644 index 0000000..2cc94f0 --- /dev/null +++ b/recipes/dnsmasq/dnsmasq_2.71.oe.sig @@ -0,0 +1 @@ +b0a39f66557c966629a0ed9282cd87df8f409004 dnsmasq-2.71.tar.gz diff --git a/recipes/dnsmasq/files/dnsmasq b/recipes/dnsmasq/files/dnsmasq new file mode 100755 index 0000000..4dbece2 --- /dev/null +++ b/recipes/dnsmasq/files/dnsmasq @@ -0,0 +1,34 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/dnsmasq +NAME=dnsmasq +DESC="Dnsmasq - DNS server" +OPTS="" + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/recipes/dnsmasq/files/makefile.patch b/recipes/dnsmasq/files/makefile.patch new file mode 100644 index 0000000..5b62741 --- /dev/null +++ b/recipes/dnsmasq/files/makefile.patch @@ -0,0 +1,11 @@ +--- dnsmasq-2.71/Makefile.orig 2014-09-09 22:19:14.705703992 +0200 ++++ dnsmasq-2.71/Makefile 2014-09-09 22:21:03.441706034 +0200 +@@ -18,7 +18,7 @@ + + # Variables you may well want to override. + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man + LOCALEDIR = $(PREFIX)/share/locale