From patchwork Tue Jun 19 01:01:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danomi Manchego X-Patchwork-Id: 165627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id CA05CB7008 for ; Tue, 19 Jun 2012 11:01:54 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B647101CF1; Tue, 19 Jun 2012 01:01:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PEHEv-cyNKOh; Tue, 19 Jun 2012 01:01:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 579E2101D03; Tue, 19 Jun 2012 01:01:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CF40D8F753 for ; Tue, 19 Jun 2012 01:01:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6841101CCC for ; Tue, 19 Jun 2012 01:01:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1o7adwEgTPNt for ; Tue, 19 Jun 2012 01:01:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from qmta09.westchester.pa.mail.comcast.net (qmta09.westchester.pa.mail.comcast.net [76.96.62.96]) by fraxinus.osuosl.org (Postfix) with ESMTP id EAE62101CF1 for ; Tue, 19 Jun 2012 01:01:48 +0000 (UTC) Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74]) by qmta09.westchester.pa.mail.comcast.net with comcast id Ppl31j00h1c6gX85911oDP; Tue, 19 Jun 2012 01:01:48 +0000 Received: from localhost.localdomain ([68.37.48.40]) by omta23.westchester.pa.mail.comcast.net with comcast id Q11n1j00c0s1VyU3j11n17; Tue, 19 Jun 2012 01:01:47 +0000 From: Danomi Manchego To: buildroot@uclibc.org Date: Mon, 18 Jun 2012 21:01:44 -0400 Message-Id: <1340067704-7095-1-git-send-email-danomimanchego123@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] xinetd: expand DESTDIR patch to fix uninstall target X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Expand the openWRT patch to fix xinetd's "uninstall" target, so that buildroot's "xinetd-clean" removes the correct files. Signed-off-by: Danomi Manchego --- package/xinetd/xinetd-2.3.15/002-destdir.patch | 28 ++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/package/xinetd/xinetd-2.3.15/002-destdir.patch b/package/xinetd/xinetd-2.3.15/002-destdir.patch index 15ff4b8..7a323eb 100644 --- a/package/xinetd/xinetd-2.3.15/002-destdir.patch +++ b/package/xinetd/xinetd-2.3.15/002-destdir.patch @@ -1,14 +1,15 @@ This patch adds $(DESTDIR) to xinetd's installation paths, to support installation to a cross-compiled RFS area. -The content of this patch was copied from the OpenWrt project: +The content of this patch was inspired by the OpenWrt project: https://dev.openwrt.org/browser/packages/net/xinetd/patches/002-destdir.patch Signed-off-by: Danomi Manchego ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr +diff -urN xinetd-2.3.15.ORIG/Makefile.in xinetd-2.3.15/Makefile.in +--- xinetd-2.3.15.ORIG/Makefile.in 2007-09-20 13:01:52.000000000 -0400 ++++ xinetd-2.3.15/Makefile.in 2012-06-18 10:20:00.540864388 -0400 +@@ -75,27 +75,27 @@ install: build for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ @@ -33,3 +34,22 @@ Signed-off-by: Danomi Manchego @echo "You must put your xinetd.conf in /etc/xinetd.conf" @echo "There is a sample config file in xinetd/sample.conf and you can" @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format" + + uninstall: +- rm -f $(DAEMONDIR)/xinetd +- rm -f $(DAEMONDIR)/itox +- rm -f $(DAEMONDIR)/xconv.pl +- rm -f $(MANDIR)/man5/xinetd.conf.5 +- rm -f $(MANDIR)/man8/xinetd.log.8 +- rm -f $(MANDIR)/man8/xinetd.8 +- rm -f $(MANDIR)/man8/itox.8 ++ rm -f $(DESTDIR)$(DAEMONDIR)/xinetd ++ rm -f $(DESTDIR)$(DAEMONDIR)/itox ++ rm -f $(DESTDIR)$(DAEMONDIR)/xconv.pl ++ rm -f $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5 ++ rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.log.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.8 ++ rm -f $(DESTDIR)$(MANDIR)/man8/itox.8 + + distclean: clean + rm -f config.cache config.log Makefile config.status xinetd/itox