diff options
author | Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com> | 2019-07-10 16:10:46 -0700 |
---|---|---|
committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2019-11-19 16:01:14 -0800 |
commit | 3b225fd39c9e9774e1cdb3b1a9ab30f3665dfeaa (patch) | |
tree | d5b3d898e73ad60d1d4d14a428c76b4e3d9bc69a | |
parent | 0454d0a8a098ad9dbeb06dcdc401187cfebfc37b (diff) | |
download | meta-xilinx-3b225fd39c9e9774e1cdb3b1a9ab30f3665dfeaa.tar.gz |
libmali-xlnx: Squash all monolithic library name into a variable
Create a variable for monolithic library as it will be easy to call/make
changes for future revision upgrade.
Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r-- | meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb index 85812191..3611e580 100644 --- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb +++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb | |||
@@ -62,6 +62,7 @@ USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" | |||
62 | USE_FB = "${@bb.utils.contains("DISTRO_FEATURES", "fbdev", "yes", "no", d)}" | 62 | USE_FB = "${@bb.utils.contains("DISTRO_FEATURES", "fbdev", "yes", "no", d)}" |
63 | USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" | 63 | USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" |
64 | 64 | ||
65 | MONOLITHIC_LIBMALI = "libMali.so.8.0" | ||
65 | 66 | ||
66 | do_install() { | 67 | do_install() { |
67 | #Identify the ARCH type | 68 | #Identify the ARCH type |
@@ -93,19 +94,19 @@ do_install() { | |||
93 | 94 | ||
94 | cp -a --no-preserve=ownership ${S}/${PV}/${ARCH_PLATFORM_DIR}/common/*.so* ${D}${libdir} | 95 | cp -a --no-preserve=ownership ${S}/${PV}/${ARCH_PLATFORM_DIR}/common/*.so* ${D}${libdir} |
95 | 96 | ||
96 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/headless/libMali.so.8.0 ${D}${libdir}/headless/libMali.so.8.0 | 97 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/headless/${MONOLITHIC_LIBMALI} ${D}${libdir}/headless/${MONOLITHIC_LIBMALI} |
97 | ln -snf headless/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 | 98 | ln -snf headless/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI} |
98 | 99 | ||
99 | if [ "${USE_FB}" = "yes" ]; then | 100 | if [ "${USE_FB}" = "yes" ]; then |
100 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/fbdev/libMali.so.8.0 ${D}${libdir}/fbdev/libMali.so.8.0 | 101 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/fbdev/${MONOLITHIC_LIBMALI} ${D}${libdir}/fbdev/${MONOLITHIC_LIBMALI} |
101 | if [ "${MALI_BACKEND_DEFAULT}" = "fbdev" ]; then | 102 | if [ "${MALI_BACKEND_DEFAULT}" = "fbdev" ]; then |
102 | ln -snf fbdev/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 | 103 | ln -snf fbdev/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI} |
103 | fi | 104 | fi |
104 | fi | 105 | fi |
105 | if [ "${USE_X11}" = "yes" ]; then | 106 | if [ "${USE_X11}" = "yes" ]; then |
106 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/x11/libMali.so.8.0 ${D}${libdir}/x11/libMali.so.8.0 | 107 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/x11/${MONOLITHIC_LIBMALI} ${D}${libdir}/x11/${MONOLITHIC_LIBMALI} |
107 | if [ "${MALI_BACKEND_DEFAULT}" = "x11" ]; then | 108 | if [ "${MALI_BACKEND_DEFAULT}" = "x11" ]; then |
108 | ln -snf x11/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 | 109 | ln -snf x11/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI} |
109 | fi | 110 | fi |
110 | else | 111 | else |
111 | # We cant rely on the fact that all apps will use pkgconfig correctly | 112 | # We cant rely on the fact that all apps will use pkgconfig correctly |
@@ -114,9 +115,9 @@ do_install() { | |||
114 | if [ "${USE_WL}" = "yes" ]; then | 115 | if [ "${USE_WL}" = "yes" ]; then |
115 | install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/ | 116 | install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/ |
116 | install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc | 117 | install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc |
117 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/libMali.so.8.0 ${D}${libdir}/wayland/libMali.so.8.0 | 118 | install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/wayland/${MONOLITHIC_LIBMALI} |
118 | if [ "${MALI_BACKEND_DEFAULT}" = "wayland" ]; then | 119 | if [ "${MALI_BACKEND_DEFAULT}" = "wayland" ]; then |
119 | ln -snf wayland/libMali.so.8.0 ${D}${libdir}/libMali.so.8.0 | 120 | ln -snf wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI} |
120 | fi | 121 | fi |
121 | fi | 122 | fi |
122 | } | 123 | } |
@@ -127,21 +128,21 @@ do_install() { | |||
127 | PACKAGES += "${PN}-x11 ${PN}-fbdev ${PN}-wayland ${PN}-headless" | 128 | PACKAGES += "${PN}-x11 ${PN}-fbdev ${PN}-wayland ${PN}-headless" |
128 | 129 | ||
129 | # This is default/common for all alternatives | 130 | # This is default/common for all alternatives |
130 | ALTERNATIVE_LINK_NAME[libmali-xlnx] = "${libdir}/libMali.so.8.0" | 131 | ALTERNATIVE_LINK_NAME[libmali-xlnx] = "${libdir}/${MONOLITHIC_LIBMALI}" |
131 | 132 | ||
132 | 133 | ||
133 | # Declare alternatives and corresponding library location | 134 | # Declare alternatives and corresponding library location |
134 | ALTERNATIVE_${PN}-x11 = "libmali-xlnx" | 135 | ALTERNATIVE_${PN}-x11 = "libmali-xlnx" |
135 | ALTERNATIVE_TARGET_libmali-xlnx-x11[libmali-xlnx] = "${libdir}/x11/libMali.so.8.0" | 136 | ALTERNATIVE_TARGET_libmali-xlnx-x11[libmali-xlnx] = "${libdir}/x11/${MONOLITHIC_LIBMALI}" |
136 | 137 | ||
137 | ALTERNATIVE_${PN}-fbdev = "libmali-xlnx" | 138 | ALTERNATIVE_${PN}-fbdev = "libmali-xlnx" |
138 | ALTERNATIVE_TARGET_libmali-xlnx-fbdev[libmali-xlnx] = "${libdir}/fbdev/libMali.so.8.0" | 139 | ALTERNATIVE_TARGET_libmali-xlnx-fbdev[libmali-xlnx] = "${libdir}/fbdev/${MONOLITHIC_LIBMALI}" |
139 | 140 | ||
140 | ALTERNATIVE_${PN}-wayland = "libmali-xlnx" | 141 | ALTERNATIVE_${PN}-wayland = "libmali-xlnx" |
141 | ALTERNATIVE_TARGET_libmali-xlnx-wayland[libmali-xlnx] = "${libdir}/wayland/libMali.so.8.0" | 142 | ALTERNATIVE_TARGET_libmali-xlnx-wayland[libmali-xlnx] = "${libdir}/wayland/${MONOLITHIC_LIBMALI}" |
142 | 143 | ||
143 | ALTERNATIVE_${PN}-headless = "libmali-xlnx" | 144 | ALTERNATIVE_${PN}-headless = "libmali-xlnx" |
144 | ALTERNATIVE_TARGET_libmali-xlnx-headless[libmali-xlnx] = "${libdir}/headless/libMali.so.8.0" | 145 | ALTERNATIVE_TARGET_libmali-xlnx-headless[libmali-xlnx] = "${libdir}/headless/${MONOLITHIC_LIBMALI}" |
145 | 146 | ||
146 | # Set priorities according to what we prveiously defined | 147 | # Set priorities according to what we prveiously defined |
147 | ALTERNATIVE_PRIORITY_libmali-xlnx-x11[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "x11", "20", "10", d)}" | 148 | ALTERNATIVE_PRIORITY_libmali-xlnx-x11[libmali-xlnx] = "${@bb.utils.contains("MALI_BACKEND_DEFAULT", "x11", "20", "10", d)}" |
@@ -162,7 +163,7 @@ DEBIAN_NOAUTONAME_libmali-xlnx = "1" | |||
162 | python populate_packages_updatealternatives_append () { | 163 | python populate_packages_updatealternatives_append () { |
163 | # We need to remove the 'fake' libmali-xlnx before creating any links | 164 | # We need to remove the 'fake' libmali-xlnx before creating any links |
164 | libdir = d.getVar('libdir') | 165 | libdir = d.getVar('libdir') |
165 | common_postinst = "#!/bin/sh\nrm " + libdir + "/libMali.so.8.0\n" | 166 | common_postinst = "#!/bin/sh\nrm " + libdir + "/${MONOLITHIC_LIBMALI}\n" |
166 | for pkg in (d.getVar('PACKAGES') or "").split(): | 167 | for pkg in (d.getVar('PACKAGES') or "").split(): |
167 | # Not all packages provide an alternative (e.g. ${PN}-lic) | 168 | # Not all packages provide an alternative (e.g. ${PN}-lic) |
168 | postinst = d.getVar('pkg_postinst_%s' % pkg) | 169 | postinst = d.getVar('pkg_postinst_%s' % pkg) |