diff --git a/.drone.yml b/.drone.yml index 60302a7..11fd141 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: EOF - apt-get update - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf qtbase5-dev:armhf libqt5core5a:armhf libqt5gui5:armhf libqt5widgets5:armhf libqt5network5:armhf libexif-dev:armhf libmosquitto-dev:armhf qt5-image-formats-plugins:armhf - - ARCH=armhf BUILD_DIR=build-armhf QMAKESPEC=$PWD/mkspecs/linux-armhf-g++ QMAKE_CFLAGS="$ARM_CFLAGS" QMAKE_CXXFLAGS="$ARM_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}" + - ARCH=armhf BUILD_DIR=build-armhf QMAKESPEC=$PWD/mkspecs/linux-armhf-g++ QMAKE_QTCONF=$PWD/mkspecs/qt-armhf.conf QMAKE_CFLAGS="$ARM_CFLAGS" QMAKE_CXXFLAGS="$ARM_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}" - ls -la dist - name: build-deb-arm64 @@ -56,7 +56,7 @@ steps: EOF - apt-get update - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qtbase5-dev:arm64 libqt5core5a:arm64 libqt5gui5:arm64 libqt5widgets5:arm64 libqt5network5:arm64 libexif-dev:arm64 libmosquitto-dev:arm64 qt5-image-formats-plugins:arm64 - - ARCH=arm64 BUILD_DIR=build-arm64 QMAKESPEC=$PWD/mkspecs/linux-arm64-g++ QMAKE_CFLAGS="$ARM64_CFLAGS" QMAKE_CXXFLAGS="$ARM64_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}" + - ARCH=arm64 BUILD_DIR=build-arm64 QMAKESPEC=$PWD/mkspecs/linux-arm64-g++ QMAKE_QTCONF=$PWD/mkspecs/qt-arm64.conf QMAKE_CFLAGS="$ARM64_CFLAGS" QMAKE_CXXFLAGS="$ARM64_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}" - ls -la dist - name: build-deps-image diff --git a/mkspecs/qt-arm64.conf b/mkspecs/qt-arm64.conf new file mode 100644 index 0000000..f68507d --- /dev/null +++ b/mkspecs/qt-arm64.conf @@ -0,0 +1,11 @@ +[Paths] +Prefix=/usr +Headers=/usr/include/aarch64-linux-gnu/qt5 +Libraries=/usr/lib/aarch64-linux-gnu +ArchData=/usr/lib/aarch64-linux-gnu/qt5 +Data=/usr/lib/aarch64-linux-gnu/qt5 +Plugins=/usr/lib/aarch64-linux-gnu/qt5/plugins +HostPrefix=/usr +HostData=/usr/lib/x86_64-linux-gnu/qt5 +HostBinaries=/usr/lib/qt5/bin +HostLibraries=/usr/lib/x86_64-linux-gnu diff --git a/mkspecs/qt-armhf.conf b/mkspecs/qt-armhf.conf new file mode 100644 index 0000000..3b385f1 --- /dev/null +++ b/mkspecs/qt-armhf.conf @@ -0,0 +1,11 @@ +[Paths] +Prefix=/usr +Headers=/usr/include/arm-linux-gnueabihf/qt5 +Libraries=/usr/lib/arm-linux-gnueabihf +ArchData=/usr/lib/arm-linux-gnueabihf/qt5 +Data=/usr/lib/arm-linux-gnueabihf/qt5 +Plugins=/usr/lib/arm-linux-gnueabihf/qt5/plugins +HostPrefix=/usr +HostData=/usr/lib/x86_64-linux-gnu/qt5 +HostBinaries=/usr/lib/qt5/bin +HostLibraries=/usr/lib/x86_64-linux-gnu diff --git a/sbin/build_deb.sh b/sbin/build_deb.sh index 243cc65..ca426b3 100644 --- a/sbin/build_deb.sh +++ b/sbin/build_deb.sh @@ -20,6 +20,9 @@ QMAKE_ARGS=() if [[ -n "${QMAKESPEC:-}" ]]; then QMAKE_ARGS+=("-spec" "$QMAKESPEC") fi +if [[ -n "${QMAKE_QTCONF:-}" ]]; then + QMAKE_ARGS+=("-qtconf" "$QMAKE_QTCONF") +fi if [[ -n "${QMAKE_CC:-}" ]]; then QMAKE_ARGS+=("QMAKE_CC=$QMAKE_CC") fi