Skip to content

Commit 5b6a13a

Browse files
committed
Remove auto-replace source
1 parent a9a0a83 commit 5b6a13a

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

rebuild

+9-19
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ ophub_release_file="etc/ophub-release"
6565
# Kernel files download repository
6666
kernel_repo="https://github.com/ophub/kernel/tree/main/pub"
6767
version_branch="stable"
68-
build_kernel=("5.15.25" "5.4.180")
6968
auto_kernel="true"
69+
build_kernel=("5.15.25" "5.4.180")
7070
# Set supported SoC
7171
build_armbian=(
7272
"s922x" "s922x-n2" "s922x-reva" "a311d"
@@ -385,6 +385,14 @@ extract_armbian() {
385385
fi
386386

387387
cd ${tmp_armbian}
388+
389+
# Find ID in ${os_release_file}: such as [ubuntu/debian]
390+
release_codeid="$(cat ${os_release_file} | grep -oE "^ID=.*" | cut -d"=" -f2)"
391+
[ -z "${release_codeid}" ] && error_msg "The [ ${os_release_file}: ID ] is invalid."
392+
# Find VERSION_CODENAME in ${os_release_file}: such as [focal/bullseye/buster]
393+
release_codename="$(cat ${os_release_file} | grep -oE "^VERSION_CODENAME=.*" | cut -d"=" -f2)"
394+
[ -z "${release_codename}" ] && error_msg "The [ ${os_release_file}: VERSION_CODENAME ] is invalid."
395+
388396
# Delete all files of /boot partition and replace it later
389397
rm -rf boot/* 2>/dev/null
390398
# Delete the kernel files and replace it later
@@ -422,24 +430,6 @@ refactor_files() {
422430
# Copy the overload files
423431
cp -f ${uboot_path}/overload/* ${tag_bootfs}
424432

425-
# Find ID in ${os_release_file}: such as [ubuntu/debian]
426-
release_codeid="$(cat ${tag_rootfs}/${os_release_file} | grep -oE "^ID=.*" | cut -d"=" -f2)"
427-
[ -z "${release_codeid}" ] && error_msg "The [ ${os_release_file}: ID ] is invalid."
428-
# Find VERSION_CODENAME in ${os_release_file}: such as [focal/bullseye/buster]
429-
release_codename="$(cat ${tag_rootfs}/${os_release_file} | grep -oE "^VERSION_CODENAME=.*" | cut -d"=" -f2)"
430-
[ -z "${release_codename}" ] && error_msg "The [ ${os_release_file}: VERSION_CODENAME ] is invalid."
431-
# Copy the different files of the release for ROOTFS
432-
diff_release_files="${configfiles_path}/release/${release_codename}"
433-
if [[ -n "${release_codename}" && -d "${diff_release_files}" ]]; then
434-
# Backup source
435-
mv -f ${tag_rootfs}/etc/apt/sources.list ${tag_rootfs}/etc/apt/sources.list.bak
436-
mv -f ${tag_rootfs}/etc/apt/sources.list.d/armbian.list ${tag_rootfs}/etc/apt/sources.list.d/armbian.list.bak
437-
# Copy custom source
438-
cp -rf ${diff_release_files}/* ${tag_rootfs}
439-
fi
440-
441-
sync && sleep 3
442-
443433
# Replace the kernel
444434
build_boot=$(ls ${kernel_path}/${kernel}/boot-${kernel}-*.tar.gz 2>/dev/null | head -n 1)
445435
build_dtb=$(ls ${kernel_path}/${kernel}/dtb-amlogic-${kernel}-*.tar.gz 2>/dev/null | head -n 1)

0 commit comments

Comments
 (0)