diff --git a/Dockerfile.agnos b/Dockerfile.agnos index cb5ccdb..9fbdb97 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -25,10 +25,8 @@ ENV PATH="/usr/lib/ccache:$PATH" FROM agnos-compiler AS agnos-compiler-graphics RUN apt-get update && apt-get install -yq --no-install-recommends patchelf COPY ./userspace/graphics/ /tmp/agnos/graphics-src/ -COPY ./userspace/debs/agnos-display_0.0.4.deb /tmp/agnos/ -RUN dpkg-deb -x /tmp/agnos/agnos-display_0.0.4.deb /tmp/agnos/display && \ - mkdir -p /tmp/agnos/graphics && \ - cp /tmp/agnos/display/usr/lib/aarch64-linux-gnu/libgbm.so /tmp/agnos/graphics/ && \ +RUN mkdir -p /tmp/agnos/graphics && \ + cp /tmp/agnos/graphics-src/libgbm.so /tmp/agnos/graphics/ && \ cp /tmp/agnos/graphics-src/libeglSubDriverWayland.so.patched /tmp/agnos/graphics/libeglSubDriverWayland.so && \ cd /tmp/agnos/graphics && \ gcc -shared -fPIC -Os -s -Wall -Wextra -Werror -Wl,-z,defs -Wl,-z,relro,-z,now \ diff --git a/userspace/.gitattributes b/userspace/.gitattributes index ad526fb..ce0e863 100644 --- a/userspace/.gitattributes +++ b/userspace/.gitattributes @@ -5,3 +5,7 @@ root/usr/comma/reset filter=lfs diff=lfs merge=lfs -text root/usr/comma/setup filter=lfs diff=lfs merge=lfs -text root/usr/comma/installer filter=lfs diff=lfs merge=lfs -text root/usr/comma/updater filter=lfs diff=lfs merge=lfs -text +graphics/libgbm.so filter=lfs diff=lfs merge=lfs -text +root/usr/lib/aarch64-linux-gnu/libEGL_adreno.so filter=lfs diff=lfs merge=lfs -text +root/usr/lib/aarch64-linux-gnu/libGLESv2_adreno.so filter=lfs diff=lfs merge=lfs -text +root/usr/lib/aarch64-linux-gnu/libpcre.so.1.2.6 filter=lfs diff=lfs merge=lfs -text diff --git a/userspace/base_setup.sh b/userspace/base_setup.sh index 6ee1801..20d9d2b 100755 --- a/userspace/base_setup.sh +++ b/userspace/base_setup.sh @@ -122,7 +122,6 @@ ln -s usr/lib64 /lib64 cd /tmp/agnos/debs apt-get --no-install-recommends -o Dpkg::Options::="--force-overwrite" install -yq \ ./agnos-base_0.0.4.deb \ - ./agnos-display_0.0.4.deb \ ./agnos-wlan_0.0.4.deb # pdmappersvc requires the Ubuntu 16.04 version of libjson-c2. diff --git a/userspace/debs/agnos-display_0.0.4.deb b/userspace/debs/agnos-display_0.0.4.deb deleted file mode 100644 index 02c93fc..0000000 --- a/userspace/debs/agnos-display_0.0.4.deb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67a62868275e64fde22cd0c4c2d122ad5fb851c3e35e485a22d0dfc5ebfff40c -size 13497620 diff --git a/userspace/graphics/libgbm.so b/userspace/graphics/libgbm.so new file mode 100755 index 0000000..6477eef --- /dev/null +++ b/userspace/graphics/libgbm.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da344766f2899e99f2d84994f847550ab83e6d0bcbb3a38ff03c3d304a8dc095 +size 108536 diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libEGL_adreno.so b/userspace/root/usr/lib/aarch64-linux-gnu/libEGL_adreno.so new file mode 100644 index 0000000..bd071c2 --- /dev/null +++ b/userspace/root/usr/lib/aarch64-linux-gnu/libEGL_adreno.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3f32843d3d68bfc26fe4b1ddd1c6fe54dbe2d1b6318670e62035c57d94fde86 +size 119624 diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libGLESv2_adreno.so b/userspace/root/usr/lib/aarch64-linux-gnu/libGLESv2_adreno.so new file mode 100644 index 0000000..fb3a11b --- /dev/null +++ b/userspace/root/usr/lib/aarch64-linux-gnu/libGLESv2_adreno.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bb91eb4509771b9851e5610c5f721b56ba54718a72195d8538dec2651d55fb6 +size 20152176 diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libadreno_utils.so b/userspace/root/usr/lib/aarch64-linux-gnu/libadreno_utils.so new file mode 100644 index 0000000..7c71a8e Binary files /dev/null and b/userspace/root/usr/lib/aarch64-linux-gnu/libadreno_utils.so differ diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1 b/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1 new file mode 120000 index 0000000..34fdfd1 --- /dev/null +++ b/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1 @@ -0,0 +1 @@ +libpcre.so.1.2.6 \ No newline at end of file diff --git a/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1.2.6 b/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1.2.6 new file mode 100755 index 0000000..a39dfb9 --- /dev/null +++ b/userspace/root/usr/lib/aarch64-linux-gnu/libpcre.so.1.2.6 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a7c325c7abd144236284e3d60420961c1d76da1bf348f42620926bdb043145 +size 247648