From patchwork Wed Oct 9 03:05:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Nelson X-Patchwork-Id: 281706 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 A09E62C00C8 for ; Wed, 9 Oct 2013 14:05:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C7DD789AF1; Wed, 9 Oct 2013 03:05:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A08iQ-UCE-RS; Wed, 9 Oct 2013 03:05:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB0828A7FF; Wed, 9 Oct 2013 03:05:39 +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 50A281BF9CA for ; Wed, 9 Oct 2013 03:05:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C2108AD1B for ; Wed, 9 Oct 2013 03:05:37 +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 1QgZjB2OTghT for ; Wed, 9 Oct 2013 03:05:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from fed1rmfepo102.cox.net (fed1rmfepo102.cox.net [68.230.241.144]) by whitealder.osuosl.org (Postfix) with ESMTP id 62C778AD38 for ; Wed, 9 Oct 2013 03:05:36 +0000 (UTC) Received: from fed1rmimpo210 ([68.230.241.161]) by fed1rmfepo102.cox.net (InterMail vM.8.01.05.09 201-2260-151-124-20120717) with ESMTP id <20131009030536.SZHU3896.fed1rmfepo102.cox.net@fed1rmimpo210> for ; Tue, 8 Oct 2013 23:05:36 -0400 Received: from localhost.localdomain ([98.167.230.131]) by fed1rmimpo210 with cox id ar5a1m00L2ql3AS01r5bC9; Tue, 08 Oct 2013 23:05:35 -0400 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A020206.5254C7FF.00B0,ss=1,re=0.000,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.0 cv=drIF/Sc4 c=1 sm=1 a=np+gEjoI14f0/4viqHkTOw==:17 a=YSOOK8VJOgUA:10 a=rcTfVT_afHIA:10 a=R_N1NMmAAAAA:8 a=1wbUWnPrkHIA:10 a=alK4_DS-AAAA:8 a=6ohNodAXAAAA:8 a=b3aYIHySLn7Bd95p_H0A:9 a=QOiTB_lUNkwA:10 a=np+gEjoI14f0/4viqHkTOw==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none From: Eric Nelson To: buildroot@busybox.net Date: Tue, 8 Oct 2013 20:05:31 -0700 Message-Id: <1381287931-7070-3-git-send-email-eric.nelson@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381287931-7070-1-git-send-email-eric.nelson@boundarydevices.com> References: <1381287931-7070-1-git-send-email-eric.nelson@boundarydevices.com> Cc: thomas.petazzoni@free-electrons.com, jacmet@uclibc.org Subject: [Buildroot] [PATCH V4 2/2] i.MX: Update versions to match latest Freescale release 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: Eric Nelson --- V4 addresses comments from Arnout Vandecappelle: - Reworks license statement and extracts EULA for imx-lib - Adds comment about AUTORECONF to libfslparser - Adds EULA to LIBFSLVPUWRAP_LICENSE_FILES package/freescale-imx/freescale-imx.mk | 6 ++---- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 6 +++++- package/freescale-imx/imx-lib/imx-lib.mk | 22 ++++++++++++++++++++-- .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +- package/libfslcodec/libfslcodec.mk | 2 +- package/libfslparser/libfslparser.mk | 7 ++++++- package/libfslvpuwrap/libfslvpuwrap.mk | 22 ++++++++++++++++++++-- 7 files changed, 55 insertions(+), 12 deletions(-) diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 0dd5629..39ffa8a 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,9 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 1.1.0 - -# No official download site from freescale, just this mirror -FREESCALE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source +FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ include $(sort $(wildcard package/freescale-imx/*/*.mk)) diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk index 8e979ee..e799fd2 100644 --- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk @@ -4,7 +4,11 @@ # ################################################################################ -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +ifeq ($(BR2_ARM_EABIHF),y) +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp +else +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp +endif GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE) GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index e1a68ef..2edfc06 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -6,8 +6,9 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = LGPLv2.1+ -# No license file included +IMX_LIB_LICENSE = IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement (vpu), LGPLv2.1+ (the rest) +IMX_LIB_LICENSE_FILES = EULA +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin IMX_LIB_INSTALL_STAGING = YES @@ -25,6 +26,23 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info +# Since there's a EULA in the bin file, extract it to imx-lib-x.y.z/EULA +# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef + define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) endef diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk index 4437875..9ec92d8 100644 --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_FSL_PLUGINS_VERSION = 3.0.1 +GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION) GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) # Most is LGPLv2+, but some sources are copied from upstream and are diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index ad1cc63..d52158c 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLCODEC_VERSION = 3.0.1 +LIBFSLCODEC_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk index 3aab3a7..d49c95c 100644 --- a/package/libfslparser/libfslparser.mk +++ b/package/libfslparser/libfslparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = 3.0.1 +LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement @@ -36,4 +36,9 @@ endef # The Makefile installs several versions of the libraries, but we only # need one of them, depending on the platform. +# +# without AUTORECONF, configure fails to find install-sh. +# +LIBFSLPARSER_AUTORECONF = YES + $(eval $(autotools-package)) diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index 346a20a..e93d761 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -4,14 +4,32 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = 1.0.17 +LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) +LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt +LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (libfslvpuwrap-x.y.z) +# The --force makes sure it doesn't fail if the source dir already exists. +# The --auto-accept skips the license check - not needed for us +# because we have legal-info +# Since the EULA in the bin file differs from the one in the tar file, +# extract the one from the bin file as well. +define LIBFSLVPUWRAP_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept +endef + $(eval $(autotools-package))