qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

orangepi3-lts: add next branch - linux5.16.16

This commit is contained in:
orangepi-xunlong 2022-03-24 16:27:10 +08:00
parent c6d73dedb4
commit 8c43515868
5 changed files with 8149 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/config/boards/orangepi3-lts.conf vendored
View File

@ -2,9 +2,9 @@
BOARD_NAME="OPI 3 LTS"
BOARDFAMILY="sun50iw6"
BOOTCONFIG="orangepi_3_lts_defconfig"
KERNEL_TARGET="legacy,current"
MODULES="uwe5622_bsp_sdio sprdbt_tty sprdwl_ng"
KERNEL_TARGET="legacy,current,next"
MODULES="sprdbt_tty sprdwl_ng"
MODULES_BLACKLIST_LEGACY="bcmdhd"
ATFBRANCH="tag:v2.2"
DISTRIB_TYPE_LEGACY="buster focal"
DISTRIB_TYPE_CURRENT="bullseye"
DISTRIB_TYPE_CURRENT="bullseye bookworm focal jammy"

8140
external/config/kernel/linux-5.16-sunxi64-current.config vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
scripts/configuration.sh
View File

@ -222,7 +222,7 @@ desktop_element_available_for_arch() {
echo "Checking if ${desktop_element_path} is available for ${targeted_arch} in ${arch_limitation_file}" >> "${DEST}"/${LOG_SUBPATH}/output.log
if [[ -f "${arch_limitation_file}" ]]; then
grep -- "${targeted_arch}" "${arch_limitation_file}"
grep -- "${targeted_arch}" "${arch_limitation_file}" > /dev/null
return $?
else
return 0

5
scripts/general.sh
View File

@ -821,7 +821,10 @@ function distro_menu ()
[[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="buster bionic focal"
elif [[ "${BRANCH}" == "current" ]]; then
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_LEGACY}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
elif [[ "${BRANCH}" == "next" ]]; then
DISTRIB_TYPE="${DISTRIB_TYPE_CURRENT}"
[[ -z "${DISTRIB_TYPE_CURRENT}" ]] && DISTRIB_TYPE="bullseye bookworm focal jammy"
fi
if [[ "${DISTRIB_TYPE}" =~ "${distro_codename}" ]]; then

9
scripts/main.sh
View File

@ -254,7 +254,7 @@ if [[ -z $BRANCH ]]; then
options=()
[[ $KERNEL_TARGET == *current* ]] && options+=("current" "Recommended. Come with best support")
[[ $KERNEL_TARGET == *legacy* ]] && options+=("legacy" "Old stable / Legacy")
[[ $KERNEL_TARGET == *edge* && $EXPERT = yes ]] && options+=("edge" "\Z1Bleeding edge from @kernel.org\Zn")
[[ $KERNEL_TARGET == *next* ]] && options+=("next" "Use the latest kernel")
menustr="Select the target kernel branch\nExact kernel versions depend on selected board"
# do not display selection dialog if only one kernel branch is available
@ -270,13 +270,6 @@ if [[ -z $BRANCH ]]; then
[[ -z $BRANCH ]] && exit_with_error "No kernel branch selected"
[[ $BRANCH == dev && $SHOW_WARNING == yes ]] && show_developer_warning
else
[[ $BRANCH == next ]] && KERNEL_TARGET="next"
# next = new legacy. Should stay for backward compatibility, but be removed from menu above
# or we left definitions in board configs and only remove menu
[[ $KERNEL_TARGET != *$BRANCH* ]] && exit_with_error "Kernel branch not defined for this board" "$BRANCH"
fi