Skip to content

Commit

Permalink
updated weston build steps; more verbose weston ld
Browse files Browse the repository at this point in the history
  • Loading branch information
andiradulescu committed Jan 31, 2024
1 parent 5ff0625 commit b63a38c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
10 changes: 9 additions & 1 deletion Dockerfile.agnos
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,21 @@ RUN apt-get install --no-install-recommends -yq \
# kernel headers for the AGNOS kernel (built on device)
COPY ./userspace/files/linux-headers-4.9.103+_4.9.103+-1_arm64.deb /tmp/
RUN dpkg -i /tmp/linux-headers-4.9.103+_4.9.103+-1_arm64.deb
COPY ./userspace/weston /tmp/weston
COPY ./userspace/weston/include /tmp/weston/include
COPY ./userspace/weston/patches /tmp/weston/patches
COPY ./userspace/weston/compile-libdrm.sh /tmp/weston/compile-libdrm.sh
RUN /tmp/weston/compile-libdrm.sh
COPY ./userspace/weston/compile-display-commonsys-intf.sh /tmp/weston/compile-display-commonsys-intf.sh
RUN /tmp/weston/compile-display-commonsys-intf.sh
COPY ./userspace/weston/compile-libgbm.sh /tmp/weston/compile-libgbm.sh
RUN /tmp/weston/compile-libgbm.sh
COPY ./userspace/weston/compile-libhardware.sh /tmp/weston/compile-libhardware.sh
RUN /tmp/weston/compile-libhardware.sh
COPY ./userspace/weston/compile-display.sh /tmp/weston/compile-display.sh
RUN /tmp/weston/compile-display.sh
COPY ./userspace/weston/compile-wayland-protocols.sh /tmp/weston/compile-wayland-protocols.sh
RUN /tmp/weston/compile-wayland-protocols.sh
COPY ./userspace/weston/compile-weston.sh /tmp/weston/compile-weston.sh
RUN /tmp/weston/compile-weston.sh

# ################### #
Expand Down
4 changes: 3 additions & 1 deletion build_system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ fi
# Start docker build
echo "Building image"
export DOCKER_CLI_EXPERIMENTAL=enabled
docker build -f Dockerfile.agnos -t agnos-builder $DIR
# docker build -f Dockerfile.agnos -t agnos-builder $DIR
docker build -f Dockerfile.agnos -t agnos-compiler-weston --target agnos-compiler-weston $DIR
exit 0

# Create filesystem ext4 image
echo "Creating empty filesystem"
Expand Down
6 changes: 3 additions & 3 deletions userspace/weston/compile-weston.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ cd weston
git apply /tmp/weston/patches/weston/*.patch

DISPLAY_PATH=/tmp/weston/hardware/qcom/display
export CPPFLAGS="-I/tmp/weston/libdrm -I/tmp/weston/libdrm/include/drm -I/tmp/weston/vendor/qcom/opensource/commonsys-intf/display/include -I/tmp/weston/libgbm/inc -I$DISPLAY_PATH/sdm/include -I$DISPLAY_PATH/libdebug -I/tmp/weston/system/core/include -I$DISPLAY_PATH/libdrmutils -D__GBM__"
export CXXFLAGS="-I$DISPLAY_PATH/include -I$DISPLAY_PATH/sdm -D__GBM__"
export CPPFLAGS="-w -I/tmp/weston/libdrm -I/tmp/weston/libdrm/include/drm -I/tmp/weston/vendor/qcom/opensource/commonsys-intf/display/include -I/tmp/weston/libgbm/inc -I$DISPLAY_PATH/sdm/include -I$DISPLAY_PATH/libdebug -I/tmp/weston/system/core/include -I$DISPLAY_PATH/libdrmutils -D__GBM__"
export CXXFLAGS="-w -I$DISPLAY_PATH/include -I$DISPLAY_PATH/sdm -D__GBM__"

export LDFLAGS="-L$DISPLAY_PATH/sdm/libs/core/.libs -L$DISPLAY_PATH/sdm/libs/utils/.libs -L$DISPLAY_PATH/libdrmutils/.libs -L/usr/lib/aarch64-linux-gnu/android -L/tmp/weston/libgbm/.libs"
export LDFLAGS="-Wl,--verbose -L$DISPLAY_PATH/sdm/libs/core/.libs -L$DISPLAY_PATH/sdm/libs/utils/.libs -L$DISPLAY_PATH/libdrmutils/.libs -L/usr/lib/aarch64-linux-gnu/android -L/tmp/weston/libgbm/.libs"

export PKG_CONFIG_PATH=/tmp/weston/libdrm/image/usr/local/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH

Expand Down

0 comments on commit b63a38c

Please sign in to comment.