Archived
Public Access
Drop joeyblog branding from kernel build artifact names
Rename the kernel LOCALVERSION used by the build from -joeyblog-bbrv3 / -joeyblog-bbrv3-max to -bbrv3 / -bbrv3-max, so the produced uname strings and .deb package names no longer carry the custom brand. Standard vs max kernels stay distinguishable. - .github/workflows/build.yml: matrix localversion for all four jobs - scripts/build-bbrv3-max-kernel.sh: LOCALVERSION for local max builds - install.sh: update detection, profile matching, expected-uname and uninstall logic to key off -bbrv3 / -bbrv3-max instead of joeyblog - README.md: describe uninstall by the new package-name suffixes Runtime config paths (e.g. /etc/sysctl.d/99-joeyblog.conf) and author attribution are unchanged; they are not kernel names. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PvXBX9hm6GzStHUMDZzDoZ
This commit is contained in:
@@ -95,25 +95,25 @@ jobs:
|
||||
profile: standard
|
||||
profile_name: BBRv3
|
||||
release_suffix: ""
|
||||
localversion: -joeyblog-bbrv3
|
||||
localversion: -bbrv3
|
||||
- arch: arm64
|
||||
runs_on: ubuntu-24.04-arm
|
||||
profile: standard
|
||||
profile_name: BBRv3
|
||||
release_suffix: ""
|
||||
localversion: -joeyblog-bbrv3
|
||||
localversion: -bbrv3
|
||||
- arch: x86_64
|
||||
runs_on: ubuntu-latest
|
||||
profile: max
|
||||
profile_name: BBRv3 Max
|
||||
release_suffix: -max
|
||||
localversion: -joeyblog-bbrv3-max
|
||||
localversion: -bbrv3-max
|
||||
- arch: arm64
|
||||
runs_on: ubuntu-24.04-arm
|
||||
profile: max
|
||||
profile_name: BBRv3 Max
|
||||
release_suffix: -max
|
||||
localversion: -joeyblog-bbrv3-max
|
||||
localversion: -bbrv3-max
|
||||
runs-on: ${{ matrix.runs_on }}
|
||||
env:
|
||||
ARCH: ${{ matrix.arch }}
|
||||
|
||||
@@ -379,7 +379,7 @@ sudo python3 cve_2026_31431_detector.py
|
||||
9. 卸载 BBR 内核
|
||||
```
|
||||
|
||||
脚本会卸载由本项目安装的 `joeyblog` 内核包,并更新引导配置。卸载后建议重启。
|
||||
脚本会卸载由本项目安装的 BBR v3 内核包(包名带 `-bbrv3` / `-bbrv3-max` 后缀),并更新引导配置。卸载后建议重启。
|
||||
|
||||
## 反馈
|
||||
|
||||
|
||||
+9
-9
@@ -976,18 +976,18 @@ ask_to_save() {
|
||||
fi
|
||||
}
|
||||
|
||||
# 函数:获取已安装的 joeyblog 内核版本
|
||||
# 函数:获取已安装的 BBR v3 内核版本
|
||||
get_installed_version() {
|
||||
local profile="${1:-any}"
|
||||
local versions
|
||||
|
||||
versions=$(dpkg -l 2>/dev/null | awk '/^ii/ && $2 ~ /^linux-image-/ && $2 ~ /joeyblog/ {sub(/^linux-image-/, "", $2); print $2}')
|
||||
versions=$(dpkg -l 2>/dev/null | awk '/^ii/ && $2 ~ /^linux-image-/ && $2 ~ /-bbrv3/ {sub(/^linux-image-/, "", $2); print $2}')
|
||||
case "$profile" in
|
||||
standard)
|
||||
echo "$versions" | grep -E -- '-joeyblog-bbrv3$' | sort -V | tail -n 1
|
||||
echo "$versions" | grep -E -- '-bbrv3$' | sort -V | tail -n 1
|
||||
;;
|
||||
max)
|
||||
echo "$versions" | grep -E -- '-joeyblog-bbrv3-max$' | sort -V | tail -n 1
|
||||
echo "$versions" | grep -E -- '-bbrv3-max$' | sort -V | tail -n 1
|
||||
;;
|
||||
*)
|
||||
echo "$versions" | sort -V | tail -n 1
|
||||
@@ -1020,9 +1020,9 @@ get_expected_installed_version() {
|
||||
version="${version%-max}"
|
||||
|
||||
if [[ "$profile" == "max" ]]; then
|
||||
echo "${version}-joeyblog-bbrv3-max"
|
||||
echo "${version}-bbrv3-max"
|
||||
else
|
||||
echo "${version}-joeyblog-bbrv3"
|
||||
echo "${version}-bbrv3"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1086,7 +1086,7 @@ install_packages() {
|
||||
done
|
||||
|
||||
echo -e "\033[36m开始卸载旧版内核... \033[0m"
|
||||
INSTALLED_PACKAGES=$(dpkg -l | grep "joeyblog" | awk '{print $2}' | tr '\n' ' ')
|
||||
INSTALLED_PACKAGES=$(dpkg -l | grep -- '-bbrv3' | awk '{print $2}' | tr '\n' ' ')
|
||||
if [[ -n "$INSTALLED_PACKAGES" ]]; then
|
||||
sudo apt-get remove --purge $INSTALLED_PACKAGES -y > /dev/null 2>&1
|
||||
fi
|
||||
@@ -1349,14 +1349,14 @@ case "$ACTION" in
|
||||
;;
|
||||
9)
|
||||
echo -e "\033[1;32mヽ(・∀・)ノ 您选择了卸载 BBR 内核!\033[0m"
|
||||
PACKAGES_TO_REMOVE=$(dpkg -l | grep "joeyblog" | awk '{print $2}' | tr '\n' ' ')
|
||||
PACKAGES_TO_REMOVE=$(dpkg -l | grep -- '-bbrv3' | awk '{print $2}' | tr '\n' ' ')
|
||||
if [[ -n "$PACKAGES_TO_REMOVE" ]]; then
|
||||
echo -e "\033[36m将要卸载以下内核包: \033[33m$PACKAGES_TO_REMOVE\033[0m"
|
||||
sudo apt-get remove --purge $PACKAGES_TO_REMOVE -y
|
||||
update_bootloader
|
||||
echo -e "\033[1;32m内核包已卸载。请记得重启系统。\033[0m"
|
||||
else
|
||||
echo -e "\033[33m未找到由本脚本安装的 'joeyblog' 内核包。\033[0m"
|
||||
echo -e "\033[33m未找到由本脚本安装的 BBR v3 内核包。\033[0m"
|
||||
fi
|
||||
;;
|
||||
10)
|
||||
|
||||
@@ -66,9 +66,9 @@ export KERNEL_VERSION="$kernel_version"
|
||||
bash "$repo_root/scripts/prepare-kernel-config.sh" "$config_arch"
|
||||
|
||||
if [[ "$build_arch" == "arm64" ]]; then
|
||||
make ARCH=arm64 bindeb-pkg -j"$(nproc)" LOCALVERSION=-joeyblog-bbrv3-max KDEB_COMPRESS=gzip skipdbg=true
|
||||
make ARCH=arm64 bindeb-pkg -j"$(nproc)" LOCALVERSION=-bbrv3-max KDEB_COMPRESS=gzip skipdbg=true
|
||||
else
|
||||
make bindeb-pkg -j"$(nproc)" LOCALVERSION=-joeyblog-bbrv3-max KDEB_COMPRESS=gzip skipdbg=true
|
||||
make bindeb-pkg -j"$(nproc)" LOCALVERSION=-bbrv3-max KDEB_COMPRESS=gzip skipdbg=true
|
||||
fi
|
||||
|
||||
if find "$workdir" -maxdepth 1 \( -name '*-dbg*.deb' -o -name '*-dbgsym*.deb' \) | grep -q .; then
|
||||
|
||||
Reference in New Issue
Block a user