diff --git a/build-docker.sh b/build-docker.sh index 0258920..d28b687 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -98,6 +98,40 @@ else ) fi +# Check if binfmt_misc is required +binfmt_misc_required=1 +case $(uname -m) in + aarch64) + binfmt_misc_required=0 + ;; + arm*) + binfmt_misc_required=0 + ;; +esac + +# Check if qemu-arm-static and /proc/sys/fs/binfmt_misc are present +if [[ "${binfmt_misc_required}" == "1" ]]; then + if ! qemu_arm=$(which qemu-arm-static) ; then + echo "qemu-arm-static not found (please install qemu-user-static)" + exit 1 + fi + if [ ! -f /proc/sys/fs/binfmt_misc/register ]; then + echo "binfmt_misc required but not mounted, trying to mount it..." + if ! mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc ; then + echo "mounting binfmt_misc failed" + exit 1 + fi + echo "binfmt_misc mounted" + fi + # Register qemu-arm for binfmt_misc (binfmt_misc won't care duplicate entries unless they have common names) + reg="echo ':qemu-arm-rpi:M::"\ +"\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:"\ +"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:"\ +"$qemu_arm:F' > /proc/sys/fs/binfmt_misc/register" + echo "Registering qemu-arm for binfmt_misc..." + sudo bash -c "$reg" 2>/dev/null || true +fi + trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${DOCKER_CMDLINE_NAME}' SIGINT SIGTERM time ${DOCKER} run \ "${DOCKER_CMDLINE_PRE[@]}" \ @@ -123,6 +157,10 @@ time ${DOCKER} run \ # Ensure that deploy/ is always owned by calling user echo "copying results from deploy/" ${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy - | tar -xf - + +echo "copying log from container ${CONTAINER_NAME} to depoy/" +${DOCKER} logs --timestamps "${CONTAINER_NAME}" &>deploy/build-docker.log + ls -lah deploy # cleanup diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt index c694828..7ec34fd 100644 --- a/export-noobs/00-release/files/release_notes.txt +++ b/export-noobs/00-release/files/release_notes.txt @@ -1,4 +1,37 @@ UNRELEASED: + * 64-bit Mathematica added to rp-prefapps + * Bug fix - occasional segfault in CPU temperature plugin + * Bug fix - X server crash when changing screen orientation + * Bug fix - X server DPMS not working + * Mathematica updated to 13.2.1 + * Matlab updated to 23.1.0 + * Chromium updated to 113.0.5672.59 + * Raspberry Pi Imager updated to 1.7.4 + * RealVNC server updated to 7.0.1.49073 + * RealVNC viewer updated to 7.0.1.48981 + * Updated VLC HW acceleration patch + * libcamera + - Add generalised statistics handling. + - Fix overflow that would cause incorrect calculations in the AGC algorithm. + - Improve IMX296 sensor tuning. + * libcamera-apps + - Improve handling of audio resampling and encoding using libav + - Improve performance of QT preview window rendering + - Add support for 16-bit Bayer in the DNG writer + - Fix for encoder lockup when framerate is set to 0 + - Improved thumbnail rendering + * picamera2 + - MJPEG server example that uses the hardware MJPEG encoder. + - Example showing preview from two cameras in a single Qt app. + - H264 encoder accepts frame time interval for SPS headers. + - H264 encoder should advertise correct profile/level. + - H264 encoder supports constant quality parameter. + - Exif DateTime and DateTimeOriginal tags are now added. + - Various bug fixes (check Picamera2 release notes for more details). + * Some translations added + * Raspberry Pi firmware 055e044d5359ded1aacc5a17a8e35365373d0b8b + * Linux kernel 6.1.21 +2023-02-21: * glamor now disabled on all platforms other than Raspberry Pi 4 with legacy video driver * msdri3 video driver support added * KiCad added to Recommended Software