Skip to content

Commit a441088

Browse files
committed
[CES-3162] Set sysroot environment to bookworm and link pyqt against python 3.11
1 parent 7415e66 commit a441088

File tree

5 files changed

+12
-16
lines changed

5 files changed

+12
-16
lines changed

build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ TOOLS_DIR="${SRC_DIR}/tools"
2323
SYSROOT="${TOOLS_DIR}/sysroot"
2424
MAKEFLAGS=-j$(($(getconf _NPROCESSORS_ONLN) - 1))
2525

26+
PYQT_TARGET_PYTHON_VERSION="3.11"
27+
2628
export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/pkgconfig:${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/local/lib/pkgconfig
2729

2830
build()
@@ -123,10 +125,11 @@ build_pyqt()
123125
--qml-debug --qml-plugindir="${TARGET_DIR}/pyqt" \
124126
--destdir "${TARGET_DIR}/pyqt" \
125127
--configuration "${TOOLS_DIR}/pyqt.cfg" \
128+
--target-py-version="${PYQT_TARGET_PYTHON_VERSION}" \
126129
--qmake="${BUILD_DIR}/qtbase/bin/qmake"
127130

128-
make
129-
make install
131+
make "${MAKEFLAGS}"
132+
make "${MAKEFLAGS}" install
130133
}
131134

132135
create_debian_package()

build_for_ultimaker.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ deliver_pkg()
117117
cp "${SRC_DIR}/${BUILD_DIR}/"*"deb" "${SRC_DIR}"
118118
}
119119

120-
run_tests()
121-
{
122-
echo "There are no tests available for this repository."
123-
}
124-
125120
usage()
126121
{
127122
echo "Usage: ${0} [OPTIONS]"

docker_env/buildenv_check.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/sh
2+
# shellcheck disable=SC2317
23

34
set -eu
45

tools/pyqt.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The target Python installation.
22
py_platform = linux
33
py_major = 3
4-
py_minor = 7
4+
py_minor = 11
55
py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)
66

77
py_pyshlib = True
@@ -11,4 +11,4 @@ pyqt_disabled_features = PyQt_Desktop_OpenGL PyQt_qreal_double
1111
qt_shared = True
1212

1313
[Qt 5.2.13]
14-
pyqt_modules = QtQml QtCore QtDBus QtGui QtQuick QtMultimedia QtNetwork QtOpenGL QtSvg QtWidgets
14+
pyqt_modules = QtQml QtCore QtDBus QtGui QtQuick QtMultimedia QtNetwork QtOpenGL QtSvg QtWidgets

tools/sysroot_multistrap.cfg

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@ noauth=true
44
unpack=true
55
explicitsuite=true
66
aptsources=Debian
7-
bootstrap=Debian DebianStable DebianBackport
7+
bootstrap=Debian DebianStable
88

99
[DebianStable]
10+
packages=libgles-dev
1011
packages=perl pkg-config libudev-dev debconf zlib1g-dev libxkbcommon-dev libpng-dev
1112
packages=python3-dev python3-sip-dev libssl-dev
1213
source=http://ftp.debian.org/debian
13-
suite=buster
14+
suite=bookworm
1415
components=main non-free
1516

16-
[DebianBackport]
17-
packages=libgles-dev
18-
source=http://archive.debian.org/debian
19-
suite=buster-backports
20-
components=main non-free
17+

0 commit comments

Comments
 (0)