| Message ID | 1416432642-26005-7-git-send-email-jezz@sysmic.org |
|---|---|
| State | Accepted |
| Headers | show |
Jérôme, All, On 2014-11-19 22:30 +0100, Jérôme Pouiller spake thusly: > Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Ditto the variable re-ordering... Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/libfslvpuwrap/libfslvpuwrap.mk | 24 +++++------------------- > 1 file changed, 5 insertions(+), 19 deletions(-) > > diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk > index c3a5c1c..3bdab99 100644 > --- a/package/libfslvpuwrap/libfslvpuwrap.mk > +++ b/package/libfslvpuwrap/libfslvpuwrap.mk > @@ -7,30 +7,16 @@ > LIBFSLVPUWRAP_VERSION = 1.0.46 > LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) > LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin > +LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu > +LIBFSLVPUWRAP_INSTALL_STAGING = YES > + > +# See freescale-imx.mk > LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement > -# N.B.: the content of the two license files is different > LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt > LIBFSLVPUWRAP_REDISTRIBUTE = NO > > -LIBFSLVPUWRAP_INSTALL_STAGING = YES > - > -LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu > - > -# 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; } \ > - /<<EOEULA/ { start=1; }'\ > - $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA > - cd $(BUILD_DIR); \ > - sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept > + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE)) > endef > > $(eval $(autotools-package)) > -- > 1.9.1 >
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk index c3a5c1c..3bdab99 100644 --- a/package/libfslvpuwrap/libfslvpuwrap.mk +++ b/package/libfslvpuwrap/libfslvpuwrap.mk @@ -7,30 +7,16 @@ LIBFSLVPUWRAP_VERSION = 1.0.46 LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin +LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu +LIBFSLVPUWRAP_INSTALL_STAGING = YES + +# See freescale-imx.mk LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -# N.B.: the content of the two license files is different LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO -LIBFSLVPUWRAP_INSTALL_STAGING = YES - -LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu - -# 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; } \ - /<<EOEULA/ { start=1; }'\ - $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA - cd $(BUILD_DIR); \ - sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE)) endef $(eval $(autotools-package))
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> --- package/libfslvpuwrap/libfslvpuwrap.mk | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-)