Remove imx-gpu-viv rules, build as package
Change-Id: Id6af5bbdbca4b43253dcc2a4cc6d7c2354103e49
diff --git a/gpu.mk b/gpu.mk
index 9e40815..03313d5 100644
--- a/gpu.mk
+++ b/gpu.mk
@@ -4,14 +4,9 @@
include $(ROOTDIR)/build/preamble.mk
-GPU_VERSION := imx-gpu-viv-6.2.4.p1.0-aarch64
-GPU_DIR := $(ROOTDIR)/imx-gpu-viv/$(GPU_VERSION)
-GPU_OUT_DIR := $(PRODUCT_OUT)/obj/GPU
-
WAYLAND_PROTO_DIR := $(PRODUCT_OUT)/obj/WAYLAND_PROTO
WESTON_DIR := $(PRODUCT_OUT)/obj/WESTON
-imx-gpu-viv: $(PRODUCT_OUT)/imx-gpu-viv_6.2.4_arm64.deb
wayland-protocols: $(PRODUCT_OUT)/wayland-protocols-imx_1.13-0_all.deb
weston: $(PRODUCT_OUT)/weston-imx_3.0.0-0_arm64.deb
gpu-packages: weston wayland-protocols imx-gpu-viv
@@ -31,62 +26,6 @@
cd /weston/weston-imx-3.0.0; dpkg-buildpackage -uc -us -tc'
mv $(WESTON_DIR)/weston-imx_3.0.0-0_arm64.deb $(PRODUCT_OUT)
-$(PRODUCT_OUT)/imx-gpu-viv_6.2.4_arm64.deb:
- mkdir -p $(GPU_OUT_DIR)
- mkdir -p $(GPU_OUT_DIR)/usr
- mkdir -p $(GPU_OUT_DIR)/usr/bin
- mkdir -p $(GPU_OUT_DIR)/usr/lib
- mkdir -p $(GPU_OUT_DIR)/usr/lib/dri
- mkdir -p $(GPU_OUT_DIR)/usr/lib/pkgconfig
- mkdir -p $(GPU_OUT_DIR)/usr/lib/vulkan
- mkdir -p $(GPU_OUT_DIR)/usr/include
-
- cp -P $(GPU_DIR)/gpu-core/usr/lib/*.so* $(GPU_OUT_DIR)/usr/lib/
- cp -r $(GPU_DIR)/gpu-core/usr/include/* $(GPU_OUT_DIR)/usr/include/
- cp -r $(GPU_DIR)/gpu-demos/opt $(GPU_OUT_DIR)
- cp -r $(GPU_DIR)/gpu-tools/gmem-info/usr/bin/* $(GPU_OUT_DIR)/usr/bin
-
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/egl_wayland.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig/egl.pc
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/glesv2.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/vg.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/wayland-egl.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig
- cp $(GPU_DIR)/gpu-core/usr/lib/pkgconfig/gbm.pc $(GPU_OUT_DIR)/usr/lib/pkgconfig
-
- cp -r $(GPU_DIR)/gpu-core/usr/lib/dri $(GPU_OUT_DIR)/usr/lib
-
- mv $(GPU_OUT_DIR)/usr/lib/libGL.so.1.2 $(GPU_OUT_DIR)/usr/lib/libGL.so.1.2.0
- ln -sf libGL.so.1.2.0 $(GPU_OUT_DIR)/usr/lib/libGL.so.1.2
- ln -sf libGL.so.1.2 $(GPU_OUT_DIR)/usr/lib/libGL.so.1
- ln -sf libGL.so.1 $(GPU_OUT_DIR)/usr/lib/libGL.so
-
- mv $(GPU_OUT_DIR)/usr/lib/libEGL-wl.so $(GPU_OUT_DIR)/usr/lib/libEGL.so.1.0
- ln -sf libEGL.so.1.0 $(GPU_OUT_DIR)/usr/lib/libEGL.so.1
- ln -sf libEGL.so.1 $(GPU_OUT_DIR)/usr/lib/libEGL.so
-
- mv $(GPU_OUT_DIR)/usr/lib/libGAL-wl.so $(GPU_OUT_DIR)/usr/lib/libGAL.so
- mv $(GPU_OUT_DIR)/usr/lib/libVDK-wl.so $(GPU_OUT_DIR)/usr/lib/libVDK.so
-
- rm -rf $(GPU_OUT_DIR)/usr/lib/libGLESv2*
- cp $(GPU_DIR)/gpu-core/usr/lib/libGLESv2-wl.so $(GPU_OUT_DIR)/usr/lib/libGLESv2.so.2.0.0
- ln -sf libGLESv2.so.2.0.0 $(GPU_OUT_DIR)/usr/lib/libGLESv2.so.2.0
- ln -sf libGLESv2.so.2.0 $(GPU_OUT_DIR)/usr/lib/libGLESv2.so.2
- ln -sf libGLESv2.so.2 $(GPU_OUT_DIR)/usr/lib/libGLESv2.so
-
- mv $(GPU_OUT_DIR)/usr/lib/libvulkan-wl.so $(GPU_OUT_DIR)/usr/lib/vulkan/libvulkan_VSI.so
-
- rm -rf $(GPU_OUT_DIR)/usr/lib/*-wl.so
- rm -rf $(GPU_OUT_DIR)/usr/lib/*-fb.so
- rm -rf $(GPU_OUT_DIR)/usr/lib/*-x11.so
-
- rm -f $(GPU_OUT_DIR)/usr/lib/libOpenVG.so
- ln -sf libOpenVG.3d.so $(GPU_OUT_DIR)/usr/lib/libOpenVG.so
-
- cp -r $(ROOTDIR)/imx-gpu-viv/debian $(GPU_OUT_DIR)
- cd $(GPU_OUT_DIR); dpkg-buildpackage -aarm64 -b -rfakeroot -us -uc -tc
-
- mv $(GPU_OUT_DIR)/../imx-gpu-viv_6.2.4_arm64.deb $(PRODUCT_OUT)
-
$(PRODUCT_OUT)/wayland-protocols-imx_1.13-0_all.deb:
mkdir -p $(WAYLAND_PROTO_DIR)/wayland-protocols-imx-1.13
cp -r $(ROOTDIR)/wayland-protocols-imx/* $(WAYLAND_PROTO_DIR)/wayland-protocols-imx-1.13
@@ -96,4 +35,4 @@
mv $(WAYLAND_PROTO_DIR)/wayland-protocols-imx_1.13-0_all.deb $(PRODUCT_OUT)
-.PHONY:: imx-gpu-viv wayland-protocols-imx weston-imx gpu-packages
+.PHONY:: wayland-protocols-imx weston-imx gpu-packages
diff --git a/packages.mk b/packages.mk
index b72771b..62c936c 100644
--- a/packages.mk
+++ b/packages.mk
@@ -13,7 +13,7 @@
# Packages which require ARM64 binaries to be built.
ARM64_PACKAGE_NAMES := \
-
+ imx-gpu-viv
ALL_PACKAGE_NAMES := $(ALLARCH_PACKAGE_NAMES) $(ARM64_PACKAGE_NAMES)
diff --git a/rootfs.mk b/rootfs.mk
index 3aee89a..16597a3 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -87,7 +87,6 @@
$(PRODUCT_OUT)/linux-image-4.9.51-aiy_1_arm64.deb \
$(PRODUCT_OUT)/wayland-protocols-imx_1.13-0_all.deb \
$(PRODUCT_OUT)/weston-imx_3.0.0-0_arm64.deb \
- $(PRODUCT_OUT)/imx-gpu-viv_6.2.4_arm64.deb \
| $(PRODUCT_OUT)/boot.img \
modules \
packages
