diff --git a/external/config/templates/config-example.conf b/external/config/templates/config-example.conf index 74bdee186385..84734837e8c3 100644 --- a/external/config/templates/config-example.conf +++ b/external/config/templates/config-example.conf @@ -22,3 +22,4 @@ BUILD_KSRC="no" INSTALL_KSRC="no" IGNORE_UPDATES="" COMPRESS_OUTPUTIMAGE="no" +NO_APT_CACHER="yes" diff --git a/scripts/compilation.sh b/scripts/compilation.sh index f5935458fd67..408c9802c4d2 100755 --- a/scripts/compilation.sh +++ b/scripts/compilation.sh @@ -310,7 +310,7 @@ compile_uboot() [[ -n $atftempdir && -f $atftempdir/license.md ]] && cp "${atftempdir}/license.md" "$uboottempdir/${uboot_name}/usr/lib/u-boot/LICENSE.atf" display_alert "Building deb" "${uboot_name}.deb" "info" - fakeroot dpkg-deb -b "$uboottempdir/${uboot_name}" "$uboottempdir/${uboot_name}.deb" >> "${DEST}"/${LOG_SUBPATH}/output.log 2>&1 + fakeroot dpkg-deb -b -Z${DEB_COMPRESS} "$uboottempdir/${uboot_name}" "$uboottempdir/${uboot_name}.deb" >> "${DEST}"/${LOG_SUBPATH}/output.log 2>&1 rm -rf "$uboottempdir/${uboot_name}" [[ -n $atftempdir ]] && rm -rf "${atftempdir}" @@ -617,7 +617,7 @@ compile_firmware() # pack mv "orangepi-firmware${FULL}" "orangepi-firmware${FULL}_${REVISION}_all" display_alert "Building firmware package" "orangepi-firmware${FULL}_${REVISION}_all" "info" - fakeroot dpkg -b "orangepi-firmware${FULL}_${REVISION}_all" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + fakeroot dpkg-deb -b -Z${DEB_COMPRESS} "orangepi-firmware${FULL}_${REVISION}_all" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 mv "orangepi-firmware${FULL}_${REVISION}_all" "orangepi-firmware${FULL}" rsync -rq "orangepi-firmware${FULL}_${REVISION}_all.deb" "${DEB_STORAGE}/" @@ -743,7 +743,7 @@ compile_orangepi-config() ln -sf /usr/sbin/orangepi-config $tmpdir/usr/bin/orangepi-config ln -sf /usr/sbin/softy "${tmpdir}"/usr/bin/softy - fakeroot dpkg -b "${tmpdir}" >/dev/null + fakeroot dpkg-deb -b -Z${DEB_COMPRESS} "${tmpdir}" >/dev/null rsync --remove-source-files -rq "${tmpdir}.deb" "${DEB_STORAGE}/" rm -rf "${tmpdir}" } diff --git a/scripts/desktop.sh b/scripts/desktop.sh index 486a77f84f17..edbcbaa7337a 100755 --- a/scripts/desktop.sh +++ b/scripts/desktop.sh @@ -157,7 +157,7 @@ create_bsp_desktop_package () mkdir -p "${DEB_STORAGE}/${RELEASE}" cd "${destination}"; cd .. - fakeroot dpkg-deb -b "${destination}" "${DEB_STORAGE}/${RELEASE}/${package_name}.deb" >/dev/null + fakeroot dpkg-deb -b -Z${DEB_COMPRESS} "${destination}" "${DEB_STORAGE}/${RELEASE}/${package_name}.deb" >/dev/null # cleanup rm -rf "${tmp_dir}" diff --git a/scripts/general.sh b/scripts/general.sh index c7a612708750..8aabbe6f0c85 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -1365,7 +1365,7 @@ prepare_host() build-essential ca-certificates ccache cpio cryptsetup curl \ debian-archive-keyring debian-keyring debootstrap device-tree-compiler \ dialog dirmngr dosfstools dwarves f2fs-tools fakeroot flex gawk \ - gcc-arm-linux-gnueabihf gdisk gnupg1 gpg imagemagick jq kmod libbison-dev \ + gcc-arm-linux-gnueabihf gdisk gpg imagemagick jq kmod libbison-dev \ libc6-dev-armhf-cross libelf-dev libfdt-dev libfile-fcntllock-perl \ libfl-dev liblz4-tool libncurses-dev libpython2.7-dev libssl-dev \ libusb-1.0-0-dev linux-base locales lzop ncurses-base ncurses-term \ @@ -1392,7 +1392,7 @@ prepare_host() fi # Add support for Ubuntu 20.04, 21.04 and Mint 20.x - if [[ $HOSTRELEASE =~ ^(focal|hirsute|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then + if [[ $HOSTRELEASE =~ ^(focal|hirsute|jammy|ulyana|ulyssa|bullseye|bookworm|uma)$ ]]; then hostdeps+=" python2 python3" ln -fs /usr/bin/python2.7 /usr/bin/python2 ln -fs /usr/bin/python2.7 /usr/bin/python @@ -1407,7 +1407,7 @@ prepare_host() # # NO_HOST_RELEASE_CHECK overrides the check for a supported host system # Disable host OS check at your own risk. Any issues reported with unsupported releases will be closed without discussion - if [[ -z $HOSTRELEASE || "buster bullseye bookworm focal hirsute debbie tricia ulyana ulyssa uma" != *"$HOSTRELEASE"* ]]; then + if [[ -z $HOSTRELEASE || "focal jammy" != *"$HOSTRELEASE"* ]]; then if [[ $NO_HOST_RELEASE_CHECK == yes ]]; then display_alert "You are running on an unsupported system" "${HOSTRELEASE:-(unknown)}" "wrn" display_alert "Do not report any errors, warnings or other issues encountered beyond this point" "" "wrn"