From 349dfdd4fae14f83daf71dbb7d620451253cab93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Wed, 19 Nov 2014 22:30:37 +0100 Subject: [PATCH] libfslcodec: Use self-extractible helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Thomas: remove unneeded comment.] Signed-off-by: Jérôme Pouiller Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/libfslcodec/libfslcodec.mk | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk index 1a364bb7d..fe6f0ba50 100644 --- a/package/libfslcodec/libfslcodec.mk +++ b/package/libfslcodec/libfslcodec.mk @@ -7,30 +7,14 @@ LIBFSLCODEC_VERSION = 3.0.11 LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin -LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt -# This is a legal minefield: the EULA in the bin file specifies that -# the Board Support Package includes software and hardware (sic!) -# for which a separate license is needed... -LIBFSLCODEC_REDISTRIBUTE = NO - LIBFSLCODEC_INSTALL_STAGING = YES -# The archive is a shell-self-extractor of a bzipped tar. It happens -# to extract in the correct directory (libfslcodec-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. +LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) +LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt +LIBFSLCODEC_REDISTRIBUTE = NO + define LIBFSLCODEC_EXTRACT_CMDS - awk 'BEGIN { start=0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLCODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the