From patchwork Thu Apr 10 08:09:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 338033 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id D8AF41400BD for ; Thu, 10 Apr 2014 18:18:54 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 62CB23FDC8 for ; Thu, 10 Apr 2014 10:09:59 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 55FCD3FDC8 for ; Thu, 10 Apr 2014 10:09:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=5396; q=dns/txt; s=ironport2; t=1397117393; x=1428653393; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=JneZEoAMjoOiNVOMiGlYI+cA0e6nnGhq1VpH9rosk+I=; b=XwOCJ5B8KvU+pJXMK6zNELeWvfJofmt9i5mgBHRKh213O/AFeGyXzt1E q3aXwP2QtnbfS3OcUmnhS/3Rmz2PlOb4t4tpkx4X1KFWauTWD+8ERpOz2 hzHJ2NnZahbmYxGmuhKdTB26nR5OZhRu3FVyKupzqLazpZ/F4S9fRkSIX 4=; X-IronPort-AV: E=Sophos;i="4.97,833,1389740400"; d="scan'208";a="477280" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 10 Apr 2014 10:09:52 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Thu, 10 Apr 2014 10:09:51 +0200 Received: by localhost (Postfix, from userid 30007) id D9896682CDA; Thu, 10 Apr 2014 08:09:51 +0000 (UTC) From: To: Subject: [PATCH 24/28] dhcp: Remove version 4.2.4-P2 Date: Thu, 10 Apr 2014 08:09:44 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 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 From: Christian Sørensen Signed-off-by: Christian Sørensen --- recipes/dhcp/dhcp-4.2.4-P2/fix-external-bind.patch | 101 --------------------- recipes/dhcp/dhcp_4.2.4-P2.oe | 12 --- recipes/dhcp/dhcp_4.2.4-P2.oe.sig | 1 - 3 files changed, 114 deletions(-) delete mode 100644 recipes/dhcp/dhcp-4.2.4-P2/fix-external-bind.patch delete mode 100644 recipes/dhcp/dhcp_4.2.4-P2.oe delete mode 100644 recipes/dhcp/dhcp_4.2.4-P2.oe.sig diff --git a/recipes/dhcp/dhcp-4.2.4-P2/fix-external-bind.patch b/recipes/dhcp/dhcp-4.2.4-P2/fix-external-bind.patch deleted file mode 100644 index 2206b71..0000000 --- a/recipes/dhcp/dhcp-4.2.4-P2/fix-external-bind.patch +++ /dev/null @@ -1,101 +0,0 @@ -11/30/2010 ---with-libbind=PATH is available but not used by Makefile, -this patch is to allow building with external bind - -Signed-off-by: Qing He - -diff --git a/Makefile.am b/Makefile.am -index 928d926..cd17af8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -21,7 +21,7 @@ EXTRA_DIST = RELNOTES LICENSE \ - util/bindvar.sh \ - bind/Makefile bind/bind.tar.gz bind/version.tmp - --SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server -+SUBDIRS = includes tests common dst omapip client dhcpctl relay server - - nobase_include_HEADERS = dhcpctl/dhcpctl.h - -diff --git a/client/Makefile.am b/client/Makefile.am -index 77ed055..5a77f2d 100644 ---- a/client/Makefile.am -+++ b/client/Makefile.am -@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ - scripts/netbsd scripts/nextstep scripts/openbsd \ - scripts/solaris scripts/openwrt - dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a - man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 - EXTRA_DIST = $(man_MANS) - -diff --git a/configure.ac b/configure.ac -index ff832aa..60d342c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -500,6 +500,7 @@ no) - libbind="$use_libbind" - ;; - esac -+AC_SUBST([libbind]) - - # OpenLDAP support. - AC_ARG_WITH(ldap, -diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am -index 61049be..85aefa3 100644 ---- a/dhcpctl/Makefile.am -+++ b/dhcpctl/Makefile.am -@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS) - - omshell_SOURCES = omshell.c - omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a - - libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c - - cltest_SOURCES = cltest.c - cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ -- ../bind/lib/libdns.a ../bind/lib/libisc.a -\ No newline at end of file -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a -diff --git a/omapip/Makefile.am b/omapip/Makefile.am -index 595950a..17f2233 100644 ---- a/omapip/Makefile.am -+++ b/omapip/Makefile.am -@@ -10,5 +10,5 @@ man_MANS = omapi.3 - EXTRA_DIST = $(man_MANS) - - svtest_SOURCES = test.c --svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a -+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a - -diff --git a/relay/Makefile.am b/relay/Makefile.am -index d8757ca..a7885da 100644 ---- a/relay/Makefile.am -+++ b/relay/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' - sbin_PROGRAMS = dhcrelay - dhcrelay_SOURCES = dhcrelay.c - dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- ../bind/lib/libdns.a ../bind/lib/libisc.a -+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a - man_MANS = dhcrelay.8 - EXTRA_DIST = $(man_MANS) - -diff --git a/server/Makefile.am b/server/Makefile.am -index cdfaf47..d2c254b 100644 ---- a/server/Makefile.am -+++ b/server/Makefile.am -@@ -8,8 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ - - dhcpd_CFLAGS = $(LDAP_CFLAGS) - dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \ -- ../bind/lib/libisc.a -+ ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \ -+ $(libbind)/lib/libisc.a - - man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - EXTRA_DIST = $(man_MANS) diff --git a/recipes/dhcp/dhcp_4.2.4-P2.oe b/recipes/dhcp/dhcp_4.2.4-P2.oe deleted file mode 100644 index d59420b..0000000 --- a/recipes/dhcp/dhcp_4.2.4-P2.oe +++ /dev/null @@ -1,12 +0,0 @@ -require dhcp4.inc - -SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz" -SRC_URI += "${SRC_URI_EXTRA}" - -SRC_URI += "file://fix-external-bind.patch" -SRC_URI += "file://nobash.patch" - -DEPENDS += "bind-dev" -EXTRA_OECONF += "--with-libbind=${TARGET_SYSROOT}${target_libdir}/.." -# These are needed by bind, and dhcp doesn't handle this automatically -EXTRA_OECONF += 'LIBS="-lssl -lcrypto"' diff --git a/recipes/dhcp/dhcp_4.2.4-P2.oe.sig b/recipes/dhcp/dhcp_4.2.4-P2.oe.sig deleted file mode 100644 index 22e7784..0000000 --- a/recipes/dhcp/dhcp_4.2.4-P2.oe.sig +++ /dev/null @@ -1 +0,0 @@ -78a819d7af6688942429de2178124ea371f038f2 dhcp-4.2.4-P2.tar.gz