From patchwork Fri Sep 21 22:28:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 185962 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5876E2C007D for ; Sat, 22 Sep 2012 08:29:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E64322F1CE; Fri, 21 Sep 2012 22:29:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bXY-fFEoMCzn; Fri, 21 Sep 2012 22:29:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 967EE30E05; Fri, 21 Sep 2012 22:29:08 +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 1AC858F75E for ; Fri, 21 Sep 2012 22:29:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C93BB81093 for ; Fri, 21 Sep 2012 22:29:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rSFZ4Wy76Ggw for ; Fri, 21 Sep 2012 22:29:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 075E6805F9 for ; Fri, 21 Sep 2012 22:29:00 +0000 (UTC) Received: by wibhm2 with SMTP id hm2so1944892wib.10 for ; Fri, 21 Sep 2012 15:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=gM964KWVvHaCJPuSPwZYzMvGLsWYSJqeBmiN4Ft4P1A=; b=x1RW4tUGqXWffA0QujFUByWgKBXZTYJzPRVdaED4iG00h5LNVv6v+qJEelSEzp+FU1 ccV0tsWfuTiVQfzznwmrv4nUZqYOo1np078kpitorfp45ozTbm9AqOvDP51jTTuojn63 nLjzIIx+vaHvwb2fTeUHQhepWNweGgiDnRTsu22UEA4Xndx34u477o57ECv4UiA0CLOp MioYsMMWRFA1kaS2DUZ+TtmBGGqARXqUBBrFUF0V7FJxS0yFGFDjRblKx/jvl7TpIVd5 zPmF0I58u4hiIBq2QXGONT5f8KJ6f8kkXOByvzlWlvM5nnVarubDhv8PV1nHsuHdh5F3 6srw== Received: by 10.217.3.7 with SMTP id q7mr3882989wes.47.1348266539015; Fri, 21 Sep 2012 15:28:59 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id fb20sm346407wid.1.2012.09.21.15.28.57 (version=SSLv3 cipher=OTHER); Fri, 21 Sep 2012 15:28:58 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Sat, 22 Sep 2012 00:28:33 +0200 Message-Id: <1348266518-27665-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1348266518-27665-1-git-send-email-s.martin49@gmail.com> References: <1348266518-27665-1-git-send-email-s.martin49@gmail.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 1/6] 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 Acked-by: Samuel Martin 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))