From patchwork Sat Aug 11 17:40:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 176705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id F18D02C00A8 for ; Sun, 12 Aug 2012 03:42:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B128A0618; Sat, 11 Aug 2012 17:42:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id syV783yqBO-P; Sat, 11 Aug 2012 17:42:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 94E88A0632; Sat, 11 Aug 2012 17:41:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5A0ED8F753 for ; Sat, 11 Aug 2012 17:41:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A2498F666 for ; Sat, 11 Aug 2012 17:41:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EJyZUvv878hd for ; Sat, 11 Aug 2012 17:41:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [88.190.12.23]) by whitealder.osuosl.org (Postfix) with ESMTP id 30D888D40A for ; Sat, 11 Aug 2012 17:41:32 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 4011430A; Sat, 11 Aug 2012 19:41:28 +0200 (CEST) Received: from localhost (37-8-187-107.coucou-networks.fr [37.8.187.107]) by mail.free-electrons.com (Postfix) with ESMTPSA id 07886310 for ; Sat, 11 Aug 2012 19:41:19 +0200 (CEST) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sat, 11 Aug 2012 19:40:41 +0200 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 09/20] netkittelnet: convert to generic-package infrastructure 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 Signed-off-by: Thomas Petazzoni --- package/netkittelnet/netkittelnet.mk | 80 ++++++++----------------------- package/netkittelnet/netkittelnet.patch | 2 +- 2 files changed, 21 insertions(+), 61 deletions(-) diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 43ba324..b1f8c53 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -3,69 +3,29 @@ # netkittelnet # ############################################################# -NETKITTELNET_VERSION:=0.17 -NETKITTELNET_SOURCE:=netkit-telnet-$(NETKITTELNET_VERSION).tar.gz -NETKITTELNET_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-$(NETKITTELNET_VERSION) -NETKITTELNET_CAT:=$(ZCAT) -NETKITTELNET_BINARY:=telnetd/telnetd -NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd +NETKITTELNET_VERSION = 0.17 +NETKITTELNET_SOURCE = netkit-telnet-$(NETKITTELNET_VERSION).tar.gz +NETKITTELNET_SITE = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -$(DL_DIR)/$(NETKITTELNET_SOURCE): - $(call DOWNLOAD,$(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE)) - -netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE) - -$(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE) - $(NETKITTELNET_CAT) $(DL_DIR)/$(NETKITTELNET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - +define NETKITTELNET_CONFIGURE_CMDS # use ANSI syntax - $(SED) "s/main()/main(void)/;" $(NETKITTELNET_DIR)/configure + $(SED) "s/main()/main(void)/;" $(@D)/configure # Disable termcap support - $(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c - # don't try to run cross compiled binaries while configuring things - support/scripts/apply-patches.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch - touch $(NETKITTELNET_DIR)/.unpacked - -$(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked - (cd $(NETKITTELNET_DIR); rm -f config.cache; \ - PATH=$(TARGET_PATH) CC="$(TARGET_CC)" \ - ./configure --installroot=$(TARGET_DIR) --with-c-compiler="$(TARGET_CC)" \ - ) - touch $(NETKITTELNET_DIR)/.configured - -$(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured - $(MAKE) SUB=telnetd CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR) - $(STRIPCMD) $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) - -$(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) - # Only install a few selected items... - mkdir -p $(TARGET_DIR)/usr/sbin - rm -f $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) - cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) + $(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(@D)/telnetd/telnetd.c + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + ./configure \ + --installroot=$(TARGET_DIR)) +endef + +define NETKITTELNET_BUILD_CMDS + $(MAKE) SUB=telnetd -C $(@D) +endef + +define NETKITTELNET_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/telnetd/telnetd $(TARGET_DIR)/usr/sbin/telnetd # Enable telnet in inetd $(SED) "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf - #$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR) install - #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - -netkittelnet-legal-info: - @$(call legal-warning-pkg,netkittelnet,legal-info not yet implemented) - -netkittelnet: netkitbase $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) +endef -netkittelnet-clean: - #$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITTELNET_DIR) uninstall - -rm -f $(TARGET_DIR)/usr/sbin/telnetd - -$(MAKE) -C $(NETKITTELNET_DIR) clean - -netkittelnet-dirclean: - rm -rf $(NETKITTELNET_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_NETKITTELNET),y) -TARGETS+=netkittelnet -endif +$(eval $(generic-package)) diff --git a/package/netkittelnet/netkittelnet.patch b/package/netkittelnet/netkittelnet.patch index c894c2a..863bbcd 100644 --- a/package/netkittelnet/netkittelnet.patch +++ b/package/netkittelnet/netkittelnet.patch @@ -66,7 +66,7 @@ -cat <__conftest.cc -#include -#include --int main(void) { +-int main() { - tgetent(NULL, NULL); return 0; -} -