summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-07-18 17:13:35 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-07-18 18:44:57 -0300
commit7ad2b3efa944f3ee80c45d683fcf56c4925a3034 (patch)
tree7b1420396cdfa262a091a874184eabf35d46e380
parent30066410d3264b66323b52af0d0731732064a496 (diff)
downloadmeta-fsl-arm-7ad2b3efa944f3ee80c45d683fcf56c4925a3034.tar.gz
imx-lib: fix packaging of libraries
The package was mistakenly removing the links of libraries making runtime applications to fail to run. The patch that caused it has been removed and package files adjusted. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Adrian Alonso <aalonso00@gmail.com>
Diffstat
-rw-r--r--recipes-multimedia/fsl-mm-core/imx-lib.inc6
-rw-r--r--recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch147
-rw-r--r--recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb5
3 files changed, 5 insertions, 153 deletions
diff --git a/recipes-multimedia/fsl-mm-core/imx-lib.inc b/recipes-multimedia/fsl-mm-core/imx-lib.inc
index 52e25d0..554df15 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib.inc
+++ b/recipes-multimedia/fsl-mm-core/imx-lib.inc
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2.1"
5SECTION = "multimedia" 5SECTION = "multimedia"
6DEPENDS = "virtual/kernel" 6DEPENDS = "virtual/kernel"
7 7
8INC_PR = "r1" 8INC_PR = "r2"
9 9
10LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e" 10LIC_FILES_CHKSUM = "file://ipu/mxc_ipu_hl_lib.h;endline=13;md5=6c7486b21a8524b1879fa159578da31e"
11 11
@@ -27,7 +27,7 @@ do_install () {
27 oe_runmake DEST_DIR="${D}" install 27 oe_runmake DEST_DIR="${D}" install
28} 28}
29 29
30FILES_${PN} += "${libdir}/*.so" 30FILES_${PN} += "${libdir}/*${SOLIBS}"
31FILES_${PN}-dbg += "${libdir}/.debug" 31FILES_${PN}-dbg += "${libdir}/.debug"
32FILES_${PN}-dev += "${libdir}/*.la ${libdir}/*.a" 32FILES_${PN}-dev += "${libdir}/*${SOLIBSDEV}"
33 33
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
deleted file mode 100644
index dc58504..0000000
--- a/recipes-multimedia/fsl-mm-core/imx-lib/imx-lib-remove-shared-libs-symlinks.patch
+++ /dev/null
@@ -1,147 +0,0 @@
1From 91732b83137039597b1cd0d747626d70e59d252d Mon Sep 17 00:00:00 2001
2From: Adrian Alonso <aalonso@freescale.com>
3Date: Tue, 1 Nov 2011 14:57:32 -0600
4Subject: [PATCH] imx-lib: remove shared libs symlinks
5
6* Remove shared libs symlinks creation
7
8Signed-off-by: Adrian Alonso <aalonso@freescale.com>
9---
10 ipu/Makefile | 5 +----
11 pxp/Makefile | 5 +----
12 rng/Makefile | 5 +----
13 sahara2/Makefile | 5 +----
14 screenlayer/Makefile | 5 +----
15 sim/Makefile | 5 +----
16 vpu/Makefile | 5 +----
17 7 files changed, 7 insertions(+), 28 deletions(-)
18
19diff --git a/ipu/Makefile b/ipu/Makefile
20index 97241e3..654f650 100644
21--- a/ipu/Makefile
22+++ b/ipu/Makefile
23@@ -27,12 +27,9 @@ all install:
24 @echo "Not support platform, will not complile"
25 endif
26
27-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
28+$(LIBNAME).so: $(OBJS)
29 $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
30
31-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
32- ln -s $< $@
33-
34 %.o: %.c
35 ifeq "$(PLATFORM)" ""
36 $(error "Unspecified PLATFORM variable")
37diff --git a/pxp/Makefile b/pxp/Makefile
38index c2bb59d..70bb508 100644
39--- a/pxp/Makefile
40+++ b/pxp/Makefile
41@@ -27,12 +27,9 @@ endif
42 %.o: %.c
43 $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
44
45-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
46+$(LIBNAME).so: $(OBJ)
47 $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
48
49-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
50- ln -s $< $@
51-
52 $(LIBNAME).a: $(OBJ)
53 $(AR) -rc $@ $^
54
55diff --git a/rng/Makefile b/rng/Makefile
56index 4b1dd5c..b5dd2e1 100644
57--- a/rng/Makefile
58+++ b/rng/Makefile
59@@ -30,12 +30,9 @@ install_headers:
60 $(LIBNAME).a: $(OBJS)
61 $(AR) $@ $^
62
63-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
64+$(LIBNAME).so: $(OBJS)
65 $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
66
67-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
68- ln -s $< $@
69-
70 .PHONY: clean
71 clean:
72 @rm -f *.o $(LIBNAME).*
73diff --git a/sahara2/Makefile b/sahara2/Makefile
74index 106d932..dd9550e 100644
75--- a/sahara2/Makefile
76+++ b/sahara2/Makefile
77@@ -49,12 +49,9 @@ endif
78 $(LIBNAME).a: $(OBJS)
79 $(AR) $@ $^
80
81-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
82+$(LIBNAME).so: $(OBJS)
83 $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^
84
85-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
86- ln -s $< $@
87-
88 .PHONY: clean
89 clean:
90 @rm -f $(OBJS) $(LIBNAME).*
91diff --git a/screenlayer/Makefile b/screenlayer/Makefile
92index a90d4d5..a4f36ae 100644
93--- a/screenlayer/Makefile
94+++ b/screenlayer/Makefile
95@@ -23,12 +23,9 @@ all install:
96 @echo "Not support platform, will not complile"
97 endif
98
99-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
100+$(LIBNAME).so: $(OBJS)
101 $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -L../ipu -lipu
102
103-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
104- ln -s $< $@
105-
106 %.o: %.c
107 $(CC) $(INC) -Wall -O2 -fPIC -c $^ -o $@
108
109diff --git a/sim/Makefile b/sim/Makefile
110index 7685e32..5e31e6a 100644
111--- a/sim/Makefile
112+++ b/sim/Makefile
113@@ -20,12 +20,9 @@ install:
114 @mkdir -p $(DEST_DIR)/usr/include
115 cp iso7816-3.h $(DEST_DIR)/usr/include
116
117-$(LIBNAME).so.$(SONAMEVERSION): $(OBJS)
118+$(LIBNAME).so: $(OBJS)
119 $(CC) -shared -nostartfiles -Wl,-soname,$@ -o $@ $^ -lpthread
120
121-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
122- ln -s $< $@
123-
124 %.o: %.c
125 $(CC) -D$(PLATFORM) $(INCLUDE) -Wall -O2 -fPIC -c $^ -o $@
126
127diff --git a/vpu/Makefile b/vpu/Makefile
128index ab6ccf1..8f3ce8e 100644
129--- a/vpu/Makefile
130+++ b/vpu/Makefile
131@@ -35,12 +35,9 @@ endif
132 %.o: %.c
133 $(CC) -D$(PLATFORM) -Wall -O2 -fPIC -c $^ -o $@
134
135-$(LIBNAME).so.$(SONAMEVERSION): $(OBJ)
136+$(LIBNAME).so: $(OBJ)
137 $(CC) -shared -nostartfiles -Wl,-soname,$@ $^ -o $@
138
139-$(LIBNAME).so: $(LIBNAME).so.$(SONAMEVERSION)
140- ln -s $< $@
141-
142 $(LIBNAME).a: $(OBJ)
143 $(AR) -rc $@ $^
144
145--
1461.7.5.4
147
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
index 843c1a7..95cc021 100644
--- a/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
+++ b/recipes-multimedia/fsl-mm-core/imx-lib_11.09.01.bb
@@ -1,11 +1,10 @@
1include imx-lib.inc 1include imx-lib.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.1"
4 4
5COMPATIBLE_MACHINE = "(mx5)" 5COMPATIBLE_MACHINE = "(mx5)"
6 6
7SRC_URI += " file://imx-lib-remove-shared-libs-symlinks.patch \ 7SRC_URI += " file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
8 file://0001-ENGR00156800-vpu-Fix-decoding-mp4PackedPBFrame-strea.patch \
9 file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch" 8 file://0002-ENGR00162690-vpu-Fix-the-issue-of-rotation-180-degre.patch"
10SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c" 9SRC_URI[md5sum] = "45574f8f32f7000ca11d585fa60dea8c"
11SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27" 10SRC_URI[sha256sum] = "f151a8bb3099b596b5834a1139c19e526802e6a0aa965018d16375e7e1f48f27"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-25 23:42:05 +0000