drholy/orangepi-build
1
0
Fork 0
mirror of https://github.com/DrHo1y/orangepi-build.git synced 2026-08-30 18:33:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Update some packages

Browse Source
This commit is contained in:
orangepi-xunlong
2022-03-23 11:58:59 +08:00
parent 02a7e48f05
commit 09e16e6575
30 changed files with 502 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/configuration.sh
View File

@@ -61,7 +61,7 @@ case $REGIONAL_MIRROR in
china)
[[ -z $USE_MAINLINE_GOOGLE_MIRROR ]] && [[ -z $MAINLINE_MIRROR ]] && MAINLINE_MIRROR=tuna
[[ -z $USE_GITHUB_UBOOT_MIRROR ]] && [[ -z $UBOOT_MIRROR ]] && UBOOT_MIRROR=gitee
[[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=fastgit
[[ -z $GITHUB_MIRROR ]] && GITHUB_MIRROR=gitclone
[[ -z $DOWNLOAD_MIRROR ]] && DOWNLOAD_MIRROR=china
;;
*)
@@ -110,16 +110,13 @@ MAINLINE_UBOOT_DIR="$SRC/u-boot"
case $GITHUB_MIRROR in
fastgit)
GITHUB_SOURCE='https://hub.fastgit.org/'
GITHUB_SOURCE='https://hub.fastgit.xyz'
;;
gitclone)
GITHUB_SOURCE='https://gitclone.com/github.com/'
;;
cnpmjs)
GITHUB_SOURCE='https://github.com.cnpmjs.org/'
GITHUB_SOURCE='https://gitclone.com/github.com'
;;
*)
GITHUB_SOURCE='https://github.com/'
GITHUB_SOURCE='https://github.com'
;;
esac
@@ -601,6 +598,10 @@ fi
if [[ "${ARCH}" == "amd64" ]]; then
UBUNTU_MIRROR='archive.ubuntu.com/ubuntu' # ports are only for non-amd64, of course.
if [[ -n ${CUSTOM_UBUNTU_MIRROR} ]]; then # ubuntu redirector doesn't work well on amd64
UBUNTU_MIRROR="${CUSTOM_UBUNTU_MIRROR}"
fi
fi
# don't use mirrors that throws garbage on 404

3
scripts/distributions.sh
View File

@@ -137,7 +137,7 @@ install_common()
#[Service]
#ExecStartPre=/bin/sh -c 'exec /bin/sleep 10'
#ExecStart=
#ExecStart=-/sbin/agetty --noissue --autologin root %I $TERM
#ExecStart=-/sbin/agetty --noissue --autologin root %I \$TERM
#Type=idle
#EOF
#cp "${SDCARD}"/etc/systemd/system/serial-getty@.service.d/override.conf "${SDCARD}"/etc/systemd/system/getty@.service.d/override.conf
@@ -695,6 +695,7 @@ install_distribution_specific()
sed '/security/ d' -i "${SDCARD}"/etc/apt/sources.list
;;
bionic|focal|hirsute|impish|jammy)
# by using default lz4 initrd compression leads to corruption, go back to proven method

7
scripts/general.sh
View File

@@ -95,7 +95,7 @@ cleaning()
;;
oldcache) # remove old `cache/rootfs` except for the newest 8 files
if [[ -d $EXTER/cache/rootfs && $(ls -1 $EXTER/cache/rootfs/*.lz4 2> /dev/null | wc -l) -gt ${ROOTFS_CACHE_MAX} ]]; then
if [[ -d $EXTER/cache/rootfs && $(ls -1 $EXTER/cache/rootfs/*.lz4 2> /dev/null | wc -l) -gt "${ROOTFS_CACHE_MAX}" ]]; then
display_alert "Cleaning" "rootfs cache (old)" "info"
(cd $EXTER/cache/rootfs; ls -t *.lz4 | sed -e "1,${ROOTFS_CACHE_MAX}d" | xargs -d '\n' rm -f)
# Remove signatures if they are present. We use them for internal purpose
@@ -435,7 +435,8 @@ fetch_from_repo()
local ref_subdir=$4
# Set GitHub mirror before anything else touches $url
url=${url//'https://github.com/'/$GITHUB_SOURCE}
url=${url//'https://github.com/'/$GITHUB_SOURCE'/'}
# The 'offline' variable must always be set to 'true' or 'false'
if [ "$OFFLINE_WORK" == "yes" ]; then
local offline=true
@@ -1367,7 +1368,7 @@ prepare_host()
if [[ $(dpkg --print-architecture) == amd64 ]]; then
hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386 zlib1g:i386"
hostdeps+=" distcc lib32ncurses-dev lib32stdc++6 libc6-i386"
grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386
elif [[ $(dpkg --print-architecture) == arm64 ]]; then