diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 843b17ab8..b54730730 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -170,19 +170,19 @@ compilation_prepare() if linux-version compare "${version}" ge 5.10.82 && linux-version compare "${version}" le 5.11 ; then aufstag="5.10.82"; fi # check if Mr. Okajima already made a branch for this version - improved_git ls-remote --exit-code --heads https://github.com/sfjro/aufs5-standalone "aufs${aufstag}" >/dev/null + improved_git ls-remote --exit-code --heads $GITHUB_SOURCE/sfjro/aufs5-standalone "aufs${aufstag}" >/dev/null if [ "$?" -ne "0" ]; then # then use rc branch aufstag="5.x-rcN" - improved_git ls-remote --exit-code --heads https://github.com/sfjro/aufs5-standalone "aufs${aufstag}" >/dev/null + improved_git ls-remote --exit-code --heads $GITHUB_SOURCE/sfjro/aufs5-standalone "aufs${aufstag}" >/dev/null fi if [ "$?" -eq "0" ]; then display_alert "Adding" "AUFS ${aufstag}" "info" local aufsver="branch:aufs${aufstag}" - fetch_from_repo "https://github.com/sfjro/aufs5-standalone" "aufs5" "branch:${aufsver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/sfjro/aufs5-standalone" "aufs5" "branch:${aufsver}" "yes" cd "$kerneldir" || exit process_patch_file "${SRC}/cache/sources/aufs5/${aufsver#*:}/aufs5-kbuild.patch" "applying" process_patch_file "${SRC}/cache/sources/aufs5/${aufsver#*:}/aufs5-base.patch" "applying" @@ -235,7 +235,7 @@ compilation_prepare() local rtl8152ver="branch:master" display_alert "Adding" "Drivers for 2.5Gb RTL8152/RTL8153 USB dongles ${rtl8152ver}" "info" - fetch_from_repo "https://github.com/igorpecovnik/realtek-r8152-linux" "rtl8152" "${rtl8152ver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/igorpecovnik/realtek-r8152-linux" "rtl8152" "${rtl8152ver}" "yes" cp -R "${SRC}/cache/sources/rtl8152/${rtl8152ver#*:}"/{r8152.c,compatibility.h} \ "$kerneldir/drivers/net/usb/" @@ -250,7 +250,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8189ES chipsets ${rtl8189esver}" "info" - fetch_from_repo "https://github.com/jwrdegoede/rtl8189ES_linux" "rtl8189es" "${rtl8189esver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/jwrdegoede/rtl8189ES_linux" "rtl8189es" "${rtl8189esver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8189es" mkdir -p "$kerneldir/drivers/net/wireless/rtl8189es/" @@ -285,7 +285,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8189FS chipsets ${rtl8189fsver}" "info" - fetch_from_repo "https://github.com/jwrdegoede/rtl8189ES_linux" "rtl8189fs" "${rtl8189fsver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/jwrdegoede/rtl8189ES_linux" "rtl8189fs" "${rtl8189fsver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8189fs" mkdir -p "$kerneldir/drivers/net/wireless/rtl8189fs/" @@ -320,7 +320,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info" - fetch_from_repo "https://github.com/Mange/rtl8192eu-linux-driver" "rtl8192eu" "${rtl8192euver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/Mange/rtl8192eu-linux-driver" "rtl8192eu" "${rtl8192euver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8192eu" mkdir -p "$kerneldir/drivers/net/wireless/rtl8192eu/" @@ -355,7 +355,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8811, 8812, 8814 and 8821 chipsets ${rtl8812auver}" "info" - fetch_from_repo "https://github.com/aircrack-ng/rtl8812au" "rtl8812au" "${rtl8812auver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/aircrack-ng/rtl8812au" "rtl8812au" "${rtl8812auver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8812au" mkdir -p "$kerneldir/drivers/net/wireless/rtl8812au/" @@ -385,7 +385,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info" - fetch_from_repo "https://github.com/karabek/xradio" "xradio" "branch:master" "yes" + fetch_from_repo "$GITHUB_SOURCE/karabek/xradio" "xradio" "branch:master" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/xradio" mkdir -p "$kerneldir/drivers/net/wireless/xradio/" @@ -424,7 +424,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets ${rtl8811cuver}" "info" - fetch_from_repo "https://github.com/brektrou/rtl8821CU" "rtl8811cu" "${rtl8811cuver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/brektrou/rtl8821CU" "rtl8811cu" "${rtl8811cuver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8811cu" mkdir -p "$kerneldir/drivers/net/wireless/rtl8811cu/" @@ -444,7 +444,7 @@ compilation_prepare() sed -i "s/^CONFIG_RTW_DEBUG.*/CONFIG_RTW_DEBUG = n/" \ "$kerneldir/drivers/net/wireless/rtl8811cu/Makefile" - # Address ARM related bug https://github.com/aircrack-ng/rtl8812au/issues/233 + # Address ARM related bug $GITHUB_SOURCE/aircrack-ng/rtl8812au/issues/233 sed -i "s/^CONFIG_MP_VHT_HW_TX_MODE.*/CONFIG_MP_VHT_HW_TX_MODE = n/" \ "$kerneldir/drivers/net/wireless/rtl8811cu/Makefile" @@ -474,7 +474,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets ${rtl8188euver}" "info" - fetch_from_repo "https://github.com/aircrack-ng/rtl8188eus" "rtl8188eu" "${rtl8188euver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/aircrack-ng/rtl8188eus" "rtl8188eu" "${rtl8188euver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8188eu" mkdir -p "$kerneldir/drivers/net/wireless/rtl8188eu/" @@ -518,7 +518,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 88x2bu chipsets ${rtl88x2buver}" "info" - fetch_from_repo "https://github.com/cilynx/rtl88x2bu" "rtl88x2bu" "${rtl88x2buver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/cilynx/rtl88x2bu" "rtl88x2bu" "${rtl88x2buver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl88x2bu" mkdir -p "$kerneldir/drivers/net/wireless/rtl88x2bu/" @@ -555,7 +555,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 88x2cs chipsets ${rtl88x2csver}" "info" - fetch_from_repo "https://github.com/jethome-ru/rtl88x2cs" "rtl88x2cs" "${rtl88x2csver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/jethome-ru/rtl88x2cs" "rtl88x2cs" "${rtl88x2csver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl88x2cs" mkdir -p "$kerneldir/drivers/net/wireless/rtl88x2cs/" @@ -607,7 +607,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info" - fetch_from_repo "https://github.com/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/lwfinger/rtl8723ds" "rtl8723ds" "${rtl8723dsver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8723ds" mkdir -p "$kerneldir/drivers/net/wireless/rtl8723ds/" @@ -650,7 +650,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8723DU chipsets ${rtl8723duver}" "info" - fetch_from_repo "https://github.com/lwfinger/rtl8723du" "rtl8723du" "${rtl8723duver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/lwfinger/rtl8723du" "rtl8723du" "${rtl8723duver}" "yes" cd "$kerneldir" || exit rm -rf $kerneldir/drivers/net/wireless/rtl8723du mkdir -p $kerneldir/drivers/net/wireless/rtl8723du/ @@ -682,7 +682,7 @@ compilation_prepare() display_alert "Adding" "Wireless drivers for Realtek 8822BS chipsets ${rtl8822bsver}" "info" local rtl8822bsver="branch:local_rtl8822bs" - fetch_from_repo "https://github.com/150balbes/wifi" "rtl8822bs" "${rtl8822bsver}" "yes" + fetch_from_repo "$GITHUB_SOURCE/150balbes/wifi" "rtl8822bs" "${rtl8822bsver}" "yes" cd "$kerneldir" || exit rm -rf "$kerneldir/drivers/net/wireless/rtl8822bs" mkdir -p $kerneldir/drivers/net/wireless/rtl8822bs/ diff --git a/lib/compilation.sh b/lib/compilation.sh index 7d4e57331..d6d6ab0df 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -588,7 +588,7 @@ compile_firmware() plugin_dir="armbian-firmware${FULL}" mkdir -p "${firmwaretempdir}/${plugin_dir}/lib/firmware" - fetch_from_repo "https://github.com/armbian/firmware" "armbian-firmware-git" "branch:master" + fetch_from_repo "$GITHUB_SOURCE/armbian/firmware" "armbian-firmware-git" "branch:master" if [[ -n $FULL ]]; then fetch_from_repo "$MAINLINE_FIRMWARE_SOURCE" "linux-firmware-git" "branch:main" # cp : create hardlinks @@ -640,8 +640,8 @@ compile_armbian-zsh() armbian_zsh_dir=armbian-zsh_${REVISION}_all display_alert "Building deb" "armbian-zsh" "info" - fetch_from_repo "https://github.com/robbyrussell/oh-my-zsh" "oh-my-zsh" "branch:master" - fetch_from_repo "https://github.com/mroth/evalcache" "evalcache" "branch:master" + fetch_from_repo "$GITHUB_SOURCE/robbyrussell/oh-my-zsh" "oh-my-zsh" "branch:master" + fetch_from_repo "$GITHUB_SOURCE/mroth/evalcache" "evalcache" "branch:master" mkdir -p "${tmp_dir}/${armbian_zsh_dir}"/{DEBIAN,etc/skel/,etc/oh-my-zsh/,/etc/skel/.oh-my-zsh/cache} @@ -719,9 +719,9 @@ compile_armbian-config() armbian_config_dir=armbian-config_${REVISION}_all display_alert "Building deb" "armbian-config" "info" - fetch_from_repo "https://github.com/armbian/config" "armbian-config" "branch:master" - fetch_from_repo "https://github.com/dylanaraps/neofetch" "neofetch" "tag:7.1.0" - fetch_from_repo "https://github.com/complexorganizations/wireguard-manager" "wireguard-manager" "tag:v1.0.0.10-26-2021" + fetch_from_repo "$GITHUB_SOURCE/armbian/config" "armbian-config" "branch:master" + fetch_from_repo "$GITHUB_SOURCE/dylanaraps/neofetch" "neofetch" "tag:7.1.0" + fetch_from_repo "$GITHUB_SOURCE/complexorganizations/wireguard-manager" "wireguard-manager" "tag:v1.0.0.10-26-2021" mkdir -p "${tmp_dir}/${armbian_config_dir}"/{DEBIAN,usr/bin/,usr/sbin/,usr/lib/armbian-config/} @@ -769,7 +769,7 @@ compile_armbian-config() compile_xilinx_bootgen() { # Source code checkout - (fetch_from_repo "https://github.com/Xilinx/bootgen.git" "xilinx-bootgen" "branch:master") + (fetch_from_repo "$GITHUB_SOURCE/Xilinx/bootgen.git" "xilinx-bootgen" "branch:master") pushd "${SRC}"/cache/sources/xilinx-bootgen || exit @@ -1024,7 +1024,7 @@ userpatch_create() read -e -p "Patch description: " -i "$COMMIT_MESSAGE" COMMIT_MESSAGE [[ -z "$COMMIT_MESSAGE" ]] && COMMIT_MESSAGE="Patching something" git commit -s -m "$COMMIT_MESSAGE" - git format-patch -1 HEAD --stdout --signature="Created with Armbian build tools https://github.com/armbian/build" > "${patch}" + git format-patch -1 HEAD --stdout --signature="Created with Armbian build tools $GITHUB_SOURCE/armbian/build" > "${patch}" PATCHFILE=$(git format-patch -1 HEAD) rm $PATCHFILE # delete the actual file # create a symlink to have a nice name ready diff --git a/lib/configuration.sh b/lib/configuration.sh index 2ccfdba14..2e48a8db8 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -74,7 +74,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=cnpmjs [[ -z $DOWNLOAD_MIRROR ]] && DOWNLOAD_MIRROR=china ;; *)