From 35bac125c3492c65c742c320d441809b66f9b185 Mon Sep 17 00:00:00 2001 From: Adrian Alonso Date: Mon, 7 Nov 2011 20:41:44 -0600 Subject: imx-lib: update to release version 11.09.01 * Update to release version 11.09.01 * Distribute imx-lib source code as part of metadata * Remove libraries shared link creation, prevent QA test failure. Signed-off-by: Adrian Alonso --- .../fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz | Bin 0 -> 153932 bytes .../imx-lib-remove-shared-libs-symlinks.patch | 147 +++++++++++++++++++++ recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb | 32 ----- recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb | 33 +++++ 4 files changed, 180 insertions(+), 32 deletions(-) create mode 100644 recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz create mode 100644 recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch delete mode 100644 recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb create mode 100644 recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb (limited to 'recipes-multimedia/fsl-mm-core') diff --git a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz new file mode 100644 index 0000000..1d22276 Binary files /dev/null and b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-11.09.01.tar.gz differ diff --git a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch new file mode 100644 index 0000000..dc58504 --- /dev/null +++ b/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch @@ -0,0 +1,147 @@ +From 91732b83137039597b1cd0d747626d70e59d252d Mon Sep 17 00:00:00 2001 +From: Adrian Alonso +Date: Tue, 1 Nov 2011 14:57:32 -0600 +Subject: [PATCH] imx-lib: remove shared libs symlinks + +* Remove shared libs symlinks creation + +Signed-off-by: Adrian Alonso +--- + ipu/Makefile | 5 +---- + pxp/Makefile | 5 +---- + rng/Makefile | 5 +---- + sahara2/Makefile | 5 +---- + screenlayer/Makefile | 5 +---- + sim/Makefile | 5 +---- + vpu/Makefile | 5 +---- + 7 files changed, 7 insertions(+), 28 deletions(-) + +diff --git a/ipu/Makefile b/ipu/Makefile +index 97241e3..654f650 100644 +--- a/ipu/Makefile ++++ b/ipu/Makefile +@@ -27,12 +27,9 @@ all install: + @echo "Not support platform, will not complile" + endif + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS) ++$(LIBNAME).so: $(OBJS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + %.o: %.c + ifeq "$(PLATFORM)" "" + $(error "Unspecified PLATFORM variable") +diff --git a/pxp/Makefile b/pxp/Makefile +index c2bb59d..70bb508 100644 +--- a/pxp/Makefile ++++ b/pxp/Makefile +@@ -27,12 +27,9 @@ endif + %.o: %.c + $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ) ++$(LIBNAME).so: $(OBJ) + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + $(LIBNAME).a: $(OBJ) + $(AR) -rc $@ $^ + +diff --git a/rng/Makefile b/rng/Makefile +index 4b1dd5c..b5dd2e1 100644 +--- a/rng/Makefile ++++ b/rng/Makefile +@@ -30,12 +30,9 @@ install_headers: + $(LIBNAME).a: $(OBJS) + $(AR) $@ $^ + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS) ++$(LIBNAME).so: $(OBJS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + .PHONY: clean + clean: + @rm -f *.o $(LIBNAME).* +diff --git a/sahara2/Makefile b/sahara2/Makefile +index 106d932..dd9550e 100644 +--- a/sahara2/Makefile ++++ b/sahara2/Makefile +@@ -49,12 +49,9 @@ endif + $(LIBNAME).a: $(OBJS) + $(AR) $@ $^ + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS) ++$(LIBNAME).so: $(OBJS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + .PHONY: clean + clean: + @rm -f $(OBJS) $(LIBNAME).* +diff --git a/screenlayer/Makefile b/screenlayer/Makefile +index a90d4d5..a4f36ae 100644 +--- a/screenlayer/Makefile ++++ b/screenlayer/Makefile +@@ -23,12 +23,9 @@ all install: + @echo "Not support platform, will not complile" + endif + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS) ++$(LIBNAME).so: $(OBJS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + %.o: %.c + $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@ + +diff --git a/sim/Makefile b/sim/Makefile +index 7685e32..5e31e6a 100644 +--- a/sim/Makefile ++++ b/sim/Makefile +@@ -20,12 +20,9 @@ install: + @mkdir -p $(DEST_DIR)/usr/include + cp iso7816-3.h $(DEST_DIR)/usr/include + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS) ++$(LIBNAME).so: $(OBJS) + $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + %.o: %.c + $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@ + +diff --git a/vpu/Makefile b/vpu/Makefile +index ab6ccf1..8f3ce8e 100644 +--- a/vpu/Makefile ++++ b/vpu/Makefile +@@ -35,12 +35,9 @@ endif + %.o: %.c + $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@ + +-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ) ++$(LIBNAME).so: $(OBJ) + $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@ + +-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION) +- ln -s $< $@ +- + $(LIBNAME).a: $(OBJ) + $(AR) -rc $@ $^ + +-- +1.7.5.4 + diff --git a/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb b/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb deleted file mode 100644 index cb14753..0000000 --- a/recipes-multimedia/fsl-mm-core/imx-lib_11.05.01.bb +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2011 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Platform specific libraries for imx platform" -LICENSE = "LGPL" -SECTION = "multimedia" -DEPENDS = "virtual/kernel" -PR = "r3" - -LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" - -SRC_URI = "http://auslxsc01.mtwk.freescale.net/ppp/${PN}-${PV}.tar.gz" -SRC_URI[md5sum] = "67e1be286abbee3529fc55cdf2b4cd51" -SRC_URI[sha256sum] = "063e722e8abc6f2e90afde1338f213b92bc1187a7a741ec04df22851cc952e29" - -# override parallel make flags -PARALLEL_MAKE="-j 1" -EXTRA_OEMAKE = "" - -do_compile () { - INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ - -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" - oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="IMX51" INCLUDE="${INCLUDE_DIR}" all -} - -do_install () { - oe_runmake DEST_DIR="${D}" install -} - -FILES_${PN} += "${libdir}/*.so" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_${PN}-devstatic += "${libdir}/*.la ${libdir}/*.a" diff --git a/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb new file mode 100644 index 0000000..4512c15 --- /dev/null +++ b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb @@ -0,0 +1,33 @@ +# Copyright (C) 2011 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Platform specific libraries for imx platform" +LICENSE = "LGPL" +SECTION = "multimedia" +DEPENDS = "virtual/kernel" +PR = "r0" + +LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" + +SRC_URI = "file://${PN}-${PV}.tar.gz \ + file://imx-lib-remove-shared-libs-symlinks.patch" +SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c" +SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27" + +# override parallel make flags +PARALLEL_MAKE="-j 1" +EXTRA_OEMAKE = "" + +do_compile () { + INCLUDE_DIR="-I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \ + -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" + oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="IMX51" INCLUDE="${INCLUDE_DIR}" all +} + +do_install () { + oe_runmake DEST_DIR="${D}" install +} + +FILES_${PN} += "${libdir}/*.so" +FILES_${PN}-dbg += "${libdir}/.debug" +FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a" -- cgit v1.2.3-54-g00ecf