Skip to content

Commit

Permalink
Adjust the grammar format
Browse files Browse the repository at this point in the history
  • Loading branch information
@ophub
ophub committed Oct 29, 2023
1 parent 32887d1 commit b821665
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 61 deletions.
13 changes: 7 additions & 6 deletions build-armbian/armbian-files/common-files/usr/sbin/armbian-update
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ check_depends() {
is_missing="0"
necessary_packages=("subversion" "tar" "coreutils" "bsdextrautils" "jq")
i="1"
for package in ${necessary_packages[*]}; do
for package in "${necessary_packages[@]}"; do
[[ -n "$(dpkg -l | awk '{print $2}' | grep -w "^${package}$" 2>/dev/null)" ]] || is_missing="1"
let i++
done

if [[ "${is_missing}" -eq "1" ]]; then
echo -e "${INFO} Start installing dependencies..."
sudo apt-get update
sudo apt-get install -y ${necessary_packages[*]}
sudo apt-get install -y ${necessary_packages[@]}
[[ "${?}" -ne "0" ]] && error_msg "Dependency installation failed, stop updating."
else
echo -e "${INFO} Dependency check completed."
Expand Down Expand Up @@ -291,7 +291,8 @@ query_version() {
# Query the latest version
echo -e "${INFO} Query the latest kernel version of the [ ${kernel_verpatch} ] series within [ kernel_${KERNEL_TAGS} ]..."
latest_version="$(
curl -fsSL ${kernel_api}/releases/expanded_assets/kernel_${KERNEL_TAGS} |
curl -fsSL \
${kernel_api}/releases/expanded_assets/kernel_${KERNEL_TAGS} |
grep -oE "${kernel_verpatch}.[0-9]+.tar.gz" | sed 's/.tar.gz//' |
sort -urV | head -n 1
)"
Expand Down Expand Up @@ -376,7 +377,7 @@ check_kernel() {

kernel_list=("boot" "dtb-${PLATFORM}" "modules" "header")
i="1"
for kernel_file in ${kernel_list[*]}; do
for kernel_file in "${kernel_list[@]}"; do
# Set check filename
tmp_file="${kernel_file}-${kernel_name}.tar.gz"
# Check if file exists
Expand Down Expand Up @@ -411,8 +412,8 @@ backup_kernel() {

# Keep the latest 3 kernel backups and delete the others
backup_kernel_list=($(ls ${backup_path} -lt | grep "^d" | awk '{print $9}'))
[[ "${#backup_kernel_list[*]}" -ge "3" ]] && {
for ((i = 2; i < ${#backup_kernel_list[*]}; i++)); do rm -rf ${backup_path}/${backup_kernel_list[$i]}; done
[[ "${#backup_kernel_list[@]}" -ge "3" ]] && {
for ((i = 2; i < ${#backup_kernel_list[@]}; i++)); do rm -rf ${backup_path}/${backup_kernel_list[$i]}; done
}

# Identify the current kernel files
Expand Down
96 changes: 48 additions & 48 deletions rebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ specific_tags="${default_tags}"
rk3588_kernel=("5.10.1")
h6_kernel=("6.5.1")
stable_kernel=("6.1.1" "5.15.1")
flippy_kernel=(${stable_kernel[*]})
dev_kernel=(${stable_kernel[*]})
beta_kernel=(${stable_kernel[*]})
flippy_kernel=(${stable_kernel[@]})
dev_kernel=(${stable_kernel[@]})
beta_kernel=(${stable_kernel[@]})
# Set to automatically use the latest kernel
auto_kernel="true"

Expand Down Expand Up @@ -274,7 +274,7 @@ check_data() {
board_list=":($(echo ${build_board} | sed -e 's/_/\|/g')):(yes|no)"
build_armbian=($(echo ${build_board} | sed -e 's/_/ /g'))
fi
[[ "${#build_armbian[*]}" -eq "0" ]] && error_msg "The [ BOARD ] is missing, stop building."
[[ "${#build_armbian[@]}" -eq "0" ]] && error_msg "The [ BOARD ] is missing, stop building."

# Get a list of kernel
kernel_from=($(
Expand All @@ -283,22 +283,22 @@ check_data() {
grep -E "^[^#].*${board_list}$" | awk -F':' '{print $9}' |
sort -u | xargs
))
[[ "${#kernel_from[*]}" -eq "0" ]] && error_msg "Missing [ KERNEL_TAGS ] settings, stop building."
[[ "${#kernel_from[@]}" -eq "0" ]] && error_msg "Missing [ KERNEL_TAGS ] settings, stop building."
# Replace custom kernel tags
[[ -n "${kernel_usage}" ]] && {
specific_tags="${kernel_usage}"
kernel_from=(${kernel_from[*]//${default_tags}/${kernel_usage}})
kernel_from=(${kernel_from[@]//${default_tags}/${kernel_usage}})
}

# The [ specific kernel ], Use the [ kernel version number ], such as 5.15.y, 6.1.y, etc. download from [ kernel_stable ].
specific_kernel=($(echo ${kernel_from[*]} | sed -e 's/[ ][ ]*/\n/g' | grep -E "^[0-9]+" | sort -u | xargs))
specific_kernel=($(echo ${kernel_from[@]} | sed -e 's/[ ][ ]*/\n/g' | grep -E "^[0-9]+" | sort -u | xargs))

# The [ suffix ] of KERNEL_TAGS starts with a [ letter ], such as kernel_stable, kernel_rk3588, etc.
tags_list=($(echo ${kernel_from[*]} | sed -e 's/[ ][ ]*/\n/g' | grep -E "^[a-z]" | sort -u | xargs))
tags_list=($(echo ${kernel_from[@]} | sed -e 's/[ ][ ]*/\n/g' | grep -E "^[a-z]" | sort -u | xargs))
# Add the specific kernel to the list
[[ "${#specific_kernel[*]}" -ne "0" ]] && tags_list=(${tags_list[*]} "specific")
[[ "${#specific_kernel[@]}" -ne "0" ]] && tags_list=(${tags_list[@]} "specific")
# Check the kernel list
[[ "${#tags_list[*]}" -eq "0" ]] && error_msg "The [ tags_list ] is missing, stop building."
[[ "${#tags_list[@]}" -eq "0" ]] && error_msg "The [ tags_list ] is missing, stop building."

# Convert kernel repository address to api format
[[ "${kernel_repo}" =~ ^https: ]] && kernel_repo="$(echo ${kernel_repo} | awk -F'/' '{print $4"/"$5}')"
Expand Down Expand Up @@ -341,19 +341,19 @@ query_kernel() {

# Check the version on the kernel repository
x="1"
for k in ${tags_list[*]}; do
for k in "${tags_list[@]}"; do
{
# Select the kernel list
kd="${k}"
case "${k}" in
stable) down_kernel_list=(${stable_kernel[*]}) ;;
flippy) down_kernel_list=(${flippy_kernel[*]}) ;;
dev) down_kernel_list=(${dev_kernel[*]}) ;;
beta) down_kernel_list=(${beta_kernel[*]}) ;;
rk3588) down_kernel_list=(${rk3588_kernel[*]}) ;;
h6) down_kernel_list=(${h6_kernel[*]}) ;;
stable) down_kernel_list=(${stable_kernel[@]}) ;;
flippy) down_kernel_list=(${flippy_kernel[@]}) ;;
dev) down_kernel_list=(${dev_kernel[@]}) ;;
beta) down_kernel_list=(${beta_kernel[@]}) ;;
rk3588) down_kernel_list=(${rk3588_kernel[@]}) ;;
h6) down_kernel_list=(${h6_kernel[@]}) ;;
specific)
down_kernel_list=(${specific_kernel[*]})
down_kernel_list=(${specific_kernel[@]})
kd="${specific_tags}"
;;
*) error_msg "Invalid tags." ;;
Expand All @@ -362,7 +362,7 @@ query_kernel() {
# Query the name of the latest kernel version
tmp_arr_kernels=()
i=1
for kernel_var in ${down_kernel_list[*]}; do
for kernel_var in "${down_kernel_list[@]}"; do
echo -e "${INFO} (${x}.${i}) Auto query the latest kernel version for [ ${k} - ${kernel_var} ]"

# Identify the kernel <VERSION> and <PATCHLEVEL>, such as [ 6.1 ]
Expand All @@ -389,13 +389,13 @@ query_kernel() {

# Reset the kernel array to the latest kernel version
case "${k}" in
stable) stable_kernel=(${tmp_arr_kernels[*]}) ;;
flippy) flippy_kernel=(${tmp_arr_kernels[*]}) ;;
dev) dev_kernel=(${tmp_arr_kernels[*]}) ;;
beta) beta_kernel=(${tmp_arr_kernels[*]}) ;;
rk3588) rk3588_kernel=(${tmp_arr_kernels[*]}) ;;
h6) h6_kernel=(${tmp_arr_kernels[*]}) ;;
specific) specific_kernel=(${tmp_arr_kernels[*]}) ;;
stable) stable_kernel=(${tmp_arr_kernels[@]}) ;;
flippy) flippy_kernel=(${tmp_arr_kernels[@]}) ;;
dev) dev_kernel=(${tmp_arr_kernels[@]}) ;;
beta) beta_kernel=(${tmp_arr_kernels[@]}) ;;
rk3588) rk3588_kernel=(${tmp_arr_kernels[@]}) ;;
h6) h6_kernel=(${tmp_arr_kernels[@]}) ;;
specific) specific_kernel=(${tmp_arr_kernels[@]}) ;;
*) error_msg "Invalid tags." ;;
esac

Expand All @@ -407,7 +407,7 @@ query_kernel() {
check_kernel() {
[[ -n "${1}" ]] && check_path="${1}" || error_msg "Invalid kernel path to check."
check_files=($(cat "${check_path}/sha256sums" | awk '{print $2}'))
for cf in ${check_files[*]}; do
for cf in "${check_files[@]}"; do
{
# Check if file exists
[[ -s "${check_path}/${cf}" ]] || error_msg "The [ ${cf} ] file is missing."
Expand All @@ -417,35 +417,35 @@ check_kernel() {
[[ "${tmp_sha256sum}" == "${tmp_checkcode}" ]] || error_msg "[ ${cf} ]: sha256sum verification failed."
}
done
echo -e "${INFO} All [ ${#check_files[*]} ] kernel files are sha256sum checked to be complete.\n"
echo -e "${INFO} All [ ${#check_files[@]} ] kernel files are sha256sum checked to be complete.\n"
}

download_kernel() {
cd ${current_path}
echo -e "${STEPS} Start downloading the kernel files..."

x="1"
for k in ${tags_list[*]}; do
for k in "${tags_list[@]}"; do
{
# Set the kernel download list
kd="${k}"
case "${k}" in
stable) down_kernel_list=(${stable_kernel[*]}) ;;
flippy) down_kernel_list=(${flippy_kernel[*]}) ;;
dev) down_kernel_list=(${dev_kernel[*]}) ;;
beta) down_kernel_list=(${beta_kernel[*]}) ;;
rk3588) down_kernel_list=(${rk3588_kernel[*]}) ;;
h6) down_kernel_list=(${h6_kernel[*]}) ;;
stable) down_kernel_list=(${stable_kernel[@]}) ;;
flippy) down_kernel_list=(${flippy_kernel[@]}) ;;
dev) down_kernel_list=(${dev_kernel[@]}) ;;
beta) down_kernel_list=(${beta_kernel[@]}) ;;
rk3588) down_kernel_list=(${rk3588_kernel[@]}) ;;
h6) down_kernel_list=(${h6_kernel[@]}) ;;
specific)
down_kernel_list=(${specific_kernel[*]})
down_kernel_list=(${specific_kernel[@]})
kd="${specific_tags}"
;;
*) error_msg "Invalid tags." ;;
esac

# Download the kernel to the storage directory
i="1"
for kernel_var in ${down_kernel_list[*]}; do
for kernel_var in "${down_kernel_list[@]}"; do
if [[ ! -d "${kernel_path}/${kd}/${kernel_var}" ]]; then
kernel_down_from="https://github.com/${kernel_repo}/releases/download/kernel_${kd}/${kernel_var}.tar.gz"
echo -e "${INFO} (${x}.${i}) [ ${k} - ${kernel_var} ] Kernel download from [ ${kernel_down_from} ]"
Expand Down Expand Up @@ -511,7 +511,7 @@ confirm_version() {
[[ -n "${PLATFORM}" ]] || error_msg "Invalid PLATFORM parameter: [ ${PLATFORM} ]"
# Set supported platform name
support_platform=("amlogic" "rockchip" "allwinner")
[[ -n "$(echo "${support_platform[*]}" | grep -w "${PLATFORM}")" ]] || error_msg "[ ${PLATFORM} ] not supported."
[[ -n "$(echo "${support_platform[@]}" | grep -w "${PLATFORM}")" ]] || error_msg "[ ${PLATFORM} ] not supported."

# Replace custom kernel tags
[[ -n "${kernel_usage}" && "${KERNEL_TAGS}" == "${default_tags}" ]] && KERNEL_TAGS="${kernel_usage}"
Expand Down Expand Up @@ -1057,7 +1057,7 @@ loop_rebuild() {
echo -e "${STEPS} Start building Armbian..."

j="1"
for b in ${build_armbian[*]}; do
for b in "${build_armbian[@]}"; do
{
# Set specific configuration for building Armbian system
board="${b}"
Expand All @@ -1066,21 +1066,21 @@ loop_rebuild() {
# Determine kernel tags
kd="${KERNEL_TAGS}"
case "${KERNEL_TAGS}" in
stable) kernel_list=(${stable_kernel[*]}) ;;
flippy) kernel_list=(${flippy_kernel[*]}) ;;
dev) kernel_list=(${dev_kernel[*]}) ;;
beta) kernel_list=(${beta_kernel[*]}) ;;
rk3588) kernel_list=(${rk3588_kernel[*]}) ;;
h6) kernel_list=(${h6_kernel[*]}) ;;
stable) kernel_list=(${stable_kernel[@]}) ;;
flippy) kernel_list=(${flippy_kernel[@]}) ;;
dev) kernel_list=(${dev_kernel[@]}) ;;
beta) kernel_list=(${beta_kernel[@]}) ;;
rk3588) kernel_list=(${rk3588_kernel[@]}) ;;
h6) kernel_list=(${h6_kernel[@]}) ;;
[0-9]*)
kernel_list=(${specific_kernel[*]})
kernel_list=(${specific_kernel[@]})
kd="${specific_tags}"
;;
*) error_msg "Invalid tags." ;;
esac

i="1"
for k in ${kernel_list[*]}; do
for k in "${kernel_list[@]}"; do
{
kernel="${k}"

Expand Down Expand Up @@ -1141,7 +1141,7 @@ download_depends
download_kernel

# Show rebuild settings
echo -e "${INFO} [ ${#build_armbian[*]} ] lists of Armbian board: [ $(echo ${build_armbian[*]} | xargs) ]"
echo -e "${INFO} [ ${#build_armbian[@]} ] lists of Armbian board: [ $(echo ${build_armbian[@]} | xargs) ]"
echo -e "${INFO} ROOTFS type: [ ${rootfs_type} ]"
echo -e "${INFO} Kernel Repo: [ ${kernel_repo} ], Kernel Usage: [ ${kernel_usage} ] \n"
# Show server start information
Expand Down
11 changes: 4 additions & 7 deletions recompile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ query_version() {

# Query the latest kernel in a loop
i=1
for KERNEL_VAR in ${build_kernel[*]}; do
for KERNEL_VAR in "${build_kernel[@]}"; do
echo -e "${INFO} (${i}) Auto query the latest kernel version of the same series for [ ${KERNEL_VAR} ]"
# Identify the kernel mainline
MAIN_LINE="$(echo ${KERNEL_VAR} | awk -F '.' '{print $1"."$2}')"
Expand All @@ -312,8 +312,7 @@ query_version() {
done

# Reset the kernel array to the latest kernel version
unset build_kernel
build_kernel="${tmp_arr_kernels[*]}"
build_kernel=(${tmp_arr_kernels[@]})
}

apply_patch() {
Expand Down Expand Up @@ -374,12 +373,10 @@ get_kernel_source() {
# Pull the latest source code of the server
cd ${kernel_path}/${local_kernel_path}
git checkout ${code_branch} && git reset --hard origin/${code_branch} && git pull
unset kernel_version
kernel_version="${local_makefile_version}.${local_makefile_patchlevel}.${kernel_sub}"
echo -e "${INFO} Synchronize the upstream source code, compile the kernel version [ ${kernel_version} ]."
else
# Reset to local kernel version number
unset kernel_version
kernel_version="${local_makefile_version}.${local_makefile_patchlevel}.${local_makefile_sublevel}"
echo -e "${INFO} Use local source code, compile the kernel version [ ${kernel_version} ]."
fi
Expand Down Expand Up @@ -680,7 +677,7 @@ loop_recompile() {
cd ${current_path}

j="1"
for k in ${build_kernel[*]}; do
for k in "${build_kernel[@]}"; do
# kernel_version, such as [ 6.1.15 ]
kernel_version="${k}"
# kernel <VERSION> and <PATCHLEVEL>, such as [ 6.1 ]
Expand Down Expand Up @@ -728,7 +725,7 @@ echo -e "${INFO} Kernel patch: [ ${auto_patch} ]"
echo -e "${INFO} Kernel Package: [ ${package_list} ]"
echo -e "${INFO} kernel signature: [ ${custom_name} ]"
echo -e "${INFO} Latest kernel version: [ ${auto_kernel} ]"
echo -e "${INFO} Kernel List: [ $(echo ${build_kernel[*]} | xargs) ] \n"
echo -e "${INFO} Kernel List: [ $(echo ${build_kernel[@]} | xargs) ] \n"

# Show server start information
echo -e "${INFO} Server space usage before starting to compile: \n$(df -hT ${current_path}) \n"
Expand Down

0 comments on commit b821665

Please sign in to comment.