From patchwork Sat Aug 11 17:40:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 176703 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 B07642C008E for ; Sun, 12 Aug 2012 03:42:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A1C8EA02C2; Sat, 11 Aug 2012 17:42:30 +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 Z1UjY6DXWqha; Sat, 11 Aug 2012 17:42:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E241CA062A; Sat, 11 Aug 2012 17:41:31 +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 19D878F753 for ; Sat, 11 Aug 2012 17:41:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E83F8F66F for ; Sat, 11 Aug 2012 17:41:30 +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 s9rT+2G4wDaW for ; Sat, 11 Aug 2012 17:41:28 +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 1D1048D40A for ; Sat, 11 Aug 2012 17:41:28 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 807D830A; Sat, 11 Aug 2012 19:41:22 +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 41227311 for ; Sat, 11 Aug 2012 19:41:13 +0200 (CEST) From: Thomas Petazzoni To: buildroot@busybox.net Date: Sat, 11 Aug 2012 19:40:39 +0200 Message-Id: <21de7855c603a5f2015575e67ee886eead42046b.1344706801.git.thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 07/20] netkitbase: convert to the 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/netkitbase/netkitbase.mk | 79 ++++++++++---------------------------- 1 file changed, 21 insertions(+), 58 deletions(-) diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 56480fc..3899b78 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -3,69 +3,32 @@ # netkitbase # ############################################################# -NETKITBASE_VERSION:=0.17 -NETKITBASE_SOURCE:=netkit-base-$(NETKITBASE_VERSION).tar.gz -NETKITBASE_SITE:=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITBASE_DIR:=$(BUILD_DIR)/netkit-base-$(NETKITBASE_VERSION) -NETKITBASE_CAT:=$(ZCAT) -NETKITBASE_BINARY:=inetd/inetd -NETKITBASE_TARGET_BINARY:=usr/sbin/inetd +NETKITBASE_VERSION = 0.17 +NETKITBASE_SOURCE = netkit-base-$(NETKITBASE_VERSION).tar.gz +NETKITBASE_SITE = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ +NETKITBASE_LICENSE = BSD-4c -$(DL_DIR)/$(NETKITBASE_SOURCE): - $(call DOWNLOAD,$(NETKITBASE_SITE)/$(NETKITBASE_SOURCE)) - -netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE) - -$(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE) - $(NETKITBASE_CAT) $(DL_DIR)/$(NETKITBASE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - +define NETKITBASE_CONFIGURE_CMDS # use ANSI syntax $(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure # don't try to run cross compiled binaries while configuring things $(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure - support/scripts/apply-patches.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch - touch $(NETKITBASE_DIR)/.unpacked - -$(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked - (cd $(NETKITBASE_DIR); rm -f config.cache; \ - PATH=$(TARGET_PATH) CC="$(TARGET_CC)" \ - ./configure --installroot=$(TARGET_DIR) --with-c-compiler="$(TARGET_CC)" \ - ) - touch $(NETKITBASE_DIR)/.configured - -$(NETKITBASE_DIR)/$(NETKITBASE_BINARY): $(NETKITBASE_DIR)/.configured - $(MAKE) CC="$(TARGET_CC)" -C $(NETKITBASE_DIR) - $(STRIPCMD) $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) - -$(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY): $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) - # Only install a few selected items... - mkdir -p $(TARGET_DIR)/usr/sbin - cp $(NETKITBASE_DIR)/$(NETKITBASE_BINARY) $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) - @if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \ - mkdir -p $(TARGET_DIR)/etc; \ - cp $(NETKITBASE_DIR)/etc.sample/inetd.conf $(TARGET_DIR)/etc/; \ + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) \ + ./configure \ + --installroot=$(TARGET_DIR)) +endef + +define NETKITBASE_BUILD_CMDS + $(MAKE) -C $(@D) +endef + +define NETKITBASE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/inetd/inetd $(TARGET_DIR)/usr/sbin/inetd + if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \ + $(INSTALL) -D -m 0644 $(@D)/etc.sample/inetd.conf $(TARGET_DIR)/etc/inetd.conf; \ $(SED) "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf; \ fi - touch -c $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) - -netkitbase-legal-info: - @$(call legal-warning-pkg,netkitbase,legal-info not yet implemented) - -netkitbase: $(TARGET_DIR)/$(NETKITBASE_TARGET_BINARY) +endef -netkitbase-clean: - #$(MAKE) DESTDIR=$(TARGET_DIR) CC="$(TARGET_CC)" -C $(NETKITBASE_DIR) uninstall - -rm -f $(TARGET_DIR)/usr/sbin/inetd $(TARGET_DIR)/etc/inetd.conf - -rm -f $(TARGET_DIR)/etc/inetd.conf - -$(MAKE) -C $(NETKITBASE_DIR) clean - -netkitbase-dirclean: - rm -rf $(NETKITBASE_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_NETKITBASE),y) -TARGETS+=netkitbase -endif +$(eval $(generic-package))