ImmortalWrt v23.05.0-rc3: adjust config defaults

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

.devcontainer/ci-env/devcontainer.json

@@ -1,12 +0,0 @@
-{
-  "name": "CI build container",
-  "image": "ghcr.io/openwrt/buildbot/buildworker-v3.8.0:v9",
-  "features": {
-  },
-  "remoteUser": "buildbot",
-  "customizations": {
-    "vscode": {
-      "extensions": ["ms-vscode.cpptools", "plorefice.devicetree"]
-    }
-  }
-}

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -19,15 +19,6 @@ body:
         ```. /etc/openwrt_release && echo $DISTRIB_REVISION```
     validations:
       required: true
-  - type: input
-    id: release
-    attributes:
-      label: ImmortalWrt release
-      description: |
-        The ImmortalWrt release or commit hash where this bug occurs (use command below).
-        ```. /etc/openwrt_release && echo $DISTRIB_RELEASE```
-    validations:
-      required: true
   - type: input
     id: target
     attributes:

.gitignore

@@ -14,15 +14,12 @@
 /feeds
 /feeds.conf
 /files
-/target/linux/feeds
 /overlay
 /package/feeds
 /package/openwrt-packages
 /*.patch
 /llvm-bpf*
 key-build*
-private-key.pem
-public-key.pem
 *.orig
 *.rej
 *~
@@ -35,4 +32,3 @@ git-src
 .cproject
 .ccache
 .vscode*
-/openwrt_logs

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "git.alwaysSignOff": true
-}

Config.in

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006-2013 OpenWrt.org
 
-mainmenu "ImmortalWrt Configuration"
+mainmenu "OpenWrt Configuration"
 
 config MODULES
 	modules

Makefile

@@ -14,7 +14,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt dir
 
 world:
 
-DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep -e '/usr' -e '/nix/store' -m 1)
+DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep '/usr' -m 1)
 
 export ORIG_PATH:=$(if $(ORIG_PATH),$(ORIG_PATH),$(PATH))
 export PATH:=$(if $(STAGING_DIR),$(abspath $(STAGING_DIR)/../host/bin),$(TOPDIR)/staging_dir/host/bin):$(PATH)
@@ -40,9 +40,6 @@ else
   include tools/Makefile
   include toolchain/Makefile
 
-# Include the test suite Makefile if it exists
--include tests/Makefile
-
 $(toolchain/stamp-compile): $(tools/stamp-compile) $(if $(CONFIG_BUILDBOT),toolchain_rebuild_check)
 $(target/stamp-compile): $(toolchain/stamp-compile) $(tools/stamp-compile) $(BUILD_DIR)/.prepared
 $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup)

README.md

@@ -2,8 +2,8 @@
 
 # Project ImmortalWrt
 
-ImmortalWrt is a fork of [OpenWrt](https://openwrt.org), with more packages ported, more devices supported, default optimized profiles and localization modifications for mainland China users.<br/>
-Compared to upstream, we allow to use (non-upstreamable) modifications/hacks to provide better feature/performance/support.
+ImmortalWrt is a fork of [OpenWrt](https://openwrt.org), with more packages ported, more devices supported, better performance, and special optimizations for mainland China users.<br/>
+Compared the official one, we allow to use hacks or non-upstreamable patches / modifications to achieve our purpose. Source from anywhere.
 
 Default login address: http://192.168.1.1 or http://immortalwrt.lan, username: __root__, password: _none_.
 
@@ -15,14 +15,14 @@ Built firmware images are available for many architectures and come with a packa
 If your device is supported, please follow the **Info** link to see install instructions or consult the support resources listed below.
 
 ## Development
-To build your own firmware you need a GNU/Linux, BSD or macOS system (case sensitive filesystem required). Cygwin is unsupported because of the lack of a case sensitive file system.<br/>
+To build your own firmware you need a GNU/Linux, BSD or MacOSX system (case sensitive filesystem required). Cygwin is unsupported because of the lack of a case sensitive file system.<br/>
 
   ### Requirements
-  To build with this project, Debian 11 is preferred. And you need use the CPU based on AMD64 architecture, with at least 4GB RAM and 25 GB available disk space. Make sure the __Internet__ is accessible.
+  To build with this project, Ubuntu 20.04 LTS is preferred. And you need use the CPU based on AMD64 architecture, with at least 4GB RAM and 25 GB available disk space. Make sure the __Internet__ is accessible.
 
   The following tools are needed to compile ImmortalWrt, the package names vary between distributions.
 
-  - Here is an example for Debian/Ubuntu users:<br/>
+  - Here is an example for Ubuntu users:<br/>
     - Method 1:
       <details>
         <summary>Setup dependencies via APT</summary>
@@ -33,16 +33,16 @@ To build your own firmware you need a GNU/Linux, BSD or macOS system (case sensi
         sudo apt install -y ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
           bzip2 ccache clang cmake cpio curl device-tree-compiler ecj fastjar flex gawk gettext gcc-multilib \
           g++-multilib git gnutls-dev gperf haveged help2man intltool lib32gcc-s1 libc6-dev-i386 libelf-dev \
-          libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses-dev libpython3-dev \
-          libreadline-dev libssl-dev libtool libyaml-dev libz-dev lld llvm lrzsz mkisofs msmtp nano \
-          ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-ply python3-docutils \
-          python3-pyelftools qemu-utils re2c rsync scons squashfs-tools subversion swig texinfo uglifyjs \
-          upx-ucl unzip vim wget xmlto xxd zlib1g-dev zstd
+          libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5 \
+          libncursesw5-dev libpython3-dev libreadline-dev libssl-dev libtool lld llvm lrzsz mkisofs msmtp \
+          nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pip python3-ply \
+          python-docutils python3-pyelftools qemu-utils re2c rsync scons squashfs-tools subversion swig \
+          texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
         ```
       </details>
     - Method 2:
       ```bash
-      sudo bash -c 'bash <(curl -s https://build-scripts.immortalwrt.org/init_build_environment.sh)'
+      sudo bash -c 'bash <(curl -s https://build-scripts.immortalwrt.eu.org/init_build_environment.sh)'
       ```
 
   Note:
@@ -88,6 +88,6 @@ ImmortalWrt is licensed under [GPL-2.0-only](https://spdx.org/licenses/GPL-2.0-o
   <tr>
     <td><a href="https://dlercloud.com/"><img src="https://user-images.githubusercontent.com/22235437/111103249-f9ec6e00-8588-11eb-9bfc-67cc55574555.png" width="183" height="52" border="0" alt="Dler Cloud"></a></td>
     <td><a href="https://www.jetbrains.com/"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_square.png" width="120" height="120" border="0" alt="JetBrains Black Box Logo logo"></a></td>
-    <td><a href="https://sourceforge.net/"><img src="https://sourceforge.net/sflogo.php?type=17&group_id=3663829" alt="SourceForge" width=200></a></td>
+    <td><a href="https://osdn.net/"><img src="https://osdn.net/sflogo.php?group_id=13647&type=2" width="125" height="39" border="0" alt="OSDN"></a></td>
   </tr>
 </table>

build_openwrt.sh

@@ -1,749 +0,0 @@
-#!/usr/bin/env bash
-
-#====================================================
-# OpenWrt 构建管理脚本
-# 功能：提供交互式菜单，可选择执行特定操作
-# 更新：2025-04-05
-#====================================================
-
-#---------------基础配置---------------#
-# 日志目录设置
-LOGS_ROOT="openwrt_logs"
-SESSION_DIR="${LOGS_ROOT}/$(date +%Y%m%d_%H%M%S)"
-LOG_FILE="${SESSION_DIR}/main_build_script.log" # 主脚本日志文件名更改，更清晰
-
-#---------------清理配置---------------#
-# 需要移除的目录列表 (示例，根据你的需要添加)
-declare -a REMOVE_DIRS=(
-    # "feeds/packages/net/v2ray-geodata" # 示例
-)
-
-# 需要移除的包列表 (示例，根据你的需要添加)
-declare -a REMOVE_PACKAGES=(
-    # "package/feeds/luci/luci-app-example" # 示例
-)
-
-#---------------自定义包配置---------------#
-# 定义自定义包配置，格式：[包名]=[目标目录]=[仓库URL]=[分支]=[是否使用--depth 1]
-declare -A CUSTOM_PACKAGES=(
-    ["partexp"]="package/luci-app-partexp=https://github.com/sirpdboy/luci-app-partexp=main=false"
-    ["openclash"]="package/openclash=https://github.com/vernesong/OpenClash=dev=true"
-    ["zerotier"]="package/luci-app-zerotier=https://github.com/Firsgith/luci-app-zerotier.git=main=false"
-    # ["5gsupport"]="package/5G-Modem-Support=https://nanako.site/gitea/Nanako/openwrt-app-actions.git=main=false"
-    # ["pcat"]="package/pcat-manager=https://github.com/photonicat/rockchip_rk3568_pcat_manager.git=master=true"
-)
-
-#---------------日志系统---------------#
-# 保存原始的标准输出和错误输出文件描述符
-exec {STDOUT_ORIG}>&1
-exec {STDERR_ORIG}>&2
-
-# 全局变量标记日志是否启用
-LOGGING_ENABLED=false # 初始为 false，由 init_logger 启用
-
-# 初始化日志系统
-init_logger() {
-    # 创建日志目录结构
-    mkdir -p "$SESSION_DIR" || {
-        echo "错误: 无法创建日志目录: $SESSION_DIR" >&2
-        exit 1
-    }
-
-    LOGGING_ENABLED=true
-    echo "日志将保存在: $SESSION_DIR"
-    echo "主脚本日志: $LOG_FILE"
-
-    # 重定向主脚本的 stdout 和 stderr 到 tee，同时输出到控制台和主日志文件
-    # 使用 process substitution 和 tee
-    exec > >(tee -a "$LOG_FILE")
-    exec 2> >(tee -a "$LOG_FILE" >&2)
-
-    # 记录初始信息到日志
-    echo "[$(date "+%Y-%m-%d %H:%M:%S")] [INFO]: 日志系统初始化完成。主日志文件: $LOG_FILE"
-}
-
-# 创建新的特定构建阶段的日志文件
-create_build_log() {
-    local build_type=$1
-    local timestamp=$(date +%Y%m%d_%H%M%S)
-    # 使用更明确的文件名
-    BUILD_LOG_FILE="${SESSION_DIR}/${build_type}_build_${timestamp}.log"
-    # 确保文件被创建，即使命令没有输出
-    touch "$BUILD_LOG_FILE" || {
-        log "ERROR" "无法创建构建日志文件: $BUILD_LOG_FILE"
-        return 1
-    }
-    # 返回创建的日志文件名
-    echo "$BUILD_LOG_FILE"
-    return 0
-}
-
-# 禁用日志重定向 (用于 menuconfig 等交互场景)
-disable_logging() {
-    if [ "$LOGGING_ENABLED" = true ]; then
-        log "DEBUG" "禁用日志重定向，恢复原始标准输出/错误。"
-        exec >&$STDOUT_ORIG
-        exec 2>&$STDERR_ORIG
-        LOGGING_ENABLED=false # 标记为禁用
-    fi
-}
-
-# 启用日志重定向 (恢复)
-enable_logging() {
-    # 仅在之前被禁用的情况下才重新启用
-    if [ "$LOGGING_ENABLED" = false ]; then
-        # 重新应用重定向到主日志
-        exec > >(tee -a "$LOG_FILE")
-        exec 2> >(tee -a "$LOG_FILE" >&2)
-        LOGGING_ENABLED=true # 标记为启用
-        log "DEBUG" "重新启用日志重定向到主日志。"
-    fi
-}
-
-# 设置终端颜色
-setup_colors() {
-    if [[ -t 1 ]]; then # 检查标准输出是否连接到终端
-        RED='\033[0;31m'
-        GREEN='\033[0;32m'
-        YELLOW='\033[1;33m'
-        BLUE='\033[0;34m'
-        NC='\033[0m' # No Color
-    else
-        RED='' GREEN='' YELLOW='' BLUE='' NC=''
-    fi
-}
-
-# 记录日志函数 - 使用此函数来明确日志级别
-# 注意：此函数输出会经过 init_logger 设置的全局重定向
-log() {
-    local level=$1
-    local message=$2
-    local timestamp
-    timestamp=$(date "+%Y-%m-%d %H:%M:%S")
-    local color="" level_str=""
-
-    case $level in
-        "INFO")  color="$GREEN";  level_str="INFO " ;; # 加空格对齐
-        "WARN")  color="$YELLOW"; level_str="WARN " ;;
-        "ERROR") color="$RED";    level_str="ERROR" ;;
-        "DEBUG") color="$BLUE";   level_str="DEBUG" ;;
-        *)       color="";        level_str="LOG  " ;; # 默认级别
-    esac
-
-    # 使用 printf 保证原子写入，减少并发问题
-    printf "[%s] %b[%s]%b: %s\n" "$timestamp" "$color" "$level_str" "$NC" "$message"
-}
-
-# 同时记录消息到主日志和特定的构建日志
-log_to_both() {
-    local level=$1
-    local message=$2
-    local build_log_file=$3 # 明确参数名
-
-    # 1. 输出到主日志（通过全局重定向和 log 函数）
-    log "$level" "$message"
-
-    # 2. 追加到指定的构建日志文件
-    local timestamp
-    timestamp=$(date "+%Y-%m-%d %H:%M:%S")
-    # 直接追加，不需要颜色代码
-    printf "[%s] [%s]: %s\n" "$timestamp" "$level" "$message" >> "$build_log_file"
-}
-
-
-#---------------自定义包管理函数---------------#
-# 更新单个自定义包
-update_single_package() {
-    local pkg_name=$1
-    local config=$2
-
-    # 解析配置 (保持 cut 的方式，假设路径/URL/分支名不含 '=')
-    # 如果遇到问题，可以切换到 IFS/read
-    local target_dir repo_url branch use_depth
-    target_dir=$(echo "$config" | cut -d= -f1)
-    repo_url=$(echo "$config" | cut -d= -f2)
-    branch=$(echo "$config" | cut -d= -f3)
-    use_depth=$(echo "$config" | cut -d= -f4)
-
-    # 基础验证
-    if [ -z "$target_dir" ] || [ -z "$repo_url" ]; then
-        log "ERROR" "包 '$pkg_name' 的配置无效: $config"
-        return 1
-    fi
-
-    log "INFO" "更新自定义包: $pkg_name..."
-
-    # 检查目标目录的父目录是否存在
-    local parent_dir
-    parent_dir=$(dirname "$target_dir")
-    if [ ! -d "$parent_dir" ]; then
-        log "INFO" "创建父目录: $parent_dir"
-        mkdir -p "$parent_dir" || {
-            log "ERROR" "无法创建父目录: $parent_dir"
-            return 1
-        }
-    fi
-
-    # 移除现有目录
-    if [ -d "$target_dir" ]; then
-        log "INFO" "移除现有目录: $target_dir"
-        rm -rf "$target_dir" || {
-            log "ERROR" "无法删除目录: $target_dir"
-            return 1
-        }
-    fi
-
-    # 准备 git clone 命令参数数组 (移除 eval)
-    local git_options=("--progress") # 总是显示进度
-    # 处理分支
-    if [ -n "$branch" ] && [ "$branch" != "master" ]; then
-        git_options+=("-b" "$branch")
-    fi
-    # 处理 depth
-    if [ "$use_depth" = "true" ]; then
-        git_options+=("--depth" "1")
-    fi
-
-    # 执行克隆
-    log "INFO" "执行: git clone ${git_options[*]} $repo_url $target_dir"
-    if git clone "${git_options[@]}" "$repo_url" "$target_dir"; then
-        log "INFO" "包 '$pkg_name' 更新成功"
-        return 0
-    else
-        log "ERROR" "克隆包 '$pkg_name' 失败 (仓库: $repo_url)"
-        # 尝试给出更具体的错误提示
-        log "ERROR" "请检查网络连接、仓库 URL、分支名称以及目标目录权限。"
-        # 保留可能存在的空目录或部分克隆，让用户检查
-        # rm -rf "$target_dir" # 不再自动删除失败的克隆
-        return 1
-    fi
-}
-
-# 更新所有自定义包的主函数
-update_custom_package() {
-    local failed_packages=()
-    local success_count=0
-    local total_packages=${#CUSTOM_PACKAGES[@]}
-
-    if [ "$total_packages" -eq 0 ]; then
-        log "INFO" "没有配置自定义包，跳过更新。"
-        return 0
-    fi
-
-    log "INFO" "开始更新 $total_packages 个自定义包..."
-
-    for pkg_name in "${!CUSTOM_PACKAGES[@]}"; do
-        # 使用 subshell 执行，避免污染当前环境的变量，但这里影响不大
-        if update_single_package "$pkg_name" "${CUSTOM_PACKAGES[$pkg_name]}"; then
-             ((success_count++))
-        else
-            failed_packages+=("$pkg_name")
-        fi
-    done
-
-    # 显示更新结果
-    if [ ${#failed_packages[@]} -eq 0 ]; then
-        log "INFO" "所有自定义包更新成功 ($success_count/$total_packages)"
-        return 0
-    else
-        log "WARN" "部分自定义包更新失败 (成功: $success_count/$total_packages)"
-        log "ERROR" "更新失败的包: ${failed_packages[*]}"
-        return 1 # 返回失败状态码
-    fi
-}
-
-# 更新特定自定义包
-update_specific_package() {
-    local pkg_name=$1
-
-    if [ -z "$pkg_name" ]; then
-        log "ERROR" "未指定包名"
-        return 1
-    fi
-
-    if [ -z "${CUSTOM_PACKAGES[$pkg_name]}" ]; then
-        log "ERROR" "未找到包配置：'$pkg_name'"
-        log "INFO" "可用的包名: ${!CUSTOM_PACKAGES[*]}"
-        return 1
-    fi
-
-    update_single_package "$pkg_name" "${CUSTOM_PACKAGES[$pkg_name]}"
-}
-
-#---------------基础功能函数---------------#
-# 清理工作区 (make clean 的替代方案，更彻底)
-clean_workspace() {
-    log "INFO" "开始彻底清理工作区..."
-
-    # 清理 feeds (可选，如果 feeds 内容经常变动或出问题可以启用)
-    # log "INFO" "执行 ./scripts/feeds clean ..."
-    # ./scripts/feeds clean || log "WARN" "./scripts/feeds clean 执行时遇到问题。"
-
-    # 清理编译产物和临时文件
-    log "INFO" "执行 rm -rf ./tmp ./logs ./staging_dir ./build_dir ./bin ./dl ..."
-    # 注意：这里移除了 logs 目录，但我们的脚本日志在 openwrt_logs 下，不会被删
-    # 如果 OpenWrt 自身有 logs 目录且需要保留，则从下面移除 ./logs
-    rm -rf ./tmp ./logs ./staging_dir ./build_dir ./bin ./dl || {
-        log "ERROR" "删除部分工作区目录失败，请检查权限或文件占用。"
-        return 1
-    }
-
-    log "INFO" "工作区清理完成。"
-    return 0
-}
-
-# 清理编译临时文件 (make clean 的快速版)
-clean_build_temp() {
-    log "INFO" "开始清理编译临时文件..."
-
-    log "INFO" "执行 rm -rf ./tmp ./staging_dir ./build_dir ..."
-    rm -rf ./tmp ./staging_dir ./build_dir || {
-         log "ERROR" "删除部分编译临时目录失败。"
-         return 1
-    }
-
-    log "INFO" "编译临时文件清理完成。"
-    return 0
-}
-
-# 更新源码
-update_source() {
-    log "INFO" "开始更新 OpenWrt 源码 (git pull)..."
-    if git pull --rebase; then # 使用 rebase 避免不必要的 merge commit
-        log "INFO" "源码更新完成"
-        return 0
-    else
-        log "ERROR" "源码更新失败 (git pull --rebase)"
-        log "WARN" "请检查本地是否有未提交的修改，或尝试手动解决 Git 冲突。"
-        return 1
-    fi
-}
-
-# 更新并安装 feeds
-update_feeds() {
-    log "INFO" "开始更新 Feeds (update -a)..."
-    if ./scripts/feeds update -a; then
-        log "INFO" "Feeds 更新成功，开始安装 (install -a)..."
-        if ./scripts/feeds install -a; then
-            log "INFO" "Feeds 安装成功"
-            return 0
-        else
-            log "ERROR" "Feeds 安装失败 (install -a)"
-            return 1
-        fi
-    else
-        log "ERROR" "Feeds 更新失败 (update -a)"
-        return 1
-    fi
-}
-
-# 执行构建相关命令，并将 stdout 重定向到日志，stderr 同时输出到控制台和日志
-run_build_command() {
-    local cmd=$1              # 要执行的命令字符串
-    local log_file=$2         # 目标日志文件
-    local description=$3      # 操作描述
-
-    log_to_both "INFO" "开始执行: $description" "$log_file"
-    log "DEBUG" "命令详情: $cmd" # 只记录到主日志
-
-    # 执行命令
-    # stdout (>>) 追加到日志文件
-    # stderr (2>) 通过管道给 tee
-    #   tee -a "$log_file" 将 stderr 追加到日志文件
-    #   tee 默认将其标准输入复制到标准输出，这里即脚本的 stderr，因此会显示在控制台
-    local start_time end_time duration
-    start_time=$(date +%s)
-    if eval "$cmd" >> "$log_file" 2> >(tee -a "$log_file" >&2); then
-        end_time=$(date +%s)
-        duration=$((end_time - start_time))
-        log_to_both "INFO" "$description 完成 (耗时: ${duration}s)" "$log_file"
-        return 0 # 成功返回 0
-    else
-        end_time=$(date +%s)
-        duration=$((end_time - start_time))
-        local exit_code=$? # 获取命令的退出码
-        # 错误信息已经通过 stderr 的 tee 输出到控制台了
-        log_to_both "ERROR" "$description 失败 (退出码: $exit_code, 耗时: ${duration}s)" "$log_file"
-        log "ERROR" "详细错误请查看控制台输出以及日志文件: $log_file"
-        return $exit_code # 失败返回命令的退出码
-    fi
-}
-
-# 编译固件
-build_firmware() {
-    # 创建新的固件编译日志文件
-    local current_log
-    current_log=$(create_build_log "firmware") || return 1 # 创建失败则退出
-
-    log "INFO" "开始编译固件..."
-    log "INFO" "详细编译日志将保存在: $current_log"
-
-    # 1. 下载依赖包
-    local download_cmd="make download -j$(nproc) V=s"
-    run_build_command "$download_cmd" "$current_log" "下载依赖包" || {
-        log "ERROR" "依赖包下载失败，编译中止。"
-        # 即使下载失败，日志文件也已包含错误信息
-        return 1
-    }
-
-    # 2. 多线程编译
-    local cpu_cores
-    cpu_cores=$(nproc)
-    log "INFO" "检测到 $cpu_cores 个 CPU 核心，开始多线程编译..."
-    local build_cmd="make -j${cpu_cores} V=s"
-
-    if run_build_command "$build_cmd" "$current_log" "固件编译 (多线程)"; then
-        log "INFO" "${GREEN}固件编译成功完成！${NC}"
-        log "INFO" "固件输出目录: ./bin/targets/"
-        return 0 # 编译成功
-    else
-        # 多线程编译失败，询问用户是否重试
-        log "WARN" "多线程编译失败。"
-        local retry_choice
-        # -r: raw input, -p: prompt, -n 1: read only one char (optional but nice), -t 15: timeout (optional)
-        # Default to No
-        read -rp "$(echo -e ${YELLOW}"是否尝试使用单线程重新编译? (y/N): "${NC})" -n 1 -t 30 retry_choice
-        echo # Add a newline after read -n
-
-        if [[ "$retry_choice" =~ ^[Yy]$ ]]; then
-            log "INFO" "用户选择使用单线程重试编译..."
-
-            # 3. 单线程编译重试
-            local build_cmd_single="make -j1 V=s"
-            if run_build_command "$build_cmd_single" "$current_log" "固件编译 (单线程重试)"; then
-                log "INFO" "${GREEN}单线程编译成功完成！${NC}"
-                log "INFO" "固件输出目录: ./bin/targets/"
-                return 0 # 单线程编译成功
-            else
-                log "ERROR" "${RED}单线程编译也失败了。${NC}"
-                log "ERROR" "请仔细检查控制台错误输出以及日志文件: $current_log"
-                return 1 # 最终编译失败
-            fi
-        else
-            log "INFO" "用户选择不进行单线程重试编译。"
-            log "ERROR" "${RED}编译失败，未进行单线程重试。${NC}"
-            log "ERROR" "请仔细检查控制台错误输出以及日志文件: $current_log"
-            return 1 # 用户取消重试，编译失败
-        fi
-    fi
-}
-
-# 清理配置文件中指定的旧包/目录
-clean_packages() {
-    log "INFO" "开始清理配置文件中指定的旧包和目录..."
-    local removed_count=0
-    local failed_count=0
-    local total_to_remove=$((${#REMOVE_DIRS[@]} + ${#REMOVE_PACKAGES[@]}))
-
-    if [ "$total_to_remove" -eq 0 ]; then
-        log "INFO" "配置文件中未指定需要移除的包或目录。"
-        return 0
-    fi
-
-    # 清理目录
-    for dir in "${REMOVE_DIRS[@]}"; do
-        if [ -e "$dir" ]; then # 使用 -e 检查文件或目录是否存在
-            log "INFO" "正在删除目录: $dir"
-            if rm -rf "$dir"; then
-                log "INFO" "已删除: $dir"
-                ((removed_count++))
-            else
-                log "ERROR" "删除失败: $dir (请检查权限或是否被占用)"
-                ((failed_count++))
-            fi
-        else
-             log "WARN" "指定的目录不存在，跳过: $dir"
-        fi
-    done
-
-    # 清理包 (通常包也是目录)
-    for pkg in "${REMOVE_PACKAGES[@]}"; do
-         if [ -e "$pkg" ]; then
-            log "INFO" "正在删除包/目录: $pkg"
-            if rm -rf "$pkg"; then
-                log "INFO" "已删除: $pkg"
-                ((removed_count++))
-            else
-                log "ERROR" "删除失败: $pkg (请检查权限或是否被占用)"
-                ((failed_count++))
-            fi
-        else
-             log "WARN" "指定的包/目录不存在，跳过: $pkg"
-        fi
-    done
-
-    if [ $failed_count -eq 0 ]; then
-        log "INFO" "旧包/目录清理完成，共处理 $removed_count 个项目。"
-        return 0
-    else
-        log "WARN" "旧包/目录清理部分完成 (成功: $removed_count, 失败: $failed_count)"
-        return 1 # 返回失败状态码
-    fi
-}
-
-# 更新所有组件 (源码 -> 清理旧包 -> 自定义包 -> feeds)
-update_all_components() {
-    log "INFO" "开始更新所有组件..."
-    local success=true # 假设成功
-
-    # 1. 更新源码
-    log "INFO" "[1/4] 更新 OpenWrt 源码..."
-    update_source || success=false
-
-    # 2. 清理旧包 (即使上一步失败也尝试清理)
-    log "INFO" "[2/4] 清理配置文件指定的旧包/目录..."
-    clean_packages || log "WARN" "清理旧包/目录时遇到问题，继续执行..." # 清理失败通常不阻止后续
-
-    # 3. 更新自定义包 (只有在源码更新成功时才执行较好)
-    if [ "$success" = true ]; then
-        log "INFO" "[3/4] 更新自定义包..."
-        update_custom_package || success=false
-    else
-        log "WARN" "[3/4] 跳过更新自定义包，因为源码更新失败。"
-    fi
-
-    # 4. 更新 Feeds (只有在源码和自定义包都成功时执行较好)
-    if [ "$success" = true ]; then
-        log "INFO" "[4/4] 更新 Feeds..."
-        update_feeds || success=false
-    else
-        log "WARN" "[4/4] 跳过更新 Feeds，因为之前的步骤失败。"
-    fi
-
-    # 总结
-    if [ "$success" = true ]; then
-        log "INFO" "所有组件更新完成！"
-        return 0
-    else
-        log "ERROR" "部分或全部组件更新失败，请检查上面的日志。"
-        return 1
-    fi
-}
-
-# 菜单配置 (make menuconfig)
-menuconfig() {
-    log "INFO" "准备进入菜单配置 (make menuconfig)..."
-    log "INFO" "注意：日志重定向将暂时禁用以进行交互。"
-
-    # 禁用日志重定向，否则 menuconfig 界面可能显示不正常
-    disable_logging
-
-    # 执行 menuconfig
-    if make menuconfig; then
-        # 配置成功后重新启用日志
-        enable_logging
-        log "INFO" "菜单配置完成。新配置已保存到 .config"
-        # 询问是否保存 defconfig (可选)
-        # read -p "是否将当前配置保存为 defconfig? (y/N): " save_defconfig
-        # if [[ "$save_defconfig" =~ ^[Yy]$ ]]; then
-        #     ./scripts/diffconfig.sh > my_defconfig
-        #     log "INFO" "当前配置已保存到 my_defconfig"
-        # fi
-        return 0
-    else
-        # 配置失败或被取消，也要恢复日志
-        enable_logging
-        log "WARN" "菜单配置未完成或被取消。"
-        return 1 # 返回失败状态码
-    fi
-}
-
-#---------------组合功能函数---------------#
-# 完整构建流程
-full_build() {
-    log "INFO" "启动完整构建流程..."
-    local step=1
-    local total_steps=6 # 预估步骤数
-
-    # 1. 清理工作区
-    log "INFO" "[${step}/${total_steps}] 清理工作区..."
-    clean_workspace || { log "WARN" "工作区清理可能不完整，尝试继续..."; } # 清理失败通常不致命
-    ((step++))
-
-    # 2. 更新源码
-    log "INFO" "[${step}/${total_steps}] 更新源码..."
-    update_source || { log "ERROR" "源码更新失败，终止构建流程。"; return 1; }
-    ((step++))
-
-    # 3. 清理旧包
-    log "INFO" "[${step}/${total_steps}] 清理配置文件指定的旧包..."
-    clean_packages || log "WARN" "清理旧包时遇到问题，继续执行..."
-    ((step++))
-
-    # 4. 更新自定义包
-    log "INFO" "[${step}/${total_steps}] 更新自定义包..."
-    update_custom_package || { log "ERROR" "自定义包更新失败，终止构建流程。"; return 1; }
-    ((step++))
-
-    # 5. 更新 Feeds
-    log "INFO" "[${step}/${total_steps}] 更新 Feeds..."
-    update_feeds || { log "ERROR" "Feeds 更新失败，终止构建流程。"; return 1; }
-    ((step++))
-
-    # 6. 菜单配置
-    log "INFO" "[${step}/${total_steps}] 进入菜单配置 (make menuconfig)..."
-    menuconfig || { log "WARN" "菜单配置未完成或取消，但继续尝试编译..."; } # 允许使用现有配置编译
-    ((step++)) # 无论成功与否，都算一步
-
-    # 7. 编译固件 (独立步骤，不计入前面的 total_steps)
-    log "INFO" "所有准备工作完成，开始编译固件..."
-    if build_firmware; then
-        log "INFO" "${GREEN}完整构建流程成功完成！${NC}"
-        return 0
-    else
-        log "ERROR" "${RED}完整构建流程失败于编译阶段。${NC}"
-        return 1
-    fi
-}
-
-#---------------菜单函数---------------#
-# 打印主菜单
-print_menu() {
-    echo -e "\n${BLUE}======= OpenWrt 构建管理菜单 =======${NC}"
-    echo -e " ${YELLOW}会话日志目录: ${SESSION_DIR}${NC}"
-    echo -e "${GREEN} 1.${NC} ${BOLD}完整构建流程${NC} (清理 > 更新源码/包/feeds > 配置 > 编译)"
-    echo -e "${GREEN} 2.${NC} 清理工作区 (删除 tmp, bin, build_dir 等)"
-    echo -e "${GREEN} 3.${NC} 更新所有组件 (源码 + 旧包清理 + 自定义包 + feeds)"
-    echo -e "${GREEN} 4.${NC} 清理配置文件指定的旧包/目录"
-    echo -e "${GREEN} 5.${NC} ${BOLD}编译固件${NC} (make V=s)"
-    echo -e "${GREEN} 6.${NC} 调整配置 (make menuconfig)"
-    echo -e "${GREEN} 7.${NC} 更新所有自定义包"
-    echo -e "${GREEN} 8.${NC} 更新特定的自定义包"
-    echo -e "${GREEN} 9.${NC} 更新 OpenWrt 源码 (git pull)"
-    echo -e "${GREEN}10.${NC} 更新并安装 Feeds"
-    echo -e "-------------------------------------"
-    echo -e "${GREEN} 0.${NC} 退出脚本"
-    echo -e "${BLUE}====================================${NC}"
-    # 使用 read -p 提供提示
-    read -rp "请输入选项 [0-10]: " choice
-}
-
-# 打印并选择特定自定义包进行更新
-select_specific_package() {
-    local pkg_names=("${!CUSTOM_PACKAGES[@]}") # 获取所有包名
-    local num_packages=${#pkg_names[@]}
-
-    if [ "$num_packages" -eq 0 ]; then
-        log "WARN" "没有配置任何自定义包。"
-        return 1
-    fi
-
-    echo -e "\n${BLUE}--- 选择要更新的自定义包 ---${NC}"
-    local i=1
-    # 使用 sort 命令让包名按字母排序显示
-    local sorted_pkg_names=($(printf "%s\n" "${pkg_names[@]}" | sort))
-
-    for pkg_name in "${sorted_pkg_names[@]}"; do
-        echo -e " ${GREEN}$i.${NC} $pkg_name"
-        ((i++))
-    done
-    echo -e " ${GREEN}0.${NC} 返回主菜单"
-    echo -e "${BLUE}----------------------------${NC}"
-
-    local choice_pkg
-    read -rp "请输入包的序号 [0-$num_packages]: " choice_pkg
-
-    # 验证选择
-    if [[ ! "$choice_pkg" =~ ^[0-9]+$ ]]; then
-        log "ERROR" "无效输入，请输入数字。"
-        return 1
-    fi
-
-    if [ "$choice_pkg" -eq 0 ]; then
-        log "INFO" "返回主菜单。"
-        return 0 # 返回成功，表示正常退出选择
-    elif [ "$choice_pkg" -ge 1 ] && [ "$choice_pkg" -le "$num_packages" ]; then
-        local selected_pkg=${sorted_pkg_names[$((choice_pkg-1))]}
-        log "INFO" "选择更新包: $selected_pkg"
-        update_specific_package "$selected_pkg" # 调用更新函数
-        return $? # 返回更新函数的执行结果
-    else
-        log "ERROR" "无效的选择序号: $choice_pkg"
-        return 1
-    fi
-}
-
-#---------------主函数---------------#
-main() {
-    # 0. 设置颜色变量
-    setup_colors
-
-    # 1. 初始化日志系统 (会进行第一次输出重定向)
-    init_logger || exit 1 # 初始化失败则退出
-
-    # 2. 检查运行环境和依赖
-    log "INFO" "检查运行环境..."
-    local dep_missing=false
-    if [ ! -f "Makefile" ] || [ ! -d "scripts" ] || [ ! -d ".git" ]; then
-        log "ERROR" "脚本必须在 OpenWrt 源码的根目录下运行 (需要存在 Makefile, scripts, .git)。"
-        dep_missing=true
-    fi
-    for cmd in git make nproc tee cut dirname mkdir rm git date printf sort read; do
-        if ! command -v "$cmd" &> /dev/null; then
-            log "ERROR" "缺少必要的系统命令: $cmd"
-            dep_missing=true
-        fi
-    done
-     if [ "$dep_missing" = true ]; then
-        log "ERROR" "环境或依赖检查失败，请修正后重试。"
-        # 恢复原始输出，避免后续可能的错误信息无法显示
-        exec >&$STDOUT_ORIG
-        exec 2>&$STDERR_ORIG
-        exit 1
-    fi
-    log "INFO" "环境检查通过。"
-
-    # 记录脚本启动信息
-    log "INFO" "${BOLD}OpenWrt 构建管理脚本已启动${NC}"
-    log "INFO" "PID: $$"
-    log "INFO" "会话日志目录: $SESSION_DIR"
-
-    # 3. 主菜单循环
-    local choice # 提前声明 choice
-    while true; do
-        print_menu # 显示菜单并获取输入到 choice 变量
-        log "DEBUG" "用户选择了: $choice" # 记录用户选择
-
-        # 根据选择执行操作
-        case $choice in
-            1) full_build ;;
-            2) clean_workspace ;;
-            3) update_all_components ;;
-            4) clean_packages ;;
-            5) build_firmware ;;
-            6) menuconfig ;;
-            7) update_custom_package ;;
-            8) select_specific_package ;;
-            9) update_source ;;
-            10) update_feeds ;;
-            0)
-                log "INFO" "收到退出命令，正在退出脚本..."
-                # 恢复原始输出流 (好习惯)
-                exec >&$STDOUT_ORIG
-                exec 2>&$STDERR_ORIG
-                echo -e "${GREEN}脚本已退出。${NC}"
-                exit 0
-                ;;
-            *)
-                log "WARN" "无效的选项: '$choice'，请输入 0 到 10 之间的数字。"
-                ;;
-        esac
-
-        local last_exit_code=$? # 获取上一个命令的退出状态码
-        # 操作完成后暂停，给用户查看结果的时间
-        if [[ $choice != 0 ]]; then
-            if [ $last_exit_code -eq 0 ]; then
-                echo -e "\n${GREEN}操作 '$choice' 执行完成。${NC}"
-            else
-                 echo -e "\n${RED}操作 '$choice' 执行时遇到错误 (退出码: $last_exit_code)。${NC}"
-            fi
-             echo -e "${YELLOW}按 Enter 键返回主菜单...${NC}"
-             read -r # 等待用户按回车
-        fi
-    done
-}
-
-#---------------脚本入口---------------#
-# 将所有主逻辑放入 main 函数，并在最后调用它
-# "$@" 将所有命令行参数传递给 main 函数 (虽然本脚本目前未使用)
-main "$@"

config/Config-build.in

@@ -26,14 +26,6 @@ menu "Global build settings"
 		  directory containing machine readable list of built profiles
 		  and resulting images.
 
-	config JSON_CYCLONEDX_SBOM
-		bool "Create CycloneDX SBOM JSON"
-		default BUILDBOT
-		help
-		  Create a JSON files *.bom.cdx.json in the build
-		  directory containing Software Bill Of Materials in CycloneDX
-		  format.
-
 	config ALL_NONSHARED
 		bool "Select all target specific packages by default"
 		select ALL_KMODS
@@ -68,11 +60,6 @@ menu "Global build settings"
 		bool "Enable TLS certificate verification during package download"
 		default y
 
-	config USE_APK
-		imply PACKAGE_apk-mbedtls
-		bool "Use APK instead of OPKG to build distribution (BROKEN)"
-		depends on BROKEN
-
 	comment "General build options"
 
 	config TESTING_KERNEL
@@ -115,7 +102,6 @@ menu "Global build settings"
 	config IPK_FILES_CHECKSUMS
 		bool
 		prompt "Record files checksums in package metadata"
-		depends on !USE_APK
 		help
 		  This makes file checksums part of package metadata. It increases size
 		  but provides you with pkg_check command to check for flash corruptions.
@@ -173,19 +159,6 @@ menu "Global build settings"
 		  Adds LTO flags to the CFLAGS and LDFLAGS.
 		  Packages can choose to opt-out via setting PKG_BUILD_FLAGS:=no-lto
 
-	config MOLD
-		depends on (aarch64 || arm || i386 || i686 || m68k || powerpc || powerpc64 || sh4 || x86_64)
-		depends on !GCC_USE_VERSION_11
-		def_bool $(shell, ./config/check-hostcxx.sh 10 2 12)
-
-	config USE_MOLD
-		bool
-		prompt "Use the mold linker for all packages"
-		depends on MOLD
-		help
-		  Link packages with mold, a modern linker
-		  Packages can opt-out via setting PKG_BUILD_FLAGS:=no-mold
-
 	config IPV6
 		def_bool y
 
@@ -209,6 +182,7 @@ menu "Global build settings"
 			help
 			  This will install binaries stripped using strip from binutils.
 
+
 		config USE_SSTRIP
 			bool "sstrip"
 			depends on !USE_GLIBC
@@ -225,16 +199,16 @@ menu "Global build settings"
 		help
 		  Specifies arguments passed to the strip command when stripping binaries.
 
-	config SSTRIP_DISCARD_TRAILING_ZEROES
-		bool "Strip trailing zero bytes"
-		depends on USE_SSTRIP && !USE_MOLD
-		default y
+	config SSTRIP_ARGS
+		string
+		prompt "Sstrip arguments"
+		depends on USE_SSTRIP
+		default "-z"
 		help
-		  Use sstrip's -z option to discard trailing zero bytes
+		  Specifies arguments passed to the sstrip command when stripping binaries.
 
 	config STRIP_KERNEL_EXPORTS
 		bool "Strip unnecessary exports from the kernel image"
-		depends on BROKEN
 		help
 		  Reduces kernel size by stripping unused kernel exports from the kernel
 		  image.  Note that this might make the kernel incompatible with any kernel
@@ -296,22 +270,10 @@ menu "Global build settings"
 		  Enable GCC Stack Smashing Protection (SSP) for userspace applications
 		config PKG_CC_STACKPROTECTOR_NONE
 			bool "None"
-			help
-				No stack smashing protection.
 		config PKG_CC_STACKPROTECTOR_REGULAR
 			bool "Regular"
-			help
-				Protects functions with vulnerable objects.
-				This includes functions with buffers larger than 8 bytes or calls to alloca.
 		config PKG_CC_STACKPROTECTOR_STRONG
 			bool "Strong"
-			help
-				Like Regular, but also protects functions with
-				local arrays or references to local frame addresses.
-		config PKG_CC_STACKPROTECTOR_ALL
-			bool "All"
-			help
-				Protects all functions.
 	endchoice
 
 	choice
@@ -321,18 +283,10 @@ menu "Global build settings"
 		  Enable GCC Stack-Smashing Protection (SSP) for the kernel
 		config KERNEL_CC_STACKPROTECTOR_NONE
 			bool "None"
-			help
-				No stack smashing protection.
 		config KERNEL_CC_STACKPROTECTOR_REGULAR
 			bool "Regular"
-			help
-				Protects functions with vulnerable objects.
-				This includes functions with buffers larger than 8 bytes or calls to alloca.
 		config KERNEL_CC_STACKPROTECTOR_STRONG
 			bool "Strong"
-			help
-				Like Regular, but also protects functions with
-				local arrays or references to local frame addresses.
 	endchoice
 
 	config KERNEL_STACKPROTECTOR
@@ -423,11 +377,11 @@ menu "Global build settings"
 
 	endchoice
 
-	config USE_SECCOMP
+	config SECCOMP
 		bool "Enable SECCOMP"
 		select KERNEL_SECCOMP
 		select PACKAGE_procd-seccomp
-		depends on (aarch64 || arm || armeb || mips || mipsel || mips64 || mips64el || i386 || loongarch64 || powerpc || x86_64)
+		depends on (aarch64 || arm || armeb || mips || mipsel || mips64 || mips64el || i386 || powerpc || x86_64)
 		depends on !TARGET_uml
 		default y
 		help

config/Config-images.in

@@ -17,7 +17,7 @@ menu "Target Images"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
-			default TARGET_INITRAMFS_COMPRESSION_ZSTD if TARGET_qualcommax
+			default TARGET_INITRAMFS_COMPRESSION_ZSTD if TARGET_ipq807x
 			default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPARATE_INITRAMFS
 			default TARGET_INITRAMFS_COMPRESSION_NONE
 			depends on TARGET_ROOTFS_INITRAMFS
@@ -127,7 +127,6 @@ menu "Target Images"
 		config TARGET_EXT4_JOURNAL
 			bool "Create a journaling filesystem"
 			depends on TARGET_ROOTFS_EXT4FS
-			default y
 			help
 			  Create an ext4 filesystem with a journal.
 
@@ -204,14 +203,13 @@ menu "Target Images"
 		default y
 
 	config GRUB_EFI_IMAGES
-		bool "Build GRUB EFI images"
-		depends on TARGET_x86 || TARGET_armsr || TARGET_loongarch64
+		bool "Build GRUB EFI images (Linux x86 or x86_64 host only)"
+		depends on TARGET_x86 || TARGET_armsr
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2 if TARGET_x86
 		select PACKAGE_grub2-efi if TARGET_x86
 		select PACKAGE_grub2-bios-setup if TARGET_x86
 		select PACKAGE_grub2-efi-arm if TARGET_armsr
-		select PACKAGE_grub2-efi-loongarch64 if TARGET_loongarch64
 		select PACKAGE_kmod-fs-vfat
 		default y
 
@@ -220,6 +218,11 @@ menu "Target Images"
 		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
 		default y
 
+	config GRUB_SERIAL
+		string "Serial port device"
+		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
+		default "ttyS0"
+
 	config GRUB_BAUDRATE
 		int "Serial port baud rate"
 		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
@@ -228,8 +231,7 @@ menu "Target Images"
 
 	config GRUB_FLOWCONTROL
 		bool "Use RTE/CTS on serial console"
-		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
-		depends on TARGET_SERIAL != ""
+		depends on GRUB_SERIAL != ""
 
 	config GRUB_BOOTOPTS
 		string "Extra kernel boot options"
@@ -240,7 +242,7 @@ menu "Target Images"
 	config GRUB_TIMEOUT
 		string "Seconds to wait before booting the default entry"
 		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
-		default "0"
+		default "3"
 		help
 		  If you don't know, 5 seconds is a reasonable default.
 
@@ -286,14 +288,9 @@ menu "Target Images"
 		select PACKAGE_kmod-e1000
 		default y if BUILDBOT
 
-	config TARGET_SERIAL
-		string "Serial port device"
-		depends on TARGET_x86 || TARGET_armsr || TARGET_loongarch64
-		default "ttyS0"
-
 	config TARGET_IMAGES_GZIP
 		bool "GZip images"
-		depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta || TARGET_loongarch64
+		depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta
 		default y
 
 	comment "Image Options"

config/Config-kernel.in

@@ -47,23 +47,8 @@ config KERNEL_MIPS_FP_SUPPORT
 
 config KERNEL_ARM_PMU
 	bool
-	default y if TARGET_armsr_armv8
 	depends on (arm || aarch64)
 
-config KERNEL_ARM_PMUV3
-	bool
-	default y if TARGET_armsr_armv8
-	depends on (arm_v7 || aarch64) && LINUX_6_6
-
-config KERNEL_RISCV_PMU
-	bool
-	select KERNEL_RISCV_PMU_SBI
-	depends on riscv64
-
-config KERNEL_RISCV_PMU_SBI
-	bool
-	depends on riscv64
-
 config KERNEL_X86_VSYSCALL_EMULATION
 	bool "Enable vsyscall emulation"
 	depends on x86_64
@@ -84,8 +69,6 @@ config KERNEL_X86_VSYSCALL_EMULATION
 config KERNEL_PERF_EVENTS
 	bool "Compile the kernel with performance events and counters"
 	select KERNEL_ARM_PMU if (arm || aarch64)
-	select KERNEL_ARM_PMUV3 if (arm_v7 || aarch64) && LINUX_6_6
-	select KERNEL_RISCV_PMU if riscv64
 
 config KERNEL_PROFILING
 	bool "Compile the kernel with profiling enabled"
@@ -160,7 +143,7 @@ config KERNEL_UBSAN_TRAP
 config KERNEL_KASAN
 	bool "Compile the kernel with KASan: runtime memory debugger"
 	select KERNEL_SLUB_DEBUG
-	depends on (x86_64 || aarch64 || arm || powerpc || riscv64)
+	depends on (x86_64 || aarch64)
 	help
 	  Enables kernel address sanitizer - runtime memory debugger,
 	  designed to find out-of-bounds accesses and use-after-free bugs.
@@ -173,6 +156,16 @@ config KERNEL_KASAN
 	  Currently CONFIG_KASAN doesn't work with CONFIG_DEBUG_SLAB
 	  (the resulting kernel does not boot).
 
+config KERNEL_KASAN_EXTRA
+	bool "KAsan: extra checks"
+	depends on KERNEL_KASAN && KERNEL_DEBUG_KERNEL
+	help
+	  This enables further checks in the kernel address sanitizer, for now
+	  it only includes the address-use-after-scope check that can lead
+	  to excessive kernel stack usage, frame size warnings and longer
+	  compile time.
+	  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 has more
+
 config KERNEL_KASAN_VMALLOC
 	bool "Back mappings in vmalloc space with real shadow memory"
 	depends on KERNEL_KASAN
@@ -191,73 +184,16 @@ config KERNEL_KASAN_VMALLOC
 	  will have no effect.
 
 if KERNEL_KASAN
-choice
-	prompt "KASAN mode"
-	depends on KERNEL_KASAN
-	default KERNEL_KASAN_GENERIC
-	help
-	  KASAN has three modes:
-
-	  1. Generic KASAN (supported by many architectures, enabled with
-	     CONFIG_KASAN_GENERIC, similar to userspace ASan),
-	  2. Software Tag-Based KASAN (arm64 only, based on software memory
-	     tagging, enabled with CONFIG_KASAN_SW_TAGS, similar to userspace
-	     HWASan), and
-	  3. Hardware Tag-Based KASAN (arm64 only, based on hardware memory
-	     tagging, enabled with CONFIG_KASAN_HW_TAGS).
-
-config KERNEL_KASAN_GENERIC
-	bool "Generic KASAN"
-	select KERNEL_SLUB_DEBUG
-	help
-	  Enables Generic KASAN.
-
-	  Consumes about 1/8th of available memory at kernel start and adds an
-	  overhead of ~50% for dynamic allocations.
-	  The performance slowdown is ~x3.
-
-config KERNEL_KASAN_SW_TAGS
-	bool "Software Tag-Based KASAN"
-	depends on aarch64
-	select KERNEL_SLUB_DEBUG
-	help
-	  Enables Software Tag-Based KASAN.
-
-	  Supported only on arm64 CPUs and relies on Top Byte Ignore.
-
-	  Consumes about 1/16th of available memory at kernel start and
-	  add an overhead of ~20% for dynamic allocations.
-
-	  May potentially introduce problems related to pointer casting and
-	  comparison, as it embeds a tag into the top byte of each pointer.
-
-config KERNEL_KASAN_HW_TAGS
-	bool "Hardware Tag-Based KASAN"
-	depends on aarch64
-	select KERNEL_SLUB_DEBUG
-	select KERNEL_ARM64_MTE
-	help
-	  Enables Hardware Tag-Based KASAN.
-
-	  Supported only on arm64 CPUs starting from ARMv8.5 and relies on
-	  Memory Tagging Extension and Top Byte Ignore.
-
-	  Consumes about 1/32nd of available memory.
-
-	  May potentially introduce problems related to pointer casting and
-	  comparison, as it embeds a tag into the top byte of each pointer.
-
-endchoice
-
-	config KERNEL_ARM64_MTE
-		def_bool n
+	config KERNEL_KASAN_GENERIC
+	def_bool y
 
+	config KERNEL_KASAN_SW_TAGS
+	def_bool n
 endif
 
 choice
 	prompt "Instrumentation type"
 	depends on KERNEL_KASAN
-	depends on !KERNEL_KASAN_HW_TAGS
 	default KERNEL_KASAN_OUTLINE
 
 config KERNEL_KASAN_OUTLINE
@@ -333,25 +269,6 @@ if KERNEL_TASKSTATS
 
 endif
 
-config KERNEL_PSI
-	bool "Compile the kernel with pressure stall information tracking"
-	help
-	  Collect metrics that indicate how overcommitted the CPU, memory,
-	  and IO capacity are in the system.
-
-	  If you say Y here, the kernel will create /proc/pressure/ with the
-	  pressure statistics files cpu, memory, and io. These will indicate
-	  the share of walltime in which some or all tasks in the system are
-	  delayed due to contention of the respective resource.
-
-	  In kernels with cgroup support, cgroups (cgroup2 only) will
-	  have cpu.pressure, memory.pressure, and io.pressure files,
-	  which aggregate pressure stalls for the grouped tasks only.
-
-	  For more details see Documentation/accounting/psi.rst.
-
-	  Say N if unsure.
-
 config KERNEL_KALLSYMS
 	bool "Compile the kernel with symbol table information"
 	default y if !SMALL_FLASH
@@ -444,8 +361,9 @@ config KERNEL_DEBUG_INFO
 	  This will compile your kernel and modules with debug information.
 
 config KERNEL_DEBUG_INFO_BTF
+
 	bool "Enable additional BTF type information"
-	default y if (TARGET_armsr || TARGET_bcm27xx_bcm2709 || TARGET_bcm27xx_bcm2710 || TARGET_bcm27xx_bcm2711 || TARGET_bcm27xx_bcm2712 || TARGET_ipq806x_chromium || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi_cortexa53 || TARGET_x86_64) && BUILDBOT
+	default y if TARGET_armsr || TARGET_bcm27xx || TARGET_ipq807x || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64
 	depends on !HOST_OS_MACOS
 	depends on KERNEL_DEBUG_INFO && !KERNEL_DEBUG_INFO_REDUCED
 	select DWARVES
@@ -456,13 +374,9 @@ config KERNEL_DEBUG_INFO_BTF
 
 	  Required to run BPF CO-RE applications.
 
-config KERNEL_DEBUG_INFO_BTF_MODULES
-	def_bool y
-	depends on KERNEL_DEBUG_INFO_BTF
-
 config KERNEL_MODULE_ALLOW_BTF_MISMATCH
 	bool "Allow loading modules with non-matching BTF type info"
-	depends on KERNEL_DEBUG_INFO_BTF_MODULES
+	depends on KERNEL_DEBUG_INFO_BTF
 	default y
 	help
 	  For modules whose split BTF does not match vmlinux, load without
@@ -473,7 +387,7 @@ config KERNEL_MODULE_ALLOW_BTF_MISMATCH
 
 config KERNEL_DEBUG_INFO_REDUCED
 	bool "Reduce debugging information"
-	default y if !(TARGET_armsr || TARGET_bcm27xx_bcm2709 || TARGET_bcm27xx_bcm2710 || TARGET_bcm27xx_bcm2711 || TARGET_bcm27xx_bcm2712 || TARGET_ipq806x_chromium || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi_cortexa53 || TARGET_x86_64) || !BUILDBOT
+	default y if !(TARGET_armsr || TARGET_bcm27xx || TARGET_ipq807x || TARGET_mediatek_filogic || TARGET_mvebu_cortexa53 || TARGET_mvebu_cortexa72 || TARGET_rockchip || TARGET_sunxi || TARGET_x86_64)
 	depends on KERNEL_DEBUG_INFO
 	help
 	  If you say Y here gcc is instructed to generate less debugging
@@ -568,10 +482,6 @@ config KERNEL_BPF_EVENTS
 	  for sending data from BPF programs to user-space for post-processing
 	  or logging.
 
-config KERNEL_PROBE_EVENTS_BTF_ARGS
-	bool "Support BTF function arguments for probe events"
-	depends on KERNEL_DEBUG_INFO_BTF && KERNEL_KPROBE_EVENTS && LINUX_6_6
-
 config KERNEL_BPF_KPROBE_OVERRIDE
 	bool
 	depends on KERNEL_KPROBES
@@ -582,15 +492,6 @@ config KERNEL_BPF_STREAM_PARSER
 	depends on KERNEL_CGROUP_BPF
 	default y if KERNEL_DEBUG_INFO_BTF
 
-config KERNEL_NETKIT
-	bool "Compile the kernel with BPF-programmable network device support"
-	default y if KERNEL_DEBUG_INFO_BTF
-	help
-	  The netkit device is a virtual networking device where BPF programs
-	  can be attached to the device(s) transmission routine in order to
-	  implement the driver's internal logic. The device can be configured
-	  to operate in L3 or L2 mode.
-
 config KERNEL_AIO
 	bool "Compile the kernel with asynchronous IO support"
 	default y if !SMALL_FLASH
@@ -731,23 +632,10 @@ config KERNEL_PRINTK_TIME
 	default y
 
 config KERNEL_SLUB_DEBUG
-	bool "Enable SLUB debugging support"
-	help
-	  This enables various debugging features:
-	    - Accepts "slub_debug" kernel parameter
-	    - Provides caches debugging options (e.g. tracing, validating)
-	    - Adds /sys/kernel/slab/ attrs for reading amounts of *objects*
-	    - Enables /proc/slabinfo support
-	    - Prints info when running out of memory
-
-	  Enabling this can result in a significant increase of code size.
+	bool
 
 config KERNEL_SLUB_DEBUG_ON
-	depends on KERNEL_SLUB_DEBUG
-	bool "Boot kernel with basic caches debugging enabled"
-	help
-	  This enables by default sanity_checks, red_zone, poison and store_user
-	  debugging options for all caches.
+	bool
 
 config KERNEL_SLABINFO
 	select KERNEL_SLUB_DEBUG
@@ -1223,18 +1111,24 @@ endif
 
 config KERNEL_NET_L3_MASTER_DEV
 	bool "L3 Master device support"
-	default y if !SMALL_FLASH
 	help
 	  This module provides glue between core networking code and device
 	  drivers to support L3 master devices like VRF.
-  	  Increases the compressed kernel size by ~4kB (as of Linux 6.6).
 
-config KERNEL_XDP_SOCKETS
-	bool "XDP sockets support"
-	default y if KERNEL_DEBUG_INFO_BTF
-	help
-	  XDP sockets allows a channel between XDP programs and
-	  userspace applications.
+config KERNEL_WIRELESS_EXT
+	def_bool n
+
+config KERNEL_WEXT_CORE
+	def_bool KERNEL_WIRELESS_EXT
+
+config KERNEL_WEXT_PRIV
+	def_bool KERNEL_WIRELESS_EXT
+
+config KERNEL_WEXT_PROC
+	def_bool KERNEL_WIRELESS_EXT
+
+config KERNEL_WEXT_SPY
+	def_bool KERNEL_WIRELESS_EXT
 
 config KERNEL_PAGE_POOL
 	def_bool n
@@ -1243,27 +1137,6 @@ config KERNEL_PAGE_POOL_STATS
 	bool "Page pool stats support"
 	depends on KERNEL_PAGE_POOL
 
-config KERNEL_MPTCP
-	bool "Multi-Path TCP support"
-	default y if !SMALL_FLASH
-	help
-	   Select this option to enable support for Multi-Path TCP.
-	   Increases the compressed kernel size by ~214kB (as of Linux 6.6).
-
-if KERNEL_IPV6
-config KERNEL_MPTCP_IPV6
-	bool "IPv6 support for Multipath TCP"
-	depends on KERNEL_MPTCP
-	default KERNEL_MPTCP
-endif
-
-config KERNEL_NF_CONNTRACK_TIMEOUT
-	bool "Per-connection connection tracking timeout"
-	default y if !SMALL_FLASH
-	help
-	   Select this option to enable support for per-connection conntrack timeouts.
-	   Increases the (uncompressed) size of nf_conntrack.ko by ~8kB.
-
 #
 # NFS related symbols
 #
@@ -1298,20 +1171,13 @@ if KERNEL_IP_PNP
 
 endif
 
-config KERNEL_BTRFS_FS
-	bool "Compile the kernel with built-in BTRFS support"
-	help
-	  Say Y here if you want to make the kernel to be able to boot off a
-	  BTRFS partition.
-
 menu "Filesystem ACL and attr support options"
 	config USE_FS_ACL_ATTR
 		bool "Use filesystem ACL and attr support by default"
-		default y if !SMALL_FLASH
 		help
 		  Make using ACLs (e.g. POSIX ACL, NFSv4 ACL) the default
-		  for kernel and packages, except old NFS.
-		  Also enable userspace extended attribute support
+		  for kernel and packages, except tmpfs, flash filesystems,
+		  and old NFS.  Also enable userspace extended attribute support
 		  by default.  (OpenWrt already has an expection it will be
 		  present in the kernel).
 
@@ -1332,17 +1198,14 @@ menu "Filesystem ACL and attr support options"
 	config KERNEL_F2FS_FS_POSIX_ACL
 		bool "Enable POSIX ACL for F2FS Filesystems"
 		select KERNEL_FS_POSIX_ACL
-		default y if USE_FS_ACL_ATTR
 
 	config KERNEL_JFFS2_FS_POSIX_ACL
 		bool "Enable POSIX ACL for JFFS2 Filesystems"
 		select KERNEL_FS_POSIX_ACL
-		default y if USE_FS_ACL_ATTR
 
 	config KERNEL_TMPFS_POSIX_ACL
 		bool "Enable POSIX ACL for TMPFS Filesystems"
 		select KERNEL_FS_POSIX_ACL
-		default y if USE_FS_ACL_ATTR
 
 	config KERNEL_CIFS_ACL
 		bool "Enable CIFS ACLs"
@@ -1479,30 +1342,12 @@ config KERNEL_LSM
 
 config KERNEL_EXT4_FS_SECURITY
 	bool "Ext4 Security Labels"
-	default y if !SMALL_FLASH
 
 config KERNEL_F2FS_FS_SECURITY
 	bool "F2FS Security Labels"
-	default y if !SMALL_FLASH
 
 config KERNEL_UBIFS_FS_SECURITY
 	bool "UBIFS Security Labels"
-	default y if !SMALL_FLASH
 
 config KERNEL_JFFS2_FS_SECURITY
 	bool "JFFS2 Security Labels"
-	default y if !SMALL_FLASH
-
-config KERNEL_WERROR
-	bool "Compile the kernel with warnings as errors"
-	help
-	  A kernel build should not cause any compiler warnings, and this
-	  enables the '-Werror' (for C) and '-Dwarnings' (for Rust) flags
-	  to enforce that rule by default. Certain warnings from other tools
-	  such as the linker may be upgraded to errors with this option as
-	  well.
-
-	  However, if you have a new (or very old) compiler or linker with odd
-	  and unusual warnings, or you have some architecture with problems,
-	  you may need to disable this config option in order to
-	  successfully build the kernel.

config/check-hostcxx.sh

@@ -1,12 +0,0 @@
-cat << EOF | "$STAGING_DIR_HOST/bin/g++" -c -x c++ -o /dev/null - >/dev/null 2>&1
-#if __clang__
-  #if __clang_major__ < $3
-    #error "clang too old"
-  #endif
-#else
-  #if __GNUC__ < $1 || (__GNUC__ == $1 && (__GNUC_MINOR__ < $2))
-    #error "gcc too old"
-  #endif
-#endif
-EOF
-[ $? -eq 0 ] && echo y || echo n

feeds.conf.default

@@ -1,4 +1,4 @@
-src-git packages https://github.com/immortalwrt/packages.git;openwrt-24.10
-src-git luci https://github.com/immortalwrt/luci.git;openwrt-24.10
-src-git routing https://github.com/openwrt/routing.git;openwrt-24.10
-src-git telephony https://github.com/openwrt/telephony.git;openwrt-24.10
+src-git packages https://github.com/immortalwrt/packages.git^ff24324c828b9f3ae6f55f2f29970a7b00ecfcc9
+src-git luci https://github.com/immortalwrt/luci.git^618ec58c290cddd920c6c02422ec075d9063e4ca
+src-git routing https://github.com/openwrt/routing.git^b71e865ccaa764f46e358fc659812290e8612ee3
+src-git telephony https://github.com/openwrt/telephony.git^f7fbaea4c7bfe9203b037ad616553c9e5ed12405

include/autotools.mk

@@ -44,7 +44,7 @@ define autoreconf
 				touch NEWS AUTHORS COPYING ABOUT-NLS ChangeLog; \
 				$(AM_TOOL_PATHS) \
 					LIBTOOLIZE='$(STAGING_DIR_HOST)/bin/libtoolize --install' \
-					$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i \
+					$(STAGING_DIR_HOST)/bin/autoreconf -v -f -i -s \
 					$(if $(word 2,$(3)),--no-recursive) \
 					-B $(STAGING_DIR_HOST)/share/aclocal \
 					$(patsubst %,-I %,$(5)) \

include/bpf.mk

@@ -1,40 +1,30 @@
-BPF_DEPENDS := @HAS_BPF_TOOLCHAIN +@NEED_BPF_TOOLCHAIN
+BPF_DEPENDS := @HAS_BPF_TOOLCHAIN
+LLVM_VER:=
 
 CLANG_MIN_VER:=12
 
 ifneq ($(CONFIG_USE_LLVM_HOST),)
-  find-llvm-tool=$(firstword $(shell PATH='$(BPF_PATH)' command -v $(1) || echo '$(firstword $(1))-not-found'))
-
   BPF_TOOLCHAIN_HOST_PATH:=$(call qstrip,$(CONFIG_BPF_TOOLCHAIN_HOST_PATH))
   ifneq ($(BPF_TOOLCHAIN_HOST_PATH),)
     BPF_PATH:=$(BPF_TOOLCHAIN_HOST_PATH)/bin:$(PATH)
   else
     BPF_PATH:=$(PATH)
   endif
-  CLANG:=$(call find-llvm-tool,clang clang-13 clang-12)
+  CLANG:=$(firstword $(shell PATH='$(BPF_PATH)' command -v clang clang-13 clang-12 clang-11))
   LLVM_VER:=$(subst clang,,$(notdir $(CLANG)))
-
-  BPF_PATH:=$(dir $(CLANG)):$(BPF_PATH)
-  LLVM_LLC:=$(call find-llvm-tool,llc$(LLVM_VER))
-  LLVM_DIS:=$(call find-llvm-tool,llvm-dis$(LLVM_VER))
-  LLVM_OPT:=$(call find-llvm-tool,opt$(LLVM_VER))
-  LLVM_STRIP:=$(call find-llvm-tool,llvm-strip$(LLVM_VER))
-else
-  LLVM_PATH:=/invalid
-
-  ifneq ($(CONFIG_USE_LLVM_PREBUILT),)
-    LLVM_PATH:=$(TOPDIR)/llvm-bpf/bin
-  endif
-  ifneq ($(CONFIG_USE_LLVM_BUILD),)
-    LLVM_PATH:=$(STAGING_DIR_HOST)/llvm-bpf/bin
-  endif
-
-  CLANG:=$(LLVM_PATH)/clang
-  LLVM_LLC:=$(LLVM_PATH)/llc
-  LLVM_DIS:=$(LLVM_PATH)/llvm-dis
-  LLVM_OPT:=$(LLVM_PATH)/opt
-  LLVM_STRIP:=$(LLVM_PATH)/llvm-strip
 endif
+ifneq ($(CONFIG_USE_LLVM_PREBUILT),)
+  CLANG:=$(TOPDIR)/llvm-bpf/bin/clang
+endif
+ifneq ($(CONFIG_USE_LLVM_BUILD),)
+  CLANG:=$(STAGING_DIR_HOST)/llvm-bpf/bin/clang
+endif
+
+LLVM_PATH:=$(dir $(CLANG))
+LLVM_LLC:=$(LLVM_PATH)/llc$(LLVM_VER)
+LLVM_DIS:=$(LLVM_PATH)/llvm-dis$(LLVM_VER)
+LLVM_OPT:=$(LLVM_PATH)/opt$(LLVM_VER)
+LLVM_STRIP:=$(LLVM_PATH)/llvm-strip$(LLVM_VER)
 
 BPF_KARCH:=mips
 BPF_ARCH:=mips$(if $(CONFIG_ARCH_64BIT),64)$(if $(CONFIG_BIG_ENDIAN),,el)
@@ -43,8 +33,7 @@ BPF_TARGET:=bpf$(if $(CONFIG_BIG_ENDIAN),eb,el)
 BPF_HEADERS_DIR:=$(STAGING_DIR)/bpf-headers
 
 BPF_KERNEL_INCLUDE := \
-	-nostdinc -isystem $(TOOLCHAIN_ROOT_DIR)/lib/gcc/*/*/include \
-	$(patsubst %,-isystem%,$(TOOLCHAIN_INC_DIRS)) \
+	-nostdinc -isystem $(TOOLCHAIN_DIR)/include \
 	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include \
 	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/asm/mach-generic \
 	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/generated \
@@ -76,7 +65,7 @@ BPF_CFLAGS := \
 
 ifneq ($(CONFIG_HAS_BPF_TOOLCHAIN),)
 ifeq ($(DUMP)$(filter download refresh,$(MAKECMDGOALS)),)
-  CLANG_VER:=$(shell $(CLANG) --target=$(BPF_TARGET) -dM -E - < /dev/null | grep __clang_major__ | cut -d' ' -f3)
+  CLANG_VER:=$(shell $(CLANG) -dM -E - < /dev/null | grep __clang_major__ | cut -d' ' -f3)
   CLANG_VER_VALID:=$(shell [ "$(CLANG_VER)" -ge "$(CLANG_MIN_VER)" ] && echo 1 )
   ifeq ($(CLANG_VER_VALID),)
     $(error ERROR: LLVM/clang version too old. Minimum required: $(CLANG_MIN_VER), found: $(CLANG_VER))

include/cmake.mk

@@ -22,7 +22,7 @@ HOST_CMAKE_BINARY_DIR = $(HOST_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BI
 MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)
 
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-  cmake_tool=$(firstword $(TOOLCHAIN_BIN_DIRS))/$(1)
+  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
 else
   cmake_tool=$(shell command -v $(1))
 endif
@@ -49,7 +49,7 @@ CMAKE_AR:=$(call cmake_tool,$(TARGET_AR))
 CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
 CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
 
-CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_ROOT_DIR)
+CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
 CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
 CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
 CMAKE_HOST_INSTALL_PREFIX = $(HOST_BUILD_PREFIX)
@@ -68,8 +68,6 @@ ifeq ($(HOST_USE_NINJA),1)
   define Host/Uninstall/Default
 	+$(NINJA) -C $(HOST_CMAKE_BINARY_DIR) uninstall
   endef
-else
-  CMAKE_HOST_OPTIONS += -DCMAKE_GENERATOR="Unix Makefiles"
 endif
 
 ifeq ($(PKG_USE_NINJA),1)
@@ -82,8 +80,6 @@ ifeq ($(PKG_USE_NINJA),1)
   define Build/Install/Default
 	+DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(CMAKE_BINARY_DIR) install
   endef
-else
-  CMAKE_OPTIONS += -DCMAKE_GENERATOR="Unix Makefiles"
 endif
 
 define Build/Configure/Default
@@ -93,11 +89,10 @@ define Build/Configure/Default
 		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 		cmake \
-			--no-warn-unused-cli \
 			-DCMAKE_SYSTEM_NAME=Linux \
 			-DCMAKE_SYSTEM_VERSION=1 \
 			-DCMAKE_SYSTEM_PROCESSOR=$(ARCH) \
-			-DCMAKE_BUILD_TYPE=$(if $(CONFIG_DEBUG),Debug,Release) \
+			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
 			-DCMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \
@@ -146,7 +141,6 @@ define Host/Configure/Default
 		CXXFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		cmake \
-			--no-warn-unused-cli \
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_C_COMPILER_LAUNCHER="$(CMAKE_C_COMPILER_LAUNCHER)" \
 			-DCMAKE_C_COMPILER="$(CMAKE_HOST_C_COMPILER)" \
@@ -174,7 +168,6 @@ define Host/Configure/Default
 			-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \
 			-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \
 			-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \
-			-DBUILD_SHARED_LIBS=OFF \
 			$(CMAKE_HOST_OPTIONS) \
 		$(HOST_CMAKE_SOURCE_DIR) \
 	)

include/default-packages.mk

@@ -1,5 +0,0 @@
-ifneq ($(CONFIG_USE_APK),)
-  DEFAULT_PACKAGES += apk-openssl
-else
-  DEFAULT_PACKAGES += opkg
-endif

include/download.mk

@@ -10,10 +10,10 @@ LEDE_GIT = $(PROJECT_GIT)
 
 ifdef PKG_SOURCE_VERSION
   ifndef PKG_VERSION
-    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(subst -,.,$(PKG_SOURCE_DATE)),0)~$(call version_abbrev,$(PKG_SOURCE_VERSION))
+    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
   endif
   PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
-  PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.zst
+  PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz
 endif
 
 DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
@@ -168,7 +168,7 @@ define DownloadMethod/cvs
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		cvs -d $(URL) export $(SOURCE_VERSION) $(SUBDIR) && \
+		cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
 		echo "Packing checkout..." && \
 		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
@@ -184,10 +184,10 @@ define DownloadMethod/svn
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
 		( svn help export | grep -q trust-server-cert && \
-		svn export --non-interactive --trust-server-cert -r$(SOURCE_VERSION) $(URL) $(SUBDIR) || \
-		svn export --non-interactive -r$(SOURCE_VERSION) $(URL) $(SUBDIR) ) && \
+		svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+		svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \
 		echo "Packing checkout..." && \
-		export TAR_TIMESTAMP="`svn info -r$(SOURCE_VERSION) --show-item last-changed-date $(URL)`" && \
+		export TAR_TIMESTAMP="`svn info -r$(VERSION) --show-item last-changed-date $(URL)`" && \
 		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 		mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 		rm -rf $(SUBDIR); \
@@ -205,21 +205,15 @@ define DownloadMethod/github_archive
 		$(SCRIPT_DIR)/dl_github_archive.py \
 			--dl-dir="$(DL_DIR)" \
 			--url="$(URL)" \
-			--version="$(SOURCE_VERSION)" \
+			--version="$(VERSION)" \
 			--subdir="$(SUBDIR)" \
 			--source="$(FILE)" \
 			--hash="$(MIRROR_HASH)" \
-			--submodules $(SUBMODULES) \
 		|| ( $(call DownloadMethod/rawgit) ); \
 	)
 endef
 
 # Only intends to be called as a submethod from other DownloadMethod
-#
-# We first clone, checkout and then we generate a tar using the
-# git archive command to apply any rules of .gitattributes
-# To keep consistency with github generated tar archive, we default
-# the short hash to 8 (default is 7). (for git log related usage)
 define DownloadMethod/rawgit
 	echo "Checking out files from the git repository..."; \
 	mkdir -p $(TMP_DIR)/dl && \
@@ -227,17 +221,11 @@ define DownloadMethod/rawgit
 	rm -rf $(SUBDIR) && \
 	[ \! -d $(SUBDIR) ] && \
 	git clone --filter=blob:none $(OPTS) $(URL) $(SUBDIR) && \
-	(cd $(SUBDIR) && git checkout $(SOURCE_VERSION)) && \
-	export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
-	echo "Generating formal git archive (apply .gitattributes rules)" && \
-	(cd $(SUBDIR) && git config core.abbrev 8 && \
-	git archive --format=tar HEAD --output=../$(SUBDIR).tar.git) && \
-	$(if $(filter skip,$(SUBMODULES)),true,$(TAR) --ignore-failed-read -C $(SUBDIR) -f $(SUBDIR).tar.git -r .git .gitmodules 2>/dev/null) && \
-	rm -rf $(SUBDIR) && mkdir $(SUBDIR) && \
-	$(TAR) -C $(SUBDIR) -xf $(SUBDIR).tar.git && \
-	(cd $(SUBDIR) && $(if $(filter skip,$(SUBMODULES)),true,git submodule update --init --recursive -- $(SUBMODULES) && \
-	rm -rf .git .gitmodules)) && \
+	(cd $(SUBDIR) && git checkout $(VERSION) && \
+	git submodule update --init --recursive) && \
 	echo "Packing checkout..." && \
+	export TAR_TIMESTAMP=`cd $(SUBDIR) && git log -1 --format='@%ct'` && \
+	rm -rf $(SUBDIR)/.git && \
 	$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
 	mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
 	rm -rf $(SUBDIR);
@@ -250,7 +238,7 @@ define DownloadMethod/bzr
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		bzr export --per-file-timestamps -r$(SOURCE_VERSION) $(SUBDIR) $(URL) && \
+		bzr export --per-file-timestamps -r$(VERSION) $(SUBDIR) $(URL) && \
 		echo "Packing checkout..." && \
 		export TAR_TIMESTAMP="" && \
 		$(call dl_tar_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@@ -266,7 +254,7 @@ define DownloadMethod/hg
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		hg clone -r $(SOURCE_VERSION) $(URL) $(SUBDIR) && \
+		hg clone -r $(VERSION) $(URL) $(SUBDIR) && \
 		export TAR_TIMESTAMP=`cd $(SUBDIR) && hg log --template '@{date}' -l 1` && \
 		find $(SUBDIR) -name .hg | xargs rm -rf && \
 		echo "Packing checkout..." && \
@@ -283,7 +271,7 @@ define DownloadMethod/darcs
 		cd $(TMP_DIR)/dl && \
 		rm -rf $(SUBDIR) && \
 		[ \! -d $(SUBDIR) ] && \
-		darcs get -t $(SOURCE_VERSION) $(URL) $(SUBDIR) && \
+		darcs get -t $(VERSION) $(URL) $(SUBDIR) && \
 		export TAR_TIMESTAMP=`cd $(SUBDIR) && LC_ALL=C darcs log --last 1 | sed -ne 's!^Date: \+!!p'` && \
 		find $(SUBDIR) -name _darcs | xargs rm -rf && \
 		echo "Packing checkout..." && \
@@ -293,12 +281,12 @@ define DownloadMethod/darcs
 	)
 endef
 
-Validate/cvs=SOURCE_VERSION SUBDIR
-Validate/svn=SOURCE_VERSION SUBDIR
-Validate/git=SOURCE_VERSION SUBDIR
-Validate/bzr=SOURCE_VERSION SUBDIR
-Validate/hg=SOURCE_VERSION SUBDIR
-Validate/darcs=SOURCE_VERSION SUBDIR
+Validate/cvs=VERSION SUBDIR
+Validate/svn=VERSION SUBDIR
+Validate/git=VERSION SUBDIR
+Validate/bzr=VERSION SUBDIR
+Validate/hg=VERSION SUBDIR
+Validate/darcs=VERSION SUBDIR
 
 define Download/Defaults
   URL:=
@@ -311,9 +299,8 @@ define Download/Defaults
   MIRROR:=1
   MIRROR_HASH=$$(MIRROR_MD5SUM)
   MIRROR_MD5SUM:=x
-  SOURCE_VERSION:=
+  VERSION:=
   OPTS:=
-  SUBMODULES:=
 endef
 
 define Download/default
@@ -322,11 +309,10 @@ define Download/default
   URL_FILE:=$(PKG_SOURCE_URL_FILE)
   SUBDIR:=$(PKG_SOURCE_SUBDIR)
   PROTO:=$(PKG_SOURCE_PROTO)
-  SUBMODULES:=$(PKG_SOURCE_SUBMODULES)
   $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
   $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
   $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
-  SOURCE_VERSION:=$(PKG_SOURCE_VERSION)
+  VERSION:=$(PKG_SOURCE_VERSION)
   $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
   $(if $(PKG_HASH),HASH:=$(PKG_HASH))
 endef

include/feeds.mk

@@ -18,10 +18,6 @@ opkg_package_files = $(wildcard \
 	$(foreach dir,$(PACKAGE_SUBDIRS), \
 	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
 
-apk_package_files = $(wildcard \
-	$(foreach dir,$(PACKAGE_SUBDIRS), \
-	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.apk)))
-
 # 1: package name
 define FeedPackageDir
 $(strip $(if $(CONFIG_PER_FEED_REPO), \
@@ -32,12 +28,12 @@ $(strip $(if $(CONFIG_PER_FEED_REPO), \
 endef
 
 # 1: destination file
-define FeedSourcesAppendOPKG
+define FeedSourcesAppend
 ( \
   echo 'src/gz %d_core %U/targets/%S/packages'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo 'src/gz %d_base %U/packages/%A/base'; \
-	$(if $(CONFIG_BUILDBOT), \
+	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
 		echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \
@@ -45,20 +41,6 @@ define FeedSourcesAppendOPKG
 ) >> $(1)
 endef
 
-# 1: destination file
-define FeedSourcesAppendAPK
-( \
-  echo '%U/targets/%S/packages/packages.adb'; \
-  $(strip $(if $(CONFIG_PER_FEED_REPO), \
-	echo '%U/packages/%A/base/packages.adb'; \
-	$(if $(CONFIG_BUILDBOT), \
-		echo '%U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)/packages.adb';) \
-	$(foreach feed,$(FEEDS_AVAILABLE), \
-		$(if $(CONFIG_FEED_$(feed)), \
-			echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )%U/packages/%A/$(feed)/packages.adb';)))) \
-) >> $(1)
-endef
-
 # 1: package name
 define GetABISuffix
 $(if $(ABIV_$(1)),$(ABIV_$(1)),$(call FormatABISuffix,$(1),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v)))))

include/hardening.mk

@@ -36,11 +36,6 @@ ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
     TARGET_CFLAGS += -fstack-protector-strong
   endif
 endif
-ifdef CONFIG_PKG_CC_STACKPROTECTOR_ALL
-  ifeq ($(strip $(PKG_SSP)),1)
-    TARGET_CFLAGS += -fstack-protector-all
-  endif
-endif
 ifdef CONFIG_PKG_FORTIFY_SOURCE_1
   ifeq ($(strip $(PKG_FORTIFY_SOURCE)),1)
     TARGET_CFLAGS += -D_FORTIFY_SOURCE=1

include/host-build.mk

@@ -26,7 +26,7 @@ HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
 HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
 HOST_BUILD_PREFIX?=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
 HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed
-HOST_STAMP_PROGRAMS:=$(foreach program,$(PKG_PROGRAMS),$(dir $(HOST_STAMP_INSTALLED))$(subst $(PKG_NAME),$(program),$(notdir $(HOST_STAMP_INSTALLED))) )
+HOST_STAMP_PROGRAMS:=$(foreach program,$(PKG_PROGRAMS),$(subst $(PKG_NAME),$(program),$(HOST_STAMP_INSTALLED)) )
 
 override MAKEFLAGS=
 
@@ -35,25 +35,18 @@ include $(INCLUDE_DIR)/autotools.mk
 _host_target:=$(if $(HOST_QUILT),,.)
 
 Host/Patch:=$(Host/Patch/Default)
-define Host/Prepare/Default
-	$(if $(strip $(HOST_UNPACK)),$(HOST_UNPACK))
+ifneq ($(strip $(HOST_UNPACK)),)
+  define Host/Prepare/Default
+	$(HOST_UNPACK)
 	[ ! -d ./src/ ] || $(CP) ./src/* $(HOST_BUILD_DIR)
 	$(Host/Patch)
-endef
+  endef
+endif
 
 define Host/Prepare
   $(call Host/Prepare/Default)
 endef
 
-define Host/Gnulib/Prepare
-  $(STAGING_DIR_HOST)/bin/gnulib-tool \
-	--local-dir=$(STAGING_DIR_HOST)/share/gnulib \
-	--source-base=$(PKG_GNULIB_BASE) \
-	$(PKG_GNULIB_ARGS) \
-	$(PKG_GNULIB_MODS) \
-  ;
-endef
-
 HOST_CONFIGURE_VARS = \
 	CC="$(HOSTCC)" \
 	CFLAGS="$(HOST_CFLAGS)" \
@@ -76,10 +69,6 @@ HOST_CONFIGURE_ARGS = \
 	--localstatedir=$(HOST_BUILD_PREFIX)/var \
 	--sbindir=$(HOST_BUILD_PREFIX)/bin
 
-ifneq ($(YEAR_2038),y)
-  HOST_CONFIGURE_ARGS += --disable-year2038
-endif
-
 HOST_MAKE_VARS = \
 	CFLAGS="$(HOST_CFLAGS)" \
 	CPPFLAGS="$(HOST_CPPFLAGS)" \
@@ -111,25 +100,19 @@ define Host/Configure
   $(call Host/Configure/Default)
 endef
 
-HOST_MAKE_PATH ?= .
-
 define Host/Compile/Default
 	+$(HOST_MAKE_VARS) \
-	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/$(HOST_MAKE_PATH) \
+	$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
 		$(HOST_MAKE_FLAGS) \
 		$(1)
 endef
 
 define Host/Compile
-  $(call Host/Compile/Default,$(if $(PKG_SUBDIRS),SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))'))
-endef
-
-define Host/Gnulib/Compile
-  $(call Host/Compile/Default,SUBDIRS='$$$$(wildcard $(PKG_GNULIB_BASE))')
+  $(call Host/Compile/Default)
 endef
 
 define Host/Install/Default
-  $(call Host/Compile/Default,$(if $(PKG_SUBDIRS),SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))') install)
+	$(call Host/Compile/Default,install)
 endef
 
 define Host/Install

include/image-commands.mk

@@ -46,7 +46,7 @@ endef
 
 ifdef IB
 define Build/append-image-stage
-	dd if=$(STAGING_DIR_IMAGE)/$(BOARD)-$(SUBTARGET)-$(DEVICE_NAME)-$(1) >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1) >> $@
 endef
 else
 define Build/append-image-stage
@@ -54,7 +54,7 @@ define Build/append-image-stage
 	fwtool -s /dev/null -t "$@.stripmeta" || :
 	fwtool -i /dev/null -t "$@.stripmeta" || :
 	mkdir -p "$(STAGING_DIR_IMAGE)"
-	dd if="$@.stripmeta" of="$(STAGING_DIR_IMAGE)/$(BOARD)-$(SUBTARGET)-$(DEVICE_NAME)-$(1)"
+	dd if="$@.stripmeta" of="$(STAGING_DIR_IMAGE)/$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))-$(DEVICE_NAME)-$(1)"
 	dd if="$@.stripmeta" >> "$@"
 	rm "$@.stripmeta"
 endef
@@ -133,8 +133,6 @@ define Build/append-md5sum-ascii-salted
 	rm $@.salted
 endef
 
-UBI_NAND_SIZE_LIMIT = $(IMAGE_SIZE) - ($(NAND_SIZE)*20/1024 + 4*$(BLOCKSIZE))
-
 define Build/append-ubi
 	sh $(TOPDIR)/scripts/ubinize-image.sh \
 		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
@@ -148,22 +146,6 @@ define Build/append-ubi
 		$(UBINIZE_OPTS)
 	cat $@.tmp >> $@
 	rm $@.tmp
-	$(if $(and $(IMAGE_SIZE),$(NAND_SIZE)),\
-		$(call Build/check-size,$(UBI_NAND_SIZE_LIMIT)))
-endef
-
-define Build/ubinize-image
-	sh $(TOPDIR)/scripts/ubinize-image.sh \
-		$(if $(UBOOTENV_IN_UBI),--uboot-env) \
-		$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
-		--part $(word 1,$(1))="$(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(word 2,$(1))" \
-		$@.tmp \
-		-p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \
-		$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
-		$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
-		$(UBINIZE_OPTS)
-	cat $@.tmp >> $@
-	rm $@.tmp
 endef
 
 define Build/ubinize-kernel
@@ -231,30 +213,9 @@ define Build/buffalo-tag-dhp
 	mv $@.new $@
 endef
 
-define Build/buffalo-trx
-	$(eval magic=$(word 1,$(1)))
-	$(eval kern_bin=$(if $(1),$(IMAGE_KERNEL),$@))
-	$(eval rtfs_bin=$(word 2,$(1)))
-	$(eval apnd_bin=$(word 3,$(1)))
-	$(eval kern_size=$(if $(KERNEL_SIZE),$(KERNEL_SIZE),0x400000))
-
-	$(if $(rtfs_bin),touch $(rtfs_bin))
-	$(STAGING_DIR_HOST)/bin/otrx create $@.new \
-		$(if $(magic),-M $(magic),) \
-		-f $(kern_bin) \
-		$(if $(rtfs_bin),\
-			-a 0x20000 \
-			-b $$(( $(call exp_units,$(kern_size)) )) \
-			-f $(rtfs_bin),) \
-		$(if $(apnd_bin),\
-			-A $(apnd_bin) \
-			-a 0x20000)
-	mv $@.new $@
-endef
-
 define Build/check-size
 	@imagesize="$$(stat -c%s $@)"; \
-	limitsize="$$(($(call exp_units,$(if $(1),$(1),$(IMAGE_SIZE)))))"; \
+	limitsize="$$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE))))))"; \
 	[ $$limitsize -ge $$imagesize ] || { \
 		$(call ERROR_MESSAGE,    WARNING: Image file $@ is too big: $$imagesize > $$limitsize); \
 		rm -f $@; \
@@ -265,48 +226,6 @@ define Build/copy-file
 	cat "$(1)" > "$@"
 endef
 
-# Create a header for a D-Link AI series recovery image and add it at the beginning of the image
-# Currently supported: AQUILA M30, EAGLE M32 and R32
-# Arguments:
-# 1: Start string of the header
-# 2: Firmware version
-# 3: Block start address
-# 4: Block length
-# 5: Device FMID
-define Build/dlink-ai-recovery-header
-	$(eval header_start=$(word 1,$(1)))
-	$(eval firmware_version=$(word 2,$(1)))
-	$(eval block_start=$(word 3,$(1)))
-	$(eval block_length=$(word 4,$(1)))
-	$(eval device_fmid=$(word 5,$(1)))
-# create $@.header without the checksum
-	echo -en "$(header_start)\x00\x00" > "$@.header"
-# Calculate checksum over data area ($@) and append it to the header.
-# The checksum is the 2byte-sum over the whole data area.
-# Every overflow during the checksum calculation must increment the current checksum value by 1.
-	od -v -w2 -tu2 -An --endian little "$@" | awk '{ s+=$$1; } END { s%=65535; printf "%c%c",s%256,s/256; }' >> "$@.header"
-	echo -en "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00" >> "$@.header"
-	echo -en "$(firmware_version)" >> "$@.header"
-# Only one block supported: Erase start/length is identical to data start/length
-	echo -en "$(block_start)$(block_length)$(block_start)$(block_length)" >> "$@.header"
-# Only zeros
-	echo -en "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" >> "$@.header"
-# Last 16 bytes, but without checksum
-	echo -en "\x42\x48\x02\x00\x00\x00\x08\x00\x00\x00\x00\x00" >> "$@.header"
-	echo -en "$(device_fmid)" >> "$@.header"
-# Calculate and append checksum: The checksum must be set so that the 2byte-sum of the whole header is 0.
-# Every overflow during the checksum calculation must increment the current checksum value by 1.
-	od -v -w2 -tu2 -An --endian little "$@.header" | awk '{s+=65535-$$1;}END{s%=65535;printf "%c%c",s%256,s/256;}' >> "$@.header"
-	cat "$@.header" "$@" > "$@.new"
-	mv "$@.new" "$@"
-	rm "$@.header"
-endef
-
-define Build/dlink-sge-image
-	$(STAGING_DIR_HOST)/bin/dlink-sge-image $(1) $@ $@.enc
-	mv $@.enc $@
-endef
-
 define Build/edimax-header
 	$(STAGING_DIR_HOST)/bin/mkedimaximg -i $@ -o $@.new $(1)
 	@mv $@.new $@
@@ -316,12 +235,12 @@ define Build/elecom-product-header
 	$(eval product=$(word 1,$(1)))
 	$(eval fw=$(if $(word 2,$(1)),$(word 2,$(1)),$@))
 
-	-( \
+	( \
 		echo -n -e "ELECOM\x00\x00$(product)" | dd bs=40 count=1 conv=sync; \
 		echo -n "0.00" | dd bs=16 count=1 conv=sync; \
 		dd if=$(fw); \
-	) > $(fw).new \
-	&& mv $(fw).new $(fw) || rm -f $(fw)
+	) > $(fw).new
+	mv $(fw).new $(fw)
 endef
 
 define Build/elecom-wrc-gs-factory
@@ -351,10 +270,10 @@ define Build/elx-header
 		echo -ne "$$($(MKHASH) md5 $@ | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \
 			dd bs=58 count=1 conv=sync; \
 	) > $(KDIR)/tmp/$(DEVICE_NAME).header
-	-$(call Build/xor-image,-p $(xor_pattern) -x) \
-	&& cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new \
-	&& mv $@.new $@ \
-	&& rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header
+	$(call Build/xor-image,-p $(xor_pattern) -x)
+	cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new
+	mv $@.new $@
+	rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header
 endef
 
 define Build/eva-image
@@ -373,7 +292,7 @@ define Build/initrd_compression
 endef
 
 define Build/fit
-	$(call locked,$(TOPDIR)/scripts/mkits.sh \
+	$(TOPDIR)/scripts/mkits.sh \
 		-D $(DEVICE_NAME) -o $@.its -k $@ \
 		-C $(word 1,$(1)) \
 		$(if $(word 2,$(1)),\
@@ -383,14 +302,14 @@ define Build/fit
 		$(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \
 		$(if $(findstring with-initrd,$(word 3,$(1))), \
 			$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
-				-i $(KERNEL_BUILD_DIR)/initrd$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))).cpio$(strip $(call Build/initrd_compression)))) \
+				-i $(KERNEL_BUILD_DIR)/initrd.cpio$(strip $(call Build/initrd_compression)))) \
 		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 		$(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
 		$(if $(DEVICE_DTS_DELIMITER),-l $(DEVICE_DTS_DELIMITER)) \
 		$(if $(DEVICE_DTS_LOADADDR),-s $(DEVICE_DTS_LOADADDR)) \
 		$(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
 		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
-		-A $(LINUX_KARCH) -v $(LINUX_VERSION), gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))))
+		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\
 		-E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new
 	@mv $@.new $@
@@ -451,18 +370,12 @@ define Build/jffs2
 	@mv $@.new $@
 endef
 
-define Build/yaffs-filesystem
-	let \
-		kernel_size="$$(stat -c%s $@)" \
-		kernel_chunks="(kernel_size / 1024) + 1" \
-		filesystem_chunks="kernel_chunks + 3" \
-		filesystem_blocks="(filesystem_chunks / 63) + 1" \
-		filesystem_size="filesystem_blocks * 64 * 1024" \
-		filesystem_size_with_reserve="(filesystem_blocks + 2) * 64 * 1024"; \
-		head -c $$filesystem_size_with_reserve /dev/zero | tr "\000" "\377" > $@.img \
-		&& yafut -d $@.img -w -i $@ -o kernel -C 1040 -B 64k -E -P -S $(1) \
-		&& truncate -s $$filesystem_size $@.img \
-		&& mv $@.img $@
+define Build/kernel2minor
+	$(eval temp_file := $(shell mktemp))
+	cp $@ $(temp_file)
+	kernel2minor -k $(temp_file) -r $(temp_file).new $(1)
+	mv $(temp_file).new $@
+	rm -f $(temp_file)
 endef
 
 define Build/kernel-bin
@@ -471,17 +384,10 @@ define Build/kernel-bin
 endef
 
 define Build/linksys-image
-	let \
-		size="$$(stat -c%s $@)" \
-		pad="$(call exp_units,$(PAGESIZE))" \
-		offset="256" \
-		pad="(pad - ((size + offset) % pad)) % pad"; \
-		dd if=/dev/zero bs=$$pad count=1 | tr '\000' '\377' >> $@
-	printf ".LINKSYS.01000409%-15s%08X%-8s%-16s" \
+	$(TOPDIR)/scripts/linksys-image.sh \
 		"$(call param_get_default,type,$(1),$(DEVICE_NAME))" \
-		"$$(cksum $@ | cut -d ' ' -f1)" \
-		"0" "K0000000F0246434" >> $@
-	dd if=/dev/zero bs=192 count=1 >> $@
+		$@ $@.new
+		mv $@.new $@
 endef
 
 define Build/lzma
@@ -493,15 +399,6 @@ define Build/lzma-no-dict
 	@mv $@.new $@
 endef
 
-define Build/moxa-encode-fw
-	$(TOPDIR)/scripts/moxa-encode-fw.py \
-		--input $@ \
-		--output $@ \
-		--magic $(MOXA_MAGIC) \
-		--hwid $(MOXA_HWID) \
-		--buildid 00000000
-endef
-
 define Build/netgear-chk
 	$(STAGING_DIR_HOST)/bin/mkchkimg \
 		-o $@.new \
@@ -555,8 +452,8 @@ endef
 define Build/pad-offset
 	let \
 		size="$$(stat -c%s $@)" \
-		pad="$(call exp_units,$(word 1, $(1)))" \
-		offset="$(call exp_units,$(word 2, $(1)))" \
+		pad="$(subst k,* 1024,$(word 1, $(1)))" \
+		offset="$(subst k,* 1024,$(word 2, $(1)))" \
 		pad="(pad - ((size + offset) % pad)) % pad" \
 		newsize='size + pad'; \
 		dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
@@ -621,8 +518,8 @@ define Build/seama-seal
 endef
 
 define Build/senao-header
-	-$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new \
-	&& mv $@.new $@ || rm -f $@
+	$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new
+	mv $@.new $@
 endef
 
 define Build/sysupgrade-tar
@@ -673,22 +570,23 @@ define Build/tplink-v1-image
 endef
 
 define Build/tplink-v2-header
-	-$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
+	$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
 		-c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \
 		-E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR))  \
 		-w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
 		-T $(TPLINK_HVERSION) -V "ver. 2.0" \
-		-k $@ -o $@.new $(1) \
-	&& mv $@.new $@ || rm -f $@
+		-k $@ -o $@.new $(1)
+	@mv $@.new $@
 endef
 
 define Build/tplink-v2-image
-	-$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
+	$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
 		-H $(TPLINK_HWID) -W $(TPLINK_HWREV) \
 		-w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
 		-T $(TPLINK_HVERSION) -V "ver. 2.0" -a 0x4 -j \
-		-k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new $(1) \
-	&& cat $@.new >> $@ && rm -rf $@.new || rm -f $@
+		-k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new $(1)
+	cat $@.new >> $@
+	rm -rf $@.new
 endef
 
 define Build/uImage
@@ -707,26 +605,9 @@ define Build/uImage
 	mv $@.new $@
 endef
 
-define Build/multiImage
-	$(if $(UIMAGE_TIME),SOURCE_DATE_EPOCH="$(UIMAGE_TIME)") \
-	mkimage \
-		-A $(LINUX_KARCH) \
-		-O linux \
-		-T multi \
-		-C $(word 1,$(1)) \
-		-a $(KERNEL_LOADADDR) \
-		-e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-		-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' \
-		$(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \
-		-d $@:$(word 2,$(1)):$(word 3,$(1)) \
-		$(wordlist 4,$(words $(1)),$(1)) \
-		$@.new
-	mv $@.new $@
-endef
-
 define Build/xor-image
-	-$(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) \
-	&& mv $@.xor $@ || rm -f $@
+	$(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1)
+	mv $@.xor $@
 endef
 
 define Build/zip
@@ -739,13 +620,9 @@ define Build/zip
 	rm -rf $@.tmp
 endef
 
-define Build/zyimage
-	$(STAGING_DIR_HOST)/bin/zyimage $(1) $@
-endef
-
 define Build/zyxel-ras-image
 	let \
-		newsize="$(call exp_units,$(RAS_ROOTFS_SIZE))"; \
+		newsize="$(subst k,* 1024,$(RAS_ROOTFS_SIZE))"; \
 		$(STAGING_DIR_HOST)/bin/mkrasimage \
 			-b $(RAS_BOARD) \
 			-v $(RAS_VERSION) \

include/image.mk

@@ -5,7 +5,6 @@
 override TARGET_BUILD=
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/kernel-defaults.mk
 include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/image-commands.mk
 
@@ -21,13 +20,6 @@ include $(INCLUDE_DIR)/rootfs.mk
 override MAKE:=$(_SINGLE)$(SUBMAKE)
 override NO_TRACE_MAKE:=$(_SINGLE)$(NO_TRACE_MAKE)
 
-##@
-# @brief Convert size with unit postfix to unitless expression in bytes.
-#
-# @param 1: Size with unit. Possible unit postfix are `g`, `m`, `k`.
-##
-exp_units = $(subst k, * 1024,$(subst m, * 1024k,$(subst g, * 1024m,$(1))))
-
 target_params = $(subst +,$(space),$*)
 param_get = $(patsubst $(1)=%,%,$(filter $(1)=%,$(2)))
 param_get_default = $(firstword $(call param_get,$(1),$(2)) $(3))
@@ -45,13 +37,11 @@ IMG_PREFIX_EXTRA:=$(if $(EXTRA_IMAGE_NAME),$(call sanitize,$(EXTRA_IMAGE_NAME))-
 IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NUMBER))-)
 IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-)
 
-IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)-$(SUBTARGET)
+IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
 IMG_ROOTFS:=$(IMG_PREFIX)-rootfs
 IMG_COMBINED:=$(IMG_PREFIX)-combined
-ifeq ($(DUMP),)
 IMG_PART_SIGNATURE:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | $(MKHASH) md5 | cut -b1-8)
 IMG_PART_DISKGUID:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | $(MKHASH) md5 | sed -E 's/(.{8})(.{4})(.{4})(.{4})(.{10})../\1-\2-\3-\4-\500/')
-endif
 
 MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt
 
@@ -116,12 +106,6 @@ endef
 
 PROFILE_SANITIZED := $(call tolower,$(subst DEVICE_,,$(subst $(space),-,$(PROFILE))))
 
-##@
-# @brief Call function for each group of arguments.
-#
-# @param 1: List of lists of arguments. Lists are separated by `|`.
-# @param 2: Function to call for list of arguments.
-##
 define split_args
 $(foreach data, \
 	$(subst |,$(space),\
@@ -129,24 +113,12 @@ $(foreach data, \
 	$(call $(2),$(strip $(subst ^,$(space),$(data)))))
 endef
 
-##@
-# @brief Call build function with arguments.
-#
-# @param 1: Function to call. Function name is prepended with `Build/`.
-# @param 2...: Function arguments.
-##
 define build_cmd
 $(if $(Build/$(word 1,$(1))),,$(error Missing Build/$(word 1,$(1))))
 $(call Build/$(word 1,$(1)),$(wordlist 2,$(words $(1)),$(1)))
 
 endef
 
-##@
-# @brief Call build functions from the list.
-#
-# @param 1: List of build functions with arguments, separated by `|`.
-#           First word in each group is a build command without `Build/` prefix.
-##
 define concat_cmd
 $(call split_args,$(1),build_cmd)
 endef
@@ -175,31 +147,27 @@ endif
 
 # Disable noisy checks by default as in upstream
 DTC_WARN_FLAGS := \
-  -Wno-interrupt_provider \
-  -Wno-unique_unit_address \
   -Wno-unit_address_vs_reg \
+  -Wno-simple_bus_reg \
+  -Wno-unit_address_format \
+  -Wno-pci_bridge \
+  -Wno-pci_device_bus_num \
+  -Wno-pci_device_reg \
   -Wno-avoid_unnecessary_addr_size \
   -Wno-alias_paths \
   -Wno-graph_child_address \
-  -Wno-simple_bus_reg
+  -Wno-graph_port \
+  -Wno-unique_unit_address
 
 DTC_FLAGS += $(DTC_WARN_FLAGS)
 DTCO_FLAGS += $(DTC_WARN_FLAGS)
 
-##@
-# @brief Pad file to specified size.
-#
-# @param 1: File.
-# @param 2: Padding.
-##
 define Image/pad-to
 	dd if=$(1) of=$(1).new bs=$(2) conv=sync
 	mv $(1).new $(1)
 endef
 
-ifeq ($(DUMP),)
 ROOTFS_PARTSIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024)))
-endif
 
 define Image/pad-root-squashfs
 	$(call Image/pad-to,$(KDIR)/root.squashfs,$(if $(1),$(1),$(ROOTFS_PARTSIZE)))
@@ -215,7 +183,6 @@ define Image/BuildDTB/sub
 		-I$(DTS_DIR) \
 		-I$(DTS_DIR)/include \
 		-I$(LINUX_DIR)/include/ \
-		-I$(LINUX_DIR)/scripts/dtc/include-prefixes \
 		-undef -D__DTS__ $(3) \
 		-o $(2).tmp $(1)
 	$(LINUX_DIR)/scripts/dtc/dtc -O dtb \
@@ -308,19 +275,8 @@ define Image/mkfs/ext4
 endef
 
 define Image/Manifest
-	$(if $(CONFIG_USE_APK), \
-		$(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network \
-			--repositories-file /dev/zero | sort | sed 's/ / - /'  > \
-			$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest, \
-		$(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
-			$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest \
-	)
-ifneq ($(CONFIG_JSON_CYCLONEDX_SBOM),)
-	$(SCRIPT_DIR)/package-metadata.pl imgcyclonedxsbom \
-		$(if $(IB),$(TOPDIR)/.packageinfo, $(TMP_DIR)/.packageinfo) \
-		$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest > \
-		$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).bom.cdx.json
-endif
+	$(call opkg,$(TARGET_DIR_ORIG)) list-installed > \
+		$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
 endef
 
 define Image/gzip-ext4-padded-squashfs
@@ -355,7 +311,7 @@ ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
 endif
 
 mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params))))
-mkfs_packages_add = $(foreach pkg,$(filter-out -% ~%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg)))
+mkfs_packages_add = $(foreach pkg,$(filter-out -%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg)))
 mkfs_packages_remove = $(foreach pkg,$(patsubst -%,%,$(filter -%,$(mkfs_packages))),$(pkg)$(call GetABISuffix,$(pkg)))
 mkfs_cur_target_dir = $(call mkfs_target_dir,pkg=$(target_params))
 
@@ -363,22 +319,7 @@ opkg_target = \
 	$(call opkg,$(mkfs_cur_target_dir)) \
 		-f $(mkfs_cur_target_dir).conf
 
-apk_target = \
-	$(call apk,$(mkfs_cur_target_dir)) --no-scripts \
-		--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb
-
-
 target-dir-%: FORCE
-ifneq ($(CONFIG_USE_APK),)
-	rm -rf $(mkfs_cur_target_dir)
-	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
-	mv $(mkfs_cur_target_dir)/etc/apk/repositories $(mkfs_cur_target_dir).repositories
-	$(if $(mkfs_packages_remove), \
-		$(apk_target) del $(mkfs_packages_remove))
-	$(if $(mkfs_packages_add), \
-		$(apk_target) add $(mkfs_packages_add))
-	mv $(mkfs_cur_target_dir).repositories $(mkfs_cur_target_dir)/etc/apk/repositories
-else
 	rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg
 	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
 	-mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
@@ -392,7 +333,6 @@ else
 			$(call opkg_package_files,$(mkfs_packages_add)))
 	-$(CP) -T $(mkfs_cur_target_dir).opkg/ $(mkfs_cur_target_dir)/etc/opkg/
 	rm -rf $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir).conf
-endif
 	$(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files)
 
 $(KDIR)/root.%: kernel_prepare
@@ -406,7 +346,6 @@ define Device/InitProfile
   DEVICE_ALT2_TITLE = $$(DEVICE_ALT2_VENDOR) $$(DEVICE_ALT2_MODEL)$$(if $$(DEVICE_ALT2_VARIANT), $$(DEVICE_ALT2_VARIANT))
   DEVICE_ALT3_TITLE = $$(DEVICE_ALT3_VENDOR) $$(DEVICE_ALT3_MODEL)$$(if $$(DEVICE_ALT3_VARIANT), $$(DEVICE_ALT3_VARIANT))
   DEVICE_ALT4_TITLE = $$(DEVICE_ALT4_VENDOR) $$(DEVICE_ALT4_MODEL)$$(if $$(DEVICE_ALT4_VARIANT), $$(DEVICE_ALT4_VARIANT))
-  DEVICE_ALT5_TITLE = $$(DEVICE_ALT5_VENDOR) $$(DEVICE_ALT5_MODEL)$$(if $$(DEVICE_ALT5_VARIANT), $$(DEVICE_ALT5_VARIANT))
   DEVICE_VENDOR :=
   DEVICE_MODEL :=
   DEVICE_VARIANT :=
@@ -425,60 +364,29 @@ define Device/InitProfile
   DEVICE_ALT4_VENDOR :=
   DEVICE_ALT4_MODEL :=
   DEVICE_ALT4_VARIANT :=
-  DEVICE_ALT5_VENDOR :=
-  DEVICE_ALT5_MODEL :=
-  DEVICE_ALT5_VARIANT :=
   DEVICE_PACKAGES :=
   DEVICE_DESCRIPTION = Build firmware images for $$(DEVICE_TITLE)
 endef
 
-##@
-# @brief Image configuration variables.
-#
-# @param 1: Device name.
-##
 define Device/Init
-  ##@ Device name.
   DEVICE_NAME := $(1)
-  ##@ Commands to build kernel.
-  # Commands with arguments are separated by `|`.
-  ##
   KERNEL:=
-  ##@ Commands to build initramfs.
-  # Commands with arguments are separated by `|`.
-  ##
   KERNEL_INITRAMFS = $$(KERNEL)
-  ##@ Kernel command line.
   CMDLINE:=
 
-  ##@ Images to build.
   IMAGES :=
-  ##@ Artifacts to build.
   ARTIFACTS :=
-  ##@ Device image prefix.
   DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
-  ##@ Device image name.
   DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
-  ##@ Factory image name.
   FACTORY_IMG_NAME :=
-  ##@ Maximum image size. Optional.
   IMAGE_SIZE :=
-  ##@ Maximum image size. Optional.
-  NAND_SIZE :=
-  ##@ Kernel image prefix.
   KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
-  ##@ Kernel image suffix.
   KERNEL_SUFFIX := -kernel.bin
-  ##@ Initramfs image suffix.
   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
-  ##@ Kernel image name.
   KERNEL_IMAGE = $$(KERNEL_PREFIX)$$(KERNEL_SUFFIX)
-  ##@ Initramfs image prefix.
   KERNEL_INITRAMFS_PREFIX = $$(DEVICE_IMG_PREFIX)-initramfs
   KERNEL_INITRAMFS_IMAGE = $$(KERNEL_INITRAMFS_PREFIX)$$(KERNEL_INITRAMFS_SUFFIX)
-  ##@ Initramfs image name.
   KERNEL_INITRAMFS_NAME = $$(KERNEL_NAME)-initramfs
-  ##@ Kernel install flag.
   KERNEL_INSTALL :=
   KERNEL_NAME := vmlinux
   KERNEL_DEPENDS :=
@@ -532,7 +440,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS_DIR DEVICE_DTS_OVERLAY DEVICE_DTS_LOADADDR \
   DEVICE_FDT_NUM DEVICE_IMG_PREFIX SOC BOARD_NAME UIMAGE_MAGIC UIMAGE_NAME \
   UIMAGE_TIME SUPPORTED_DEVICES IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR \
-  UBOOT_PATH IMAGE_SIZE NAND_SIZE \
+  UBOOT_PATH IMAGE_SIZE \
   FACTORY_IMG_NAME FACTORY_SIZE \
   DEVICE_PACKAGES DEVICE_COMPAT_VERSION DEVICE_COMPAT_MESSAGE \
   DEVICE_VENDOR DEVICE_MODEL DEVICE_VARIANT \
@@ -540,8 +448,7 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_ALT1_VENDOR DEVICE_ALT1_MODEL DEVICE_ALT1_VARIANT \
   DEVICE_ALT2_VENDOR DEVICE_ALT2_MODEL DEVICE_ALT2_VARIANT \
   DEVICE_ALT3_VENDOR DEVICE_ALT3_MODEL DEVICE_ALT3_VARIANT \
-  DEVICE_ALT4_VENDOR DEVICE_ALT4_MODEL DEVICE_ALT4_VARIANT \
-  DEVICE_ALT5_VENDOR DEVICE_ALT5_MODEL DEVICE_ALT5_VARIANT
+  DEVICE_ALT4_VENDOR DEVICE_ALT4_MODEL DEVICE_ALT4_VARIANT
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
@@ -555,10 +462,10 @@ endef
 ifdef IB
   DEVICE_CHECK_PROFILE = $(filter $(1),DEVICE_$(PROFILE) $(PROFILE))
 else
-  DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)_$(SUBTARGET))_$(1))
+  DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1))
 endif
 
-DEVICE_EXTRA_PACKAGES = $(call qstrip,$(CONFIG_TARGET_DEVICE_PACKAGES_$(call target_conf,$(BOARD)_$(SUBTARGET))_DEVICE_$(1)))
+DEVICE_EXTRA_PACKAGES = $(call qstrip,$(CONFIG_TARGET_DEVICE_PACKAGES_$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_DEVICE_$(1)))
 
 define merge_packages
   $(1) :=
@@ -569,15 +476,6 @@ endef
 
 define Device/Check/Common
   _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile))))
-  # Check if device is disabled and if so do not mark to be installed when ImageBuilder is used
-  ifeq ($(IB),1)
-    ifeq ($$(DEFAULT),n)
-      _PROFILE_SET :=
-    endif
-    ifeq ($$(BROKEN),y)
-      _PROFILE_SET :=
-    endif
-  endif
   DEVICE_PACKAGES += $$(call extra_packages,$$(DEVICE_PACKAGES))
   ifdef TARGET_PER_DEVICE_ROOTFS
     $$(eval $$(call merge_packages,_PACKAGES,$$(DEVICE_PACKAGES) $$(call DEVICE_EXTRA_PACKAGES,$(1))))
@@ -602,20 +500,11 @@ define Device/Build/initramfs
 	  $$(if $$(CONFIG_JSON_OVERVIEW_IMAGE_INFO), $(BUILD_DIR)/json_info_files/$$(KERNEL_INITRAMFS_IMAGE).json,))
 
   $(KDIR)/$$(KERNEL_INITRAMFS_NAME):: image_prepare
-  ifdef TARGET_PER_DEVICE_ROOTFS
-    $(KDIR)/$$(KERNEL_INITRAMFS_NAME).$$(ROOTFS_ID/$(1)):: image_prepare target-dir-$$(ROOTFS_ID/$(1))
-	$(call Kernel/CompileImage/Initramfs,$(KDIR)/target-dir-$$(ROOTFS_ID/$(1)),.$$(ROOTFS_ID/$(1)))
-  endif
-  $(1)-initramfs-images: $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))
-
-  .IGNORE: $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE)
-
+  $(1)-images: $$(if $$(KERNEL_INITRAMFS),$(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE))
   $(BIN_DIR)/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE)
 	cp $$^ $$@
 
-  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME)$$(strip \
-						$(if $(TARGET_PER_DEVICE_ROOTFS),.$$(ROOTFS_ID/$(1))) \
-					) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
+  $(KDIR)/tmp/$$(KERNEL_INITRAMFS_IMAGE): $(KDIR)/$$(KERNEL_INITRAMFS_NAME) $(CURDIR)/Makefile $$(KERNEL_DEPENDS) image_prepare
 	@rm -f $$@
 	$$(call concat_cmd,$$(KERNEL_INITRAMFS))
 
@@ -648,13 +537,10 @@ define Device/Build/initramfs
 	DEVICE_ALT4_VENDOR="$$(DEVICE_ALT4_VENDOR)" \
 	DEVICE_ALT4_MODEL="$$(DEVICE_ALT4_MODEL)" \
 	DEVICE_ALT4_VARIANT="$$(DEVICE_ALT4_VARIANT)" \
-	DEVICE_ALT5_VENDOR="$$(DEVICE_ALT5_VENDOR)" \
-	DEVICE_ALT5_MODEL="$$(DEVICE_ALT5_MODEL)" \
-	DEVICE_ALT5_VARIANT="$$(DEVICE_ALT5_VARIANT)" \
 	DEVICE_TITLE="$$(DEVICE_TITLE)" \
 	DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
 	TARGET="$(BOARD)" \
-	SUBTARGET="$(SUBTARGET)" \
+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
 	VERSION_NUMBER="$(VERSION_NUMBER)" \
 	VERSION_CODE="$(VERSION_CODE)" \
 	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
@@ -678,7 +564,7 @@ define Device/Build/dtb
   $(KDIR)/image-$(1).dtb: FORCE
 	$(call Image/BuildDTB,$(strip $(2))/$(strip $(3)).dts,$$@)
 
-  compile-dtb: $(KDIR)/image-$(1).dtb
+  image_prepare: $(KDIR)/image-$(1).dtb
   endif
 
 endef
@@ -689,7 +575,7 @@ define Device/Build/dtbo
   $(KDIR)/image-$(1).dtbo: FORCE
 	$(call Image/BuildDTBO,$(strip $(2))/$(strip $(3)).dtso,$$@)
 
-  compile-dtb: $(KDIR)/image-$(1).dtbo
+  image_prepare: $(KDIR)/image-$(1).dtbo
   endif
 
 endef
@@ -742,7 +628,7 @@ define Device/Build/image
   ifndef IB
     $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3)))
   endif
-  $(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3)) $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(if $(IB),,$(3)-initramfs-images))
+  $(KDIR)/tmp/$(call DEVICE_IMG_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3))
 	@rm -f $$@
 	[ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ]
 	$$(call concat_cmd,$(if $(IMAGE/$(2)/$(1)),$(IMAGE/$(2)/$(1)),$(IMAGE/$(2))))
@@ -782,13 +668,10 @@ define Device/Build/image
 	DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
 	DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
 	DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
-	DEVICE_ALT5_VENDOR="$(DEVICE_ALT5_VENDOR)" \
-	DEVICE_ALT5_MODEL="$(DEVICE_ALT5_MODEL)" \
-	DEVICE_ALT5_VARIANT="$(DEVICE_ALT5_VARIANT)" \
 	DEVICE_TITLE="$(DEVICE_TITLE)" \
 	DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
 	TARGET="$(BOARD)" \
-	SUBTARGET="$(SUBTARGET)" \
+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
 	VERSION_NUMBER="$(VERSION_NUMBER)" \
 	VERSION_CODE="$(VERSION_CODE)" \
 	SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \
@@ -801,7 +684,7 @@ define Device/Build/artifact
 	  $(BUILD_DIR)/json_info_files/$(DEVICE_IMG_PREFIX)-$(1).json, \
 	  $(BIN_DIR)/$(DEVICE_IMG_PREFIX)-$(1))
   $(eval $(call Device/Export,$(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1)))
-  $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE) $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(if $(IB),,$(2)-initramfs-images)) $(2)-images
+  $(KDIR)/tmp/$(DEVICE_IMG_PREFIX)-$(1): $$(KDIR_KERNEL_IMAGE) $(2)-images
 	@rm -f $$@
 	$$(call concat_cmd,$(ARTIFACT/$(1)))
 
@@ -836,13 +719,10 @@ define Device/Build/artifact
 	DEVICE_ALT4_VENDOR="$(DEVICE_ALT4_VENDOR)" \
 	DEVICE_ALT4_MODEL="$(DEVICE_ALT4_MODEL)" \
 	DEVICE_ALT4_VARIANT="$(DEVICE_ALT4_VARIANT)" \
-	DEVICE_ALT5_VENDOR="$(DEVICE_ALT5_VENDOR)" \
-	DEVICE_ALT5_MODEL="$(DEVICE_ALT5_MODEL)" \
-	DEVICE_ALT5_VARIANT="$(DEVICE_ALT5_VARIANT)" \
 	DEVICE_TITLE="$(DEVICE_TITLE)" \
 	DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \
 	TARGET="$(BOARD)" \
-	SUBTARGET="$(SUBTARGET)" \
+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
 	VERSION_NUMBER="$(VERSION_NUMBER)" \
 	VERSION_CODE="$(VERSION_CODE)" \
 	SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \
@@ -851,7 +731,7 @@ define Device/Build/artifact
 endef
 
 define Device/Build
-  $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$$(eval $$(call Device/Build/initramfs,$(1))))
+  $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
   $(call Device/Build/kernel,$(1))
 
   $$(eval $$(foreach compile,$$(COMPILE), \
@@ -882,7 +762,6 @@ $(if $(strip $(DEVICE_ALT1_TITLE)),- $(DEVICE_ALT1_TITLE))
 $(if $(strip $(DEVICE_ALT2_TITLE)),- $(DEVICE_ALT2_TITLE))
 $(if $(strip $(DEVICE_ALT3_TITLE)),- $(DEVICE_ALT3_TITLE))
 $(if $(strip $(DEVICE_ALT4_TITLE)),- $(DEVICE_ALT4_TITLE))
-$(if $(strip $(DEVICE_ALT5_TITLE)),- $(DEVICE_ALT5_TITLE))
 @@
 
 endef
@@ -908,10 +787,6 @@ ifneq ($$(strip $$(DEVICE_ALT4_TITLE)),)
 DEVICE_DISPLAY = $$(DEVICE_ALT4_TITLE) ($$(DEVICE_TITLE))
 $$(info $$(call Device/DumpInfo,$(1)))
 endif
-ifneq ($$(strip $$(DEVICE_ALT5_TITLE)),)
-DEVICE_DISPLAY = $$(DEVICE_ALT5_TITLE) ($$(DEVICE_TITLE))
-$$(info $$(call Device/DumpInfo,$(1)))
-endif
 DEVICE_DISPLAY = $$(DEVICE_TITLE)
 $$(eval $$(if $$(DEVICE_TITLE),$$(info $$(call Device/DumpInfo,$(1)))))
 endef
@@ -937,20 +812,18 @@ define BuildImage
   download:
   prepare:
   compile:
-  compile-dtb:
   clean:
   image_prepare:
 
   ifeq ($(IB),)
-    .PHONY: download prepare compile compile-dtb clean image_prepare kernel_prepare install install-images
+    .PHONY: download prepare compile clean image_prepare kernel_prepare install install-images
     compile:
 		$(call Build/Compile)
 
     clean:
 		$(call Build/Clean)
 
-    compile-dtb:
-    image_prepare: compile compile-dtb
+    image_prepare: compile
 		mkdir -p $(BIN_DIR) $(KDIR)/tmp
 		rm -rf $(BUILD_DIR)/json_info_files
 		$(call Image/Prepare)

include/kernel-5.15

@@ -0,0 +1,2 @@
+LINUX_VERSION-5.15 = .120
+LINUX_KERNEL_HASH-5.15.120 = 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6

include/kernel-6.6

@@ -1,2 +0,0 @@
-LINUX_VERSION-6.6 = .99
-LINUX_KERNEL_HASH-6.6.99 = b08679729f1ec74b9fa829f5990936ca2511039d87acc7e8b3f39912de89ab36

include/kernel-build.mk

@@ -51,7 +51,7 @@ endif
 define Download/git-kernel
   URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
   PROTO:=git
-  SOURCE_VERSION:=$(CONFIG_KERNEL_GIT_REF)
+  VERSION:=$(CONFIG_KERNEL_GIT_REF)
   FILE:=$(LINUX_SOURCE)
   SUBDIR:=linux-$(LINUX_VERSION)
   OPTS:=$(KERNEL_GIT_OPTS)
@@ -63,7 +63,7 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG
 	mkdir -p $(KERNEL_BUILD_DIR)/debug/modules
 	$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/debug/
 	-$(CP) \
-		$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)/*.ko \
+		$(STAGING_DIR_ROOT)/lib/modules/$(LINUX_VERSION)/* \
 		$(KERNEL_BUILD_DIR)/debug/modules/
 	$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
 	$(TAR) c -C $(KERNEL_BUILD_DIR) debug \
@@ -154,11 +154,7 @@ define BuildKernel
   download: $(if $(LINUX_SITE),$(DL_DIR)/$(LINUX_SOURCE))
   prepare: $(STAMP_PREPARED)
   compile: $(LINUX_DIR)/.modules
-	+$(MAKE) -C image compile TARGET_BUILD=
-
-  dtb: $(STAMP_CONFIGURED)
-	$(_SINGLE)$(KERNEL_MAKE) scripts_dtc
-	$(MAKE) -C image compile-dtb TARGET_BUILD=
+	$(MAKE) -C image compile TARGET_BUILD=
 
   oldconfig menuconfig nconfig xconfig: $(STAMP_PREPARED) $(STAMP_CHECKED) FORCE
 	rm -f $(LINUX_DIR)/.config.prev

include/kernel-defaults.mk

@@ -9,6 +9,10 @@ endif
 
 INITRAMFS_EXTRA_FILES ?= $(GENERIC_PLATFORM_DIR)/image/initramfs-base-files.txt
 
+ifneq (,$(KERNEL_CC))
+  KERNEL_MAKEOPTS += CC="$(KERNEL_CC)"
+endif
+
 export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
 
 # defined in quilt.mk
@@ -48,56 +52,44 @@ endif
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y)
     define Kernel/SetInitramfs/PreConfigure
-	{ \
-		grep -v -e CONFIG_BLK_DEV_INITRD $(2)/.config.old > $(2)/.config; \
-		echo 'CONFIG_BLK_DEV_INITRD=y' >> $(2)/.config; \
-		echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(2)/.config; \
-	}
+	grep -v -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
     endef
   else
-    ifeq ($(strip $(CONFIG_EXTERNAL_CPIO)),"")
-      define Kernel/SetInitramfs/PreConfigure
-	{ \
-		grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(2)/.config.old > $(2)/.config; \
-		echo 'CONFIG_BLK_DEV_INITRD=y' >> $(2)/.config; \
-		echo 'CONFIG_INITRAMFS_SOURCE="$(strip $(1) $(INITRAMFS_EXTRA_FILES))"' >> $(2)/.config; \
-	}
-      endef
-    else
-      define Kernel/SetInitramfs/PreConfigure
-	{ \
-		grep -v INITRAMFS $(2)/.config.old > $(2)/.config; \
-		echo 'CONFIG_INITRAMFS_SOURCE="$(call qstrip,$(CONFIG_EXTERNAL_CPIO))"' >> $(2)/.config; \
-	}
-      endef
-    endif
+  ifeq ($(strip $(CONFIG_EXTERNAL_CPIO)),"")
+    define Kernel/SetInitramfs/PreConfigure
+	grep -v -e INITRAMFS -e CONFIG_RD_ -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE="$(strip $(TARGET_DIR) $(INITRAMFS_EXTRA_FILES))"' >> $(LINUX_DIR)/.config
+    endef
+  else
+    define Kernel/SetInitramfs/PreConfigure
+	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_SOURCE="$(call qstrip,$(CONFIG_EXTERNAL_CPIO))"' >> $(LINUX_DIR)/.config
+    endef
   endif
+endif
 
   define Kernel/SetInitramfs
-	{ \
-		rm -f $(2)/.config.prev; \
-		mv $(2)/.config $(2)/.config.old; \
-		$(call Kernel/SetInitramfs/PreConfigure,$(1),$(2)); \
-		echo "# CONFIG_INITRAMFS_PRESERVE_MTIME is not set" >> $(2)/.config; \
-		$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),,echo "CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)" >> $(2)/.config;) \
-		$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),,echo "CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)" >> $(2)/.config;) \
-		$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
-			echo "# CONFIG_INITRAMFS_FORCE is not set" >> $(2)/.config;, \
-			$(if $(CONFIG_TARGET_INITRAMFS_FORCE), \
-				echo "CONFIG_INITRAMFS_FORCE=y" >> $(2)/.config;, \
-				echo "# CONFIG_INITRAMFS_FORCE is not set" >> $(2)/.config;)) \
-		$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE), \
-			echo "CONFIG_INITRAMFS_COMPRESSION_NONE=y" >> $(2)/.config;, \
-			echo "# CONFIG_INITRAMFS_COMPRESSION_NONE is not set" >> $(2)/.config; ) \
-		$(foreach ALGO,GZIP BZIP2 LZMA LZO XZ LZ4 ZSTD, \
-			$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_$(ALGO)), \
-				echo "CONFIG_INITRAMFS_COMPRESSION_$(ALGO)=y" >> $(2)/.config; $\, \
-				echo "# CONFIG_INITRAMFS_COMPRESSION_$(ALGO) is not set" >> $(2)/.config; $\) \
-			$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_$(ALGO)), \
-				echo "CONFIG_RD_$(ALGO)=y" >> $(2)/.config; $\, \
-				echo "# CONFIG_RD_$(ALGO) is not set" >> $(2)/.config; $\) \
-		) \
-	}
+	rm -f $(LINUX_DIR)/.config.prev
+	mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+	$(call Kernel/SetInitramfs/PreConfigure)
+  ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y)
+	echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config
+	echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config
+  else
+	echo "# CONFIG_INITRAMFS_FORCE is not set" >> $(LINUX_DIR)/.config
+  endif
+	echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),CONFIG_INITRAMFS_COMPRESSION_LZMA=y\nCONFIG_RD_LZMA=y,# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set\n# CONFIG_RD_LZMA is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),CONFIG_INITRAMFS_COMPRESSION_LZO=y\nCONFIG_RD_LZO=y,# CONFIG_INITRAMFS_COMPRESSION_LZO is not set\n# CONFIG_RD_LZO is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),CONFIG_INITRAMFS_COMPRESSION_XZ=y\nCONFIG_RD_XZ=y,# CONFIG_INITRAMFS_COMPRESSION_XZ is not set\n# CONFIG_RD_XZ is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),CONFIG_INITRAMFS_COMPRESSION_LZ4=y\nCONFIG_RD_LZ4=y,# CONFIG_INITRAMFS_COMPRESSION_LZ4 is not set\n# CONFIG_RD_LZ4 is not set)" >> $(LINUX_DIR)/.config
+	echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),CONFIG_INITRAMFS_COMPRESSION_ZSTD=y\nCONFIG_RD_ZSTD=y,# CONFIG_INITRAMFS_COMPRESSION_ZSTD is not set\n# CONFIG_RD_ZSTD is not set)" >> $(LINUX_DIR)/.config
   endef
 else
 endif
@@ -107,7 +99,6 @@ define Kernel/SetNoInitramfs
 	grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config.set
 	echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set
 	echo '# CONFIG_INITRAMFS_FORCE is not set' >> $(LINUX_DIR)/.config.set
-	echo "# CONFIG_INITRAMFS_PRESERVE_MTIME is not set" >> $(LINUX_DIR)/.config.set
 endef
 
 define Kernel/Configure/Default
@@ -131,7 +122,7 @@ define Kernel/Configure/Default
 endef
 
 define Kernel/Configure/Initramfs
-	$(call Kernel/SetInitramfs,$(1),$(2))
+	$(call Kernel/SetInitramfs)
 endef
 
 define Kernel/CompileModules/Default
@@ -150,16 +141,14 @@ ifeq ($(LINUX_KARCH),x86_64)
 IMAGES_DIR:=../../x86/boot
 endif
 
-# $1: image suffix
-# $2: Per Device Rootfs ID
 define Kernel/CopyImage
-	cmp -s $(LINUX_DIR)$(2)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).debug$(2) || { \
-		$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)$(2)/vmlinux $(LINUX_KERNEL)$(1)$(2); \
-		$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)$(2)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf$(2); \
-		$(CP) $(LINUX_DIR)$(2)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).debug$(2); \
+	cmp -s $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).debug || { \
+		$(KERNEL_CROSS)objcopy -O binary $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)$(1); \
+		$(KERNEL_CROSS)objcopy $(OBJCOPY_STRIP) -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).elf; \
+		$(CP) $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux$(1).debug; \
 		$(foreach k, \
 			$(if $(KERNEL_IMAGES),$(KERNEL_IMAGES),$(filter-out vmlinux dtbs,$(KERNELNAME))), \
-			$(CP) $(LINUX_DIR)$(2)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1)$(2); \
+			$(CP) $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/$(IMAGES_DIR)/$(k) $(KERNEL_BUILD_DIR)/$(k)$(1); \
 		) \
 	}
 endef
@@ -170,53 +159,29 @@ define Kernel/CompileImage/Default
 	$(call Kernel/CopyImage)
 endef
 
-define Kernel/PrepareConfigPerRootfs
-	{ \
-		[ ! -d "$(1)" ] || rm -rf $(1); \
-		mkdir $(1) && $(CP) -T $(LINUX_DIR) $(1); \
-		touch $(1)/.config; \
-	}
-endef
-
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-# $1: Custom TARGET_DIR. If omitted TARGET_DIR is used.
-# $2: If defined Generate Per Rootfs Kernel Directory and use it
-# For Separate Initramf with $2 declared, skip kernel compile, it has
-# already been done previously on generic image build
 define Kernel/CompileImage/Initramfs
-	$(call locked,{ \
-		$(if $(2),$(call Kernel/PrepareConfigPerRootfs,$(LINUX_DIR)$(2));) \
-		$(call Kernel/Configure/Initramfs,$(if $(1),$(1),$(TARGET_DIR)),$(LINUX_DIR)$(2)); \
-		$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(if $(1),$(1),$(TARGET_DIR))/init; \
-		$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(if $(1),$(1),$(TARGET_DIR)) $(if $(1),$(1),$(TARGET_DIR))/init;) \
-		rm -rf $(LINUX_DIR)$(2)/usr/initramfs_data.cpio*; \
-		$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \
-			$(call locked,{ \
-				$(if $(call qstrip,$(CONFIG_EXTERNAL_CPIO)), \
-					$(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd$(2).cpio;,\
-					( cd $(if $(1),$(1),$(TARGET_DIR)); find . | LC_ALL=C sort | $(STAGING_DIR_HOST)/bin/cpio --reproducible -o -H newc -R 0:0 > $(KERNEL_BUILD_DIR)/initrd$(2).cpio );) \
-				$(if $(SOURCE_DATE_EPOCH), \
-					touch -hcd "@$(SOURCE_DATE_EPOCH)" $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2), \
-					$(STAGING_DIR_HOST)/bin/bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd$(2).cpio > $(KERNEL_BUILD_DIR)/initrd$(2).cpio.bzip2;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP), \
-					$(STAGING_DIR_HOST)/bin/libdeflate-gzip -n -f -S .gzip -12 $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4), \
-					$(STAGING_DIR_HOST)/bin/lz4c -l -c1 -fz --favor-decSpeed $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA), \
-					$(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 $(KERNEL_BUILD_DIR)/initrd$(2).cpio $(KERNEL_BUILD_DIR)/initrd$(2).cpio.lzma;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO), \
-					$(STAGING_DIR_HOST)/bin/lzop -9 -f $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ), \
-					$(STAGING_DIR_HOST)/bin/xz -T$(if $(filter 1,$(NPROC)),2,0) -9 -fz --check=crc32 $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-				$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD), \
-					$(STAGING_DIR_HOST)/bin/zstd -T0 -f -o $(KERNEL_BUILD_DIR)/initrd$(2).cpio.zstd $(KERNEL_BUILD_DIR)/initrd$(2).cpio;) \
-			}, gen-cpio$(2)); \
-			$(if $(2),,$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all);),\
-			$(KERNEL_MAKE) $(if $(2),-C $(LINUX_DIR)$(2)) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all);) \
-		$(call Kernel/CopyImage,-initramfs,$(2)); \
-		$(if $(2),rm -rf $(LINUX_DIR)$(2);) \
-	}, gen-initramfs$(2));
+	$(call Kernel/Configure/Initramfs)
+	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
+	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR) $(TARGET_DIR)/init)
+	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y)
+ifneq ($(qstrip $(CONFIG_EXTERNAL_CPIO)),)
+	$(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd.cpio
+else
+	( cd $(TARGET_DIR); find . | LC_ALL=C sort | $(STAGING_DIR_HOST)/bin/cpio --reproducible -o -H newc -R 0:0 > $(KERNEL_BUILD_DIR)/initrd.cpio )
+endif
+	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(KERNEL_BUILD_DIR)/initrd.cpio)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),$(STAGING_DIR_HOST)/bin/bzip2 -9 -c < $(KERNEL_BUILD_DIR)/initrd.cpio > $(KERNEL_BUILD_DIR)/initrd.cpio.bzip2)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),$(STAGING_DIR_HOST)/bin/libdeflate-gzip -n -f -S .gzip -12 $(KERNEL_BUILD_DIR)/initrd.cpio)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),$(STAGING_DIR_HOST)/bin/lz4c -l -c1 -fz --favor-decSpeed $(KERNEL_BUILD_DIR)/initrd.cpio)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA),$(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 $(KERNEL_BUILD_DIR)/initrd.cpio $(KERNEL_BUILD_DIR)/initrd.cpio.lzma)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),$(STAGING_DIR_HOST)/bin/lzop -9 -f $(KERNEL_BUILD_DIR)/initrd.cpio)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_XZ),$(STAGING_DIR_HOST)/bin/xz -T$(if $(filter 1,$(NPROC)),2,0) -9 -fz --check=crc32 $(KERNEL_BUILD_DIR)/initrd.cpio)
+	$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),$(STAGING_DIR_HOST)/bin/zstd -T0 -f -o $(KERNEL_BUILD_DIR)/initrd.cpio.zstd $(KERNEL_BUILD_DIR)/initrd.cpio)
+endif
+	+$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all)
+	$(call Kernel/CopyImage,-initramfs)
 endef
 else
 define Kernel/CompileImage/Initramfs

include/kernel.mk

@@ -43,7 +43,7 @@ else
     PATCH_DIR ?= $(CURDIR)/patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
     FILES_DIR ?= $(foreach dir,$(wildcard $(CURDIR)/files $(CURDIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
   endif
-  KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)_$(SUBTARGET)
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
   LINUX_UAPI_DIR=uapi/
   LINUX_VERMAGIC:=$(strip $(shell cat $(LINUX_DIR)/.vermagic 2>/dev/null))
@@ -86,8 +86,6 @@ else ifneq (,$(findstring $(ARCH) , arceb ))
   LINUX_KARCH := arc
 else ifneq (,$(findstring $(ARCH) , armeb ))
   LINUX_KARCH := arm
-else ifneq (,$(findstring $(ARCH) , loongarch64 ))
-  LINUX_KARCH := loongarch
 else ifneq (,$(findstring $(ARCH) , mipsel mips64 mips64el ))
   LINUX_KARCH := mips
 else ifneq (,$(findstring $(ARCH) , powerpc64 ))
@@ -121,10 +119,6 @@ KERNEL_MAKE_FLAGS = \
 	cmd_syscalls= \
 	$(if $(__package_mk),KBUILD_EXTRA_SYMBOLS="$(wildcard $(PKG_SYMVERS_DIR)/*.symvers)")
 
-ifneq (,$(KERNEL_CC))
-  KERNEL_MAKE_FLAGS += CC="$(KERNEL_CC)"
-endif
-
 KERNEL_NOSTDINC_FLAGS = \
 	-nostdinc $(if $(DUMP),, -isystem $(shell $(TARGET_CC) -print-file-name=include))
 
@@ -206,19 +200,19 @@ define KernelPackage
   $(eval $(call KernelPackage/Defaults))
   $(eval $(call KernelPackage/$(1)))
   $(eval $(call KernelPackage/$(1)/$(BOARD)))
-  $(eval $(call KernelPackage/$(1)/$(BOARD)/$(SUBTARGET)))
+  $(eval $(call KernelPackage/$(1)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)))
 
   define Package/kmod-$(1)
     TITLE:=$(TITLE)
     SECTION:=kernel
     CATEGORY:=Kernel modules
     DESCRIPTION:=$(DESCRIPTION)
-    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE))
-    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),.$(PKG_VERSION))-r$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
+    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
     PKGFLAGS:=$(PKGFLAGS)
     $(call KernelPackage/$(1))
     $(call KernelPackage/$(1)/$(BOARD))
-    $(call KernelPackage/$(1)/$(BOARD)/$(SUBTARGET))
+    $(call KernelPackage/$(1)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic))
   endef
 
   ifdef KernelPackage/$(1)/conffiles

include/meson.mk

@@ -78,7 +78,6 @@ define Meson/CreateCrossFile
 	$(STAGING_DIR_HOST)/bin/sed \
 		-e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \
 		-e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \
-		-e "s|@LD@|$(foreach FLAG,$(TARGET_LINKER),'$(FLAG)',)|" \
 		-e "s|@AR@|$(TARGET_AR)|" \
 		-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
 		-e "s|@NM@|$(TARGET_NM)|" \
@@ -98,9 +97,7 @@ endef
 define Host/Configure/Meson
 	$(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt)
 	$(call Meson, \
-		setup \
 		--native-file $(HOST_BUILD_DIR)/openwrt-native.txt \
-		-Ddefault_library=static \
 		$(MESON_HOST_ARGS) \
 		$(MESON_HOST_BUILD_DIR) \
 		$(MESON_HOST_BUILD_DIR)/.., \
@@ -123,11 +120,9 @@ define Build/Configure/Meson
 	$(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt)
 	$(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt)
 	$(call Meson, \
-		setup \
-		--buildtype $(if $(CONFIG_DEBUG),debug,plain) \
+		--buildtype plain \
 		--native-file $(PKG_BUILD_DIR)/openwrt-native.txt \
 		--cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \
-		-Ddefault_library=both \
 		$(MESON_ARGS) \
 		$(MESON_BUILD_DIR) \
 		$(MESON_BUILD_DIR)/.., \

include/netfilter.mk

@@ -131,6 +131,9 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL))
 # iprange
 $(eval $(call nf_add,IPT_IPRANGE,CONFIG_NETFILTER_XT_MATCH_IPRANGE, $(P_XT)xt_iprange))
 
+#clusterip
+$(eval $(call nf_add,IPT_CLUSTERIP,CONFIG_IP_NF_TARGET_CLUSTERIP, $(P_V4)ipt_CLUSTERIP))
+
 # ipsec
 $(eval $(call nf_add,IPT_IPSEC,CONFIG_IP_NF_MATCH_AH, $(P_V4)ipt_ah))
 $(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_ESP, $(P_XT)xt_esp))
@@ -183,7 +186,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_NAT, $(P_V6)ip6table
 $(eval $(if $(NF_KMOD),$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, $(P_V6)ip6t_NPT),))
 
 # userland only
-$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_NAT)))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT,CONFIG_NF_NAT, ipt_SNAT ipt_DNAT)))
 $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_NAT6,CONFIG_IP6_NF_TARGET_NPT, ip6t_DNPT ip6t_SNPT)))
 
 $(eval $(call nf_add,IPT_NAT,CONFIG_NETFILTER_XT_TARGET_MASQUERADE, $(P_XT)xt_MASQUERADE))
@@ -204,8 +207,6 @@ $(eval $(call nf_add,NF_NATHELPER,CONFIG_NF_NAT_FTP, $(P_XT)nf_nat_ftp))
 # nathelper-extra
 
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_BROADCAST, $(P_XT)nf_conntrack_broadcast))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_NETBIOS_NS, $(P_XT)nf_conntrack_netbios_ns))
-$(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_SANE, $(P_XT)nf_conntrack_sane))
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_AMANDA, $(P_XT)nf_conntrack_amanda))
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_NAT_AMANDA, $(P_XT)nf_nat_amanda))
 $(eval $(call nf_add,NF_NATHELPER_EXTRA,CONFIG_NF_CONNTRACK_H323, $(P_XT)nf_conntrack_h323))
@@ -252,6 +253,8 @@ $(eval $(call nf_add,IPT_LED,CONFIG_NETFILTER_XT_TARGET_LED, $(P_XT)xt_LED))
 # tee
 
 $(eval $(call nf_add,IPT_TEE,CONFIG_NETFILTER_XT_TARGET_TEE, $(P_XT)xt_TEE))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV4, $(P_V4)nf_dup_ipv4),))
+$(eval $(if $(NF_KMOD),$(call nf_add,IPT_TEE,CONFIG_NF_DUP_IPV6, $(P_V6)nf_dup_ipv6),))
 
 # u32
 
@@ -368,6 +371,7 @@ IPT_BUILTIN += $(IPT_FLOW-y) $(IPT_FLOW-m)
 IPT_BUILTIN += $(IPT_IPOPT-y)
 IPT_BUILTIN += $(IPT_IPRANGE-y)
 IPT_BUILTIN += $(IPT_CLUSTER-y)
+IPT_BUILTIN += $(IPT_CLUSTERIP-y)
 IPT_BUILTIN += $(IPT_IPSEC-y)
 IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m)
 IPT_BUILTIN += $(NF_NAT-y)

include/optee-os.mk

@@ -1,113 +0,0 @@
-include $(INCLUDE_DIR)/prereq.mk
-
-PKG_NAME ?= optee-os
-
-ifndef PKG_SOURCE_PROTO
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL = https://github.com/OP-TEE/optee_os/archive/refs/tags/
-TAR_OPTIONS+= --transform 's/optee_os/$(PKG_NAME)/'
-endif
-
-PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_TARGETS := bin
-PKG_FLAGS:=nonshared
-
-PKG_LICENSE:=BSD 2-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_PARALLEL ?= 1
-
-$(eval $(call TestHostCommand,python3-cryptography, \
-  Please install the Python3 cryptography module, \
-  $(STAGING_DIR_HOST)/bin/python3 -c 'import cryptography'))
-
-$(eval $(call TestHostCommand,python3-pyelftools, \
-    Please install the Python3 pyelftools module, \
-    $(STAGING_DIR_HOST)/bin/python3 -c 'import elftools'))
-
-export GCC_HONOUR_COPTS=s
-
-define Package/optee-os/install/default
-	$(CP) $(patsubst %,$(PKG_BUILD_DIR)/out/arm-plat-$(PLAT)/core/%,$(OPTEE_IMAGE)) $(1)/
-endef
-
-Package/optee-os/install = $(Package/optee-os/install/default)
-
-define Optee-os/Init
-  BUILD_TARGET:=
-  BUILD_SUBTARGET:=
-  BUILD_DEVICES:=
-  NAME:=
-  DEPENDS:=
-  HIDDEN:=
-  DEFAULT:=
-  VARIANT:=$(1)
-  PLAT:=$(1)
-  PLAT_FLAVOR:=
-  OPTEE_IMAGE:=tee-header_v2.bin tee-pager_v2.bin tee-pageable_v2.bin
-endef
-
-TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET))
-
-define Build/Optee-os/Target
-  $(eval $(call Optee-os/Init,$(1)))
-  $(eval $(call Optee-os/Default,$(1)))
-  $(eval $(call Optee-os/$(1),$(1)))
-
-  define Package/optee-os-$(1)
-    SECTION:=boot
-    CATEGORY:=Boot Loaders
-    TITLE:=OPTEE-OS for $(NAME)
-    VARIANT:=$(VARIANT)
-    DEPENDS:=@!IN_SDK $(DEPENDS)
-    HIDDEN:=$(HIDDEN)
-    ifneq ($(BUILD_TARGET),)
-      DEPENDS += @$(TARGET_DEP)
-      ifneq ($(BUILD_DEVICES),)
-        DEFAULT := y if ($(TARGET_DEP)_Default \
-		$(patsubst %,|| $(TARGET_DEP)_DEVICE_%,$(BUILD_DEVICES)) \
-		$(patsubst %,|| $(patsubst TARGET_%,TARGET_DEVICE_%,$(TARGET_DEP))_DEVICE_%,$(BUILD_DEVICES)))
-      endif
-    endif
-    $(if $(DEFAULT),DEFAULT:=$(DEFAULT))
-    URL:=https://optee.readthedocs.io
-  endef
-
-  define Package/optee-os-$(1)/install
-	$$(Package/optee-os/install)
-  endef
-endef
-
-define Build/Configure/Optee-os
-endef
-
-define Build/Compile/Optee-os
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		PATH=$(LINUX_DIR)/scripts/dtc/:$(STAGING_DIR_HOST)/bin:$(PATH) \
-		CROSS_COMPILE=$(TARGET_CROSS) \
-		CROSS_COMPILE_core="$(TARGET_CROSS)" \
-		CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \
-		CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" \
-		$(if $(CONFIG_ARCH_64BIT), CFG_ARM64_core=y CFG_USER_TA_TARGETS=ta_arm64, CFG_ARM32_core=y) \
-		PLATFORM="$(PLAT)" \
-		PLATFORM_FLAVOR="$(call qstrip,$(PLAT_FLAVOR))" \
-		$(OPTEE_MAKE_FLAGS)
-endef
-
-define BuildPackage/Optee-os/Defaults
-  Build/Configure/Default = $$$$(Build/Configure/Optee-os)
-  Build/Compile/Default = $$$$(Build/Compile/Optee-os)
-endef
-
-define BuildPackage/Optee-os
-  $(eval $(call BuildPackage/Optee-os/Defaults))
-  $(foreach type,$(if $(DUMP),$(OPTEE_TARGETS),$(BUILD_VARIANT)), \
-    $(eval $(call Build/Optee-os/Target,$(type)))
-  )
-  $(eval $(call Build/DefaultTargets))
-  $(foreach type,$(if $(DUMP),$(OPTEE_TARGETS),$(BUILD_VARIANT)), \
-    $(call BuildPackage,optee-os-$(type))
-  )
-endef

include/package-defaults.mk

@@ -20,10 +20,10 @@ define Package/Default
   PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=$(PKG_MAINTAINER)
-  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(patsubst $(TOPDIR)/package/%,feeds/base/%,$(CURDIR)))
+  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR))
   ifneq ($(PKG_VERSION),)
     ifneq ($(PKG_RELEASE),)
-      VERSION:=$(PKG_VERSION)-r$(PKG_RELEASE)
+      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
     else
       VERSION:=$(PKG_VERSION)
     endif
@@ -49,7 +49,7 @@ define Package/Default
   KCONFIG:=
   BUILDONLY:=
   HIDDEN:=
-  URL:=$(PKG_URL)
+  URL:=
   VARIANT:=
   DEFAULT_VARIANT:=
   USERID:=
@@ -151,7 +151,6 @@ define Build/Install/Default
 	$(MAKE_VARS) \
 	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
 		$(MAKE_INSTALL_FLAGS) \
-		$(if $(PKG_SUBDIRS),SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))') \
 		$(if $(1), $(1), install);
 endef
 

include/package-dumpinfo.mk

@@ -36,14 +36,13 @@ $(if $(USERID),Require-User: $(USERID)
 )Source: $(PKG_SOURCE)
 $(if $(LICENSE),License: $(LICENSE)
 )$(if $(LICENSE_FILES),LicenseFiles: $(LICENSE_FILES)
-)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
-)$(if $(URL),URL: $(URL)
-)$(if $(ABI_VERSION),ABI-Version: $(ABI_VERSION)
 )Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
 $(if $(KCONFIG),Kernel-Config: $(KCONFIG)
 )$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
 )$(if $(HIDDEN),Hidden: $(HIDDEN)
 )Description: $(if $(Package/$(1)/description),$(Package/$(1)/description),$(TITLE))
+$(if $(URL),$(URL)
+)$(MAINTAINER)
 @@
 $(if $(Package/$(1)/config),Config:
 $(Package/$(1)/config)

include/package-ipkg.mk

@@ -0,0 +1,276 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2006-2020 OpenWrt.org
+
+ifndef DUMP
+  include $(INCLUDE_DIR)/feeds.mk
+endif
+
+IPKG_REMOVE:= \
+  $(SCRIPT_DIR)/ipkg-remove
+
+IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
+
+# Generates a make statement to return a wildcard for candidate ipkg files
+# 1: package name
+define gen_ipkg_wildcard
+  $(1)$$(if $$(filter -%,$$(ABIV_$(1))),,[^a-z-])*
+endef
+
+# 1: package name
+# 2: candidate ipk files
+define remove_ipkg_files
+  $(if $(strip $(2)),$(IPKG_REMOVE) $(1) $(2))
+endef
+
+# 1: package name
+# 2: variable name
+# 3: variable suffix
+# 4: file is a script
+define BuildIPKGVariable
+ifdef Package/$(1)/$(2)
+  $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
+  $(call shexport,Package/$(1)/$(2))
+  $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3);)
+endif
+endef
+
+PARENL :=(
+PARENR :=)
+
+dep_split=$(subst :,$(space),$(1))
+dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
+dep_and=dep_and_res:=$$(and $(subst $(space),$(comma),$(foreach cond,$(subst &&, ,$(1)),$$(CONFIG_$(cond)))))
+dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(eval $(call dep_and,$(cond)))$(dep_and_res)))
+dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
+dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
+dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
+dep_val=$(word 2,$(call dep_split,$(1)))
+strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
+filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
+
+define AddDependency
+  $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(IPKG_$$(pkg))): $$(foreach pkg,$(2),$$(IPKG_$$(pkg)))))
+endef
+
+define FixupReverseDependencies
+  DEPS := $$(filter %:$(1),$$(IDEPEND))
+  DEPS := $$(patsubst %:$(1),%,$$(DEPS))
+  DEPS := $$(filter $$(DEPS),$$(IPKGS))
+  $(call AddDependency,$$(DEPS),$(1))
+endef
+
+define FixupDependencies
+  DEPS := $$(filter $(1):%,$$(IDEPEND))
+  DEPS := $$(patsubst $(1):%,%,$$(DEPS))
+  DEPS := $$(filter $$(DEPS),$$(IPKGS))
+  $(call AddDependency,$(1),$$(DEPS))
+endef
+
+ifneq ($(PKG_NAME),toolchain)
+  define CheckDependencies
+	@( \
+		rm -f $(PKG_INFO_DIR)/$(1).missing; \
+		( \
+			export \
+				READELF=$(TARGET_CROSS)readelf \
+				OBJCOPY=$(TARGET_CROSS)objcopy \
+				XARGS="$(XARGS)"; \
+			$(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
+		) | while read FILE; do \
+			grep -qxF "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
+				echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
+		done; \
+		if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
+			echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
+			cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
+			false; \
+		fi; \
+	)
+  endef
+endif
+
+_addsep=$(word 1,$(1))$(foreach w,$(wordlist 2,$(words $(1)),$(1)),$(strip $(2) $(w)))
+_cleansep=$(subst $(space)$(2)$(space),$(2)$(space),$(1))
+mergelist=$(call _cleansep,$(call _addsep,$(1),$(comma)),$(comma))
+addfield=$(if $(strip $(2)),$(1): $(2))
+_define=define
+_endef=endef
+
+ifeq ($(DUMP),)
+  define BuildTarget/ipkg
+    ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION))
+    PDIR_$(1):=$(call FeedPackageDir,$(1))
+    IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
+    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
+    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
+
+    TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS))))
+    ifeq ($(BUILD_VARIANT),$$(if $$(TARGET_VARIANT),$$(TARGET_VARIANT),$(BUILD_VARIANT)))
+    do_install=
+    ifdef Package/$(1)/install
+      do_install=yes
+    endif
+    ifdef Package/$(1)/install-overlay
+      do_install=yes
+    endif
+    ifdef do_install
+      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+        IPKGS += $(1)
+        $(_pkg_target)compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
+        prepare-package-install: $$(IPKG_$(1))
+        compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
+      else
+        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
+      endif
+
+      .PHONY: $(PKG_INSTALL_STAMP).$(1)
+      ifeq ($(CONFIG_PACKAGE_$(1)),y)
+        compile: $(PKG_INSTALL_STAMP).$(1)
+      endif
+      $(PKG_INSTALL_STAMP).$(1): prepare-package-install
+		echo "$(1)" >> $(PKG_INSTALL_STAMP)
+    else
+      $(if $(CONFIG_PACKAGE_$(1)),$$(warning WARNING: skipping $(1) -- package has no install section))
+    endif
+    endif
+
+    DEPENDS:=$(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
+    IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
+    IDEPEND += $$(patsubst %,$(1):%,$$(IDEPEND_$(1)))
+    $(FixupDependencies)
+    $(FixupReverseDependencies)
+
+    $(eval $(call BuildIPKGVariable,$(1),conffiles))
+    $(eval $(call BuildIPKGVariable,$(1),preinst,,1))
+    $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg,1))
+    $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1))
+    $(eval $(call BuildIPKGVariable,$(1),postrm,,1))
+
+    $(PKG_BUILD_DIR)/.pkgdir/$(1).installed : export PATH=$$(TARGET_PATH_PKG)
+    $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT)
+	rm -rf $$@ $(PKG_BUILD_DIR)/.pkgdir/$(1)
+	mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1)
+	$(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1))
+	$(call Package/$(1)/install_lib,$(PKG_BUILD_DIR)/.pkgdir/$(1))
+	touch $$@
+
+    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
+	mkdir -p $(STAGING_DIR_ROOT)/stamp
+	$(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || { \
+		echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version; \
+		$(foreach pkg,$(filter-out $(1),$(PROVIDES)), \
+			cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version; \
+		) \
+	} )
+	$(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
+	touch $$@
+
+    Package/$(1)/DEPENDS := $$(call mergelist,$$(foreach dep,$$(filter-out @%,$$(IDEPEND_$(1))),$$(dep)$$(call GetABISuffix,$$(dep))))
+    ifneq ($$(EXTRA_DEPENDS),)
+      Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
+    endif
+
+$(_define) Package/$(1)/CONTROL
+Package: $(1)$$(ABIV_$(1))
+Version: $(VERSION)
+$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
+)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
+)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))))
+)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
+)$$(call addfield,Source,$(SOURCE)
+)$$(call addfield,SourceName,$(1)
+)$$(call addfield,License,$(LICENSE)
+)$$(call addfield,LicenseFiles,$(LICENSE_FILES)
+)$$(call addfield,Section,$(SECTION)
+)$$(call addfield,Require-User,$(USERID)
+)$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
+)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
+)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
+)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
+)$(if $(filter essential,$(PKG_FLAGS)),Essential: yes
+)$(if $(MAINTAINER),Maintainer: $(MAINTAINER)
+)Architecture: $(PKGARCH)
+Installed-Size: 0
+$(_endef)
+
+    $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
+    $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
+    $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG)
+    $$(IPKG_$(1)) : export PKG_SOURCE_DATE_EPOCH:=$(PKG_SOURCE_DATE_EPOCH)
+    $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
+	@rm -rf $$(IDIR_$(1)); \
+		$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
+	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
+	$(call Package/$(1)/install,$$(IDIR_$(1)))
+	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
+	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
+	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
+	@( \
+		find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
+		for file in $$(patsubst %,$(PKG_INFO_DIR)/%.provides,$$(IDEPEND_$(1))); do \
+			if [ -f "$$$$file" ]; then \
+				cat $$$$file; \
+			fi; \
+		done; $(Package/$(1)/extra_provides) \
+	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
+	$(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
+	$(CheckDependencies)
+
+	$(RSTRIP) $$(IDIR_$(1))
+
+    ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),)
+	(cd $$(IDIR_$(1)); \
+		( \
+			find . -type f \! -path ./CONTROL/\* -exec $(MKHASH) sha256 -n \{\} \; 2> /dev/null | \
+			sed 's|\([[:blank:]]\)\./| \1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \
+		) || true \
+	)
+    endif
+	(cd $$(IDIR_$(1))/CONTROL; \
+		( \
+			echo "$$$$CONTROL"; \
+			printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
+		) > control; \
+		chmod 644 control; \
+		( \
+			echo "#!/bin/sh"; \
+			echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
+			echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
+			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+			echo "default_postinst \$$$$0 \$$$$@"; \
+		) > postinst; \
+		( \
+			echo "#!/bin/sh"; \
+			echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
+			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
+			echo "default_prerm \$$$$0 \$$$$@"; \
+		) > prerm; \
+		chmod 0755 postinst prerm; \
+		$($(1)_COMMANDS) \
+	)
+
+    ifneq ($$(KEEP_$(1)),)
+		@( \
+			keepfiles=""; \
+			for x in $$(KEEP_$(1)); do \
+				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
+			done; \
+			[ -z "$$$$keepfiles" ] || { \
+				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
+				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
+			}; \
+		)
+    endif
+
+	$(INSTALL_DIR) $$(PDIR_$(1))
+	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/bash $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
+	@[ -f $$(IPKG_$(1)) ]
+
+    $(1)-clean:
+	$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
+
+    clean: $(1)-clean
+
+  endef
+endif

include/package-pack.mk

@@ -1,380 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2006-2022 OpenWrt.org
-
-ifndef DUMP
-  include $(INCLUDE_DIR)/feeds.mk
-endif
-
-IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
-
-# Generates a make statement to return a wildcard for candidate ipkg files
-# 1: package name
-define gen_package_wildcard
-  $(1)$$(if $$(filter -%,$$(ABIV_$(1))),,[^a-z-])*
-endef
-
-# 1: package name
-# 2: candidate ipk files
-define remove_ipkg_files
-  $(if $(strip $(2)),$(SCRIPT_DIR)/ipkg-remove $(1) $(2))
-endef
-
-# 1: package name
-# 2: variable name
-# 3: variable suffix
-# 4: file is a script
-define BuildPackVariable
-ifdef Package/$(1)/$(2)
-  $$(PACK_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2))
-  $(call shexport,Package/$(1)/$(2))
-  $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3);)
-endif
-endef
-
-PARENL :=(
-PARENR :=)
-
-dep_split=$(subst :,$(space),$(1))
-dep_rem=$(subst !,,$(subst $(strip $(PARENL)),,$(subst $(strip $(PARENR)),,$(word 1,$(call dep_split,$(1))))))
-dep_and=dep_and_res:=$$(and $(subst $(space),$(comma),$(foreach cond,$(subst &&, ,$(1)),$$(CONFIG_$(cond)))))
-dep_confvar=$(strip $(foreach cond,$(subst ||, ,$(call dep_rem,$(1))),$(eval $(call dep_and,$(cond)))$(dep_and_res)))
-dep_pos=$(if $(call dep_confvar,$(1)),$(call dep_val,$(1)))
-dep_neg=$(if $(call dep_confvar,$(1)),,$(call dep_val,$(1)))
-dep_if=$(if $(findstring !,$(1)),$(call dep_neg,$(1)),$(call dep_pos,$(1)))
-dep_val=$(word 2,$(call dep_split,$(1)))
-strip_deps=$(strip $(subst +,,$(filter-out @%,$(1))))
-filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep)))
-
-define AddDependency
-  $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(PACK_$$(pkg))): $$(foreach pkg,$(2),$$(PACK_$$(pkg)))))
-endef
-
-define FixupReverseDependencies
-  DEPS := $$(filter %:$(1),$$(IDEPEND))
-  DEPS := $$(patsubst %:$(1),%,$$(DEPS))
-  DEPS := $$(filter $$(DEPS),$$(IPKGS))
-  $(call AddDependency,$$(DEPS),$(1))
-endef
-
-define FixupDependencies
-  DEPS := $$(filter $(1):%,$$(IDEPEND))
-  DEPS := $$(patsubst $(1):%,%,$$(DEPS))
-  DEPS := $$(filter $$(DEPS),$$(IPKGS))
-  $(call AddDependency,$(1),$$(DEPS))
-endef
-
-ifneq ($(PKG_NAME),toolchain)
-  define CheckDependencies
-	@( \
-		rm -f $(PKG_INFO_DIR)/$(1).missing; \
-		( \
-			export \
-				READELF=$(TARGET_CROSS)readelf \
-				OBJCOPY=$(TARGET_CROSS)objcopy \
-				XARGS="$(XARGS)"; \
-			$(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
-		) | while read FILE; do \
-			grep -qxF "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
-				echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
-		done; \
-		if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
-			echo "Package $(1) is missing dependencies for the following libraries:" >&2; \
-			cat "$(PKG_INFO_DIR)/$(1).missing" >&2; \
-			false; \
-		fi; \
-	)
-  endef
-endif
-
-_addsep=$(word 1,$(1))$(foreach w,$(wordlist 2,$(words $(1)),$(1)),$(strip $(2) $(w)))
-_cleansep=$(subst $(space)$(2)$(space),$(2)$(space),$(1))
-mergelist=$(call _cleansep,$(call _addsep,$(1),$(comma)),$(comma))
-addfield=$(if $(strip $(2)),$(1): $(2))
-_define=define
-_endef=endef
-
-ifeq ($(DUMP),)
-  define BuildTarget/ipkg
-    ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION))
-    PDIR_$(1):=$(call FeedPackageDir,$(1))
-ifeq ($(CONFIG_USE_APK),)
-    PACK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
-else
-    PACK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))-$(VERSION).apk
-endif
-    IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
-    ADIR_$(1):=$(PKG_BUILD_DIR)/apk-$(PKGARCH)/$(1)
-    KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
-
-    TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS))))
-    ifeq ($(BUILD_VARIANT),$$(if $$(TARGET_VARIANT),$$(TARGET_VARIANT),$(BUILD_VARIANT)))
-    do_install=
-    ifdef Package/$(1)/install
-      do_install=yes
-    endif
-    ifdef Package/$(1)/install-overlay
-      do_install=yes
-    endif
-    ifdef do_install
-      ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
-        IPKGS += $(1)
-        $(_pkg_target)compile: $$(PACK_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
-        prepare-package-install: $$(PACK_$(1))
-        compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed
-      else
-        $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected))
-      endif
-
-      .PHONY: $(PKG_INSTALL_STAMP).$(1)
-      ifeq ($(CONFIG_PACKAGE_$(1)),y)
-        compile: $(PKG_INSTALL_STAMP).$(1)
-      endif
-      $(PKG_INSTALL_STAMP).$(1): prepare-package-install
-		echo "$(1)" >> $(PKG_INSTALL_STAMP)
-    else
-      $(if $(CONFIG_PACKAGE_$(1)),$$(warning WARNING: skipping $(1) -- package has no install section))
-    endif
-    endif
-
-    DEPENDS:=$(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
-    IDEPEND_$(1):=$$(call filter_deps,$$(DEPENDS))
-    IDEPEND += $$(patsubst %,$(1):%,$$(IDEPEND_$(1)))
-    $(FixupDependencies)
-    $(FixupReverseDependencies)
-
-    $(eval $(call BuildPackVariable,$(1),conffiles))
-    $(eval $(call BuildPackVariable,$(1),preinst,,1))
-    $(eval $(call BuildPackVariable,$(1),postinst,-pkg,1))
-    $(eval $(call BuildPackVariable,$(1),prerm,-pkg,1))
-    $(eval $(call BuildPackVariable,$(1),postrm,,1))
-
-    $(PKG_BUILD_DIR)/.pkgdir/$(1).installed : export PATH=$$(TARGET_PATH_PKG)
-    $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT)
-	rm -rf $$@ $(PKG_BUILD_DIR)/.pkgdir/$(1)
-	mkdir -p $(PKG_BUILD_DIR)/.pkgdir/$(1)
-	$(call Package/$(1)/install,$(PKG_BUILD_DIR)/.pkgdir/$(1))
-	$(call Package/$(1)/install_lib,$(PKG_BUILD_DIR)/.pkgdir/$(1))
-	touch $$@
-
-    $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
-	mkdir -p $(STAGING_DIR_ROOT)/stamp
-	$(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || { \
-		echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version; \
-		$(foreach pkg,$(filter-out $(1),$(PROVIDES)), \
-			cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version; \
-		) \
-	} )
-	$(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
-	touch $$@
-
-    Package/$(1)/DEPENDS := $$(call mergelist,$$(foreach dep,$$(filter-out @%,$$(IDEPEND_$(1))),$$(dep)$$(call GetABISuffix,$$(dep))))
-    ifneq ($$(EXTRA_DEPENDS),)
-      Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS))
-    endif
-
-$(_define) Package/$(1)/CONTROL
-Package: $(1)$$(ABIV_$(1))
-Version: $(VERSION)
-$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
-)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))))
-)$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
-)$$(call addfield,Source,$(SOURCE)
-)$$(call addfield,SourceName,$(PKG_NAME)
-)$$(call addfield,License,$(LICENSE)
-)$$(call addfield,LicenseFiles,$(LICENSE_FILES)
-)$$(call addfield,Section,$(SECTION)
-)$$(call addfield,Require-User,$(USERID)
-)$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH)
-)$$(call addfield,URL,$(URL)
-)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1))
-)$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID)
-)$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed
-)$(if $(filter essential,$(PKG_FLAGS)),Essential: yes
-)$(if $(MAINTAINER),Maintainer: $(MAINTAINER)
-)Architecture: $(PKGARCH)
-Installed-Size: 0
-$(_endef)
-
-    $$(PACK_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL)
-    $$(PACK_$(1)) : export DESCRIPTION=$$(Package/$(1)/description)
-    $$(PACK_$(1)) : export PATH=$$(TARGET_PATH_PKG)
-    $$(PACK_$(1)) : export PKG_SOURCE_DATE_EPOCH:=$(PKG_SOURCE_DATE_EPOCH)
-    $(PKG_INFO_DIR)/$(1).provides $$(PACK_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-pack.mk
-	rm -rf $$(IDIR_$(1))
-ifeq ($$(CONFIG_USE_APK),)
-	$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1))))
-else
-	$$(call remove_ipkg_files,$(1),$$(call apk_package_files,$(call gen_package_wildcard,$(1))))
-endif
-	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
-	$(call Package/$(1)/install,$$(IDIR_$(1)))
-	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
-	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
-	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' -o -name '*~'| $(XARGS) rm -rf
-	@( \
-		find $$(IDIR_$(1)) -name lib\*.so\* -or -name \*.ko | awk -F/ '{ print $$$$NF }'; \
-		for file in $$(patsubst %,$(PKG_INFO_DIR)/%.provides,$$(IDEPEND_$(1))); do \
-			if [ -f "$$$$file" ]; then \
-				cat $$$$file; \
-			fi; \
-		done; $(Package/$(1)/extra_provides) \
-	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
-	$(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done)
-	$(CheckDependencies)
-
-	$(RSTRIP) $$(IDIR_$(1))
-
-    ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),)
-	(cd $$(IDIR_$(1)); \
-		( \
-			find . -type f \! -path ./CONTROL/\* -exec $(MKHASH) sha256 -n \{\} \; 2> /dev/null | \
-			sed 's|\([[:blank:]]\)\./| \1/|' > $$(IDIR_$(1))/CONTROL/files-sha256sum \
-		) || true \
-	)
-    endif
-
-    ifneq ($$(KEEP_$(1)),)
-		@( \
-			keepfiles=""; \
-			for x in $$(KEEP_$(1)); do \
-				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
-			done; \
-			[ -z "$$$$keepfiles" ] || { \
-				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
-				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
-			}; \
-		)
-    endif
-
-	$(INSTALL_DIR) $$(PDIR_$(1))/tmp
-
-ifeq ($(CONFIG_USE_APK),)
-	mkdir -p $$(IDIR_$(1))/CONTROL
-	(cd $$(IDIR_$(1))/CONTROL; \
-		( \
-			echo "$$$$CONTROL"; \
-			printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \
-		) > control; \
-		chmod 644 control; \
-		( \
-			echo "#!/bin/sh"; \
-			echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
-			echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
-			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
-			echo "default_postinst \$$$$0 \$$$$@"; \
-		) > postinst; \
-		( \
-			echo "#!/bin/sh"; \
-			echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
-			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
-			echo "default_prerm \$$$$0 \$$$$@"; \
-		) > prerm; \
-		chmod 0755 postinst prerm; \
-		$($(1)_COMMANDS) \
-	)
-
-	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/bash $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
-else
-	mkdir -p $$(ADIR_$(1))/
-	mkdir -p $$(IDIR_$(1))/lib/apk/packages/
-
-	(cd $$(ADIR_$(1)); $($(1)_COMMANDS))
-
-	( \
-		echo "#!/bin/sh"; \
-		echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
-		echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
-		echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
-		echo 'export root="$$$${IPKG_INSTROOT}"'; \
-		echo 'export pkgname="$(1)"'; \
-		echo "add_group_and_user"; \
-		[ ! -f $$(ADIR_$(1))/postinst-pkg ] || cat "$$(ADIR_$(1))/postinst-pkg"; \
-		echo "default_postinst"; \
-	) > $$(ADIR_$(1))/post-install;
-
-	( \
-		echo "#!/bin/sh"; \
-		echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \
-		echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
-		echo 'export root="$$$${IPKG_INSTROOT}"'; \
-		echo 'export pkgname="$(1)"'; \
-		[ ! -f $$(ADIR_$(1))/prerm-pkg ] || cat "$$(ADIR_$(1))/prerm-pkg"; \
-		echo "default_prerm"; \
-	) > $$(ADIR_$(1))/pre-deinstall;
-
-	if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi;
-	if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1).alternatives; fi;
-	(cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" > $$(IDIR_$(1))/lib/apk/packages/$(1).list)
-	# Move conffiles to IDIR and build conffiles_static with csums
-	if [ -f $$(ADIR_$(1))/conffiles ]; then \
-		mv -f $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
-		for file in $$$$(cat $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles); do \
-			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
-			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
-			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
-		done; \
-	fi
-
-	# Some package (base-files) manually append stuff to conffiles
-	# Append stuff from it and delete the CONTROL directory since everything else should be migrated
-	if [ -f $$(IDIR_$(1))/CONTROL/conffiles ]; then \
-		echo $$$$(IDIR_$(1))/CONTROL/conffiles >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; \
-		for file in $$$$(cat $$(IDIR_$(1))/CONTROL/conffiles); do \
-			[ -f $$(IDIR_$(1))/$$$$file ] || continue; \
-			csum=$$$$($(MKHASH) sha256 $$(IDIR_$(1))/$$$$file); \
-			echo $$$$file $$$$csum >> $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles_static; \
-		done; \
-		rm -rf $$(IDIR_$(1))/CONTROL/conffiles; \
-	fi
-
-	if [ -z "$$$$(ls -A $$(IDIR_$(1))/CONTROL 2>/dev/null)" ]; then \
-		rm -rf $$(IDIR_$(1))/CONTROL; \
-	else \
-		echo "CONTROL directory $$(IDIR_$(1))/CONTROL is not empty! This is not right and should be checked!" >&2; \
-		exit 1; \
-	fi
-
-	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \
-	  --info "name:$(1)$$(ABIV_$(1))" \
-	  --info "version:$(VERSION)" \
-	  --info "description:$$(strip $$(Package/$(1)/description))" \
-	  --info "arch:$(PKGARCH)" \
-	  --info "license:$(LICENSE)" \
-	  --info "origin:$(SOURCE)" \
-	  --info "url:$(URL)" \
-	  --info "maintainer:$(MAINTAINER)" \
-	  --info "provides:$$(foreach prov,\
-			$$(filter-out $(1)$$(ABIV_$(1)), \
-			$(PROVIDES)$$(if $$(ABIV_$(1)), \
-				$(1)=$(VERSION) $(foreach provide, \
-					$(PROVIDES), \
-					$(provide)$$(ABIV_$(1))=$(VERSION) \
-				) \
-			) \
-		), \
-		$$(prov) )" \
-	  $(if $(DEFAULT_VARIANT),--info "provider-priority:100") \
-	  --script "post-install:$$(ADIR_$(1))/post-install" \
-	  --script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall" \
-	  --info "depends:$$(foreach depends,$$(subst $$(comma),$$(space),$$(subst $$(space),,$$(subst $$(paren_right),,$$(subst $$(paren_left),,$$(Package/$(1)/DEPENDS))))),$$(depends))" \
-	  --files "$$(IDIR_$(1))" \
-	  --output "$$(PACK_$(1))" \
-	  --sign "$(BUILD_KEY_APK_SEC)"
-endif
-
-	@[ -f $$(PACK_$(1)) ]
-
-    $(1)-clean:
-ifeq ($(CONFIG_USE_APK),)
-	$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1))))
-else
-	$$(call remove_ipkg_files,$(1),$$(call apk_package_files,$(call gen_package_wildcard,$(1))))
-endif
-
-
-    clean: $(1)-clean
-
-  endef
-endif

include/package.mk

@@ -24,7 +24,7 @@ PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL),$(MAKE_J),-j1)
 endif
 
 PKG_BUILD_FLAGS?=
-__unknown_flags=$(filter-out no-iremap no-mips16 gc-sections no-gc-sections lto no-lto no-mold,$(PKG_BUILD_FLAGS))
+__unknown_flags=$(filter-out no-iremap no-mips16 gc-sections no-gc-sections lto no-lto,$(PKG_BUILD_FLAGS))
 ifneq ($(__unknown_flags),)
   $(error unknown PKG_BUILD_FLAGS: $(__unknown_flags))
 endif
@@ -55,11 +55,6 @@ ifeq ($(call pkg_build_flag,lto,$(if $(CONFIG_USE_LTO),1,0)),1)
   TARGET_CXXFLAGS+= -flto=auto -fno-fat-lto-objects
   TARGET_LDFLAGS+= -flto=auto -fuse-linker-plugin
 endif
-ifdef CONFIG_USE_MOLD
-  ifeq ($(call pkg_build_flag,mold,1),1)
-    TARGET_LINKER:=mold
-  endif
-endif
 
 include $(INCLUDE_DIR)/hardening.mk
 include $(INCLUDE_DIR)/prereq.mk
@@ -136,7 +131,7 @@ PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD
 
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
-include $(INCLUDE_DIR)/package-pack.mk
+include $(INCLUDE_DIR)/package-ipkg.mk
 include $(INCLUDE_DIR)/package-bin.mk
 include $(INCLUDE_DIR)/autotools.mk
 
@@ -343,7 +338,7 @@ endef
 
 Build/Prepare=$(call Build/Prepare/Default,)
 Build/Configure=$(call Build/Configure/Default,)
-Build/Compile=$(call Build/Compile/Default,$(if $(PKG_SUBDIRS),SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))'))
+Build/Compile=$(call Build/Compile/Default,)
 Build/Install=$(if $(PKG_INSTALL),$(call Build/Install/Default,))
 Build/Dist=$(call Build/Dist/Default,)
 Build/DistCheck=$(call Build/DistCheck/Default,)

include/prereq-build.mk

@@ -32,30 +32,28 @@ $(eval $(call TestHostCommand,proper-umask, \
 
 ifndef IB
 $(eval $(call SetupHostCommand,gcc, \
-	Please install the GNU C Compiler (gcc) 8 or later, \
-	$(CC) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
-	gcc -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
-	gcc-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+	Please install the GNU C Compiler (gcc) 6 or later, \
+	$(CC) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+	gcc -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
 	gcc --version | grep -E 'Apple.(LLVM|clang)' ))
 
 $(eval $(call TestHostCommand,working-gcc, \
-	Please reinstall the GNU C Compiler (8 or later) - \
+	Please reinstall the GNU C Compiler (6 or later) - \
 	it appears to be broken, \
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		$(STAGING_DIR_HOST)/bin/gcc -x c -o $(TMP_DIR)/a.out -))
+		gcc -x c -o $(TMP_DIR)/a.out -))
 
 $(eval $(call SetupHostCommand,g++, \
-	Please install the GNU C++ Compiler (g++) 8 or later, \
-	$(CXX) -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
-	g++ -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
-	g++-8 -dumpversion | grep -E '^([8-9]\.?|1[0-9]\.?)', \
+	Please install the GNU C++ Compiler (g++) 6 or later, \
+	$(CXX) -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
+	g++ -dumpversion | grep -E '^([6-9]\.?|1[0-9]\.?)', \
 	g++ --version | grep -E 'Apple.(LLVM|clang)' ))
 
 $(eval $(call TestHostCommand,working-g++, \
-	Please reinstall the GNU C++ Compiler (8 or later) - \
+	Please reinstall the GNU C++ Compiler (6 or later) - \
 	it appears to be broken, \
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		$(STAGING_DIR_HOST)/bin/g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
+		g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
 		$(TMP_DIR)/a.out))
 
 $(eval $(call RequireCHeader,ncurses.h, \
@@ -96,10 +94,6 @@ $(eval $(call TestHostCommand,perl-thread-queue, \
 	Please install the Perl Thread::Queue module, \
 	perl -MThread::Queue -e 1))
 
-$(eval $(call TestHostCommand,perl-ipc-cmd, \
-	Please install the Perl IPC:Cmd module, \
-	perl -MIPC::Cmd -e 1))
-
 $(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \
 	gtar --version 2>&1 | grep GNU, \
 	gnutar --version 2>&1 | grep GNU, \
@@ -181,28 +175,27 @@ $(eval $(call SetupHostCommand,install,Please install GNU 'install', \
 $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
 	perl --version | grep "perl.*v5"))
 
-$(eval $(call SetupHostCommand,python,Please install Python >= 3.7, \
-	python3.12 -V 2>&1 | grep 'Python 3', \
+$(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \
 	python3.11 -V 2>&1 | grep 'Python 3', \
 	python3.10 -V 2>&1 | grep 'Python 3', \
 	python3.9 -V 2>&1 | grep 'Python 3', \
 	python3.8 -V 2>&1 | grep 'Python 3', \
 	python3.7 -V 2>&1 | grep 'Python 3', \
-	python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?'))
+	python3.6 -V 2>&1 | grep 'Python 3', \
+	python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
 
-$(eval $(call SetupHostCommand,python3,Please install Python >= 3.7, \
-	python3.12 -V 2>&1 | grep 'Python 3', \
+$(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \
 	python3.11 -V 2>&1 | grep 'Python 3', \
 	python3.10 -V 2>&1 | grep 'Python 3', \
 	python3.9 -V 2>&1 | grep 'Python 3', \
 	python3.8 -V 2>&1 | grep 'Python 3', \
 	python3.7 -V 2>&1 | grep 'Python 3', \
-	python3 -V 2>&1 | grep -E 'Python 3\.([7-9]|[0-9][0-9])\.?'))
+	python3.6 -V 2>&1 | grep 'Python 3', \
+	python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
 
 $(eval $(call TestHostCommand,python3-distutils, \
 	Please install the Python3 distutils module, \
-	printf 'from sys import version_info\nif version_info < (3, 12):\n\tfrom distutils import util' | \
-		$(STAGING_DIR_HOST)/bin/python3 -))
+	$(STAGING_DIR_HOST)/bin/python3 -c 'from distutils import util'))
 
 $(eval $(call TestHostCommand,python3-stdlib, \
 	Please install the Python3 stdlib module, \
@@ -241,4 +234,4 @@ prereq: $(STAGING_DIR_HOST)/bin/mkhash $(STAGING_DIR_HOST)/bin/xxd
 
 # Install ldconfig stub
 $(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
-	$(LN) $(SCRIPT_DIR)/noop.sh $(STAGING_DIR_HOST)/bin/ldconfig))
+	$(LN) $(firstword $(wildcard /bin/true /usr/bin/true)) $(STAGING_DIR_HOST)/bin/ldconfig))

include/prereq.mk

@@ -107,14 +107,21 @@ define SetupHostCommand
 			bin="$$$$$$$$(command -v "$$$$$$$${cmd%% *}")"; \
 			if [ -x "$$$$$$$$bin" ] && eval "$$$$$$$$cmd" >/dev/null 2>/dev/null; then \
 				case "$$$$$$$$(ls -dl -- $(STAGING_DIR_HOST)/bin/$(strip $(1)))" in \
-					"-"* | \
-					*" -> $$$$$$$$bin"* | \
-					*" -> "[!/]*) \
+					*" -> $$$$$$$$bin"*) \
+						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
+						;; \
+					"-"*) \
+						find "$(STAGING_DIR_HOST)/stamp" | grep $(strip $(1)) && \
+						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
+						;; \
+					*" -> /"*) \
+						;; \
+					*" -> "*) \
 						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
 						;; \
 				esac; \
 				ln -sf "$$$$$$$$bin" "$(STAGING_DIR_HOST)/bin/$(strip $(1))"; \
-				exit 1; \
+				exit 0; \
 			fi; \
 		fi; \
 	done; \

include/quilt.mk

@@ -34,8 +34,8 @@ endif
 ifneq ($(if $(DUMP),1,$(__quilt_inc)),1)
 __quilt_inc:=1
 
-PATCH_DIR?=$(CURDIR)/patches
-FILES_DIR?=$(CURDIR)/files
+PATCH_DIR?=./patches
+FILES_DIR?=./files
 HOST_PATCH_DIR?=$(PATCH_DIR)
 HOST_FILES_DIR?=$(FILES_DIR)
 
@@ -106,14 +106,13 @@ define Kernel/Patch/Default
 endef
 
 define Quilt/RefreshDir
-	-rm -rf $(2) 2>/dev/null >/dev/null
-	[ -f $(1)/.quilt_no_patch ] || mkdir -p $(2)
-	@[ -f $(1)/.quilt_no_patch ] || { \
+	mkdir -p $(2)
+	-rm -f $(2)/* 2>/dev/null >/dev/null
+	@( \
 		for patch in $$$$($(if $(3),grep "^$(3)",cat) $(1)/patches/series | awk '{print $$$$1}'); do \
 			$(CP) -v "$(1)/patches/$$$$patch" $(2); \
 		done; \
-	}
-	@-rm -f $(1)/.quilt_no_patch 2>/dev/null >/dev/null;
+	)
 endef
 
 define Quilt/Refresh/Host
@@ -157,7 +156,7 @@ define Quilt/Template
 	}
 	@[ -f "$(1)/patches/series" ] || { \
 		echo "The source directory contains no quilt patches."; \
-		touch $(1)/patches/series $(1)/.quilt_no_patch; \
+		false; \
 	}
 	@[ -n "$$$$(ls $(1)/patches/series)" -o \
 	   "$$$$(cat $(1)/patches/series | $(MKHASH) md5)" = "$$(sort $(1)/patches/series | $(MKHASH) md5)" ] || { \
@@ -166,12 +165,10 @@ define Quilt/Template
 	}
 
   $(3)refresh: $(3)quilt-check
-	@[ -f $(1)/.quilt_no_patch ] || { \
-		cd "$(1)"; $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null; \
-		while $(QUILT_CMD) next 2>/dev/null >/dev/null && $(QUILT_CMD) push; do \
-			QUILT_DIFF_OPTS="-p" $(QUILT_CMD) refresh -p ab --no-index --no-timestamps; \
-		done; ! $(QUILT_CMD) next 2>/dev/null >/dev/null; \
-	}
+	@cd "$(1)"; $(QUILT_CMD) pop -a -f >/dev/null 2>/dev/null
+	@cd "$(1)"; while $(QUILT_CMD) next 2>/dev/null >/dev/null && $(QUILT_CMD) push; do \
+		QUILT_DIFF_OPTS="-p" $(QUILT_CMD) refresh -p ab --no-index --no-timestamps; \
+	done; ! $(QUILT_CMD) next 2>/dev/null >/dev/null
 	$(Quilt/Refresh/$(4))
 	
   $(3)update: $(3)quilt-check

include/rootfs.mk

@@ -43,15 +43,6 @@ opkg = \
 	--add-arch all:100 \
 	--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
 
-apk = \
-  IPKG_INSTROOT=$(1) \
-  $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk \
-	--root $(1) \
-	--keys-dir $(if $(APK_KEYS),$(APK_KEYS),$(TOPDIR)) \
-	--no-cache \
-	--no-logfile \
-	--preserve-env
-
 TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD)
 
 ifdef CONFIG_CLEAN_IPKG
@@ -77,29 +68,14 @@ define prepare_rootfs
 	@mkdir -p $(1)/var/lock
 	@( \
 		cd $(1); \
-		if [ -n "$(CONFIG_USE_APK)" ]; then \
-			IPKG_POSTINST_PATH=./lib/apk/db/*.post-install; \
-			$(STAGING_DIR_HOST)/bin/tar -C ./lib/apk/db/ -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install"; \
-		else \
-			IPKG_POSTINST_PATH=./usr/lib/opkg/info/*.postinst; \
-		fi; \
-		for script in $$IPKG_POSTINST_PATH; do \
+		for script in ./usr/lib/opkg/info/*.postinst; do \
 			IPKG_INSTROOT=$(1) $$(command -v bash) $$script; \
 			ret=$$?; \
 			if [ $$ret -ne 0 ]; then \
 				echo "postinst script $$script has failed with exit code $$ret" >&2; \
 				exit 1; \
 			fi; \
-			[ -n "$(CONFIG_USE_APK)" ] && $(STAGING_DIR_HOST)/bin/tar --delete -f ./lib/apk/db/scripts.tar $$(basename $$script); \
 		done; \
-		if [ -z "$(CONFIG_USE_APK)" ]; then \
-			$(if $(IB),,awk -i inplace \
-				'/^Status:/ { \
-					if ($$3 == "user") { $$3 = "ok" } \
-					else { sub(/,\<user\>|\<user\>,/, "", $$3) } \
-				}1' $(1)/usr/lib/opkg/status) ; \
-			$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status ;) \
-		fi; \
 		for script in ./etc/init.d/*; do \
 			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
 			if ! echo " $(3) " | grep -q " $$(basename $$script) "; then \
@@ -111,12 +87,11 @@ define prepare_rootfs
 			fi; \
 		done || true \
 	)
-
+	$(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status)
 	@-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf
 	rm -rf \
 		$(1)/boot \
 		$(1)/tmp/* \
-		$(1)/lib/apk/db/*.post-install* \
 		$(1)/usr/lib/opkg/info/*.postinst* \
 		$(1)/usr/lib/opkg/lists/* \
 		$(1)/var/lock/*.lock

include/scan.mk

@@ -50,8 +50,7 @@ define PackageDir
 		$$(call progress,Collecting $(SCAN_NAME) info: $(SCAN_DIR)/$(2)) \
 		echo Source-Makefile: $(SCAN_DIR)/$(2)/Makefile; \
 		$(if $(3),echo Override: $(3),true); \
-		$(if $(findstring c,$(OPENWRT_VERBOSE)),$(MAKE),$(NO_TRACE_MAKE) --no-print-dir) -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) \
-			$(if $(findstring c,$(OPENWRT_VERBOSE)),,2>/dev/null) || { \
+		$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) 2>/dev/null || { \
 			mkdir -p "$(TOPDIR)/logs/$(SCAN_DIR)/$(2)"; \
 			$(NO_TRACE_MAKE) --no-print-dir -r DUMP=1 FEED="$(call feedname,$(2))" -C $(SCAN_DIR)/$(2) $(SCAN_MAKEOPTS) > $(TOPDIR)/logs/$(SCAN_DIR)/$(2)/dump.txt 2>&1; \
 			$$(call progress,ERROR: please fix $(SCAN_DIR)/$(2)/Makefile - see logs/$(SCAN_DIR)/$(2)/dump.txt for details\n) \

include/site/linux

@@ -37,7 +37,7 @@ ac_cv_func_rindex=yes
 ac_cv_func_setlocale=yes
 ac_cv_func_setgrent_void=yes
 ac_cv_func_setpgrp_void=yes
-ac_cv_func_setresuid=yes
+ac_cv_func_setresuid=no
 ac_cv_func_setvbuf_reversed=no
 ac_cv_func_stat_empty_string_bug=no
 ac_cv_func_stat_ignores_trailing_slash=no
@@ -53,6 +53,7 @@ ac_cv_have_control_in_msghdr=yes
 ac_cv_have_decl_sys_siglist=no
 ac_cv_have_openpty_ctty_bug=yes
 ac_cv_have_space_d_name_in_struct_dirent=yes
+ac_cv_header_netinet_sctp_h=no
 ac_cv_header_netinet_sctp_uio_h=no
 ac_cv_int64_t=yes
 ac_cv_lbl_unaligned_fail=no
@@ -65,12 +66,9 @@ ac_cv_sctp=no
 ac_cv_sys_restartable_syscalls=yes
 ac_cv_time_r_type=POSIX
 ac_cv_type_suseconds_t=yes
-ac_cv_size_t=yes
-ac_cv_ssize_t=yes
 ac_cv_uchar=no
 ac_cv_uint=yes
 ac_cv_uint64_t=yes
-ac_cv_uintptr_t=yes
 ac_cv_ulong=yes
 ac_cv_ushort=yes
 ac_cv_va_copy=C99

include/site/loongarch64

@@ -1,30 +0,0 @@
-#!/bin/sh
-. $TOPDIR/include/site/linux
-ac_cv_c_littleendian=${ac_cv_c_littleendian=yes}
-ac_cv_c_bigendian=${ac_cv_c_bigendian=no}
-
-ac_cv_sizeof___int64=0
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_int16_t=2
-ac_cv_sizeof_int32_t=4
-ac_cv_sizeof_int64_t=8
-ac_cv_sizeof_long_int=8
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_long=8
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_short_int=2
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=8
-ac_cv_sizeof_ssize_t=8
-ac_cv_sizeof_u_int16_t=2
-ac_cv_sizeof_u_int32_t=4
-ac_cv_sizeof_u_int64_t=8
-ac_cv_sizeof_uint16_t=2
-ac_cv_sizeof_uint32_t=4
-ac_cv_sizeof_uint64_t=8
-ac_cv_sizeof_unsigned_int=4
-ac_cv_sizeof_unsigned_long=8
-ac_cv_sizeof_unsigned_long_long=8
-ac_cv_sizeof_unsigned_short=2
-ac_cv_sizeof_void_p=8

include/subdir.mk

@@ -5,9 +5,6 @@
 ifeq ($(MAKECMDGOALS),prereq)
   SUBTARGETS:=prereq
   PREREQ_ONLY:=1
-# For target/linux related target add dtb to selectively compile dtbs
-else ifneq ($(filter target/linux/%,$(MAKECMDGOALS)),)
-  SUBTARGETS:=$(DEFAULT_SUBDIR_TARGETS) dtb
 else
   SUBTARGETS:=$(DEFAULT_SUBDIR_TARGETS)
 endif

include/target.mk

@@ -6,18 +6,10 @@
 ifneq ($(__target_inc),1)
 __target_inc=1
 
-
-##@
-# @brief Default device type ( basic | nas | router ).
-##
+# default device type
 DEVICE_TYPE?=router
 
-##@
-# @brief Default packages.
-#
-# The really basic set. Additional packages are added based on @DEVICE_TYPE and
-# @CONFIG_* values.
-##
+# Default packages - the really basic set
 DEFAULT_PACKAGES:=\
 	base-files \
 	ca-bundle \
@@ -29,47 +21,55 @@ DEFAULT_PACKAGES:=\
 	logd \
 	mtd \
 	netifd \
+	opkg \
 	uci \
 	uclient-fetch \
 	urandom-seed \
 	urngd
 
-##@
-# @brief Default packages for @DEVICE_TYPE basic.
-##
+ifneq ($(CONFIG_SELINUX),)
+DEFAULT_PACKAGES+=busybox-selinux procd-selinux
+else
+DEFAULT_PACKAGES+=busybox procd
+endif
+
+# include ujail on systems with enough storage
+ifeq ($(CONFIG_SMALL_FLASH),)
+DEFAULT_PACKAGES+=procd-ujail
+endif
+
+# include seccomp ld-preload hooks if kernel supports it
+ifneq ($(CONFIG_SECCOMP),)
+DEFAULT_PACKAGES+=procd-seccomp
+endif
+
+# For the basic set
 DEFAULT_PACKAGES.basic:=
-##@
-# @brief Default packages for @DEVICE_TYPE nas.
-##
+# For nas targets
 DEFAULT_PACKAGES.nas:=\
 	block-mount \
 	fdisk \
 	lsblk \
 	mdadm
-##@
-# @brief Default packages for @DEVICE_TYPE router.
-##
+# For router targets
 DEFAULT_PACKAGES.router:=\
 	dnsmasq-full \
 	firewall4 \
 	nftables \
 	kmod-nft-offload \
-	odhcp6c \
-	odhcpd-ipv6only \
+	ipv6helper \
 	ppp \
 	ppp-mod-pppoe
-##@
-# @brief For easy usage
-##
+# For easy usage
 DEFAULT_PACKAGES.tweak:=\
 	block-mount \
 	default-settings-chn \
 	kmod-nf-nathelper \
 	kmod-nf-nathelper-extra \
-	luci-light \
-	luci-app-package-manager \
+	luci \
 	luci-compat \
 	luci-lib-base \
+	luci-lib-fs \
 	luci-lib-ipkg
 
 ifneq ($(DUMP),)
@@ -103,29 +103,13 @@ else
   endif
 endif
 
-# include ujail on systems with enough storage
-ifeq ($(filter small_flash,$(FEATURES)),)
-  DEFAULT_PACKAGES+=procd-ujail
-endif
+# Add tweaked packages
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.tweak)
 
 # Add device specific packages (here below to allow device type set from subtarget)
 DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
 
-# Add tweaked packages
-DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.tweak)
-
-##@
-# @brief Filter out packages, prepended with `-`.
-#
-# @param 1: Package list.
-##
 filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
-
-##@
-# @brief Append extra package dependencies.
-#
-# @param 1: Package list.
-##
 extra_packages = $(if $(filter wpad wpad-% nas,$(1)),iwinfo)
 
 define ProfileDefault
@@ -293,11 +277,6 @@ ifeq ($(DUMP),1)
     CPU_TYPE ?= riscv64
     CPU_CFLAGS_riscv64:=-mabi=lp64d -march=rv64imafdc
   endif
-  ifeq ($(ARCH),loongarch64)
-    CPU_TYPE ?= generic
-    CPU_CFLAGS := -O2 -pipe
-    CPU_CFLAGS_generic:=-march=loongarch64
-  endif
   ifneq ($(CPU_TYPE),)
     ifndef CPU_CFLAGS_$(CPU_TYPE)
       $(warning CPU_TYPE "$(CPU_TYPE)" doesn't correspond to a known type)
@@ -350,15 +329,7 @@ ifeq ($(DUMP),1)
     ifneq ($(CONFIG_CPU_MIPS32_R2),)
       FEATURES += mips16
     endif
-    ifneq ($(CONFIG_CPU_V6),)
-      FEATURES += arm_v6
-    endif
-    ifneq ($(CONFIG_CPU_V6K),)
-      FEATURES += arm_v6
-    endif
-    ifneq ($(CONFIG_CPU_V7),)
-      FEATURES += arm_v7
-    endif
+    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
 
     # remove duplicates
     FEATURES:=$(sort $(FEATURES))

include/toplevel.mk

@@ -77,8 +77,7 @@ _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p))
 
 prepare-tmpinfo: FORCE
 	@+$(MAKE) -r -s $(STAGING_DIR_HOST)/.prereq-build $(PREP_MK)
-	mkdir -p tmp/info feeds
-	[ -e $(TOPDIR)/feeds/base ] || ln -sf $(TOPDIR)/package $(TOPDIR)/feeds/base
+	mkdir -p tmp/info
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPTH=5 SCAN_EXTRA=""
 	$(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPTH=3 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
 	for type in package target; do \
@@ -213,7 +212,7 @@ prereq:: prepare-tmpinfo .config
 check: .config FORCE
 	@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
 
-val.% var.%: FORCE
+val.%: FORCE
 	@+$(NO_TRACE_MAKE) -r -s $@ QUIET= V=s
 
 WARN_PARALLEL_ERROR = $(if $(BUILD_LOG),,$(and $(filter -j,$(MAKEFLAGS)),$(findstring s,$(OPENWRT_VERBOSE))))
@@ -261,7 +260,7 @@ help:
 	cat README.md
 
 distclean:
-	rm -rf bin build_dir .ccache .config* dl feeds key-build* logs package/feeds target/linux/feeds staging_dir tmp
+	rm -rf bin build_dir .ccache .config* dl feeds key-build* logs package/feeds staging_dir tmp
 	@$(_SINGLE)$(SUBMAKE) -C scripts/config clean
 
 ifeq ($(findstring v,$(DEBUG)),)

include/trusted-firmware-a.mk

@@ -1,21 +1,13 @@
 PKG_NAME ?= trusted-firmware-a
 PKG_CPE_ID ?= cpe:/a:arm:trusted_firmware-a
 
-PKG_LTS ?=
-
-ifneq ($(PKG_LTS),)
-PKG_VERSION_PREFIX:=lts-v
-PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION_PREFIX)$(PKG_VERSION)
-else
-PKG_VERSION_PREFIX:=v
-PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-endif
-
 ifndef PKG_SOURCE_PROTO
-PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION_PREFIX)$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/TrustedFirmware-A/trusted-firmware-a/tar.gz/$(PKG_VERSION_PREFIX)$(PKG_VERSION)?
+PKG_SOURCE = trusted-firmware-a-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot
 endif
 
+PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_TARGETS := bin
 PKG_FLAGS:=nonshared
 
@@ -71,11 +63,9 @@ define Build/Trusted-Firmware-A/Target
     URL:=https://www.trustedfirmware.org/projects/tf-a/
   endef
 
-  ifndef Package/trusted-firmware-a-$(1)/install
-    define Package/trusted-firmware-a-$(1)/install
+  define Package/trusted-firmware-a-$(1)/install
 	$$(Package/trusted-firmware-a/install)
-    endef
-  endif
+  endef
 endef
 
 define Build/Configure/Trusted-Firmware-A
@@ -90,7 +80,7 @@ define Build/Compile/Trusted-Firmware-A
 		OPENSSL_DIR=$(STAGING_DIR_HOST) \
 		$(if $(DTC),DTC="$(DTC)") \
 		PLAT=$(PLAT) \
-		BUILD_STRING="ImmortalWrt $(PKG_VERSION_PREFIX)$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
+		BUILD_STRING="ImmortalWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
 		$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
 		$(TFA_MAKE_FLAGS)
 endef

include/u-boot.mk

@@ -18,7 +18,7 @@ PKG_FLAGS:=nonshared
 PKG_LICENSE:=GPL-2.0 GPL-2.0+
 PKG_LICENSE_FILES:=Licenses/README
 
-PKG_BUILD_PARALLEL ?= 1
+PKG_BUILD_PARALLEL:=1
 
 ifdef UBOOT_USE_BINMAN
   $(eval $(call TestHostCommand,python3-pyelftools, \
@@ -27,22 +27,13 @@ ifdef UBOOT_USE_BINMAN
 endif
 
 ifdef UBOOT_USE_INTREE_DTC
-  $(eval $(call TestHostCommand,python3-dev, \
-    Please install the python3-dev package, \
-    python3.11-config --includes 2>&1 | grep 'python3', \
-    python3.10-config --includes 2>&1 | grep 'python3', \
-    python3.9-config --includes 2>&1 | grep 'python3', \
-    python3.8-config --includes 2>&1 | grep 'python3', \
-    python3.7-config --includes 2>&1 | grep 'python3', \
-    python3-config --includes 2>&1 | grep -E 'python3\.([7-9]|[0-9][0-9])\.?'))
-
-  $(eval $(call TestHostCommand,python3-setuptools, \
-    Please install the Python3 setuptools module, \
-    $(STAGING_DIR_HOST)/bin/python3 -c 'import setuptools'))
-
-  $(eval $(call TestHostCommand,swig, \
-    Please install the swig package, \
+  $(eval $(call SetupHostCommand,swig,Please install 'swig', \
     swig -version))
+
+  $(eval $(call TestHostCommand,libpython3-dev, \
+    Please install the libpython3-dev package, \
+    $(STAGING_DIR_HOST)/bin/python3 -c 'import os; import sysconfig; \
+      os.path.exists(sysconfig.get_paths()["include"] + "/Python.h") or exit(1)'))
 endif
 
 export GCC_HONOUR_COPTS=s
@@ -69,7 +60,6 @@ endef
 TARGET_DEP = TARGET_$(BUILD_TARGET)$(if $(BUILD_SUBTARGET),_$(BUILD_SUBTARGET))
 
 UBOOT_MAKE_FLAGS = \
-	PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
 	HOSTCC="$(HOSTCC)" \
 	HOSTCFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -std=gnu11" \
 	HOSTLDFLAGS="$(HOST_LDFLAGS)" \
@@ -110,10 +100,10 @@ define Build/U-Boot/Target
 endef
 
 define Build/Configure/U-Boot
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) $(UBOOT_CONFIGURE_VARS) $(UBOOT_CONFIG)_config
+	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIGURE_VARS) $(UBOOT_CONFIG)_config
 	$(if $(strip $(UBOOT_CUSTOMIZE_CONFIG)),
 		$(PKG_BUILD_DIR)/scripts/config --file $(PKG_BUILD_DIR)/.config $(UBOOT_CUSTOMIZE_CONFIG)
-		+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) $(UBOOT_CONFIGURE_VARS) oldconfig)
+		+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(UBOOT_CONFIGURE_VARS) oldconfig)
 endef
 
 ifndef UBOOT_USE_INTREE_DTC

include/verbose.mk

@@ -30,18 +30,12 @@ ifeq ($(IS_TTY),1)
 endif
 
 define ERROR_MESSAGE
-  { \
-	printf "$(_R)%s$(_N)\n" "$(1)" >&9 || \
-	printf "$(_R)%s$(_N)\n" "$(1)"; \
-  } >&2 2>/dev/null
+  printf "$(_R)%s$(_N)\n" "$(1)" >&8
 endef
 
 ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
   define MESSAGE
-	{ \
-		printf "$(_Y)%s$(_N)\n" "$(1)" >&8 || \
-		printf "$(_Y)%s$(_N)\n" "$(1)"; \
-	} 2>/dev/null
+	printf "$(_Y)%s$(_N)\n" "$(1)" >&8
   endef
 
   ifeq ($(QUIET),1)
@@ -50,12 +44,9 @@ ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
     else
       _DIR:=
     endif
-    _MESSAGE:=$(if $(MAKECMDGOALS),$(shell \
+    _NULL:=$(if $(MAKECMDGOALS),$(shell \
 		$(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
     ))
-    ifneq ($(strip $(_MESSAGE)),)
-      $(info $(_MESSAGE))
-    endif
     SUBMAKE=$(MAKE)
   else
     SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)

include/version.mk

@@ -23,13 +23,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10-SNAPSHOT)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),23.05.0-rc3)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r26804-a3639e76d6)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/24.10-SNAPSHOT)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.immortalwrt.org/releases/23.05.0-rc3)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),ImmortalWrt)
@@ -95,7 +95,7 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
 	-e 's,%d,\L$(call sed_escape,$(subst $(space),_,$(VERSION_DIST))),g' \
 	-e 's,%R,$(call sed_escape,$(REVISION)),g' \
 	-e 's,%T,$(call sed_escape,$(BOARD)),g' \
-	-e 's,%S,$(call sed_escape,$(BOARD)/$(SUBTARGET)),g' \
+	-e 's,%S,$(call sed_escape,$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)),g' \
 	-e 's,%A,$(call sed_escape,$(ARCH_PACKAGES)),g' \
 	-e 's,%t,$(call sed_escape,$(VERSION_TAINTS)),g' \
 	-e 's,%M,$(call sed_escape,$(VERSION_MANUFACTURER)),g' \
@@ -104,6 +104,5 @@ VERSION_SED_SCRIPT:=$(SED) 's,%U,$(call sed_escape,$(VERSION_REPO)),g' \
 	-e 's,%u,$(call sed_escape,$(VERSION_HOME_URL)),g' \
 	-e 's,%s,$(call sed_escape,$(VERSION_SUPPORT_URL)),g' \
 	-e 's,%P,$(call sed_escape,$(VERSION_PRODUCT)),g' \
-	-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g' \
-	-e 's,%B,$(call sed_escape,$(SOURCE_DATE_EPOCH)),g'
+	-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
 

package/Makefile

@@ -53,55 +53,19 @@ $(curdir)/cleanup: $(TMP_DIR)/.build
 $(curdir)/merge:
 	rm -rf $(PACKAGE_DIR_ALL)
 	mkdir -p $(PACKAGE_DIR_ALL)
-ifneq ($(CONFIG_USE_APK),)
-	-$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.apk),ln -s $(pdir)/*.apk $(PACKAGE_DIR_ALL);))
-else
 	-$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);))
-endif
-
-$(BUILD_KEY_APK_SEC):
-	$(STAGING_DIR_HOST)/bin/openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC)
-
-$(BUILD_KEY_APK_PUB): $(BUILD_KEY_APK_SEC)
-	$(STAGING_DIR_HOST)/bin/openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB)
 
 $(curdir)/merge-index: $(curdir)/merge
-ifneq ($(CONFIG_USE_APK),)
-	(cd $(PACKAGE_DIR_ALL) && $(STAGING_DIR_HOST)/bin/apk mkndx \
-			--root $(TOPDIR) \
-			--keys-dir $(TOPDIR) \
-			--sign $(BUILD_KEY_APK_SEC) \
-			--output packages.adb \
-			*.apk; \
-	)
-else
 	(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )
-endif
 
 ifndef SDK
-  $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
-ifneq ($(CONFIG_USE_APK),)
-  $(curdir)//compile += $(curdir)/system/apk/host/compile $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
-else
   $(curdir)/compile: $(curdir)/system/opkg/host/compile
 endif
-else
-ifneq ($(CONFIG_USE_APK),)
-  $(curdir)//compile += $(BUILD_KEY_APK_SEC) $(BUILD_KEY_APK_PUB)
-endif
-endif
 
-$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(curdir)/merge-index
+$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
 	rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
 	mkdir -p $(TARGET_DIR)/tmp
-ifneq ($(CONFIG_USE_APK),)
-	$(file >$(TMP_DIR)/apk_install_list,\
-	    $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))
-	$(call apk,$(TARGET_DIR)) add --initdb --no-scripts --arch $(ARCH_PACKAGES) \
-		--repositories-file /dev/zero --repository file://$(PACKAGE_DIR_ALL)/packages.adb \
-		$$(cat $(TMP_DIR)/apk_install_list)
-else
 	$(file >$(TMP_DIR)/opkg_install_list,\
 	  $(call opkg_package_files,\
 	    $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))))
@@ -112,7 +76,6 @@ else
 			$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
 		done; \
 	done || true
-endif
 
 	$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
 
@@ -120,19 +83,6 @@ endif
 
 $(curdir)/index: FORCE
 	@echo Generating package index...
-ifneq ($(CONFIG_USE_APK),)
-	@for d in $(PACKAGE_SUBDIRS); do \
-		mkdir -p $$d; \
-		cd $$d || continue; \
-		ls *.apk >/dev/null 2>&1 || continue; \
-		$(STAGING_DIR_HOST)/bin/apk mkndx \
-			--root $(TOPDIR) \
-			--keys-dir $(TOPDIR) \
-			--sign $(BUILD_KEY_APK_SEC) \
-			--output packages.adb \
-			$$(ls *.apk | grep -v 'kernel\|libc'); \
-	done
-else
 	@for d in $(PACKAGE_SUBDIRS); do ( \
 		mkdir -p $$d; \
 		cd $$d || continue; \
@@ -142,7 +92,10 @@ else
 			$(call ERROR_MESSAGE,WARNING: Applying padding in $$d/Packages to workaround usign SHA-512 bug!); \
 			{ echo ""; echo ""; } >> Packages;; \
 		esac; \
-		$(SCRIPT_DIR)/make-index-json.py -f opkg -a "$(ARCH_PACKAGES)" Packages > index.json; \
+		echo -n '{"architecture": "$(ARCH_PACKAGES)", "packages":{' > index.json; \
+		sed -n -e 's/^Package: \(.*\)$$/"\1":/p' -e 's/^Version: \(.*\)$$/"\1",/p' Packages | tr '\n' ' ' >> index.json; \
+		echo '}}' >> index.json; \
+		sed -i 's/, }}/}}/' index.json; \
 		gzip -9nc Packages > Packages.gz; \
 	); done
 ifdef CONFIG_SIGNED_PACKAGES
@@ -153,15 +106,6 @@ ifdef CONFIG_SIGNED_PACKAGES
 		$(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY); \
 	); done
 endif
-ifdef CONFIG_JSON_CYCLONEDX_SBOM
-	@echo Creating CycloneDX package SBOMs...
-	@for d in $(PACKAGE_SUBDIRS); do ( \
-		[ -d $$d ] && \
-			cd $$d || continue; \
-		$(SCRIPT_DIR)/package-metadata.pl pkgcyclonedxsbom Packages.manifest > Packages.bom.cdx.json || true; \
-	); done
-endif
-endif
 
 $(curdir)/flags-install:= -j1
 

package/base-files/Makefile

@@ -39,14 +39,10 @@ endif
 define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:= \
-	+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring \
-	+NAND_SUPPORT:ubi-utils +fstools +fwtool \
-	+SELINUX:procd-selinux +!SELINUX:procd +USE_SECCOMP:procd-seccomp \
-	+SELINUX:busybox-selinux +!SELINUX:busybox
+  DEPENDS:=+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
-  VERSION:=$(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION)))
+  VERSION:=$(PKG_RELEASE)-$(REVISION)
 endef
 
 define Package/base-files/conffiles
@@ -81,7 +77,7 @@ endef
 define ImageConfigOptions
 	mkdir -p $(1)/lib/preinit
 	echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf
-	echo 'fs_failsafe_wait_timeout=$(if $(CONFIG_TARGET_PREINIT_TIMEOUT),$(CONFIG_TARGET_PREINIT_TIMEOUT),4)' >>$(1)/lib/preinit/00_preinit.conf
+	echo 'fs_failsafe_wait_timeout=$(if $(CONFIG_TARGET_PREINIT_TIMEOUT),$(CONFIG_TARGET_PREINIT_TIMEOUT),2)' >>$(1)/lib/preinit/00_preinit.conf
 	echo 'pi_init_path="$(TARGET_INIT_PATH)"' >>$(1)/lib/preinit/00_preinit.conf
 	echo 'pi_init_env=$(if $(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),"")' >>$(1)/lib/preinit/00_preinit.conf
 	echo 'pi_init_cmd=$(if $(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),"/sbin/init")' >>$(1)/lib/preinit/00_preinit.conf
@@ -112,22 +108,11 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
-define Build/Quilt
-endef
-
 define Build/Compile/Default
 
 endef
 Build/Compile = $(Build/Compile/Default)
 
-ifneq ($(CONFIG_USE_APK),)
-ifndef CONFIG_BUILDBOT
-  define Package/base-files/install-key
-	mkdir -p $(1)/etc/apk/keys
-	$(CP) $(BUILD_KEY_APK_PUB) $(1)/etc/apk/keys/
-  endef
-endif
-else
 ifdef CONFIG_SIGNED_PACKAGES
   define Build/Configure
 	[ -s $(BUILD_KEY) -a -s $(BUILD_KEY).pub ] || \
@@ -142,10 +127,10 @@ ifndef CONFIG_BUILDBOT
   define Package/base-files/install-key
 	mkdir -p $(1)/etc/opkg/keys
 	$(CP) $(BUILD_KEY).pub $(1)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign -F -p $(BUILD_KEY).pub`
+
   endef
 endif
 endif
-endif
 
 ifeq ($(CONFIG_NAND_SUPPORT),)
   define Package/base-files/nand-support
@@ -211,8 +196,7 @@ define Package/base-files/install
 		$(1)/usr/lib \
 		$(1)/usr/bin \
 		$(1)/sys \
-		$(1)/www
-	mkdir -p -m 750 \
+		$(1)/www \
 		$(1)/root
 
 	$(LN) /proc/mounts $(1)/etc/mtab
@@ -246,24 +230,15 @@ endif
 		cat $(BIN_DIR)/feeds.buildinfo >>$(1)/etc/build.feeds; \
 		cat $(BIN_DIR)/version.buildinfo >>$(1)/etc/build.version)
 
-	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
-		rm -f $(1)/etc/banner.failsafe,)
-
-ifneq ($(CONFIG_USE_APK),)
-	mkdir -p $(1)/etc/apk/
-	$(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories)
-	$(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories
-
-	rm -f $(1)/etc/uci-defaults/13_fix-group-user
-	rm -f $(1)/sbin/pkg_check
-else
 	$(if $(CONFIG_CLEAN_IPKG),, \
 		mkdir -p $(1)/etc/opkg; \
-		$(call FeedSourcesAppendOPKG,$(1)/etc/opkg/distfeeds.conf); \
+		$(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \
 		$(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
 	$(if $(CONFIG_IPK_FILES_CHECKSUMS),, \
 		rm -f $(1)/sbin/pkg_check)
-endif
+
+	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
+		rm -f $(1)/etc/banner.failsafe,)
 endef
 
 ifneq ($(DUMP),1)

package/base-files/files/bin/config_generate

@@ -314,14 +314,14 @@ generate_static_system() {
 		set system.@system[-1].hostname='ImmortalWrt'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].ttylogin='0'
-		set system.@system[-1].log_size='128'
+		set system.@system[-1].log_size='64'
 		set system.@system[-1].urandom_seed='0'
 
 		delete system.ntp
 		set system.ntp='timeserver'
 		set system.ntp.enabled='1'
 		set system.ntp.enable_server='0'
-		add_list system.ntp.server='time.apple.com'
+		add_list system.ntp.server='time1.apple.com'
 		add_list system.ntp.server='time1.google.com'
 		add_list system.ntp.server='time.cloudflare.com'
 		add_list system.ntp.server='pool.ntp.org'
@@ -341,11 +341,6 @@ generate_static_system() {
 				uci -q set "system.@system[-1].compat_version=1.0"
 			fi
 
-			local timezone
-			if json_get_var timezone timezone; then
-				uci -q set "system.@system[-1].timezone=$timezone"
-			fi
-
 			if json_is_a ntpserver array; then
 				local keys key
 				json_get_keys keys ntpserver

package/base-files/files/bin/ipcalc.sh

@@ -1,143 +1,89 @@
-#!/bin/sh
+#!/usr/bin/awk -f
 
-. /lib/functions/ipv4.sh
-
-PROG="$(basename "$0")"
-
-# wrapper to convert an integer to an address, unless we're using
-# decimal output format.
-# hook for library function
-_ip2str() {
-    local var="$1" n="$2"
-    assert_uint32 "$n" || exit 1
-
-    if [ "$decimal" -ne 0 ]; then
-	export -- "$var=$n"
-    elif [ "$hexadecimal" -ne 0 ]; then
-	export -- "$var=$(printf "%x" "$n")"
-    else
-        ip2str "$@"
-    fi
+function bitcount(c) {
+	c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
+	c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
+	c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+	c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+	c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+	return c
 }
 
-usage() {
-    echo "Usage: $PROG [ -d | -x ] address/prefix [ start limit ]" >&2
-    exit 1
+function ip2int(ip) {
+	ret=0
+	n=split(ip,a,"\\.")
+	for (x=1;x<=n;x++)
+		ret=or(lshift(ret,8),a[x])
+	return ret
 }
 
-decimal=0
-hexadecimal=0
-if [ "$1" = "-d" ]; then
-    decimal=1
-    shift
-elif [ "$1" = "-x" ]; then
-    hexadecimal=1
-    shift
-fi
+function int2ip(ip,ret,x) {
+	ret=and(ip,255)
+	ip=rshift(ip,8)
+	for(;x<3;x++) {
+		ret=and(ip,255)"."ret
+		ip=rshift(ip,8)
+	}
+	return ret
+}
 
-if [ $# -eq 0 ]; then
-    usage
-fi
+function compl32(v) {
+	ret=xor(v, 0xffffffff)
+	return ret
+}
 
-case "$1" in
-*/*.*)
-    # data is n.n.n.n/m.m.m.m format, like on a Cisco router
-    str2ip ipaddr "${1%/*}" || exit 1
-    str2ip netmask "${1#*/}" || exit 1
-    netmask2prefix prefix "$netmask" || exit 1
-    shift
-    ;;
-*/*)
-    # more modern prefix notation of n.n.n.n/p
-    str2ip ipaddr "${1%/*}" || exit 1
-    prefix="${1#*/}"
-    assert_uint32 "$prefix" || exit 1
-    if [ "$prefix" -gt 32 ]; then
-	printf "Prefix out of range (%s)\n" "$prefix" >&2
-	exit 1
-    fi
-    prefix2netmask netmask "$prefix" || exit 1
-    shift
-    ;;
-*)
-    # address and netmask as two separate arguments
-    str2ip ipaddr "$1" || exit 1
-    str2ip netmask "$2" || exit 1
-    netmask2prefix prefix "$netmask" || exit 1
-    shift 2
-    ;;
-esac
+BEGIN {
+	slpos=index(ARGV[1],"/")
+	if (slpos == 0) {
+		ipaddr=ip2int(ARGV[1])
+		dotpos=index(ARGV[2],".")
+		if (dotpos == 0)
+			netmask=compl32(2**(32-int(ARGV[2]))-1)
+		else
+			netmask=ip2int(ARGV[2])
+	} else {
+		ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+		netmask=compl32(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+		ARGV[4]=ARGV[3]
+		ARGV[3]=ARGV[2]
+	}
 
-# we either have no arguments left, or we have a range start and length
-if [ $# -ne 0 ] && [ $# -ne 2 ]; then
-    usage
-fi
+	network=and(ipaddr,netmask)
+	prefix=32-bitcount(compl32(netmask))
+	broadcast=or(network,compl32(netmask))
 
-# complement of the netmask, i.e. the hostmask
-hostmask=$((netmask ^ 0xffffffff))
-network=$((ipaddr & netmask))
-broadcast=$((network | hostmask))
-count=$((hostmask + 1))
+	print "IP="int2ip(ipaddr)
+	print "NETMASK="int2ip(netmask)
+	print "BROADCAST="int2ip(broadcast)
+	print "NETWORK="int2ip(network)
+	print "PREFIX="prefix
 
-_ip2str IP "$ipaddr"
-_ip2str NETMASK "$netmask"
-_ip2str NETWORK "$network"
+	# range calculations:
+	# ipcalc <ip> <netmask> <start> <num>
 
-echo "IP=$IP"
-echo "NETMASK=$NETMASK"
-# don't include this-network or broadcast addresses
-if [ "$prefix" -le 30 ]; then
-    _ip2str BROADCAST "$broadcast"
-    echo "BROADCAST=$BROADCAST"
-fi
-echo "NETWORK=$NETWORK"
-echo "PREFIX=$prefix"
-echo "COUNT=$count"
+	if (ARGC <= 3)
+		exit(0)
 
-# if there's no range, we're done
-[ $# -eq 0 ] && exit 0
-[ -z "$1$2" ] && exit 0
+	start=or(network,and(ip2int(ARGV[3]),compl32(netmask)))
+	limit=network+1
+	if (start<limit) start=limit
+	if (start==ipaddr) start=ipaddr+1
 
-if [ "$prefix" -le 30 ]; then
-    lower=$((network + 1))
-else
-    lower="$network"
-fi
+	end=start+ARGV[4]
+	limit=or(network,compl32(netmask))-1
+	if (end>limit) end=limit
+	if (end==ipaddr) end=ipaddr-1
 
-start="$1"
-assert_uint32 "$start" || exit 1
-start=$((network | (start & hostmask)))
-[ "$start" -lt "$lower" ] && start="$lower"
-[ "$start" -eq "$ipaddr" ] && start=$((start + 1))
+	if (start>end) {
+		print "network ("int2ip(network)"/"prefix") too small" > "/dev/stderr"
+		exit(1)
+	}
 
-if [ "$prefix" -le 30 ]; then
-    upper=$(((network | hostmask) - 1))
-elif [ "$prefix" -eq 31 ]; then
-    upper=$((network | hostmask))
-else
-    upper="$network"
-fi
+	if (ipaddr > start && ipaddr < end) {
+		print "ipaddr inside range" > "/dev/stderr"
+		exit(1)
+	}
 
-range="$2"
-assert_uint32 "$range" || exit 1
-end=$((start + range - 1))
-[ "$end" -gt "$upper" ] && end="$upper"
-[ "$end" -eq "$ipaddr" ] && end=$((end - 1))
-
-if [ "$start" -gt "$end" ]; then
-    echo "network ($NETWORK/$prefix) too small" >&2
-    exit 1
-fi
-
-_ip2str START "$start"
-_ip2str END "$end"
-
-if [ "$start" -le "$ipaddr" ] && [ "$ipaddr" -le "$end" ]; then
-    echo "error: address $IP inside range $START..$END" >&2
-    exit 1
-fi
-
-echo "START=$START"
-echo "END=$END"
-
-exit 0
+	print "START="int2ip(start)
+	print "END="int2ip(end)
+}

package/base-files/files/etc/hotplug.d/leds/00-init

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = "add" ] && /etc/init.d/led start "$DEVICENAME"

package/base-files/files/etc/init.d/boot

@@ -10,6 +10,7 @@ uci_apply_defaults() {
 	cd /etc/uci-defaults || return 0
 	files="$(ls)"
 	[ -z "$files" ] && return 0
+	mkdir -p /tmp/.uci
 	for file in $files; do
 		( . "./$(basename $file)" ) && rm -f "$file"
 	done
@@ -24,8 +25,6 @@ boot() {
 	chmod 1777 /var/lock
 	mkdir -p /var/log
 	mkdir -p /var/run
-	ln -s /var/run /run
-	ln -s /var/lock /run/lock
 	mkdir -p /var/state
 	mkdir -p /var/tmp
 	mkdir -p /tmp/.uci
@@ -36,12 +35,11 @@ boot() {
 	touch /tmp/resolv.conf.d/resolv.conf.auto
 	ln -sf /tmp/resolv.conf.d/resolv.conf.auto /tmp/resolv.conf.auto
 	ln -sf /tmp/resolv.conf.d/resolv.conf.auto /tmp/resolv.conf
-	grep -q debugfs /proc/filesystems && /bin/mount -o nosuid,nodev,noexec,noatime -t debugfs debugfs /sys/kernel/debug
+	grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug
 	grep -q bpf /proc/filesystems && /bin/mount -o nosuid,nodev,noexec,noatime,mode=0700 -t bpf bpffs /sys/fs/bpf
-	grep -q pstore /proc/filesystems && /bin/mount -o nosuid,nodev,noexec,noatime -t pstore pstore /sys/fs/pstore
+	grep -q pstore /proc/filesystems && /bin/mount -o noatime -t pstore pstore /sys/fs/pstore
 	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
-	touch /tmp/.config_pending
 	/sbin/kmodloader
 
 	[ ! -f /etc/config/wireless ] && {
@@ -49,11 +47,7 @@ boot() {
 		sleep 1
 	}
 
-	mkdir -p /tmp/.uci
-	[ -f /etc/uci-defaults/30_uboot-envtools ] && (. /etc/uci-defaults/30_uboot-envtools)
 	/bin/config_generate
-	rm -f /tmp/.config_pending
-	/sbin/wifi config
 	uci_apply_defaults
 	sync
 	

package/base-files/files/etc/init.d/led

@@ -3,39 +3,6 @@
 
 START=96
 
-led_color_set() {
-	local cfg="$1"
-	local sysfs="$2"
-
-	local max_b
-	local colors
-	local color
-	local multi_intensity
-	local value
-	local write
-
-	[ -e /sys/class/leds/${sysfs}/multi_intensity ] || return
-	[ -e /sys/class/leds/${sysfs}/multi_index ] || return
-
-	max_b="$(cat /sys/class/leds/${sysfs}/max_brightness)"
-	colors="$(cat /sys/class/leds/${sysfs}/multi_index | tr " " "\n")"
-	multi_intensity=""
-	for color in $colors; do
-		config_get value $1 "color_${color}" "0"
-		[ "$value" -gt 0 ] && write=1
-		[ "$value" -gt "$max_b" ] && value="$max_b"
-		multi_intensity="${multi_intensity}${value} "
-	done
-
-	# Check if any color is configured
-	[ "$write" = 1 ] || return
-	# Remove last whitespace
-	multi_intensity="${multi_intensity:0:-1}"
-
-	echo "setting '${name}' led color to '${multi_intensity}'"
-	echo "${multi_intensity}" > /sys/class/leds/${sysfs}/multi_intensity
-}
-
 load_led() {
 	local name
 	local sysfs
@@ -64,8 +31,6 @@ load_led() {
 	config_get gpio $1 gpio "0"
 	config_get_bool inverted $1 inverted "0"
 
-	[ "$2" ] && [ "$sysfs" != "$2" ] && return
-
 	# execute application led trigger
 	[ -f "/usr/libexec/led-trigger/${trigger}" ] && {
 		. "/usr/libexec/led-trigger/${trigger}"
@@ -84,29 +49,21 @@ load_led() {
 	[ -e /sys/class/leds/${sysfs}/brightness ] && {
 		echo "setting up led ${name}"
 
-		printf "%s %s %d" \
+		printf "%s %s %d\n" \
 			"$sysfs" \
 			"$(sed -ne 's/^.*\[\(.*\)\].*$/\1/p' /sys/class/leds/${sysfs}/trigger)" \
 			"$(cat /sys/class/leds/${sysfs}/brightness)" \
 				>> /var/run/led.state
-		# Save default color if supported
-		[ -e /sys/class/leds/${sysfs}/multi_intensity ] && {
-			printf " %s" \
-				"$(sed 's/\ /:/g' /sys/class/leds/${sysfs}/multi_intensity)" \
-				>> /var/run/led.state
-		}
-		printf "\n" >> /var/run/led.state
 
 		[ "$default" = 0 ] &&
 			echo 0 >/sys/class/leds/${sysfs}/brightness
 
+		echo $trigger > /sys/class/leds/${sysfs}/trigger 2> /dev/null
+		ret="$?"
+
 		[ $default = 1 ] &&
 			cat /sys/class/leds/${sysfs}/max_brightness > /sys/class/leds/${sysfs}/brightness
 
-		led_color_set "$1" "$sysfs"
-
-		echo $trigger > /sys/class/leds/${sysfs}/trigger 2> /dev/null
-		ret="$?"
 		[ $ret = 0 ] || {
 			echo >&2 "Skipping trigger '$trigger' for led '$name' due to missing kernel module"
 			return 1
@@ -123,7 +80,7 @@ load_led() {
 					[ -e "/sys/class/leds/${sysfs}/$m" ] && \
 						echo 1 > /sys/class/leds/${sysfs}/$m
 				done
-				echo $interval > /sys/class/leds/${sysfs}/interval 2>/dev/null
+				echo $interval > /sys/class/leds/${sysfs}/interval
 			}
 			;;
 
@@ -171,28 +128,18 @@ load_led() {
 start() {
 	[ -e /sys/class/leds/ ] && {
 		[ -s /var/run/led.state ] && {
-			local led trigger brightness color
-			while read led trigger brightness color; do
-				[ "$1" ] && [ "$1" != "$led" ] && continue
+			local led trigger brightness
+			while read led trigger brightness; do
 				[ -e "/sys/class/leds/$led/trigger" ] && \
 					echo "$trigger" > "/sys/class/leds/$led/trigger"
 
 				[ -e "/sys/class/leds/$led/brightness" ] && \
 					echo "$brightness" > "/sys/class/leds/$led/brightness"
-
-				[ -e "/sys/class/leds/$led/multi_intensity" ] && \
-					echo "$color" | sed 's/:/\ /g' > \
-						"/sys/class/leds/$led/multi_intensity"
 			done < /var/run/led.state
-			if [ "$1" ]; then
-				grep -v "^$1 " /var/run/led.state > /var/run/led.state.new
-				mv /var/run/led.state.new /var/run/led.state
-			else
-				rm /var/run/led.state
-			fi
+			rm /var/run/led.state
 		}
 
 		config_load system
-		config_foreach load_led led "$1"
+		config_foreach load_led led
 	}
 }

package/base-files/files/etc/rc.common

@@ -100,6 +100,10 @@ service_triggers() {
 	return 0
 }
 
+service_data() {
+	return 0
+}
+
 service_running() {
 	local instance="${1:-*}"
 

package/base-files/files/etc/sysctl.conf

@@ -1,2 +1 @@
-# User defined entries should be added to this file not to /etc/sysctl.d/* as
-# that directory is not backed-up by default and will not survive a reimage
+# Defaults are configured in /etc/sysctl.d/* and can be customized in this file

package/base-files/files/etc/uci-defaults/11_network-migrate-bridges

@@ -1,49 +0,0 @@
-. /lib/functions.sh
-
-migrate_ports() {
-	local config="$1"
-	local type ports ifname
-
-	config_get type "$config" type
-	[ "$type" != "bridge" ] && return
-
-	config_get ports "$config" ports
-	[ -n "$ports" ] && return
-
-	config_get ifname "$config" ifname
-	[ -z "$ifname" ] && return
-
-	for port in $ifname; do
-		uci add_list network.$config.ports="$port"
-	done
-	uci delete network.$config.ifname
-}
-
-migrate_bridge() {
-	local config="$1"
-	local type ifname
-
-	config_get type "$config" type
-	[ "$type" != "bridge" ] && return
-
-	config_get ifname "$config" ifname
-
-	uci -q batch <<-EOF
-		add network device
-		set network.@device[-1].name='br-$config'
-		set network.@device[-1].type='bridge'
-	EOF
-	for port in $ifname; do
-		uci add_list network.@device[-1].ports="$port"
-	done
-
-	uci -q batch <<-EOF
-		delete network.$config.type
-		delete network.$config.ifname
-		set network.$config.device='br-$config'
-	EOF
-}
-
-config_load network
-config_foreach migrate_ports device
-config_foreach migrate_bridge interface

package/base-files/files/etc/uci-defaults/12_network-generate-ula

@@ -1,7 +1,11 @@
 [ "$(uci -q get network.globals.ula_prefix)" != "auto" ] && exit 0
 
+r1=$(dd if=/dev/urandom bs=1 count=1 |hexdump -e '1/1 "%02x"')
+r2=$(dd if=/dev/urandom bs=2 count=1 |hexdump -e '2/1 "%02x"')
+r3=$(dd if=/dev/urandom bs=2 count=1 |hexdump -e '2/1 "%02x"')
+
 uci -q batch <<-EOF >/dev/null
-	set network.globals.ula_prefix="$(hexdump -vn 5 -e '"fd" 1/1 "%02x:" 2/2 "%x:"' /dev/urandom):/48"
+	set network.globals.ula_prefix=fd$r1:$r2:$r3::/48
 	commit network
 EOF
 

package/base-files/files/etc/uci-defaults/13_fix-group-user

@@ -1,8 +1,5 @@
 . /lib/functions.sh
 
-# Skip if we don't have /usr/lib/opkg/info (APK installation)
-[ -d /usr/lib/opkg/info ] || exit 0
-
 for file in $(grep -sl Require-User /usr/lib/opkg/info/*.control); do
 	file="${file##*/}"
 	file="${file%.control}"

package/base-files/files/etc/uci-defaults/50-root-passwd

@@ -1,18 +0,0 @@
-. /usr/share/libubox/jshn.sh
-
-json_init
-json_load "$(cat /etc/board.json)"
-
-if json_is_a credentials object; then
-	json_select credentials
-		json_get_vars root_password_hash root_password_hash
-		if [ -n "$root_password_hash" ]; then
-			sed -i "s|^root:[^:]*|root:$root_password_hash|g" /etc/shadow
-		fi
-
-		json_get_vars root_password_plain root_password_plain
-		if [ -n "$root_password_plain" ]; then
-			(echo "$root_password_plain"; sleep 1; echo "$root_password_plain") | passwd root
-		fi
-	json_select ..
-fi

package/base-files/files/lib/functions.sh

@@ -32,30 +32,6 @@ xor() {
 	printf "%0${retlen}x" "$ret"
 }
 
-data_2bin() {
-	local data=$1
-	local len=${#1}
-	local bin_data
-
-	for i in $(seq 0 2 $(($len - 1))); do
-		bin_data="${bin_data}\x${data:i:2}"
-	done
-
-	echo -ne $bin_data
-}
-
-data_2xor_val() {
-	local data=$1
-	local len=${#1}
-	local xor_data
-
-	for i in $(seq 0 4 $(($len - 1))); do
-		xor_data="${xor_data}${data:i:4} "
-	done
-
-	echo -n ${xor_data:0:-1}
-}
-
 append() {
 	local var="$1"
 	local value="$2"
@@ -64,14 +40,6 @@ append() {
 	eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 }
 
-prepend() {
-	local var="$1"
-	local value="$2"
-	local sep="${3:- }"
-
-	eval "export ${NO_EXPORT:+-n} -- \"$var=\$value\${$var:+\${sep}\${$var}}\""
-}
-
 list_contains() {
 	local var="$1"
 	local str="$2"
@@ -211,10 +179,8 @@ config_list_foreach() {
 
 default_prerm() {
 	local root="${IPKG_INSTROOT}"
-	[ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
+	local pkgname="$(basename ${1%.*})"
 	local ret=0
-	local filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
-	[ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list"
 
 	if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then
 		( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" )
@@ -222,7 +188,7 @@ default_prerm() {
 	fi
 
 	local shell="$(command -v bash)"
-	for i in $(grep -s "^/etc/init.d/" "$filelist"); do
+	for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do
 		if [ -n "$root" ]; then
 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable
 		else
@@ -237,11 +203,8 @@ default_prerm() {
 }
 
 add_group_and_user() {
-	[ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
+	local pkgname="$1"
 	local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)"
-	if [ -f "$root/lib/apk/packages/${pkgname}.rusers" ]; then
-		local rusers="$(cat $root/lib/apk/packages/${pkgname}.rusers)"
-	fi
 
 	if [ -n "$rusers" ]; then
 		local tuple oIFS="$IFS"
@@ -291,70 +254,17 @@ add_group_and_user() {
 	fi
 }
 
-update_alternatives() {
-	local root="${IPKG_INSTROOT}"
-	local action="$1"
-	local pkgname="$2"
-
-	if [ -f "$root/lib/apk/packages/${pkgname}.alternatives" ]; then
-		for pkg_alt in $(cat $root/lib/apk/packages/${pkgname}.alternatives); do
-			local best_prio=0;
-			local best_src="/bin/busybox";
-			pkg_prio=${pkg_alt%%:*};
-			pkg_target=${pkg_alt#*:};
-			pkg_target=${pkg_target%:*};
-			pkg_src=${pkg_alt##*:};
-
-			if [ -e "$root/$target" ]; then
-				for alts in $root/lib/apk/packages/*.alternatives; do
-					for alt in $(cat $alts); do
-						prio=${alt%%:*};
-						target=${alt#*:};
-						target=${target%:*};
-						src=${alt##*:};
-
-						if [ "$target" = "$pkg_target" ] &&
-						   [ "$src" != "$pkg_src" ] &&
-						   [ "$best_prio" -lt "$prio" ]; then
-							best_prio=$prio;
-							best_src=$src;
-						fi
-					done
-				done
-			fi
-			case "$action" in
-				install)
-					if [ "$best_prio" -lt "$pkg_prio" ]; then
-						ln -sf "$pkg_src" "$root/$pkg_target"
-						echo "add alternative: $pkg_target -> $pkg_src"
-					fi
-				;;
-				remove)
-					if [ "$best_prio" -lt "$pkg_prio" ]; then
-						ln -sf "$best_src" "$root/$pkg_target"
-						echo "add alternative: $pkg_target -> $best_src"
-					fi
-				;;
-			esac
-		done
-	fi
-}
-
 default_postinst() {
 	local root="${IPKG_INSTROOT}"
-	[ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})"
-	local filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
-	[ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list"
+	local pkgname="$(basename ${1%.*})"
+	local filelist="/usr/lib/opkg/info/${pkgname}.list"
 	local ret=0
 
-	if [ -e "${root}/usr/lib/opkg/info/${pkgname}.list" ]; then
-		filelist="${root}/usr/lib/opkg/info/${pkgname}.list"
-		add_group_and_user "${pkgname}"
-	fi
+	add_group_and_user "${pkgname}"
 
-	if [ -e "${root}/lib/apk/packages/${pkgname}.list" ]; then
-		filelist="${root}/lib/apk/packages/${pkgname}.list"
-		update_alternatives install "${pkgname}"
+	if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then
+		( . "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" )
+		ret=$?
 	fi
 
 	if [ -d "$root/rootfs-overlay" ]; then
@@ -382,13 +292,8 @@ default_postinst() {
 		rm -f /tmp/luci-indexcache
 	fi
 
-	if [ -f "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" ]; then
-		( . "$root/usr/lib/opkg/info/${pkgname}.postinst-pkg" )
-		ret=$?
-	fi
-
 	local shell="$(command -v bash)"
-	for i in $(grep -s "^/etc/init.d/" "$filelist"); do
+	for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do
 		if [ -n "$root" ]; then
 			${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable
 		else
@@ -410,11 +315,6 @@ include() {
 	done
 }
 
-ipcalc() {
-	set -- $(ipcalc.sh "$@")
-	[ $? -eq 0 ] && export -- "$@"
-}
-
 find_mtd_index() {
 	local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
 	local INDEX="${PART##mtd}"
@@ -471,7 +371,7 @@ group_add_next() {
 		return
 	fi
 	gids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/group)
-	gid=32768
+	gid=65536
 	while echo "$gids" | grep -q "^$gid$"; do
 		gid=$((gid + 1))
 	done
@@ -502,7 +402,7 @@ user_add() {
 	local rc
 	[ -z "$uid" ] && {
 		uids=$(cut -d: -f3 ${IPKG_INSTROOT}/etc/passwd)
-		uid=32768
+		uid=65536
 		while echo "$uids" | grep -q "^$uid$"; do
 			uid=$((uid + 1))
 		done
@@ -533,4 +433,4 @@ cmdline_get_var() {
 	done
 }
 
-[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh || true
+[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh

package/base-files/files/lib/functions/caldata.sh

@@ -70,7 +70,7 @@ caldata_extract_reverse() {
 	local caldata
 
 	mtd=$(find_mtd_chardev "$part")
-	reversed=$(hexdump -v -s $offset -n $count -e '1/1 "%02x "' $mtd)
+	reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd)
 
 	for byte in $reversed; do
 		caldata="\x${byte}${caldata}"
@@ -122,43 +122,49 @@ caldata_valid() {
 	return $?
 }
 
-caldata_patch_data() {
-	local data=$1
-	local data_count=$((${#1} / 2))
-	[ -n "$2" ] && local data_offset=$(($2))
-	[ -n "$3" ] && local chksum_offset=$(($3))
+caldata_patch_chksum() {
+	local mac=$1
+	local mac_offset=$(($2))
+	local chksum_offset=$(($3))
 	local target=$4
-	local fw_data
-	local fw_chksum
+	local xor_mac
+	local xor_fw_mac
+	local xor_fw_chksum
 
-	[ -z "$data" -o -z "$data_offset" ] && return
+	xor_mac=${mac//:/}
+	xor_mac="${xor_mac:0:4} ${xor_mac:4:4} ${xor_mac:8:4}"
+
+	xor_fw_mac=$(hexdump -v -n 6 -s $mac_offset -e '/1 "%02x"' /lib/firmware/$FIRMWARE)
+	xor_fw_mac="${xor_fw_mac:0:4} ${xor_fw_mac:4:4} ${xor_fw_mac:8:4}"
+
+	xor_fw_chksum=$(hexdump -v -n 2 -s $chksum_offset -e '/1 "%02x"' /lib/firmware/$FIRMWARE)
+	xor_fw_chksum=$(xor $xor_fw_chksum $xor_fw_mac $xor_mac)
+
+	printf "%b" "\x${xor_fw_chksum:0:2}\x${xor_fw_chksum:2:2}" | \
+		dd of=$target conv=notrunc bs=1 seek=$chksum_offset count=2
+}
+
+caldata_patch_mac() {
+	local mac=$1
+	local mac_offset=$(($2))
+	local chksum_offset=$3
+	local target=$4
+
+	[ -z "$mac" -o -z "$mac_offset" ] && return
 
 	[ -n "$target" ] || target=/lib/firmware/$FIRMWARE
 
-	fw_data=$(hexdump -v -n $data_count -s $data_offset -e '1/1 "%02x"' $target)
+	[ -n "$chksum_offset" ] && caldata_patch_chksum "$mac" "$mac_offset" "$chksum_offset" "$target"
 
-	if [ "$data" != "$fw_data" ]; then
-
-		if [ -n "$chksum_offset" ]; then
-			fw_chksum=$(hexdump -v -n 2 -s $chksum_offset -e '1/1 "%02x"' $target)
-			fw_chksum=$(xor $fw_chksum $(data_2xor_val $fw_data) $(data_2xor_val $data))
-
-			data_2bin $fw_chksum | \
-				dd of=$target conv=notrunc bs=1 seek=$chksum_offset count=2 || \
-				caldata_die "failed to write chksum to eeprom file"
-		fi
-
-		data_2bin $data | \
-			dd of=$target conv=notrunc bs=1 seek=$data_offset count=$data_count || \
-			caldata_die "failed to write data to eeprom file"
-	fi
+	macaddr_2bin $mac | dd of=$target conv=notrunc oflag=seek_bytes bs=6 seek=$mac_offset count=1 || \
+		caldata_die "failed to write MAC address to eeprom file"
 }
 
 ath9k_patch_mac() {
 	local mac=$1
 	local target=$2
 
-	caldata_patch_data "${mac//:/}" 0x2 "" "$target"
+	caldata_patch_mac "$mac" 0x2 "" "$target"
 }
 
 ath9k_patch_mac_crc() {
@@ -167,52 +173,12 @@ ath9k_patch_mac_crc() {
 	local chksum_offset=$((mac_offset - 10))
 	local target=$4
 
-	caldata_patch_data "${mac//:/}" "$mac_offset" "$chksum_offset" "$target"
+	caldata_patch_mac "$mac" "$mac_offset" "$chksum_offset" "$target"
 }
 
 ath10k_patch_mac() {
 	local mac=$1
 	local target=$2
 
-	caldata_patch_data "${mac//:/}" 0x6 0x2 "$target"
-}
-
-ath11k_patch_mac() {
-	local mac=$1
-	# mac_id from 0 to 5
-	local mac_id=$2
-	local target=$3
-
-	[ -z "$mac_id" ] && return
-
-	caldata_patch_data "${mac//:/}" $(printf "0x%x" $(($mac_id * 0x6 + 0xe))) 0xa "$target"
-}
-
-ath10k_remove_regdomain() {
-	local target=$1
-
-	caldata_patch_data "0000" 0xc 0x2 "$target"
-}
-
-ath11k_remove_regdomain() {
-	local target=$1
-	local regdomain
-	local regdomain_data
-
-	regdomain=$(hexdump -v -n 2 -s 0x34 -e '1/1 "%02x"' $target)
-	caldata_patch_data "0000" 0x34 0xa "$target"
-	
-	for offset in 0x450 0x458 0x500 0x5a8; do
-		regdomain_data=$(hexdump -v -n 2 -s $offset -e '1/1 "%02x"' $target)
-
-		if [ "$regdomain" == "$regdomain_data" ]; then
-			caldata_patch_data "0000" $offset 0xa "$target"
-		fi
-	done
-}
-
-ath11k_set_macflag() {
-	local target=$1
-
-	caldata_patch_data "0100" 0x3e 0xa "$target"
+	caldata_patch_mac "$mac" 0x6 0x2 "$target"
 }

package/base-files/files/lib/functions/ipv4.sh

@@ -1,268 +0,0 @@
-uint_max=4294967295
-
-d_10_0_0_0=167772160
-d_10_255_255_255=184549375
-
-d_172_16_0_0=2886729728
-d_172_31_255_255=2887778303
-
-d_192_168_0_0=3232235520
-d_192_168_255_255=3232301055
-
-d_169_254_0_0=2851995648
-d_169_254_255_255=2852061183
-
-d_127_0_0_0=2130706432
-d_127_255_255_255=2147483647
-
-d_224_0_0_0=3758096384
-d_239_255_255_255=4026531839
-
-# check that $1 is only base 10 digits, and that it doesn't
-# exceed 2^32-1
-assert_uint32() {
-    local __n="$1"
-
-    if [ -z "$__n" -o -n "${__n//[0-9]/}" ]; then
-	printf "Not a decimal integer (%s)\n" "$__n ">&2
-	return 1
-    fi
-
-    if [ "$__n" -gt $uint_max ]; then
-	printf "Out of range (%s)\n" "$__n" >&2
-	return 1
-    fi
-
-    if [ "$((__n + 0))" != "$__n" ]; then
-	printf "Not normalized notation (%s)\n" "$__n" >&2
-	return 1
-    fi
-
-    return 0
-}
-
-# return a count of the number of bits set in $1
-bitcount() {
-    local __var="$1" __c="$2"
-    assert_uint32 "$__c" || return 1
-
-    __c=$((((__c >> 1) & 0x55555555) + (__c & 0x55555555)))
-    __c=$((((__c >> 2) & 0x33333333) + (__c & 0x33333333)))
-    __c=$((((__c >> 4) & 0x0f0f0f0f) + (__c & 0x0f0f0f0f)))
-    __c=$((((__c >> 8) & 0x00ff00ff) + (__c & 0x00ff00ff)))
-    __c=$((((__c >> 16) & 0x0000ffff) + (__c & 0x0000ffff)))
-
-    export -- "$__var=$__c"
-}
-
-# tedious but portable with busybox's limited shell
-# we check each octet to be in the range of 0..255,
-# and also make sure there's no extaneous characters.
-str2ip() {
-    local __var="$1" __ip="$2" __n __val=0
-
-    case "$__ip" in
-    [0-9].*)
-	__n="${__ip:0:1}"
-	__ip="${__ip:2}"
-	;;
-    [1-9][0-9].*)
-	__n="${__ip:0:2}"
-	__ip="${__ip:3}"
-	;;
-    1[0-9][0-9].*|2[0-4][0-9].*|25[0-5].*)
-	__n="${__ip:0:3}"
-	__ip="${__ip:4}"
-	;;
-    *)
-	printf "Not a dotted quad (%s)\n" "$2" >&2
-	return 1
-	;;
-    esac
-
-    __val=$((__n << 24))
-
-    case "$__ip" in
-    [0-9].*)
-	__n="${__ip:0:1}"
-	__ip="${__ip:2}"
-	;;
-    [1-9][0-9].*)
-	__n="${__ip:0:2}"
-	__ip="${__ip:3}"
-	;;
-    1[0-9][0-9].*|2[0-4][0-9].*|25[0-5].*)
-	__n="${__ip:0:3}"
-	__ip="${__ip:4}"
-	;;
-    *)
-	printf "Not a dotted quad (%s)\n" "$2" >&2
-	return 1
-	;;
-    esac
-
-    __val=$((__val + (__n << 16)))
-
-    case "$__ip" in
-    [0-9].*)
-	__n="${__ip:0:1}"
-	__ip="${__ip:2}"
-	;;
-    [1-9][0-9].*)
-	__n="${__ip:0:2}"
-	__ip="${__ip:3}"
-	;;
-    1[0-9][0-9].*|2[0-4][0-9].*|25[0-5].*)
-	__n="${__ip:0:3}"
-	__ip="${__ip:4}"
-	;;
-    *)
-	printf "Not a dotted quad (%s)\n" "$2" >&2
-	return 1
-	;;
-    esac
-
-    __val=$((__val + (__n << 8)))
-
-    case "$__ip" in
-    [0-9])
-	__n="${__ip:0:1}"
-	__ip="${__ip:1}"
-	;;
-    [1-9][0-9])
-	__n="${__ip:0:2}"
-	__ip="${__ip:2}"
-	;;
-    1[0-9][0-9]|2[0-4][0-9]|25[0-5])
-	__n="${__ip:0:3}"
-	__ip="${__ip:3}"
-	;;
-    *)
-	printf "Not a dotted quad (%s)\n" "$2" >&2
-	return 1
-	;;
-    esac
-
-    __val=$((__val + __n))
-
-    if [ -n "$__ip" ]; then
-	printf "Not a dotted quad (%s)\n" "$2" >&2
-	return 1
-    fi
-
-    export -- "$__var=$__val"
-    return 0
-}
-
-# convert back from an integer to dotted-quad.
-ip2str() {
-    local __var="$1" __n="$2"
-    assert_uint32 "$__n" || return 1
-
-    export -- "$__var=$((__n >> 24)).$(((__n >> 16) & 255)).$(((__n >> 8) & 255)).$((__n & 255))"
-}
-
-# convert prefix into an integer bitmask
-prefix2netmask() {
-    local __var="$1" __n="$2"
-    assert_uint32 "$__n" || return 1
-
-    if [ "$__n" -gt 32 ]; then
-	printf "Prefix out-of-range (%s)" "$__n" >&2
-	return 1
-    fi
-
-    export -- "$__var=$(((~(uint_max >> __n)) & uint_max))"
-}
-
-_is_contiguous() {
-    local __x="$1"	# no checking done
-    local __y=$((~__x & uint_max))
-    local __z=$(((__y + 1) & uint_max))
-
-    [ $((__z & __y)) -eq 0 ]
-}
-
-# check argument as being contiguous upper bits (and yes,
-# 0 doesn't have any discontiguous bits).
-is_contiguous() {
-    local __var="$1" __x="$2" __val=0
-    assert_uint32 "$__x" || return 1
-
-    local __y=$((~__x & uint_max))
-    local __z=$(((__y + 1) & uint_max))
-
-    [ $((__z & __y)) -eq 0 ] && __val=1
-
-    export -- "$__var=$__val"
-}
-
-# convert mask to prefix, validating that it's a conventional
-# (contiguous) netmask.
-netmask2prefix() {
-    local __var="$1" __n="$2" __cont __bits
-    assert_uint32 "$__n" || return 1
-
-    is_contiguous __cont "$__n" || return 1
-    if [ $__cont -eq 0 ]; then
-	printf "Not a contiguous netmask (%08x)\n" "$__n" >&2
-	return 1
-    fi
-
-    bitcount __bits "$__n"		# already checked
-
-    export -- "$__var=$__bits"
-}
-
-# check the argument as being an rfc-1918 address
-is_rfc1918() {
-    local __var="$1" __x="$2" __val=0
-    assert_uint32 "$__x" || return 1
-
-    if [ $d_10_0_0_0 -le $__x ] && [ $__x -le $d_10_255_255_255 ]; then
-	__val=1
-    elif [ $d_172_16_0_0 -le $__x ] && [ $__x -le $d_172_31_255_255 ]; then
-	__val=1
-    elif [ $d_192_168_0_0 -le $__x ] && [ $__x -le $d_192_168_255_255 ]; then
-	__val=1
-    fi
-
-    export -- "$__var=$__val"
-}
-
-# check the argument as being an rfc-3927 address
-is_rfc3927() {
-    local __var="$1" __x="$2" __val=0
-    assert_uint32 "$__x" || return 1
-
-    if [ $d_169_254_0_0 -le $__x ] && [ $__x -le $d_169_254_255_255 ]; then
-	__val=1
-    fi
-
-    export -- "$__var=$__val"
-}
-
-# check the argument as being an rfc-1122 loopback address
-is_loopback() {
-    local __var="$1" __x="$2" __val=0
-    assert_uint32 "$__x" || return 1
-
-    if [ $d_127_0_0_0 -le $__x ] && [ $__x -le $d_127_255_255_255 ]; then
-	__val=1
-    fi
-
-    export -- "$__var=$__val"
-}
-
-# check the argument as being a multicast address
-is_multicast() {
-    local __var="$1" __x="$2" __val=0
-    assert_uint32 "$__x" || return 1
-
-    if [ $d_224_0_0_0 -le $__x ] && [ $__x -le $d_239_255_255_255 ]; then
-	__val=1
-    fi
-
-    export -- "$__var=$__val"
-}
-

package/base-files/files/lib/functions/leds.sh

@@ -11,36 +11,6 @@ get_dt_led_path() {
 	echo "$ledpath"
 }
 
-get_dt_led_color_func() {
-	local enum
-	local func
-	local idx
-	local label
-
-	[ -e "$1/function" ] && func=$(cat "$1/function")
-	[ -e "$1/color" ] && idx=$((0x$(hexdump -n 4 -e '4/1 "%02x"' "$1/color")))
-	[ -e "$1/function-enumerator" ] && \
-		enum=$((0x$(hexdump -n 4 -e '4/1 "%02x"' "$1/function-enumerator")))
-
-	[ -z "$idx" ] && [ -z "$func" ] && return 2
-
-	if [ -n "$idx" ]; then
-		for color in "white" "red" "green" "blue" "amber" \
-			     "violet" "yellow" "ir" "multicolor" "rgb" \
-			     "purple" "orange" "pink" "cyan" "lime"
-		do
-			[ $idx -eq 0 ] && label="$color" && break
-			idx=$((idx-1))
-		done
-	fi
-
-	label="$label:$func"
-	[ -n "$enum" ] && label="$label-$enum"
-	echo "$label"
-
-	return 0
-}
-
 get_dt_led() {
 	local label
 	local ledpath=$(get_dt_led_path $1)
@@ -48,7 +18,6 @@ get_dt_led() {
 	[ -n "$ledpath" ] && \
 		label=$(cat "$ledpath/label" 2>/dev/null) || \
 		label=$(cat "$ledpath/chan-name" 2>/dev/null) || \
-		label=$(get_dt_led_color_func "$ledpath") || \
 		label=$(basename "$ledpath")
 
 	echo "$label"

package/base-files/files/lib/functions/system.sh

@@ -61,21 +61,11 @@ find_mtd_chardev() {
 	echo "${INDEX:+$PREFIX$INDEX}"
 }
 
-get_mac_ascii() {
-	local part="$1"
-	local key="$2"
-	local mac_dirty
-
-	mac_dirty=$(strings "$part" | tr -d ' \t' | sed -n 's/^'"$key"'=//p' | head -n 1)
-
-	# "canonicalize" mac
-	[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
-}
-
 mtd_get_mac_ascii() {
 	local mtdname="$1"
 	local key="$2"
 	local part
+	local mac_dirty
 
 	part=$(find_mtd_part "$mtdname")
 	if [ -z "$part" ]; then
@@ -83,7 +73,10 @@ mtd_get_mac_ascii() {
 		return
 	fi
 
-	get_mac_ascii "$part" "$key"
+	mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
+
+	# "canonicalize" mac
+	[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
 }
 
 mtd_get_mac_encrypted_arcadyan() {
@@ -197,20 +190,6 @@ mtd_get_part_size() {
 	done < /proc/mtd
 }
 
-mmc_get_mac_ascii() {
-	local part_name="$1"
-	local key="$2"
-	local part
-
-	part=$(find_mmc_part "$part_name")
-	if [ -z "$part" ]; then
-		echo "mmc_get_mac_ascii: partition $part_name not found!" >&2
-		return
-	fi
-
-	get_mac_ascii "$part" "$key"
-}
-
 mmc_get_mac_binary() {
 	local part_name="$1"
 	local offset="$2"
@@ -279,6 +258,12 @@ macaddr_random() {
 	echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${randsrc}")")"
 }
 
+macaddr_2bin() {
+	local mac=$1
+
+	echo -ne \\x${mac//:/\\x}
+}
+
 macaddr_canonicalize() {
 	local mac="$1"
 	local canon=""

package/base-files/files/lib/functions/uci-defaults.sh

@@ -106,33 +106,20 @@ ucidef_set_bridge_mac() {
 	json_select ..
 }
 
-_ucidef_set_network_device_common() {
-	json_select_object "network_device"
-	json_select_object "${1}"
-	json_add_string "${2}" "${3}"
-	json_select ..
-	json_select ..
-}
-
 ucidef_set_network_device_mac() {
-	_ucidef_set_network_device_common $1 macaddr $2
+	json_select_object "network-device"
+	json_select_object "${1}"
+	json_add_string macaddr "${2}"
+	json_select ..
+	json_select ..
 }
 
 ucidef_set_network_device_path() {
-	_ucidef_set_network_device_common $1 path $2
-}
-
-ucidef_set_network_device_path_port() {
-	_ucidef_set_network_device_common $1 path $2
-	_ucidef_set_network_device_common $1 port $3
-}
-
-ucidef_set_network_device_gro() {
-	_ucidef_set_network_device_common $1 gro $2
-}
-
-ucidef_set_network_device_conduit() {
-	_ucidef_set_network_device_common $1 conduit $2
+	json_select_object "network_device"
+	json_select_object "$1"
+	json_add_string path "$2"
+	json_select ..
+	json_select ..
 }
 
 _ucidef_add_switch_port() {
@@ -647,92 +634,6 @@ ucidef_set_hostname() {
 	json_select ..
 }
 
-ucidef_set_timezone() {
-	local timezone="$1"
-	json_select_object system
-		json_add_string timezone "$timezone"
-	json_select ..
-}
-
-ucidef_set_wireless() {
-	local band="$1"
-	local ssid="$2"
-	local encryption="$3"
-	local key="$4"
-
-	case "$band" in
-	all|2g|5g|6g) ;;
-	*) return;;
-	esac
-	[ -z "$ssid" ] && return
-
-	json_select_object wlan
-		json_select_object defaults
-			json_select_object ssids
-				json_select_object "$band"
-					json_add_string ssid "$ssid"
-					[ -n "$encryption" ] && json_add_string encryption "$encryption"
-					[ -n "$key" ] && json_add_string key "$key"
-				json_select ..
-			json_select ..
-		json_select ..
-	json_select ..
-}
-
-ucidef_set_country() {
-	local country="$1"
-
-	json_select_object wlan
-		json_select_object defaults
-			json_add_string country "$country"
-		json_select ..
-	json_select ..
-}
-
-ucidef_set_wireless_mac_count() {
-	local band="$1"
-	local mac_count="$2"
-
-	case "$band" in
-	2g|5g|6g) ;;
-	*) return;;
-	esac
-	[ -z "$mac_count" ] && return
-
-	json_select_object wlan
-		json_select_object defaults
-			json_select_object ssids
-				json_select_object "$band"
-					json_add_string mac_count "$mac_count"
-				json_select ..
-			json_select ..
-		json_select ..
-	json_select ..
-}
-
-ucidef_set_root_password_plain() {
-	local passwd="$1"
-	json_select_object credentials
-		json_add_string root_password_plain "$passwd"
-	json_select ..
-}
-
-ucidef_set_root_password_hash() {
-	local passwd="$1"
-	json_select_object credentials
-		json_add_string root_password_hash "$passwd"
-	json_select ..
-}
-
-ucidef_set_ssh_authorized_key() {
-	local ssh_key="$1"
-	json_select_object credentials
-		json_select_array ssh_authorized_keys
-			json_add_string "" "$ssh_key"
-		json_select ..
-	json_select ..
-}
-
 ucidef_set_ntpserver() {
 	local server
 
@@ -745,17 +646,6 @@ ucidef_set_ntpserver() {
 	json_select ..
 }
 
-ucidef_set_poe() {
-	json_select_object poe
-		json_add_string "budget" "$1"
-		json_select_array ports
-			for port in $2; do
-				json_add_string "" "$port"
-			done
-		json_select ..
-	json_select ..
-}
-
 ucidef_add_wlan() {
 	local path="$1"; shift
 

package/base-files/files/lib/preinit/10_indicate_failsafe

@@ -9,14 +9,9 @@ indicate_failsafe_led () {
 
 indicate_failsafe() {
 	[ "$pi_preinit_no_failsafe" = "y" ] && return
-	local consoles="$(cat /sys/class/tty/console/active)"
-	[ -n "$consoles" ] || consoles=console
-	for console in $consoles; do
-		[ -c "/dev/$console" ] && echo "- failsafe -" >"/dev/$console"
-	done
+	echo "- failsafe -"
 	preinit_net_echo "Entering Failsafe!\n"
 	indicate_failsafe_led
-	echo OpenWrt-failsafe > /proc/sys/kernel/hostname
 }
 
 boot_hook_add failsafe indicate_failsafe

package/base-files/files/lib/preinit/10_indicate_preinit

@@ -65,27 +65,12 @@ preinit_config_switch() {
 
 preinit_config_port() {
 	local original
-	local dev_port
 
 	local netdev="$1"
 	local path="$2"
-	local port="$3"
 
 	[ -d "/sys/devices/$path/net" ] || return
-
-	if [ -z "$port" ]; then
-		original="$(ls "/sys/devices/$path/net" | head -1)"
-	else
-		for device in /sys/devices/$path/net/*; do
-			dev_port="$(cat "$device/dev_port")"
-			if [ "$dev_port" = "$port" ]; then
-				original="${device##*/}"
-				break
-			fi
-		done
-
-		[ -z "$original" ] && return
-	fi
+	original="$(ls "/sys/devices/$path/net" | head -1)"
 
 	[ "$netdev" = "$original" ] && return
 
@@ -124,8 +109,7 @@ preinit_config_board() {
 		json_select "network_device"
 			json_select "$netdev"
 				json_get_vars path path
-				json_get_vars port port
-				[ -n "$path" ] && preinit_config_port "$netdev" "$path" "$port"
+				[ -n "$path" ] && preinit_config_port "$netdev" "$path"
 			json_select ..
 		json_select ..
 	done

package/base-files/files/lib/preinit/30_failsafe_wait

@@ -40,7 +40,7 @@ fs_wait_for_key () {
 		rm -f $keypress_wait
 	} &
 
-	local consoles="$(cat /sys/class/tty/console/active)"
+	local consoles="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | sed -e 's/^console=//' -e 's/,.*//')"
 	[ -n "$consoles" ] || consoles=console
 	for console in $consoles; do
 		[ -c "/dev/$console" ] || continue
@@ -78,9 +78,6 @@ fs_wait_for_key () {
 	keypressed=1
 	[ "$(cat $keypress_true)" = "true" ] && keypressed=0
 
-	trap - INT
-	trap - USR1
-
 	rm -f $keypress_true
 	rm -f $keypress_wait
 	rm -f $keypress_sec

package/base-files/files/lib/preinit/80_mount_root

@@ -9,32 +9,13 @@ missing_lines() {
 	IFS=":"
 	while read line; do
 		set -- $line
-		grep -q "^$1:" "$file2" || echo "$line"
+		grep -q "^$1:" "$file2" || echo "$*"
 	done < "$file1"
 	IFS="$oIFS"
 }
 
-# Rootfs mount options can be passed by declaring in the kernel
-# cmdline as much options as needed prefixed with "rootfs_mount_options."
-#
-# Example:
-# rootfs_mount_options.compress_algorithm=zstd rootfs_mount_options.noinline_data
-#
-compose_rootfs_mount_options() {
-	local mount_options
-	local cmdlinevar
-
-	for cmdlinevar in $(cat /proc/cmdline); do
-		if [ "$cmdlinevar" != "${cmdlinevar#rootfs_mount_options\.}" ]; then
-			append mount_options "${cmdlinevar#rootfs_mount_options\.}"
-		fi
-	done
-
-	echo $mount_options
-}
-
 do_mount_root() {
-	mount_root start "$(compose_rootfs_mount_options)"
+	mount_root
 	boot_run_hook preinit_mount_root
 	[ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && {
 		echo "- config restore -"

package/base-files/files/lib/preinit/99_10_failsafe_login

@@ -2,22 +2,14 @@
 # Copyright (C) 2010 Vertical Communications
 
 failsafe_shell() {
-	local consoles="$(cat /sys/class/tty/console/active)"
+	local consoles="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | sed -e 's/^console=//' -e 's/,.*//')"
 	[ -n "$consoles" ] || consoles=console
 	for console in $consoles; do
-		case "$console" in
-			console|tty[0-9]*)
-				term=${TERM:-linux}
-				;;
-			*)
-				term=vt102
-				;;
-		esac
-		# Running asynchronously via the shell's & would ignore SIGINT,
-		# breaking ^C. Use start-stop-daemon instead.
-		[ -c "/dev/$console" ] && start-stop-daemon -Sb -p /dev/null -- env -i ash -c "while true; do setsid -c env -i USER=root LOGNAME=root SHELL=/bin/ash TERM="$term" ash --login <\"/dev/$console\" >\"/dev/$console\" 2>\"/dev/$console\"; sleep 1; done"
+		[ -c "/dev/$console" ] && while true; do
+			ash --login <"/dev/$console" >"/dev/$console" 2>"/dev/$console"
+			sleep 1
+		done &
 	done
-
 }
 
 boot_hook_add failsafe failsafe_shell

package/base-files/files/lib/upgrade/emmc.sh

@@ -16,22 +16,15 @@ emmc_upgrade_tar() {
 	tar tf "$tar_file" ${board_dir}/kernel 1>/dev/null 2>/dev/null && has_kernel=1
 	tar tf "$tar_file" ${board_dir}/root 1>/dev/null 2>/dev/null && has_rootfs=1
 
-	[ "$has_rootfs" = 1 -a "$EMMC_ROOT_DEV" ] && {
-		# Invalidate kernel image while rootfs is being written
-		[ "$has_kernel" = 1 -a "$EMMC_KERN_DEV" ] && {
-			dd if=/dev/zero of="$EMMC_KERN_DEV" bs=512 count=8
-			sync
-		}
+	[ "$has_kernel" = 1 -a "$EMMC_KERN_DEV" ] &&
+		export EMMC_KERNEL_BLOCKS=$(($(tar xf "$tar_file" ${board_dir}/kernel -O | dd of="$EMMC_KERN_DEV" bs=512 2>&1 | grep "records out" | cut -d' ' -f1)))
 
+	[ "$has_rootfs" = 1 -a "$EMMC_ROOT_DEV" ] && {
 		export EMMC_ROOTFS_BLOCKS=$(($(tar xf "$tar_file" ${board_dir}/root -O | dd of="$EMMC_ROOT_DEV" bs=512 2>&1 | grep "records out" | cut -d' ' -f1)))
 		# Account for 64KiB ROOTDEV_OVERLAY_ALIGN in libfstools
 		EMMC_ROOTFS_BLOCKS=$(((EMMC_ROOTFS_BLOCKS + 127) & ~127))
-		sync
 	}
 
-	[ "$has_kernel" = 1 -a "$EMMC_KERN_DEV" ] &&
-		export EMMC_KERNEL_BLOCKS=$(($(tar xf "$tar_file" ${board_dir}/kernel -O | dd of="$EMMC_KERN_DEV" bs=512 2>&1 | grep "records out" | cut -d' ' -f1)))
-
 	if [ -z "$UPGRADE_BACKUP" ]; then
 		if [ "$EMMC_DATA_DEV" ]; then
 			dd if=/dev/zero of="$EMMC_DATA_DEV" bs=512 count=8

package/base-files/files/lib/upgrade/nand.sh

@@ -57,11 +57,11 @@ nand_find_ubi() {
 }
 
 nand_get_magic_long() {
-	($2 < "$1" | dd bs=4 "skip=${3:-0}" count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
+	(${3}cat "$1" | dd bs=4 "skip=${2:-0}" count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
 }
 
 get_magic_long_tar() {
-	($2 < "$1" | tar xOf - "$3" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
+	(tar xO${3}f "$1" "$2" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
 }
 
 identify() {
@@ -73,7 +73,7 @@ identify_tar() {
 }
 
 identify_if_gzip() {
-	if [ "$(identify "$1" "cat")" = gzip ]; then echo -n z; fi
+	if [ "$(identify "$1")" = gzip ]; then echo -n z; fi
 }
 
 nand_restore_config() {
@@ -111,7 +111,7 @@ nand_remove_ubiblock() {
 
 	local ubiblk="ubiblock${ubivol:3}"
 	if [ -e "/dev/$ubiblk" ]; then
-		umount "/dev/$ubiblk" 2>/dev/null && echo "unmounted /dev/$ubiblk" || :
+		umount "/dev/$ubiblk" && echo "unmounted /dev/$ubiblk" || :
 		if ! ubiblock -r "/dev/$ubivol"; then
 			echo "cannot remove $ubiblk"
 			return 1
@@ -259,64 +259,64 @@ nand_upgrade_prepare_ubi() {
 # Write the UBI image to MTD ubi partition
 nand_upgrade_ubinized() {
 	local ubi_file="$1"
-	local cmd="$2"
+	local gz="$2"
 
-	local ubi_length=$( ($cmd < "$ubi_file" | wc -c) 2> /dev/null)
+	local ubi_length=$( (${gz}cat "$ubi_file" | wc -c) 2> /dev/null)
 
 	nand_detach_ubi "$CI_UBIPART" || return 1
 
 	local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
-	$cmd < "$ubi_file" | ubiformat "/dev/mtd$mtdnum" -S "$ubi_length" -y -f - && ubiattach -m "$mtdnum"
+	${gz}cat "$ubi_file" | ubiformat "/dev/mtd$mtdnum" -S "$ubi_length" -y -f - && ubiattach -m "$mtdnum"
 }
 
 # Write the UBIFS image to UBI rootfs volume
 nand_upgrade_ubifs() {
 	local ubifs_file="$1"
-	local cmd="$2"
+	local gz="$2"
 
-	local ubifs_length=$( ($cmd < "$ubifs_file" | wc -c) 2> /dev/null)
+	local ubifs_length=$( (${gz}cat "$ubifs_file" | wc -c) 2> /dev/null)
 
 	nand_upgrade_prepare_ubi "$ubifs_length" "ubifs" "" "" || return 1
 
 	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
 	local root_ubivol="$(nand_find_volume $ubidev "$CI_ROOTPART")"
-	$cmd < "$ubifs_file" | ubiupdatevol /dev/$root_ubivol -s "$ubifs_length" -
+	${gz}cat "$ubifs_file" | ubiupdatevol /dev/$root_ubivol -s "$ubifs_length" -
 }
 
 # Write the FIT image to UBI kernel volume
 nand_upgrade_fit() {
 	local fit_file="$1"
-	local cmd="$2"
+	local gz="$2"
 
-	local fit_length=$( ($cmd < "$fit_file" | wc -c) 2> /dev/null)
+	local fit_length=$( (${gz}cat "$fit_file" | wc -c) 2> /dev/null)
 
 	nand_upgrade_prepare_ubi "" "" "$fit_length" "1" || return 1
 
 	local fit_ubidev="$(nand_find_ubi "$CI_UBIPART")"
 	local fit_ubivol="$(nand_find_volume $fit_ubidev "$CI_KERNPART")"
-	$cmd < "$fit_file" | ubiupdatevol /dev/$fit_ubivol -s "$fit_length" -
+	${gz}cat "$fit_file" | ubiupdatevol /dev/$fit_ubivol -s "$fit_length" -
 }
 
 # Write images in the TAR file to MTD partitions and/or UBI volumes as required
 nand_upgrade_tar() {
 	local tar_file="$1"
-	local cmd="${2:-cat}"
+	local gz="$2"
 	local jffs2_markers="${CI_JFFS2_CLEAN_MARKERS:-0}"
 
 	# WARNING: This fails if tar contains more than one 'sysupgrade-*' directory.
-	local board_dir="$($cmd < "$tar_file" | tar tf - | grep -m 1 '^sysupgrade-.*/$')"
+	local board_dir="$(tar t${gz}f "$tar_file" | grep -m 1 '^sysupgrade-.*/$')"
 	board_dir="${board_dir%/}"
 
 	local kernel_mtd kernel_length
 	if [ "$CI_KERNPART" != "none" ]; then
 		kernel_mtd="$(find_mtd_index "$CI_KERNPART")"
-		kernel_length=$( ($cmd < "$tar_file" | tar xOf - "$board_dir/kernel" | wc -c) 2> /dev/null)
+		kernel_length=$( (tar xO${gz}f "$tar_file" "$board_dir/kernel" | wc -c) 2> /dev/null)
 		[ "$kernel_length" = 0 ] && kernel_length=
 	fi
-	local rootfs_length=$( ($cmd < "$tar_file" | tar xOf - "$board_dir/root" | wc -c) 2> /dev/null)
+	local rootfs_length=$( (tar xO${gz}f "$tar_file" "$board_dir/root" | wc -c) 2> /dev/null)
 	[ "$rootfs_length" = 0 ] && rootfs_length=
 	local rootfs_type
-	[ "$rootfs_length" ] && rootfs_type="$(identify_tar "$tar_file" "$cmd" "$board_dir/root")"
+	[ "$rootfs_length" ] && rootfs_type="$(identify_tar "$tar_file" "$board_dir/root" "$gz")"
 
 	local ubi_kernel_length
 	if [ "$kernel_length" ]; then
@@ -337,23 +337,23 @@ nand_upgrade_tar() {
 	if [ "$rootfs_length" ]; then
 		local ubidev="$( nand_find_ubi "${CI_ROOT_UBIPART:-$CI_UBIPART}" )"
 		local root_ubivol="$( nand_find_volume $ubidev "$CI_ROOTPART" )"
-		$cmd < "$tar_file" | tar xOf - "$board_dir/root" | \
+		tar xO${gz}f "$tar_file" "$board_dir/root" | \
 			ubiupdatevol /dev/$root_ubivol -s "$rootfs_length" -
 	fi
 	if [ "$kernel_length" ]; then
 		if [ "$kernel_mtd" ]; then
 			if [ "$jffs2_markers" = 1 ]; then
 				flash_erase -j "/dev/mtd${kernel_mtd}" 0 0
-				$cmd < "$tar_file" | tar xOf - "$board_dir/kernel" | \
+				tar xO${gz}f "$tar_file" "$board_dir/kernel" | \
 					nandwrite "/dev/mtd${kernel_mtd}" -
 			else
-				$cmd < "$tar_file" | tar xOf - "$board_dir/kernel" | \
+				tar xO${gz}f "$tar_file" "$board_dir/kernel" | \
 					mtd write - "$CI_KERNPART"
 			fi
 		else
 			local ubidev="$( nand_find_ubi "${CI_KERN_UBIPART:-$CI_UBIPART}" )"
 			local kern_ubivol="$( nand_find_volume $ubidev "$CI_KERNPART" )"
-			$cmd < "$tar_file" | tar xOf - "$board_dir/kernel" | \
+			tar xO${gz}f "$tar_file" "$board_dir/kernel" | \
 				ubiupdatevol /dev/$kern_ubivol -s "$kernel_length" -
 		fi
 	fi
@@ -363,9 +363,9 @@ nand_upgrade_tar() {
 
 nand_verify_if_gzip_file() {
 	local file="$1"
-	local cmd="$2"
+	local gz="$2"
 
-	if [ "$cmd" = zcat ]; then
+	if [ "$gz" = z ]; then
 		echo "verifying compressed sysupgrade file integrity"
 		if ! gzip -t "$file"; then
 			echo "corrupted compressed sysupgrade file"
@@ -376,10 +376,10 @@ nand_verify_if_gzip_file() {
 
 nand_verify_tar_file() {
 	local file="$1"
-	local cmd="$2"
+	local gz="$2"
 
 	echo "verifying sysupgrade tar file integrity"
-	if ! $cmd < "$file" | tar xOf - > /dev/null; then
+	if ! tar xO${gz}f "$file" > /dev/null; then
 		echo "corrupted sysupgrade tar file"
 		return 1
 	fi
@@ -387,30 +387,28 @@ nand_verify_tar_file() {
 
 nand_do_flash_file() {
 	local file="$1"
-	local cmd="$2"
-	local file_type
 
-	[ -z "$cmd" ] && cmd="$(identify_if_gzip "$file")cat"
-	file_type="$(identify "$file" "$cmd" "")"
+	local gz="$(identify_if_gzip "$file")"
+	local file_type="$(identify "$file" "" "$gz")"
 
 	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART=rootfs
 
 	case "$file_type" in
 		"fit")
-			nand_verify_if_gzip_file "$file" "$cmd" || return 1
-			nand_upgrade_fit "$file" "$cmd"
+			nand_verify_if_gzip_file "$file" "$gz" || return 1
+			nand_upgrade_fit "$file" "$gz"
 			;;
 		"ubi")
-			nand_verify_if_gzip_file "$file" "$cmd" || return 1
-			nand_upgrade_ubinized "$file" "$cmd"
+			nand_verify_if_gzip_file "$file" "$gz" || return 1
+			nand_upgrade_ubinized "$file" "$gz"
 			;;
 		"ubifs")
-			nand_verify_if_gzip_file "$file" "$cmd" || return 1
-			nand_upgrade_ubifs "$file" "$cmd"
+			nand_verify_if_gzip_file "$file" "$gz" || return 1
+			nand_upgrade_ubifs "$file" "$gz"
 			;;
 		*)
-			nand_verify_tar_file "$file" "$cmd" || return 1
-			nand_upgrade_tar "$file" "$cmd"
+			nand_verify_tar_file "$file" "$gz" || return 1
+			nand_upgrade_tar "$file" "$gz"
 			;;
 	esac
 }
@@ -421,26 +419,11 @@ nand_do_restore_config() {
 }
 
 # Recognize type of passed file and start the upgrade process
-#
-# Supported firmware containers:
-# 1. Raw file
-# 2. Gzip
-# 3. Custom (requires passing extracting command)
-#
-# Supported data formats:
-# 1. Tar with kernel/rootfs
-# 2. UBI image (built using "ubinized")
-# 3. UBIFS image (to update UBI volume with)
-# 4. FIT image (to update UBI volume with)
-#
-# $(1): firmware file path
-# $(2): (optional) pipe command to extract firmware
 nand_do_upgrade() {
 	local file="$1"
-	local cmd="$2"
 
 	sync
-	nand_do_flash_file "$file" "$cmd" && nand_do_upgrade_success
+	nand_do_flash_file "$file" && nand_do_upgrade_success
 	nand_do_upgrade_failed
 }
 
@@ -477,18 +460,18 @@ nand_do_platform_check() {
 	local board_name="$1"
 	local file="$2"
 
-	local cmd="$(identify_if_gzip "$file")cat"
-	local file_type="$(identify "$file" "$cmd" "")"
-	local control_length=$( ($cmd < "$file" | tar xOf - "sysupgrade-${board_name//,/_}/CONTROL" | wc -c) 2> /dev/null)
+	local gz="$(identify_if_gzip "$file")"
+	local file_type="$(identify "$file" "" "$gz")"
+	local control_length=$( (tar xO${gz}f "$file" "sysupgrade-${board_name//,/_}/CONTROL" | wc -c) 2> /dev/null)
 
 	if [ "$control_length" = 0 ]; then
-		control_length=$( ($cmd < "$file" | tar xOf - "sysupgrade-${board_name//_/,}/CONTROL" | wc -c) 2> /dev/null)
+		control_length=$( (tar xO${gz}f "$file" "sysupgrade-${board_name//_/,}/CONTROL" | wc -c) 2> /dev/null)
 	fi
 
 	if [ "$control_length" != 0 ]; then
-		nand_verify_tar_file "$file" "$cmd" || return 1
+		nand_verify_tar_file "$file" "$gz" || return 1
 	else
-		nand_verify_if_gzip_file "$file" "$cmd" || return 1
+		nand_verify_if_gzip_file "$file" "$gz" || return 1
 		if [ "$file_type" != "fit" -a "$file_type" != "ubi" -a "$file_type" != "ubifs" ]; then
 			echo "invalid sysupgrade file"
 			return 1

package/base-files/files/lib/upgrade/stage2

@@ -121,7 +121,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
 			v "Sending signal $sig to $name ($pid)"
 			kill -$sig $pid 2>/dev/null
 
-			[ $loop -eq 1 ] && sleep 2 && run=true
+			[ $loop -eq 1 ] && run=true
 		done
 
 		let loop_limit--

package/base-files/files/lib/upgrade/tar.sh

@@ -1,71 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-# Example usage:
-#
-# {
-#         tar_print_member "date.txt" "It's $(date +"%Y")"
-#         tar_print_trailer
-# } > test.tar
-
-__tar_print_padding() {
-	dd if=/dev/zero bs=1 count=$1 2>/dev/null
-}
-
-tar_print_member() {
-	local name="$1"
-	local content="$2"
-	local mtime="${3:-$(date +%s)}"
-	local mode=644
-	local uid=0
-	local gid=0
-	local size=${#content}
-	local type=0
-	local link=""
-	local username="root"
-	local groupname="root"
-
-	# 100 byte of padding bytes, using 0x01 since the shell does not tolerate null bytes in strings
-	local pad=$'\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1'
-
-	# validate name (strip leading slash if present)
-	name=${name#/}
-
-	# truncate string header values to their maximum length
-	name=${name:0:100}
-	link=${link:0:100}
-	username=${username:0:32}
-	groupname=${groupname:0:32}
-
-	# construct header part before checksum field
-	local header1="${name}${pad:0:$((100 - ${#name}))}"
-	header1="${header1}$(printf '%07d\1' $mode)"
-	header1="${header1}$(printf '%07o\1' $uid)"
-	header1="${header1}$(printf '%07o\1' $gid)"
-	header1="${header1}$(printf '%011o\1' $size)"
-	header1="${header1}$(printf '%011o\1' $mtime)"
-
-	# construct header part after checksum field
-	local header2="$(printf '%d' $type)"
-	header2="${header2}${link}${pad:0:$((100 - ${#link}))}"
-	header2="${header2}ustar  ${pad:0:1}"
-	header2="${header2}${username}${pad:0:$((32 - ${#username}))}"
-	header2="${header2}${groupname}${pad:0:$((32 - ${#groupname}))}"
-
-	# calculate checksum over header fields
-	local checksum=0
-	for byte in $(printf '%s%8s%s' "$header1" "" "$header2" | tr '\1' '\0' | hexdump -ve '1/1 "%u "'); do
-		checksum=$((checksum + byte))
-	done
-
-	# print member header, padded to 512 byte
-	printf '%s%06o\0 %s' "$header1" $checksum "$header2" | tr '\1' '\0'
-	__tar_print_padding 183
-
-	# print content data, padded to multiple of 512 byte
-	printf "%s" "$content"
-	__tar_print_padding $((512 - (size % 512)))
-}
-
-tar_print_trailer() {
-	__tar_print_padding 1024
-}

package/base-files/files/sbin/sysupgrade

@@ -4,35 +4,27 @@
 . /lib/functions/system.sh
 . /usr/share/libubox/jshn.sh
 
-# File-local constants
-CONF_TAR=/tmp/sysupgrade.tgz
-ETCBACKUP_DIR=/etc/backup
-INSTALLED_PACKAGES=${ETCBACKUP_DIR}/installed_packages.txt
-COMMAND=/lib/upgrade/do_stage2
-
-# File-local globals
-SAVE_OVERLAY=0
-SAVE_OVERLAY_PATH=
-SAVE_PARTITIONS=1
-SAVE_INSTALLED_PKGS=0
-SKIP_UNCHANGED=0
-CONF_IMAGE=
-CONF_BACKUP_LIST=0
-CONF_BACKUP=
-CONF_RESTORE=
-NEED_IMAGE=
-HELP=0
-TEST=0
-
-# Globals accessed in other files
+# initialize defaults
 export MTD_ARGS=""
 export MTD_CONFIG_ARGS=""
 export INTERACTIVE=0
 export VERBOSE=1
 export SAVE_CONFIG=1
+export SAVE_OVERLAY=0
+export SAVE_OVERLAY_PATH=
+export SAVE_PARTITIONS=1
+export SAVE_INSTALLED_PKGS=0
+export SKIP_UNCHANGED=0
+export CONF_IMAGE=
+export CONF_BACKUP_LIST=0
+export CONF_BACKUP=
+export CONF_RESTORE=
 export IGNORE_MINOR_COMPAT=0
+export NEED_IMAGE=
+export HELP=0
 export FORCE=0
-export CONFFILES=/tmp/sysupgrade.conffiles
+export TEST=0
+export UMOUNT_ETCBACKUP_DIR=0
 
 # parse options
 while [ -n "$1" ]; do
@@ -41,18 +33,18 @@ while [ -n "$1" ]; do
 		-v) export VERBOSE="$(($VERBOSE + 1))";;
 		-q) export VERBOSE="$(($VERBOSE - 1))";;
 		-n) export SAVE_CONFIG=0;;
-		-c) SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;;
-		-o) SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;;
-		-p) SAVE_PARTITIONS=0;;
-		-k) SAVE_INSTALLED_PKGS=1;;
-		-u) SKIP_UNCHANGED=1;;
-		-b|--create-backup) CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
-		-r|--restore-backup) CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
-		-l|--list-backup) CONF_BACKUP_LIST=1;;
-		-f) CONF_IMAGE="$2"; shift;;
+		-c) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/etc;;
+		-o) export SAVE_OVERLAY=1 SAVE_OVERLAY_PATH=/;;
+		-p) export SAVE_PARTITIONS=0;;
+		-k) export SAVE_INSTALLED_PKGS=1;;
+		-u) export SKIP_UNCHANGED=1;;
+		-b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
+		-r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
+		-l|--list-backup) export CONF_BACKUP_LIST=1;;
+		-f) export CONF_IMAGE="$2"; shift;;
 		-F|--force) export FORCE=1;;
-		-T|--test) TEST=1;;
-		-h|--help) HELP=1; break;;
+		-T|--test) export TEST=1;;
+		-h|--help) export HELP=1; break;;
 		--ignore-minor-compat-version) export IGNORE_MINOR_COMPAT=1;;
 		-*)
 			echo "Invalid option: $1" >&2
@@ -63,7 +55,14 @@ while [ -n "$1" ]; do
 	shift;
 done
 
-print_help() {
+export CONFFILES=/tmp/sysupgrade.conffiles
+export CONF_TAR=/tmp/sysupgrade.tgz
+export ETCBACKUP_DIR=/etc/backup
+export INSTALLED_PACKAGES=${ETCBACKUP_DIR}/installed_packages.txt
+
+IMAGE="$1"
+
+[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && {
 	cat <<EOF
 Usage: $0 [<upgrade-option>...] <image file or URL>
        $0 [-q] [-i] [-c] [-u] [-o] [-k] <backup-command> <file>
@@ -103,19 +102,8 @@ backup-command:
 	             sysupgrade -b. Does not create a backup file.
 
 EOF
-}
-
-IMAGE="$1"
-
-if [ $HELP -gt 0 ]; then
-	print_help
-	exit 0
-fi
-
-if [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 ]; then
-	print_help
 	exit 1
-fi
+}
 
 [ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && {
 	cat <<-EOF
@@ -130,20 +118,12 @@ fi
 
 
 list_conffiles() {
-	if [ -f /usr/lib/opkg/status ]; then
-		awk '
-			BEGIN { conffiles = 0 }
-			/^Conffiles:/ { conffiles = 1; next }
-			!/^ / { conffiles = 0; next }
-			conffiles == 1 { print }
-		' /usr/lib/opkg/status
-	elif [ -d /lib/apk/packages ]; then
-		conffiles=""
-		for file in /lib/apk/packages/*.conffiles_static; do
-			conffiles="$(echo -e "$(cat $file)\n$conffiles")"
-		done
-		echo "$conffiles"
-	fi
+	awk '
+		BEGIN { conffiles = 0 }
+		/^Conffiles:/ { conffiles = 1; next }
+		!/^ / { conffiles = 0; next }
+		conffiles == 1 { print }
+	' /usr/lib/opkg/status
 }
 
 list_changed_conffiles() {
@@ -163,7 +143,7 @@ list_static_conffiles() {
 		\( -type f -o -type l \) $filter 2>/dev/null
 }
 
-build_list_of_backup_config_files() {
+add_conffiles() {
 	local file="$1"
 
 	( list_static_conffiles "$find_filter"; list_changed_conffiles ) |
@@ -171,7 +151,7 @@ build_list_of_backup_config_files() {
 	return 0
 }
 
-build_list_of_backup_overlay_files() {
+add_overlayfiles() {
 	local file="$1"
 
 	local packagesfiles=$1.packagesfiles
@@ -223,12 +203,12 @@ build_list_of_backup_overlay_files() {
 
 if [ $SAVE_OVERLAY = 1 ]; then
 	[ ! -d /overlay/upper/etc ] && {
-		echo "Cannot find '/overlay/upper/etc', required for '-c' or '-o'" >&2
+		echo "Cannot find '/overlay/upper/etc', required for '-c'" >&2
 		exit 1
 	}
-	sysupgrade_init_conffiles="build_list_of_backup_overlay_files"
+	sysupgrade_init_conffiles="add_overlayfiles"
 else
-	sysupgrade_init_conffiles="build_list_of_backup_config_files"
+	sysupgrade_init_conffiles="add_conffiles"
 fi
 
 find_filter=""
@@ -242,69 +222,53 @@ fi
 
 include /lib/upgrade
 
-create_backup_archive() {
+do_save_conffiles() {
 	local conf_tar="$1"
-	local disabled
-	local err
 
 	[ "$(rootfs_type)" = "tmpfs" ] && {
 		echo "Cannot save config while running from ramdisk." >&2
 		ask_bool 0 "Abort" && exit
+		rm -f "$conf_tar"
 		return 0
 	}
 	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
 	ask_bool 0 "Edit config file list" && vi "$CONFFILES"
 
-	[ "$conf_tar" != "-" ] || conf_tar=""
+	if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
+		echo "${INSTALLED_PACKAGES}" >> "$CONFFILES"
+		mkdir -p "$ETCBACKUP_DIR"
+		# Avoid touching filesystem on each backup
+		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
+		mkdir -p "$RAMFS/upper" "$RAMFS/work"
+		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
+			UMOUNT_ETCBACKUP_DIR=1 || {
+				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
+				ask_bool 0 "Abort" && exit
+			}
+
+		# Format: pkg-name<TAB>{rom,overlay,unkown}
+		# rom is used for pkgs in /rom, even if updated later
+		find /usr/lib/opkg/info -name "*.control" \( \
+			\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
+			\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
+			\( -exec echo {} unknown \; \) \
+			\) | sed -e 's,.*/,,;s/\.control /\t/' > ${INSTALLED_PACKAGES}
+	fi
 
 	v "Saving config files..."
 	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
-	sed -i -e 's,^/,,' "$CONFFILES"
-	set -o pipefail
-	{
-		local ret=0
-
-		if [ $ret -eq 0 ]; then
-			for service in /etc/init.d/*; do
-				if ! $service enabled; then
-				disabled="$disabled$service disable\n"
-				fi
-			done
-			disabled="$disabled\nexit 0"
-			tar_print_member "/etc/uci-defaults/10_disable_services" "$(echo -e $disabled)" || ret=1
-		fi
-
-		# Part of archive with installed packages info
-		if [ $ret -eq 0 ]; then
-			if [ "$SAVE_INSTALLED_PKGS" -eq 1 ]; then
-				# Format: pkg-name<TAB>{rom,overlay,unknown}
-				# rom is used for pkgs in /rom, even if updated later
-				tar_print_member "$INSTALLED_PACKAGES" "$(find /usr/lib/opkg/info -name "*.control" \( \
-					\( -exec test -f /rom/{} \; -exec echo {} rom \; \) -o \
-					\( -exec test -f /overlay/upper/{} \; -exec echo {} overlay \; \) -o \
-					\( -exec echo {} unknown \; \) \
-					\) | sed -e 's,.*/,,;s/\.control /\t/')" || ret=1
-			fi
-		fi
-
-		# Rest of archive with config files and ending padding
-		if [ $ret -eq 0 ]; then
-			tar c${TAR_V} -C / -T "$CONFFILES" || ret=1
-		fi
-
-		[ $ret -eq 0 ]
-	} | gzip > "${conf_tar:-/proc/self/fd/1}"
-	err=$?
-	set +o pipefail
-
-	if [ "$err" -ne 0 ]; then
+	tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null
+	if [ "$?" -ne 0 ]; then
 		echo "Failed to create the configuration backup."
-		[ -f "$conf_tar" ] && rm -f "$conf_tar"
+		rm -f "$conf_tar"
+		exit 1
 	fi
 
+	[ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && {
+		umount "$ETCBACKUP_DIR"
+		rm -rf "$RAMFS"
+	}
 	rm -f "$CONFFILES"
-
-	return "$err"
 }
 
 if [ $CONF_BACKUP_LIST -eq 1 ]; then
@@ -316,8 +280,8 @@ if [ $CONF_BACKUP_LIST -eq 1 ]; then
 fi
 
 if [ -n "$CONF_BACKUP" ]; then
-	create_backup_archive "$CONF_BACKUP"
-	exit
+	do_save_conffiles "$CONF_BACKUP"
+	exit $?
 fi
 
 if [ -n "$CONF_RESTORE" ]; then
@@ -328,11 +292,7 @@ if [ -n "$CONF_RESTORE" ]; then
 
 	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
 	v "Restoring config files..."
-	if [ "$(type -t platform_restore_backup)" == 'platform_restore_backup' ]; then
-		platform_restore_backup "$TAR_V"
-	else
-		tar -C / -x${TAR_V}zf "$CONF_RESTORE"
-	fi
+	tar -C / -x${TAR_V}zf "$CONF_RESTORE"
 	exit $?
 fi
 
@@ -390,7 +350,7 @@ if [ -n "$CONF_IMAGE" ]; then
 	get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
 	export SAVE_CONFIG=1
 elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
-	[ $TEST -eq 1 ] || create_backup_archive "$CONF_TAR" || exit
+	[ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR"
 	export SAVE_CONFIG=1
 else
 	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
@@ -404,6 +364,8 @@ fi
 install_bin /sbin/upgraded
 v "Commencing upgrade. Closing all shell sessions."
 
+COMMAND='/lib/upgrade/do_stage2'
+
 if [ -n "$FAILSAFE" ]; then
 	printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
 	lock -u /tmp/.failsafe

package/base-files/files/sbin/wifi

@@ -0,0 +1,271 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+usage() {
+	cat <<EOF
+Usage: $0 [config|up|down|reconf|reload|status|isup]
+enables (default), disables or configures devices not yet configured.
+EOF
+	exit 1
+}
+
+ubus_wifi_cmd() {
+	local cmd="$1"
+	local dev="$2"
+
+	json_init
+	[ -n "$dev" ] && json_add_string device "$dev"
+	ubus call network.wireless "$cmd" "$(json_dump)"
+}
+
+wifi_isup() {
+	local dev="$1"
+
+	json_load "$(ubus_wifi_cmd "status" "$dev")"
+	json_get_keys devices
+
+	for device in $devices; do
+		json_select "$device"
+			json_get_var up up
+			[ $up -eq 0 ] && return 1
+		json_select ..
+	done
+
+	return 0
+}
+
+find_net_config() {(
+	local vif="$1"
+	local cfg
+	local ifname
+
+	config_get cfg "$vif" network
+
+	[ -z "$cfg" ] && {
+		include /lib/network
+		scan_interfaces
+
+		config_get ifname "$vif" ifname
+
+		cfg="$(find_config "$ifname")"
+	}
+	[ -z "$cfg" ] && return 0
+	echo "$cfg"
+)}
+
+
+bridge_interface() {(
+	local cfg="$1"
+	[ -z "$cfg" ] && return 0
+
+	include /lib/network
+	scan_interfaces
+
+	for cfg in $cfg; do
+		config_get iftype "$cfg" type
+		[ "$iftype" = bridge ] && config_get "$cfg" ifname
+		prepare_interface_bridge "$cfg"
+		return $?
+	done
+)}
+
+prepare_key_wep() {
+	local key="$1"
+	local hex=1
+
+	echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0
+	[ "${#key}" -eq 10 -a $hex -eq 1 ] || \
+	[ "${#key}" -eq 26 -a $hex -eq 1 ] || {
+		[ "${key:0:2}" = "s:" ] && key="${key#s:}"
+		key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
+	}
+	echo "$key"
+}
+
+wifi_fixup_hwmode() {
+	local device="$1"
+	local default="$2"
+	local hwmode hwmode_11n
+
+	config_get channel "$device" channel
+	config_get hwmode "$device" hwmode
+	case "$hwmode" in
+		11bg) hwmode=bg;;
+		11a) hwmode=a;;
+		11ad) hwmode=ad;;
+		11b) hwmode=b;;
+		11g) hwmode=g;;
+		11n*)
+			hwmode_11n="${hwmode##11n}"
+			case "$hwmode_11n" in
+				a|g) ;;
+				default) hwmode_11n="$default"
+			esac
+			config_set "$device" hwmode_11n "$hwmode_11n"
+		;;
+		*)
+			hwmode=
+			if [ "${channel:-0}" -gt 0 ]; then
+				if [ "${channel:-0}" -gt 14 ]; then
+					hwmode=a
+				else
+					hwmode=g
+				fi
+			else
+				hwmode="$default"
+			fi
+		;;
+	esac
+	config_set "$device" hwmode "$hwmode"
+}
+
+_wifi_updown() {
+	for device in ${2:-$DEVICES}; do (
+		config_get disabled "$device" disabled
+		[ "$disabled" = "1" ] && {
+			echo "'$device' is disabled"
+			set disable
+		}
+		config_get iftype "$device" type
+		if eval "type ${1}_$iftype" 2>/dev/null >/dev/null; then
+			eval "scan_$iftype '$device'"
+			eval "${1}_$iftype '$device'" || echo "$device($iftype): ${1} failed"
+		elif [ ! -f /lib/netifd/wireless/$iftype.sh ]; then
+			echo "$device($iftype): Interface type not supported"
+		fi
+	); done
+}
+
+wifi_updown() {
+	cmd=down
+	[ enable = "$1" ] && {
+		_wifi_updown disable "$2"
+		ubus_wifi_cmd "$cmd" "$2"
+		ubus call network reload
+		scan_wifi
+		cmd=up
+	}
+	[ reconf = "$1" ] && {
+		ubus call network reload
+		scan_wifi
+		cmd=reconf
+	}
+	ubus_wifi_cmd "$cmd" "$2"
+	_wifi_updown "$@"
+}
+
+wifi_reload_legacy() {
+	_wifi_updown "disable" "$1"
+	scan_wifi
+	_wifi_updown "enable" "$1"
+}
+
+wifi_reload() {
+	ubus call network reload
+	wifi_reload_legacy
+}
+
+wifi_detect_notice() {
+	>&2 echo "WARNING: Wifi detect is deprecated. Use wifi config instead"
+	>&2 echo "For more information, see commit 5f8f8a366136a07df661e31decce2458357c167a"
+	exit 1
+}
+
+wifi_config() {
+	[ ! -f /etc/config/wireless ] && touch /etc/config/wireless
+
+	for driver in $DRIVERS; do (
+		if eval "type detect_$driver" 2>/dev/null >/dev/null; then
+			eval "detect_$driver" || echo "$driver: Detect failed" >&2
+		else
+			echo "$driver: Hardware detection not supported" >&2
+		fi
+	); done
+}
+
+start_net() {(
+	local iface="$1"
+	local config="$2"
+	local vifmac="$3"
+
+	[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
+	[ -z "$config" ] || {
+		include /lib/network
+		scan_interfaces
+		for config in $config; do
+			setup_interface "$iface" "$config" "" "$vifmac"
+		done
+	}
+)}
+
+set_wifi_up() {
+	local cfg="$1"
+	local ifname="$2"
+	uci_set_state wireless "$cfg" up 1
+	uci_set_state wireless "$cfg" ifname "$ifname"
+}
+
+set_wifi_down() {
+	local cfg="$1"
+	local vifs vif vifstr
+
+	[ -f "/var/run/wifi-${cfg}.pid" ] &&
+		kill "$(cat "/var/run/wifi-${cfg}.pid")" 2>/dev/null
+	uci_revert_state wireless "$cfg"
+	config_get vifs "$cfg" vifs
+	for vif in $vifs; do
+		uci_revert_state wireless "$vif"
+	done
+}
+
+scan_wifi() {
+	local cfgfile="$1"
+	DEVICES=
+	config_cb() {
+		local type="$1"
+		local section="$2"
+
+		# section start
+		case "$type" in
+			wifi-device)
+				append DEVICES "$section"
+				config_set "$section" vifs ""
+				config_set "$section" ht_capab ""
+			;;
+		esac
+
+		# section end
+		config_get TYPE "$CONFIG_SECTION" TYPE
+		case "$TYPE" in
+			wifi-iface)
+				config_get device "$CONFIG_SECTION" device
+				config_get vifs "$device" vifs
+				append vifs "$CONFIG_SECTION"
+				config_set "$device" vifs "$vifs"
+			;;
+		esac
+	}
+	config_load "${cfgfile:-wireless}"
+}
+
+DEVICES=
+DRIVERS=
+include /lib/wifi
+scan_wifi
+
+case "$1" in
+	down) wifi_updown "disable" "$2";;
+	detect) wifi_detect_notice ;;
+	config) wifi_config ;;
+	status) ubus_wifi_cmd "status" "$2";;
+	isup) wifi_isup "$2"; exit $?;;
+	reload) wifi_reload "$2";;
+	reload_legacy) wifi_reload_legacy "$2";;
+	--help|help) usage;;
+	reconf) wifi_updown "reconf" "$2";;
+	''|up) wifi_updown "enable" "$2";;
+	*) usage; exit 1;;
+esac

package/base-files/files/usr/lib/os-release

@@ -16,4 +16,3 @@ OPENWRT_DEVICE_MANUFACTURER_URL="%m"
 OPENWRT_DEVICE_PRODUCT="%P"
 OPENWRT_DEVICE_REVISION="%h"
 OPENWRT_RELEASE="%D %V %C"
-OPENWRT_BUILD_DATE="%B"

package/base-files/files/usr/libexec/login.sh

@@ -1,17 +1,5 @@
 #!/bin/sh
 
-[ -t 0 ] && {
-	tty_dev=$(readlink /proc/self/fd/0)
-	case "$tty_dev" in
-		/dev/console|/dev/tty[0-9]*)
-			export TERM=${TERM:-linux}
-			;;
-		/dev/*)
-			export TERM=vt102
-			;;
-	esac
-}
-
-[ "$(uci -q get system.@system[0].ttylogin)" = 1 ] || exec /bin/login -f root
+[ "$(uci -q get system.@system[0].ttylogin)" = 1 ] || exec /bin/ash --login
 
 exec /bin/login

package/base-files/image-config.in

@@ -44,7 +44,7 @@ config TARGET_PREINIT_DISABLE_FAILSAFE
 config TARGET_PREINIT_TIMEOUT
 	int
 	prompt "Failsafe/Debug wait timeout" if PREINITOPT
-	default 4
+	default 2
 	help
 		How long to wait for failsafe mode to be entered or for
 		a debug option to be pressed before continuing with a
@@ -190,7 +190,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "https://downloads.immortalwrt.org/releases/24.10-SNAPSHOT"
+		default "https://downloads.immortalwrt.org/releases/23.05.0-rc3"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:
@@ -266,7 +266,7 @@ if VERSIONOPT
 	config VERSION_CODE_FILENAMES
 		bool
 		prompt "Revision code in filenames"
-		default y
+		default n
 		help
 			Enable this to include the revision identifier or the configured
 			version code into the firmware image, SDK- and Image Builder archive

package/boot/apex/Makefile

@@ -1,61 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2006-2023 OpenWrt.org
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=apex
-# This version was created from the stalled and unreleased v1.6.10
-# with some patches on top.
-PKG_VERSION:=1.6.10-openwrt
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/linusw/apex.git
-PKG_SOURCE_VERSION:=483e18aa133d5e25866570c29b124530b2d1e0d3
-PKG_MIRROR_HASH:=75e0be55e779a6c1f582bf12f5f98ac175404be9172750c1c1015ad78aa8aa3d
-
-PKG_TARGETS:=bin
-PKG_FLAGS:=nonshared
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-export GCC_HONOUR_COPTS=s
-
-define Package/apex
-  SECTION:=boot
-  CATEGORY:=Boot Loaders
-  DEPENDS:=@TARGET_ixp4xx @!IN_SDK
-  DEFAULT:=y
-  TITLE:=Boot loader for NSLU2, FSG3, NAS100D and others
-endef
-
-define build_apex
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		ARCH=arm \
-		$(1)_config
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		KBUILD_HAVE_NLS=no \
-		ARCH=arm \
-		clean all
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(PKG_BUILD_DIR)/out/apex-$(2).bin
-endef
-
-define Build/Compile
-	$(INSTALL_DIR) $(PKG_BUILD_DIR)/out
-	$(call build_apex,openwrt-nslu2-armeb,nslu2-armeb)
-	$(call build_apex,openwrt-nslu2-16mb-armeb,nslu2-16mb-armeb)
-	$(call build_apex,openwrt-fsg3-armeb,fsg3-armeb)
-	$(call build_apex,openwrt-nas100d-armeb,nas100d-armeb)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)/apex
-	$(CP) $(PKG_BUILD_DIR)/out/*.bin $(STAGING_DIR_IMAGE)/apex
-endef
-
-$(eval $(call BuildPackage,apex))

package/boot/arm-trusted-firmware-bcm63xx/Makefile

@@ -9,7 +9,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/bcm63xx/atf.git
 PKG_SOURCE_DATE:=2021-12-24
 PKG_SOURCE_VERSION:=e6d46baf3fae79f693f90bf34f7284c3dfc64aef
-PKG_MIRROR_HASH:=5646abc01152210a8181455151f01145001d61b3fb09619b1cee48008e36b0fa
+PKG_MIRROR_HASH:=9d5d04f572b1b6ddc6eb3064b9cb09f5fe982e82d350790041d35316349af124
 
 PKG_MAINTAINER:=Rafał Miłecki <rafal@milecki.pl>
 

package/boot/arm-trusted-firmware-mediatek/Makefile

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2017 Hauke Mehrtens
-# Copyright (C) 2021-2023 Daniel Golle
+# Copyright (C) 2021 Daniel Golle
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-mediatek
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git
-PKG_SOURCE_DATE:=2024-01-17
-PKG_SOURCE_VERSION:=bacca82a8cac369470df052a9d801a0ceb9b74ca
-PKG_MIRROR_HASH:=1138649f64ac3982330925c38c795ca6860289adbd95755991f80afa30ebdea7
+PKG_SOURCE_DATE:=2022-08-31
+PKG_SOURCE_VERSION:=7539348480af57c6d0db95aba6381f3ee7483779
+PKG_MIRROR_HASH:=125090124d77753acc379b3b124100978c1ecb3da37c4983ba9644b433b7eb08
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
@@ -26,17 +26,11 @@ include $(INCLUDE_DIR)/package.mk
 define Trusted-Firmware-A/Default
   BUILD_TARGET:=mediatek
   TFA_IMAGE:=bl2.img bl31.bin
-  HIDDEN:=y
   BOOT_DEVICE:=
   DDR3_FLYBY:=
   DDR_TYPE:=
   NAND_TYPE:=
   BOARD_QFN:=
-  DRAM_USE_COMB:=
-  RAM_BOOT_UART_DL:=
-  USE_UBI:=
-  FIP_OFFSET:=
-  FIP_SIZE:=
 endef
 
 define Trusted-Firmware-A/mt7622-nor-1ddr
@@ -54,27 +48,6 @@ define Trusted-Firmware-A/mt7622-nor-2ddr
   DDR3_FLYBY:=1
 endef
 
-define Trusted-Firmware-A/mt7622-ram-1ddr
-  NAME:=MediaTek MT7622 (RAM, 1x DDR3)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=mt7622
-  PLAT:=mt7622
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_mt7622
-endef
-
-define Trusted-Firmware-A/mt7622-ram-2ddr
-  NAME:=MediaTek MT7622 (RAM, 2x DDR3)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=mt7622
-  PLAT:=mt7622
-  DDR3_FLYBY:=1
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_mt7622
-endef
-
 define Trusted-Firmware-A/mt7622-snand-1ddr
   NAME:=MediaTek MT7622 (SPI-NAND, 1x DDR3)
   BUILD_SUBTARGET:=mt7622
@@ -82,14 +55,6 @@ define Trusted-Firmware-A/mt7622-snand-1ddr
   BOOT_DEVICE:=snand
 endef
 
-define Trusted-Firmware-A/mt7622-snand-ubi-1ddr
-  NAME:=MediaTek MT7622 (SPI-NAND using UBI, 1x DDR3)
-  BUILD_SUBTARGET:=mt7622
-  PLAT:=mt7622
-  BOOT_DEVICE:=snand
-  USE_UBI:=1
-endef
-
 define Trusted-Firmware-A/mt7622-snand-2ddr
   NAME:=MediaTek MT7622 (SPI-NAND, 2x DDR3)
   BUILD_SUBTARGET:=mt7622
@@ -98,15 +63,6 @@ define Trusted-Firmware-A/mt7622-snand-2ddr
   DDR3_FLYBY:=1
 endef
 
-define Trusted-Firmware-A/mt7622-snand-ubi-2ddr
-  NAME:=MediaTek MT7622 (SPI-NAND using UBI, 2x DDR3)
-  BUILD_SUBTARGET:=mt7622
-  PLAT:=mt7622
-  BOOT_DEVICE:=snand
-  DDR3_FLYBY:=1
-  USE_UBI:=1
-endef
-
 define Trusted-Firmware-A/mt7622-emmc-1ddr
   NAME:=MediaTek MT7622 (eMMC, 1x DDR3)
   BUILD_SUBTARGET:=mt7622
@@ -137,33 +93,6 @@ define Trusted-Firmware-A/mt7622-sdmmc-2ddr
   DDR3_FLYBY:=1
 endef
 
-define Trusted-Firmware-A/mt7981-ram-ddr4
-  NAME:=MediaTek MT7981 (RAM, DDR4)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_filogic
-endef
-
-define Trusted-Firmware-A/mt7981-emmc-ddr4
-  NAME:=MediaTek MT7981 (eMMC, DDR4)
-  BOOT_DEVICE:=emmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7981-spim-nand-ddr4
-  NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-endef
-
 define Trusted-Firmware-A/mt7981-nor-ddr3
   NAME:=MediaTek MT7981 (SPI-NOR, DDR3)
   BOOT_DEVICE:=nor
@@ -172,25 +101,6 @@ define Trusted-Firmware-A/mt7981-nor-ddr3
   DDR_TYPE:=ddr3
 endef
 
-define Trusted-Firmware-A/mt7981-ram-ddr3
-  NAME:=MediaTek MT7981 (RAM, DDR3)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr3
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_filogic
-endef
-
-define Trusted-Firmware-A/mt7981-nor-ddr4
-  NAME:=MediaTek MT7981 (SPI-NOR, DDR4)
-  BOOT_DEVICE:=nor
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-endef
-
 define Trusted-Firmware-A/mt7981-emmc-ddr3
   NAME:=MediaTek MT7981 (eMMC, DDR3)
   BOOT_DEVICE:=emmc
@@ -207,7 +117,7 @@ define Trusted-Firmware-A/mt7981-sdmmc-ddr3
   DDR_TYPE:=ddr3
 endef
 
-define Trusted-Firmware-A/mt7981-snand-ddr3
+define Trusted-Firmware-A/mt7986-snand-ddr3
   NAME:=MediaTek MT7981 (SPI-NAND via SNFI, DDR3)
   BOOT_DEVICE:=snand
   BUILD_SUBTARGET:=filogic
@@ -223,36 +133,6 @@ define Trusted-Firmware-A/mt7981-spim-nand-ddr3
   DDR_TYPE:=ddr3
 endef
 
-define Trusted-Firmware-A/mt7981-cudy-tr3000-v1
-  NAME:=Cudy TR3000 v1 (SPI-NAND via SPIM, DDR3)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr3
-  FIP_OFFSET:=0x3c0000
-  FIP_SIZE:=0x200000
-endef
-
-define Trusted-Firmware-A/mt7986-ram-ddr4
-  NAME:=MediaTek MT7986 (RAM, DDR4)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7986
-  DDR_TYPE:=ddr4
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_filogic
-endef
-
-define Trusted-Firmware-A/mt7981-spim-nand-ubi-ddr4
-  NAME:=MediaTek MT7981 (SPI-NAND via SPIM, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7981
-  DDR_TYPE:=ddr4
-  USE_UBI:=1
-endef
-
 define Trusted-Firmware-A/mt7986-nor-ddr4
   NAME:=MediaTek MT7986 (SPI-NOR, DDR4)
   BOOT_DEVICE:=nor
@@ -294,36 +174,6 @@ define Trusted-Firmware-A/mt7986-spim-nand-ddr4
   NAND_TYPE:=spim:2k+64
 endef
 
-define Trusted-Firmware-A/mt7986-spim-nand-ubi-ddr4
-  NAME:=MediaTek MT7986 (SPI-NAND via SPIM using UBI, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7986
-  DDR_TYPE:=ddr4
-  NAND_TYPE:=spim:2k+64
-  USE_UBI:=1
-endef
-
-define Trusted-Firmware-A/mt7986-spim-nand-4k-ddr4
-  NAME:=MediaTek MT7986 (SPI-NAND via SPIM, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7986
-  DDR_TYPE:=ddr4
-  NAND_TYPE:=spim:4k+256
-endef
-
-define Trusted-Firmware-A/mt7986-ram-ddr3
-  NAME:=MediaTek MT7986 (RAM, DDR3)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7986
-  DDR_TYPE:=ddr3
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_filogic
-endef
-
 define Trusted-Firmware-A/mt7986-nor-ddr3
   NAME:=MediaTek MT7986 (SPI-NOR, DDR3)
   BOOT_DEVICE:=nor
@@ -364,222 +214,30 @@ define Trusted-Firmware-A/mt7986-spim-nand-ddr3
   DDR_TYPE:=ddr3
 endef
 
-define Trusted-Firmware-A/mt7986-spim-nand-ubi-ddr3
-  NAME:=MediaTek MT7986 (SPI-NAND via SPIM using UBI, DDR3)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7986
-  DDR_TYPE:=ddr3
-  USE_UBI:=1
-endef
-
-define Trusted-Firmware-A/mt7988-nor-ddr3
-  NAME:=MediaTek MT7988 (SPI-NOR, DDR3)
-  BOOT_DEVICE:=nor
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr3
-endef
-
-define Trusted-Firmware-A/mt7988-emmc-ddr3
-  NAME:=MediaTek MT7988 (eMMC, DDR3)
-  BOOT_DEVICE:=emmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr3
-endef
-
-define Trusted-Firmware-A/mt7988-sdmmc-ddr3
-  NAME:=MediaTek MT7988 (SD card, DDR3)
-  BOOT_DEVICE:=sdmmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr3
-endef
-
-define Trusted-Firmware-A/mt7988-snand-ddr3
-  NAME:=MediaTek MT7988 (SPI-NAND via SNFI, DDR3)
-  BOOT_DEVICE:=snand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr3
-endef
-
-define Trusted-Firmware-A/mt7988-spim-nand-ddr3
-  NAME:=MediaTek MT7988 (SPI-NAND via SPIM, DDR3)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr3
-endef
-
-define Trusted-Firmware-A/mt7988-nor-ddr4
-  NAME:=MediaTek MT7988 (SPI-NOR, DDR4)
-  BOOT_DEVICE:=nor
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7988-emmc-ddr4
-  NAME:=MediaTek MT7988 (eMMC, DDR4)
-  BOOT_DEVICE:=emmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7988-sdmmc-ddr4
-  NAME:=MediaTek MT7988 (SD card, DDR4)
-  BOOT_DEVICE:=sdmmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7988-snand-ddr4
-  NAME:=MediaTek MT7988 (SPI-NAND via SNFI, DDR4)
-  BOOT_DEVICE:=snand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7988-spim-nand-ddr4
-  NAME:=MediaTek MT7988 (SPI-NAND via SPIM, DDR4)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DDR_TYPE:=ddr4
-endef
-
-define Trusted-Firmware-A/mt7988-ram-comb
-  NAME:=MediaTek MT7988 (RAM)
-  BOOT_DEVICE:=ram
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-  RAM_BOOT_UART_DL:=1
-  HIDDEN:=
-  DEFAULT:=TARGET_mediatek_filogic
-endef
-
-define Trusted-Firmware-A/mt7988-nor-comb
-  NAME:=MediaTek MT7988 (SPI-NOR)
-  BOOT_DEVICE:=nor
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-endef
-
-define Trusted-Firmware-A/mt7988-emmc-comb
-  NAME:=MediaTek MT7988 (eMMC)
-  BOOT_DEVICE:=emmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-endef
-
-define Trusted-Firmware-A/mt7988-sdmmc-comb
-  NAME:=MediaTek MT7988 (SD card)
-  BOOT_DEVICE:=sdmmc
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-endef
-
-define Trusted-Firmware-A/mt7988-snand-comb
-  NAME:=MediaTek MT7988 (SPI-NAND via SNFI)
-  BOOT_DEVICE:=snand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-endef
-
-define Trusted-Firmware-A/mt7988-snand-ubi-comb
-  NAME:=MediaTek MT7988 (SPI-NAND via SNFI, UBI)
-  BOOT_DEVICE:=snand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-  USE_UBI:=1
-endef
-
-define Trusted-Firmware-A/mt7988-spim-nand-comb
-  NAME:=MediaTek MT7988 (SPI-NAND via SPIM)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-endef
-
-define Trusted-Firmware-A/mt7988-spim-nand-ubi-comb
-  NAME:=MediaTek MT7988 (SPI-NAND via SPIM, UBI)
-  BOOT_DEVICE:=spim-nand
-  BUILD_SUBTARGET:=filogic
-  PLAT:=mt7988
-  DRAM_USE_COMB:=1
-  USE_UBI:=1
-endef
-
 TFA_TARGETS:= \
 	mt7622-nor-1ddr \
 	mt7622-nor-2ddr \
-	mt7622-ram-1ddr \
-	mt7622-ram-2ddr \
 	mt7622-snand-1ddr \
-	mt7622-snand-ubi-1ddr \
 	mt7622-snand-2ddr \
-	mt7622-snand-ubi-2ddr \
 	mt7622-emmc-1ddr \
 	mt7622-emmc-2ddr \
 	mt7622-sdmmc-1ddr \
 	mt7622-sdmmc-2ddr \
-	mt7981-ram-ddr3 \
 	mt7981-emmc-ddr3 \
 	mt7981-nor-ddr3 \
-	mt7981-nor-ddr4 \
 	mt7981-sdmmc-ddr3 \
-	mt7981-snand-ddr3 \
+	mt7986-snand-ddr3 \
 	mt7981-spim-nand-ddr3 \
-	mt7981-spim-nand-ubi-ddr4 \
-	mt7981-ram-ddr4 \
-	mt7981-emmc-ddr4 \
-	mt7981-spim-nand-ddr4 \
-	mt7981-cudy-tr3000-v1 \
-	mt7986-ram-ddr3 \
 	mt7986-emmc-ddr3 \
 	mt7986-nor-ddr3 \
 	mt7986-sdmmc-ddr3 \
 	mt7986-snand-ddr3 \
 	mt7986-spim-nand-ddr3 \
-	mt7986-spim-nand-ubi-ddr3 \
-	mt7986-ram-ddr4 \
 	mt7986-emmc-ddr4 \
 	mt7986-nor-ddr4 \
 	mt7986-sdmmc-ddr4 \
 	mt7986-snand-ddr4 \
-	mt7986-spim-nand-ddr4 \
-	mt7986-spim-nand-ubi-ddr4 \
-	mt7986-spim-nand-4k-ddr4 \
-	mt7988-emmc-ddr3 \
-	mt7988-nor-ddr3 \
-	mt7988-sdmmc-ddr3 \
-	mt7988-snand-ddr3 \
-	mt7988-spim-nand-ddr3 \
-	mt7988-emmc-ddr4 \
-	mt7988-nor-ddr4 \
-	mt7988-sdmmc-ddr4 \
-	mt7988-snand-ddr4 \
-	mt7988-spim-nand-ddr4 \
-	mt7988-ram-comb \
-	mt7988-emmc-comb \
-	mt7988-nor-comb \
-	mt7988-sdmmc-comb \
-	mt7988-snand-comb \
-	mt7988-snand-ubi-comb \
-	mt7988-spim-nand-comb \
-	mt7988-spim-nand-ubi-comb
+	mt7986-spim-nand-ddr4
 
 TFA_MAKE_FLAGS += \
 	BOOT_DEVICE=$(BOOT_DEVICE) \
@@ -589,26 +247,7 @@ TFA_MAKE_FLAGS += \
 	$(if $(NAND_TYPE),NAND_TYPE=$(NAND_TYPE)) \
 	HAVE_DRAM_OBJ_FILE=yes \
 	$(if $(DDR3_FLYBY),DDR3_FLYBY=1) \
-	$(if $(DRAM_USE_COMB),DRAM_USE_COMB=1) \
-	$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
-	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \
-	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7981,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x100000)) \
-	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7986,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x200000)) \
-	$(if $(FIP_OFFSET),OVERRIDE_FIP_BASE=$(FIP_OFFSET)) \
-	$(if $(FIP_SIZE),OVERRIDE_FIP_SIZE=$(FIP_SIZE)) \
-	$(if $(RAM_BOOT_UART_DL),bl2,all)
-
-define Package/trusted-firmware-a-ram/install
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl2.bin $(BIN_DIR)/$(BUILD_VARIANT)-bl2.bin
-endef
-Package/trusted-firmware-a-mt7622-ram-1ddr/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7622-ram-2ddr/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7981-ram-ddr3/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7981-ram-ddr4/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7986-ram-ddr3/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7986-ram-ddr4/install = $(Package/trusted-firmware-a-ram/install)
-Package/trusted-firmware-a-mt7988-ram-comb/install = $(Package/trusted-firmware-a-ram/install)
+	all
 
 define Package/trusted-firmware-a/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)

package/boot/arm-trusted-firmware-mediatek/patches/0001-mediatek-snfi-FM35Q1GA-is-x4-only.patch

@@ -1,23 +0,0 @@
-From fb2a2b669ec9bbf5c448d4b56499bc83de075c93 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Thu, 29 Feb 2024 18:01:08 +0000
-Subject: [PATCH 1/3] mediatek: snfi: FM35Q1GA is x4-only
-
-Dont allow x2 read and cache read operations on FM35Q1GA.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-+++ b/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-@@ -423,7 +423,7 @@ static const struct snand_flash_info sna
- 
- 	SNAND_INFO("FM35Q1GA", SNAND_ID(SNAND_ID_DYMMY, 0xe5, 0x71),
- 		   SNAND_MEMORG_1G_2K_64,
--		   &snand_cap_read_from_cache_x4,
-+		   &snand_cap_read_from_cache_x4_only,
- 		   &snand_cap_program_load_x4),
- 
- 	SNAND_INFO("PN26G01A", SNAND_ID(SNAND_ID_DYMMY, 0xa1, 0xe1),

package/boot/arm-trusted-firmware-mediatek/patches/0002-mediatek-snfi-adjust-pin-drive-strength-for-Fidelix-.patch

@@ -1,99 +0,0 @@
-From 6470986f037880ce76960c369d6e5a5270e7ce32 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Sun, 10 Mar 2024 15:39:07 +0000
-Subject: [PATCH 2/3] mediatek: snfi: adjust pin drive strength for Fidelix
- SPI-NAND
-
-It seems like we might need to adjust the pin driver strength to 12mA
-for Fidelix SPI-NAND chip on MT7622 to avoid SPI data corruption on
-some devices.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- .../apsoc_common/drivers/snfi/mtk-snand-def.h |  7 +++++
- .../apsoc_common/drivers/snfi/mtk-snand-ids.c |  4 ++-
- .../apsoc_common/drivers/snfi/mtk-snand.c     | 30 +++++++++++++++++++
- 3 files changed, 40 insertions(+), 1 deletion(-)
-
---- a/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-def.h
-+++ b/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-def.h
-@@ -86,6 +86,12 @@ struct snand_mem_org {
- 
- typedef int (*snand_select_die_t)(struct mtk_snand *snf, uint32_t dieidx);
- 
-+enum snand_drv {
-+	SNAND_DRV_NO_CHANGE = 0,
-+	SNAND_DRV_8mA = 8,
-+	SNAND_DRV_12mA = 12,
-+};
-+
- struct snand_flash_info {
- 	const char *model;
- 	struct snand_id id;
-@@ -93,6 +99,7 @@ struct snand_flash_info {
- 	const struct snand_io_cap *cap_rd;
- 	const struct snand_io_cap *cap_pl;
- 	snand_select_die_t select_die;
-+	enum snand_drv drv;
- };
- 
- #define SNAND_INFO(_model, _id, _memorg, _cap_rd, _cap_pl, ...) \
---- a/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-+++ b/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-@@ -424,7 +424,9 @@ static const struct snand_flash_info sna
- 	SNAND_INFO("FM35Q1GA", SNAND_ID(SNAND_ID_DYMMY, 0xe5, 0x71),
- 		   SNAND_MEMORG_1G_2K_64,
- 		   &snand_cap_read_from_cache_x4_only,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 
- 	SNAND_INFO("PN26G01A", SNAND_ID(SNAND_ID_DYMMY, 0xa1, 0xe1),
- 		   SNAND_MEMORG_1G_2K_128,
---- a/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand.c
-+++ b/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand.c
-@@ -1845,6 +1845,33 @@ static int mtk_snand_id_probe(struct mtk
- 	return -EINVAL;
- }
- 
-+#define MT7622_GPIO_BASE    (void *)0x10211000
-+#define MT7622_GPIO_DRIV(x) (MT7622_GPIO_BASE + 0x900 + 0x10 * x)
-+
-+void mtk_mt7622_snand_adjust_drive(void *dev, enum snand_drv drv)
-+{
-+	uint32_t e4, e8;
-+
-+	e4 = readl(MT7622_GPIO_DRIV(6)) & ~(0x3f00);
-+	e8 = readl(MT7622_GPIO_DRIV(7)) & ~(0x3f00);
-+
-+	switch (drv) {
-+	case SNAND_DRV_8mA:
-+		e4 |= 0x3f00;
-+		break;
-+	case SNAND_DRV_12mA:
-+		e8 |= 0x3f00;
-+		break;
-+	default:
-+		return;
-+	}
-+
-+	snand_log_chip(dev, "adjusting SPI-NAND pin drive strength to %umA\n", drv);
-+
-+	writel(e4, MT7622_GPIO_DRIV(6));
-+	writel(e8, MT7622_GPIO_DRIV(7));
-+}
-+
- int mtk_snand_init(void *dev, const struct mtk_snand_platdata *pdata,
- 		   struct mtk_snand **psnf)
- {
-@@ -1888,6 +1915,9 @@ int mtk_snand_init(void *dev, const stru
- 	if (ret)
- 		return ret;
- 
-+	if (pdata->soc == SNAND_SOC_MT7622 && snand_info->drv)
-+		mtk_mt7622_snand_adjust_drive(dev, snand_info->drv);
-+
- 	rawpage_size = snand_info->memorg.pagesize +
- 		       snand_info->memorg.sparesize;
- 

package/boot/arm-trusted-firmware-mediatek/patches/0003-mediatek-snfi-adjust-drive-strength-to-12mA-like-old.patch

@@ -1,135 +0,0 @@
-From 40a3661bebb3d738ab95b7de66e9d8382d5b9ab1 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Sun, 10 Mar 2024 17:48:09 +0000
-Subject: [PATCH 3/3] mediatek: snfi: adjust drive strength to 12mA like old
- loader does
-
-In addition to FM35X1GA, also change the driver strength to 12mA for
-all chips where this is done by the old/legacy U-Boot:
- * Winbond 512Mb
- * Winbond 1Gb
- * Winbond 2Gb
- * GD5F4GQ4UBYIG
- * GD5F4GQ4UAYIG
- * GD5F1GQ4UX
- * GD5F1GQ4UE
- * GD5F2GQ4UX
- * GD5F2GQ4UE
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- .../apsoc_common/drivers/snfi/mtk-snand-ids.c | 59 ++++++++++++++-----
- 1 file changed, 44 insertions(+), 15 deletions(-)
-
---- a/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-+++ b/plat/mediatek/apsoc_common/drivers/snfi/mtk-snand-ids.c
-@@ -80,65 +80,94 @@ static const struct snand_flash_info sna
- 	SNAND_INFO("W25N512GV", SNAND_ID(SNAND_ID_DYMMY, 0xef, 0xaa, 0x20),
- 		   SNAND_MEMORG_512M_2K_64,
- 		   &snand_cap_read_from_cache_quad,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("W25N01GV", SNAND_ID(SNAND_ID_DYMMY, 0xef, 0xaa, 0x21),
- 		   SNAND_MEMORG_1G_2K_64,
- 		   &snand_cap_read_from_cache_quad,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("W25M02GV", SNAND_ID(SNAND_ID_DYMMY, 0xef, 0xab, 0x21),
- 		   SNAND_MEMORG_2G_2K_64_2D,
- 		   &snand_cap_read_from_cache_quad,
- 		   &snand_cap_program_load_x4,
--		   mtk_snand_winbond_select_die),
-+		   mtk_snand_winbond_select_die,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("W25N02KV", SNAND_ID(SNAND_ID_DYMMY, 0xef, 0xaa, 0x22),
- 		   SNAND_MEMORG_2G_2K_128,
- 		   &snand_cap_read_from_cache_quad,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 
- 	SNAND_INFO("GD5F1GQ4UAWxx", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0x10),
- 		   SNAND_MEMORG_1G_2K_64,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F1GQ4UExIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xd1),
- 		   SNAND_MEMORG_1G_2K_128,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F1GQ4UExxH", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xd9),
- 		   SNAND_MEMORG_1G_2K_64,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F1GQ4xAYIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xf1),
- 		   SNAND_MEMORG_1G_2K_64,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F2GQ4UExIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xd2),
- 		   SNAND_MEMORG_2G_2K_128,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F2GQ5UExxH", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0x32),
- 		   SNAND_MEMORG_2G_2K_64,
- 		   &snand_cap_read_from_cache_quad_a8d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F2GQ4xAYIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xf2),
- 		   SNAND_MEMORG_2G_2K_64,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F4GQ4UBxIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xd4),
- 		   SNAND_MEMORG_4G_4K_256,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F4GQ4xAYIG", SNAND_ID(SNAND_ID_ADDR, 0xc8, 0xf4),
- 		   SNAND_MEMORG_4G_2K_64,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F2GQ5UExxG", SNAND_ID(SNAND_ID_DYMMY, 0xc8, 0x52),
- 		   SNAND_MEMORG_2G_2K_128,
- 		   &snand_cap_read_from_cache_quad_a8d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 	SNAND_INFO("GD5F4GQ4UCxIG", SNAND_ID(SNAND_ID_DYMMY, 0xc8, 0xb4),
- 		   SNAND_MEMORG_4G_4K_256,
- 		   &snand_cap_read_from_cache_quad_q2d,
--		   &snand_cap_program_load_x4),
-+		   &snand_cap_program_load_x4,
-+		   NULL,
-+		   SNAND_DRV_12mA),
- 
- 	SNAND_INFO("MX35LF1GE4AB", SNAND_ID(SNAND_ID_DYMMY, 0xc2, 0x12),
- 		   SNAND_MEMORG_1G_2K_64,

package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch

@@ -1,27 +0,0 @@
-From 94802b344195d3574701ca6ab5122f6b7615a6eb Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Sun, 11 Aug 2024 23:12:33 +0100
-Subject: [PATCH] mediatek: snfi: fix return code when reading
-
-Return 0 on succesful read, which may contain correctable bitflips.
-
-Fixes: #10
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
-+++ b/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
-@@ -29,8 +29,10 @@ static int snfi_mtd_read_page(struct nan
- 	int ret;
- 
- 	ret = mtk_snand_read_page(snf, addr, (void *)buffer, NULL, false);
--	if (ret == -EBADMSG)
-+	if (ret > 0) {
-+		NOTICE("corrected %d bitflips while reading page %u\n", ret, page);
- 		ret = 0;
-+	}
- 
- 	return ret;
- }

package/boot/arm-trusted-firmware-mediatek/patches/0010-add-support-for-dosilicon-fmsh-gsto-spi-nand.patch

@@ -1,95 +0,0 @@
-From 11e2ed1bc7bc96bd2b094fef5f57acec4efae952 Mon Sep 17 00:00:00 2001
-From: Tianling Shen <cnsztl@immortalwrt.org>
-Date: Sun, 9 Mar 2025 02:02:24 +0800
-Subject: [PATCH] : mtk_spi_nand: add support for dosilicon fmsh gsto spi nand
-
-Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
----
- .../drivers/spi_nand/mtk_spi_nand.c           | 28 ++++++++++++++-----
- 1 file changed, 21 insertions(+), 7 deletions(-)
-
---- a/plat/mediatek/apsoc_common/drivers/spi_nand/mtk_spi_nand.c
-+++ b/plat/mediatek/apsoc_common/drivers/spi_nand/mtk_spi_nand.c
-@@ -19,8 +19,11 @@
- 
- #define SPI_NAND_MAX_ID_LEN		4U
- #define DELAY_US_400MS			400000U
-+#define DOSILICON_ID			0xE5U
- #define ETRON_ID			0xD5U
-+#define FMSH_ID				0xA1U
- #define GIGADEVICE_ID			0xC8U
-+#define GSTO_ID				0x52U
- #define MACRONIX_ID			0xC2U
- #define MICRON_ID			0x2CU
- #define TOSHIBA_ID			0x98U
-@@ -129,7 +132,10 @@ static int spi_nand_quad_enable(uint8_t
- 
- 	if (manufacturer_id != MACRONIX_ID &&
- 	    manufacturer_id != GIGADEVICE_ID &&
-+	    manufacturer_id != GSTO_ID &&
-+	    manufacturer_id != DOSILICON_ID &&
- 	    manufacturer_id != ETRON_ID &&
-+	    manufacturer_id != FMSH_ID &&
- 	    manufacturer_id != FORESEE_ID) {
- 		return 0;
- 	}
-@@ -364,6 +370,10 @@ static int spi_nand_check_pp(struct para
- 		INFO("PP COPY %d CRC read: 0x%x, compute: 0x%x\n",
- 		     i, crc, crc_compute);
- 
-+		// Integrity CRC (bytes 254-255) on FMSH was reversed
-+		if (crc != crc_compute)
-+			crc = htobe16(pp->integrity_crc);
-+
- 		if (crc != crc_compute) {
- 			ret = -EBADMSG;
- 			continue;
-@@ -400,8 +410,9 @@ static int spi_nand_check_pp(struct para
- 	return ret;
- }
- 
--static int spi_nand_read_pp(struct parameter_page *pp, uint8_t *sel)
-+static int spi_nand_read_pp(uint8_t *id, struct parameter_page *pp, uint8_t *sel)
- {
-+	const bool is_dosilicon = (id[1] == DOSILICON_ID);
- 	uint8_t status;
- 	uint8_t cfg_reg;
- 	int ret, op_ret;
-@@ -413,7 +424,7 @@ static int spi_nand_read_pp(struct param
- 		return ret;
- 	}
- 
--	ret = spi_nand_write_reg(SPI_NAND_REG_CFG, cfg_reg | BIT(6));
-+	ret = spi_nand_write_reg(SPI_NAND_REG_CFG, is_dosilicon ? BIT(6) : (cfg_reg | BIT(6)));
- 	if (ret != 0) {
- 		return ret;
- 	}
-@@ -449,7 +460,7 @@ out:
- 		ERROR("Parameter page read failed\n");
- 	}
- 
--	ret = spi_nand_write_reg(SPI_NAND_REG_CFG, cfg_reg);
-+	ret = spi_nand_write_reg(SPI_NAND_REG_CFG, is_dosilicon ? 0x10 : cfg_reg);
- 	if (ret != 0) {
- 		return ret;
- 	}
-@@ -589,12 +600,15 @@ int spi_nand_init(unsigned long long *si
- 		return ret;
- 	}
- 
--	ret = spi_nand_read_pp(pp, &sel);
-+	ret = spi_nand_read_id(id);
-+	if (ret != 0) {
-+		ERROR("SPI_NAND Read ID failed.\n");
-+		return ret;
-+	}
-+
-+	ret = spi_nand_read_pp(id, pp, &sel);
- 	if (ret != 0) {
- 		ERROR("Parameter page read fail, fallback to read ID.\n");
--		ret = spi_nand_read_id(id);
--		if (ret != 0)
--			return ret;
- 		spi_nand_set_data_via_id(&spinand_dev, id, &vendor_id);
- 	} else {
- 		vendor_id = pp[sel].manufactuere_id;

package/boot/arm-trusted-firmware-mvebu/Makefile

@@ -7,9 +7,9 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2.9
-PKG_RELEASE:=2
-PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b
+PKG_VERSION:=2.7
+PKG_RELEASE:=6
+PKG_HASH:=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6
 
 PKG_MAINTAINER:=Vladimir Vid <vladimir.vid@sartura.hr>
 
@@ -123,7 +123,7 @@ TFA_MAKE_FLAGS += \
 		BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
 		MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \
 		WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \
-		WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)/wtmi_app.bin \
+		WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \
 		CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \
 		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
 		HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
@@ -138,60 +138,56 @@ TFA_MAKE_FLAGS += \
 		mrvl_uart
 
 A3700_UTILS_NAME:=a3700-utils
-A3700_UTILS_RELEASE:=a3e1c67
+A3700_UTILS_RELEASE:=1d977157
 A3700_UTILS_SOURCE=$(A3700_UTILS_NAME)-$(A3700_UTILS_RELEASE).tar.bz2
 
 define Download/a3700-utils
   FILE:=$(A3700_UTILS_SOURCE)
   PROTO:=git
   URL:=https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git
-  SOURCE_VERSION:=a3e1c67bb378e1d8a938e1b826cb602af83628d2
-  MIRROR_HASH:=0e6b8ef6423dcb52a5e282669a8aeebc6eea2d45a7c3a2c9a2fc7a749b3275a7
+  VERSION:=1d977157e37151b272f88f2406a245c833fb2d8c
+  MIRROR_HASH:=322821ec8c04afea260254e927c59cd1ec0bd84e7ec6507cc1f155f18afb8eb9
   SUBDIR:=$(A3700_UTILS_NAME)
 endef
 
 CRYPTOPP_NAME:=cryptopp
-CRYPTOPP_RELEASE:=4d0cad5
+CRYPTOPP_RELEASE:=f210224
 CRYPTOPP_SOURCE=$(CRYPTOPP_NAME)-$(CRYPTOPP_RELEASE).tar.bz2
 
 define Download/cryptopp
   FILE:=$(CRYPTOPP_SOURCE)
   PROTO:=git
   URL:=https://github.com/weidai11/cryptopp.git
-  SOURCE_VERSION:=4d0cad5401d1a2c998b314bc89288c9620d3021d
-  MIRROR_HASH:=6c53c8b4dfa07df0c5915a90c20f70c64d150b652cf5ac52e2eae08c5a9cc7cd
+  VERSION:=f2102243e6fdd48c0b2a393a0993cca228f20573
+  MIRROR_HASH:=74ec9e48ee04b9f2d9a1d8c4f2392ed0ab52780d7af0f70405d7bbb23d1504fa
   SUBDIR:=$(CRYPTOPP_NAME)
 endef
 
 MV_DDR_NAME:=mv-ddr-marvell
-MV_DDR_RELEASE:=541616b
+MV_DDR_RELEASE:=d5acc10c
 MV_DDR_SOURCE:=$(MV_DDR_NAME)-$(MV_DDR_RELEASE).tar.bz2
 
 define Download/mv-ddr-marvell
   FILE:=$(MV_DDR_SOURCE)
   PROTO:=git
   URL:=https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git
-  SOURCE_VERSION:=541616bc5d25a0167c9901546255c55973e2c0f0
-  MIRROR_HASH:=9e86a986c7400ed1a72165a88150b6c494ebd87303b16314b43e5785e3f13068
+  VERSION:=d5acc10c287e40cc2feeb28710b92e45c93c702c
+  MIRROR_HASH:=c149ab737935b5fb822f48da8e2d7fba4388f48e645f9f6da857bee20f0333ea
   SUBDIR:=$(MV_DDR_NAME)
 endef
 
 MOX_BB_NAME:=mox-boot-builder
-MOX_BB_RELEASE:=604f8f51
+MOX_BB_RELEASE:=v2022.06.11
 MOX_BB_SOURCE:=$(MOX_BB_NAME)-$(MOX_BB_RELEASE).tar.bz2
 
 define Download/mox-boot-builder
   FILE:=$(MOX_BB_SOURCE)
-  PROTO:=git
-  SUBMODULES:=skip
-  URL:=https://gitlab.nic.cz/turris/mox-boot-builder.git
-  SOURCE_VERSION:=604f8f51d97b4e59fa6d1e579101daa194d6ed2d
-  MIRROR_HASH:=b09337a7dde140f57e40133b6e7b7e1eb338e7cea9b15a3af6874824462f15f7
-  SUBDIR:=$(MOX_BB_NAME)
+  URL:=https://gitlab.nic.cz/turris/mox-boot-builder/-/archive/$(MOX_BB_RELEASE)
+  HASH:=75e7661c38f4f5e6d8910dd789d6d9ffd8652455548b68c98e5bf45eaab5b6eb
 endef
 
-CM3_GCC_NAME:=arm-gnu-toolchain
-CM3_GCC_RELEASE:=12.3.rel1
+CM3_GCC_NAME:=gcc-arm
+CM3_GCC_RELEASE:=11.2-2022.02
 CM3_GCC_VERSION:=$(HOST_ARCH)-arm-none-eabi
 CM3_GCC_SOURCE=$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION).tar.xz
 
@@ -199,9 +195,9 @@ define Download/cm3-gcc
   FILE:=$(CM3_GCC_SOURCE)
   URL:=https://developer.arm.com/-/media/Files/downloads/gnu/$(CM3_GCC_RELEASE)/binrel
 ifeq ($(HOST_ARCH),aarch64)
-  HASH:=14c0487d5753f6071d24e568881f7c7e67f80dd83165dec5164b3731394af431
+  HASH:=ef1d82e5894e3908cb7ed49c5485b5b95deefa32872f79c2b5f6f5447cabf55f
 else
-  HASH:=12a2815644318ebcceaf84beabb665d0924b6e79e21048452c5331a56332b309
+  HASH:=8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326
 endif
 endef
 
@@ -210,7 +206,7 @@ define Build/Clean
 		$(BUILD_DIR)/$(CRYPTOPP_NAME) \
 		$(BUILD_DIR)/$(A3700_UTILS_NAME) \
 		$(BUILD_DIR)/$(MV_DDR_NAME) \
-		$(BUILD_DIR)/$(MOX_BB_NAME) \
+		$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
 		$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)
 endef
 
@@ -230,7 +226,7 @@ define Build/Prepare
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MV_DDR_SOURCE)
 	$(call PatchDir/Default,$(BUILD_DIR)/$(MV_DDR_NAME),./patches-mv-ddr-marvell)
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MOX_BB_SOURCE)
-	$(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME),./patches-mox-boot-builder)
+	$(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE),./patches-mox-boot-builder)
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(CM3_GCC_SOURCE)
 endef
 
@@ -239,7 +235,7 @@ define Build/Compile
 		CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
 		WTMI_VERSION=$(MOX_BB_RELEASE) \
 		CRYPTOPP_PATH=$PWD/cryptopp/ \
-		-C $(BUILD_DIR)/$(MOX_BB_NAME) \
+		-C $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
 		wtmi_app.bin
 	$(call Build/Compile/Default)
 endef

package/boot/arm-trusted-firmware-rockchip/Makefile

@@ -3,19 +3,18 @@
 # Copyright (C) 2021-2023 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/trusted-firmware-a.mk
 
 PKG_NAME:=rkbin
+PKG_VERSION:=linux-5.10-gen-rkr4
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
-PKG_SOURCE_DATE:=2024-02-22
-PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
-PKG_MIRROR_HASH:=39f15e5f8fac02026065b6747b355b93f4e06202783ae448c43607763211597c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://gitlab.com/rk3588_linux/rk/rkbin/-/archive/$(PKG_VERSION)/
+PKG_HASH:=06e17b198d8e77008dbe188ee9cc5ec4ca2b03a8a998c66677e0b23db0a7bed9
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
-include $(INCLUDE_DIR)/trusted-firmware-a.mk
 include $(INCLUDE_DIR)/package.mk
 include ./atf-version.mk
 
@@ -24,97 +23,30 @@ define Trusted-Firmware-A/Default
   BUILD_TARGET:=rockchip
 endef
 
-define Trusted-Firmware-A/rk3308
-  BUILD_SUBTARGET:=armv8
-  ATF:=rk33/$(RK3308_ATF)
-  TPL:=rk33/$(RK3308_TPL)
-endef
-
-define Trusted-Firmware-A/rk3308-rock-pi-s
-  NAME:=Radxa ROCK Pi S board
-  BUILD_SUBTARGET:=armv8
-  ATF:=rk33/$(RK3308_ATF)
-  TPL:=rk33/$(RK3308_TPL_ROCK_PI_S)
-endef
-
 define Trusted-Firmware-A/rk3328
   BUILD_SUBTARGET:=armv8
   ATF:=rk33/$(RK3328_ATF)
-  TPL:=rk33/$(RK3328_TPL)
+  DDR:=rk33/$(RK3328_DDR)
   LOADER:=rk33/$(RK3328_LOADER)
 endef
 
 define Trusted-Firmware-A/rk3399
   BUILD_SUBTARGET:=armv8
   ATF:=rk33/$(RK3399_ATF)
-  TPL:=rk33/$(RK3399_TPL)
+  DDR:=rk33/$(RK3399_DDR)
   LOADER:=rk33/$(RK3399_LOADER)
 endef
 
-define Trusted-Firmware-A/rk3566
-  BUILD_SUBTARGET:=armv8
-  ATF:=rk35/$(RK3566_ATF)
-  TPL:=rk35/$(RK3566_TPL)
-endef
-
 define Trusted-Firmware-A/rk3568
   BUILD_SUBTARGET:=armv8
   ATF:=rk35/$(RK3568_ATF)
-  TPL:=rk35/$(RK3568_TPL)
-endef
-
-define Trusted-Firmware-A/rk3568-e25
-  NAME:=Radxa E25 board
-  BUILD_SUBTARGET:=armv8
-  ATF:=rk35/$(RK3568_ATF)
-  TPL:=rk35/$(RK3568_TPL_E25)
-endef
-
-define Trusted-Firmware-A/rk3588
-  BUILD_SUBTARGET:=armv8
-  ATF:=rk35/$(RK3588_ATF)
-  TPL:=rk35/$(RK3588_TPL)
+  DDR:=rk35/$(RK3568_DDR)
 endef
 
 TFA_TARGETS:= \
-	rk3308 \
-	rk3308-rock-pi-s \
 	rk3328 \
 	rk3399 \
-	rk3566 \
-	rk3568 \
-	rk3568-e25 \
-	rk3588
-
-ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
-  define Download/rk3308-tpl-rock-pi-s
-    FILE:=$(RK3308_TPL_ROCK_PI_S)
-    URL:=https://github.com/radxa/rkbin/raw/5696fab20dcac57c1458f72dc7604ba60e553adf/bin/rk33/
-    HASH:=8a1a42df23cccb86a2dabc14a5c0e9227d64a51b9b83e9968ef5af3b30787f7d
-  endef
-
-  define Build/Prepare
-	$(eval $(call Download,rk3308-tpl-rock-pi-s))
-	$(call Build/Prepare/Default)
-
-	$(CP) $(DL_DIR)/$(RK3308_TPL_ROCK_PI_S) $(PKG_BUILD_DIR)/bin/rk33/
-  endef
-endif
-
-ifeq ($(BUILD_VARIANT),rk3568-e25)
-  define Download/rk3568-tpl-e25
-    FILE:=$(RK3568_TPL_E25)
-    URL:=https://github.com/radxa/rkbin/raw/5696fab20dcac57c1458f72dc7604ba60e553adf/bin/rk35/
-    HASH:=1815f9649dc5661a3ef184b052da39286e51453a66f6ff53cc3e345d65dfabd4
-  endef
-
-  define Build/Prepare
-	$(eval $(call Download,rk3568-tpl-e25))
-	$(call Build/Prepare/Default)
-
-	$(CP) $(DL_DIR)/$(RK3568_TPL_E25) $(PKG_BUILD_DIR)/bin/rk35/
-  endef
-endif
+	rk3568
 
 define Build/Compile
 	# This comment is the workaround for "extraneous 'endif'" error
@@ -123,7 +55,7 @@ ifneq ($(LOADER),)
 		pushd $(PKG_BUILD_DIR) ; \
 		$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' trust.ini ; \
 		$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' trust.ini ; \
-		./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(TPL) \
+		./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(DDR) \
 			$(BUILD_VARIANT)-idbloader.bin ; \
 		cat bin/$(LOADER) >> $(BUILD_VARIANT)-idbloader.bin ; \
 		./tools/trust_merger --replace bl31.elf bin/$(ATF) trust.ini ; \
@@ -141,7 +73,7 @@ ifneq ($(LOADER),)
 	$(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-idbloader.bin $(STAGING_DIR_IMAGE)/
 	$(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-trust.bin $(STAGING_DIR_IMAGE)/
 else
-	$(CP) $(PKG_BUILD_DIR)/bin/$(TPL) $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/bin/$(DDR) $(STAGING_DIR_IMAGE)/
 endif
 endef
 

package/boot/arm-trusted-firmware-rockchip/atf-version.mk

@@ -1,21 +1,13 @@
-RK3308_ATF:=rk3308_bl31_v2.26.elf
-RK3308_TPL:=rk3308_ddr_589MHz_uart2_m1_v2.07.bin
-RK3308_TPL_ROCK_PI_S:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
-
 RK3328_ATF:=rk322xh_bl31_v1.49.elf
-RK3328_TPL:=rk3328_ddr_333MHz_v1.19.bin
+RK3328_DDR:=rk3328_ddr_333MHz_v1.19.bin
 RK3328_LOADER:=rk322xh_miniloader_v2.50.bin
 
 RK3399_ATF:=rk3399_bl31_v1.36.elf
-RK3399_TPL:=rk3399_ddr_800MHz_v1.30.bin
-RK3399_LOADER:=rk3399_miniloader_v1.30.bin
+RK3399_DDR:=rk3399_ddr_800MHz_v1.30.bin
+RK3399_LOADER:=rk3399_miniloader_v1.26.bin
 
-RK3566_ATF:=rk3568_bl31_v1.44.elf
-RK3566_TPL:=rk3566_ddr_1056MHz_v1.21.bin
+RK3568_ATF:=rk3568_bl31_v1.40.elf
+RK3568_DDR:=rk3568_ddr_1560MHz_v1.16.bin
 
-RK3568_ATF:=rk3568_bl31_v1.44.elf
-RK3568_TPL:=rk3568_ddr_1560MHz_v1.21.bin
-RK3568_TPL_E25:=rk3568_ddr_1560MHz_uart2_m0_115200_v1.21.bin
-
-RK3588_ATF:=rk3588_bl31_v1.45.elf
-RK3588_TPL:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin
+RK3588_ATF:=rk3588_bl31_v1.37.elf
+RK3588_DDR:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.10.bin

package/boot/arm-trusted-firmware-stm32/Makefile

@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2024 Bootlin
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_VERSION:=2.10.17
-PKG_RELEASE:=1
-PKG_LTS:=1
-
-PKG_HASH:=2558b2579dd1c45db6de89c49e647c109022d45da03eb74e0f6123c294295099
-PKG_MAINTAINER:=Thomas Richard <thomas.richard@bootlin.com>
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/trusted-firmware-a.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Trusted-Firmware-A/Default
-  BUILD_TARGET:=stm32
-  BUILD_DEVICES:=$(1)
-  DEPENDS:=+u-boot-$(1) +optee-os-$(1)
-endef
-
-define Trusted-Firmware-A/stm32mp1
-  BUILD_SUBTARGET:=stm32mp1
-  PLAT:=stm32mp1
-  MAKE_ARGS += BL32_EXTRA2=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-pageable_v2.bin \
-	       STM32MP_USB_PROGRAMMER=1 \
-	       STM32MP1_OPTEE_IN_SYSRAM=1 \
-	       ARM_ARCH_MAJOR=7
-endef
-
-define Trusted-Firmware-A/stm32mp135f-dk
-  $(call Trusted-Firmware-A/stm32mp1)
-  NAME:=STM32MP135F-DK
-  DTB_FILE_NAME=stm32mp135f-dk.dtb
-endef
-
-TFA_TARGETS := stm32mp135f-dk
-
-TFA_MAKE_FLAGS += \
-		ARCH=aarch32 AARCH32_SP=optee \
-		BL32=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-header_v2.bin \
-		BL32_EXTRA1=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-pager_v2.bin \
-		BL33=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.bin \
-		BL33_CFG=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.dtb \
-		DTB_FILE_NAME=$(DTB_FILE_NAME) \
-		STM32MP_SDMMC=1 \
-		TARGET_BOARD="" \
-		$(MAKE_ARGS) \
-		all fip
-
-define Package/trusted-firmware-a/install
-	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
-	$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/tf-a-$(BUILD_VARIANT).stm32 \
-		$(STAGING_DIR_IMAGE)/tf-a-$(BUILD_VARIANT).stm32
-	$(CP) $(PKG_BUILD_DIR)/build/$(PLAT)/release/fip.bin \
-		$(STAGING_DIR_IMAGE)/fip-$(BUILD_VARIANT).bin
-endef
-
-$(eval $(call BuildPackage/Trusted-Firmware-A))

package/boot/arm-trusted-firmware-sunxi/Makefile

@@ -7,10 +7,10 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2.10
+PKG_VERSION:=2.8
 PKG_RELEASE:=1
 
-PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201
+PKG_HASH:=df4e0f3803479df0ea4cbf3330b59731bc2efc2112c951f9adb3685229163af9
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=license.md
@@ -36,15 +36,9 @@ define Trusted-Firmware-A/sunxi-h6
 	PLAT:=sun50i_h6
 endef
 
-define Trusted-Firmware-A/sunxi-h616
-	NAME:=Allwinner H616
-	PLAT:=sun50i_h616
-endef
-
 TFA_TARGETS:= \
 	sunxi-a64 \
-	sunxi-h6 \
-	sunxi-h616
+	sunxi-h6
 
 define Package/trusted-firmware-a/install
 	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)

package/boot/arm-trusted-firmware-tools/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-tools
-PKG_VERSION:=2.9
+PKG_VERSION:=2.7
 PKG_RELEASE:=1
-PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b
+PKG_HASH:=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_HOST_ONLY:=1

package/boot/arm-trusted-firmware-tools/patches/002-darwin_compile.patch

@@ -1,21 +0,0 @@
---- a/tools/fiptool/fiptool.c
-+++ b/tools/fiptool/fiptool.c
-@@ -3,7 +3,7 @@
-  *
-  * SPDX-License-Identifier: BSD-3-Clause
-  */
--
-+#define _DARWIN_C_SOURCE
- #ifndef _MSC_VER
- #include <sys/mount.h>
- #endif
-@@ -18,6 +18,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
-+
-+#define uuid_t fiptool_uuid_t
- 
- #include "fiptool.h"
- #include "tbbr_config.h"

package/boot/at91bootstrap/Makefile

@@ -10,10 +10,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=at91bootstrap
 PKG_VERSION:=v4.0.3
-PKG_MIRROR_HASH:=9c1d42337294b549e6c229ae4c9996efd21e00ae5f968bd780d352e054e24cb7
+PKG_MIRROR_HASH:=1ecdc31a13350fcdcaa3f77ed8ad73906f79fc668dbb2f337e1d5dd877bf9882
 PKG_SOURCE_VERSION:=1d9e673698d9db4a4f2301559f481274de2e75ae
 BINARIES_DIR:=build/binaries
-PKG_CPE_ID:=cpe:/a:linux4sam:at91bootstrap
 
 AT91BOOTSTRAP_V4=y
 ifdef CONFIG_PACKAGE_at91bootstrap-sama5d4_xplaineddf_uboot_secure
@@ -26,7 +25,7 @@ endif
 
 ifeq ($(AT91BOOTSTRAP_V4),n)
   PKG_VERSION=v3.10.4
-  PKG_MIRROR_HASH:=08ab81c37b995592992d6eda3f76ce9aad6e2b3e9d9c4f7e88c1ba8bb8346657
+  PKG_MIRROR_HASH=6fe61fe90838e785917383bb9e887fa05e1bd061a6725954242f504e38b5c426
   PKG_SOURCE_VERSION=404846dd283894367a015ca59189bcf927d92e11
   BINARIES_DIR=binaries
 endif