From patchwork Fri Sep 28 12:20:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Braun X-Patchwork-Id: 187775 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 E9D842C00C7 for ; Fri, 28 Sep 2012 22:20:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CEDAF103AC6; Fri, 28 Sep 2012 12:20:04 +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 PeulzJLiqBV2; Fri, 28 Sep 2012 12:20:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2A9BC102534; Fri, 28 Sep 2012 12:20:02 +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 721448F74B for ; Fri, 28 Sep 2012 12:20:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 459E98E29B for ; Fri, 28 Sep 2012 12:20:04 +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 QfnyJNZBpTQB for ; Fri, 28 Sep 2012 12:20:02 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.sceen.net (shattrath.sceen.net [94.23.252.191]) by whitealder.osuosl.org (Postfix) with ESMTP id 6E06D8D670 for ; Fri, 28 Sep 2012 12:20:02 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sceen.net (Postfix) with ESMTP id 8C07F14093E for ; Fri, 28 Sep 2012 14:20:01 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at sceen.net Received: from mail.sceen.net ([127.0.0.1]) by localhost (mail.sceen.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oYMcEHFg-Yp3 for ; Fri, 28 Sep 2012 14:20:01 +0200 (CEST) Received: by mail.sceen.net (Postfix, from userid 1000) id 2259E141E74; Fri, 28 Sep 2012 14:20:01 +0200 (CEST) From: Richard Braun To: buildroot@busybox.net Date: Fri, 28 Sep 2012 14:20:01 +0200 Message-Id: <1348834801-2672-1-git-send-email-rbraun@sceen.net> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <20120928121758.GA2362@mail.sceen.net> References: <20120928121758.GA2362@mail.sceen.net> Subject: [Buildroot] [PATCH] pkg-infra: produce legal info for proprietary packages 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: Richard Braun Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-generic.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index ffe7dfb..1bfaed2 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -444,7 +444,6 @@ $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif # legal-info: declare dependencies and set values used later for the manifest -ifneq ($$($(2)_LICENSE),PROPRIETARY) ifneq ($$($(2)_SITE_METHOD),local) ifneq ($$($(2)_SITE_METHOD),override) # Packages that have a tarball need it downloaded and extracted beforehand @@ -455,7 +454,6 @@ $(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES) endif endif endif -endif # defaults for packages without tarball or license files $(2)_MANIFEST_TARBALL ?= not saved $(2)_MANIFEST_LICENSE_FILES ?= not saved @@ -464,9 +462,7 @@ $(2)_MANIFEST_LICENSE_FILES ?= not saved $(1)-legal-info: # Packages without a source are assumed to be part of Buildroot, skip them. ifneq ($(call qstrip,$$($(2)_SOURCE)),) -ifeq ($$($(2)_LICENSE),PROPRIETARY) -# Proprietary packages: nothing to save -else ifeq ($$($(2)_SITE_METHOD),local) +ifeq ($$($(2)_SITE_METHOD),local) # Packages without a tarball: don't save and warn @$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local) else ifeq ($$($(2)_SITE_METHOD),override)