From 04b05a3b483039cb8346e0dbbac9f10536f0a9d3 Mon Sep 17 00:00:00 2001 From: JieXu Date: Thu, 30 Apr 2026 02:31:00 +0800 Subject: [PATCH] Update package-rhel-riscv.sh --- package-rhel-riscv.sh | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/package-rhel-riscv.sh b/package-rhel-riscv.sh index 5a4ff8e7..30845ea0 100644 --- a/package-rhel-riscv.sh +++ b/package-rhel-riscv.sh @@ -99,7 +99,7 @@ install_dependencies() { if command -v dnf >/dev/null 2>&1; then sudo dnf -y install \ - rpm-build rpmdevtools curl unzip tar jq rsync git ca-certificates libicu gcc make \ + rpm-build rpmdevtools curl unzip tar jq rsync git ca-certificates libicu \ && install_ok=1 mkdir -p "$HOME/.dotnet" @@ -253,35 +253,6 @@ resolve_version() { echo "[*] GUI version resolved as: ${VERSION}" } -build_sqlite_native_riscv64() { - local outdir="$1" - local workdir="" - local sqlite_year="2026" - local sqlite_ver="3510300" - local sqlite_zip="sqlite-amalgamation-${sqlite_ver}.zip" - local srcdir="" - - mkdir -p "$outdir" - workdir="$(mktemp -d)" - - echo "[+] Download SQLite amalgamation: ${sqlite_zip}" - curl -fL "https://www.sqlite.org/${sqlite_year}/${sqlite_zip}" -o "${workdir}/${sqlite_zip}" || { rm -rf "$workdir"; return 1; } - unzip -q "${workdir}/${sqlite_zip}" -d "$workdir" || { rm -rf "$workdir"; return 1; } - - srcdir="$(find "$workdir" -maxdepth 1 -type d -name 'sqlite-amalgamation-*' | head -n1 || true)" - [[ -n "$srcdir" ]] || { echo "[!] SQLite source unpack failed"; rm -rf "$workdir"; return 1; } - - echo "[+] Build libe_sqlite3.so for riscv64" - gcc -shared -fPIC -O2 \ - -DSQLITE_THREADSAFE=1 \ - -DSQLITE_ENABLE_FTS5 \ - -DSQLITE_ENABLE_RTREE \ - -DSQLITE_ENABLE_JSON1 \ - -o "${outdir}/libe_sqlite3.so" "${srcdir}/sqlite3.c" -ldl -lpthread || { rm -rf "$workdir"; return 1; } - - rm -rf "$workdir" -} - xray_url_for_rid() { local rid="$1" local ver="$2" @@ -564,7 +535,6 @@ cp -a * %{buildroot}/opt/v2rayN/ find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} + find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} + [ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || : -[ -f %{buildroot}/opt/v2rayN/libe_sqlite3.so ] && chmod 0755 %{buildroot}/opt/v2rayN/libe_sqlite3.so || : install -dm0755 %{buildroot}%{_bindir} install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF' @@ -640,8 +610,6 @@ package_binary() { mkdir -p "$workdir/$PKGROOT" cp -a "$pubdir/." "$workdir/$PKGROOT/" - build_sqlite_native_riscv64 "$workdir/$PKGROOT" || echo "[!] sqlite native build failed (skipped)" - project_dir="$(cd "$(dirname "$PROJECT")" && pwd)" icon_candidate="$project_dir/v2rayN.png" [[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; }