diff --git a/.SRCINFO b/.SRCINFO index 7b88c5458c080..450d31bf26b28 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = dae-kix-git pkgdesc = 由 kix fork 的 dae 分支版本 pkgver = r4baacef - pkgrel = 2 + pkgrel = 1 url = https://github.com/olicesx/dae arch = x86_64 arch = aarch64 @@ -14,16 +14,13 @@ pkgbase = dae-kix-git makedepends = libbpf makedepends = linux-headers makedepends = linux-api-headers - optdepends = v2ray-geoip: geoip database - optdepends = v2ray-domain-list-community: domain rules + depends = v2ray-geoip + depends = v2ray-domain-list-community provides = dae conflicts = dae options = !debug - source = dae-kix-git::git+https://github.com/olicesx/dae.git - source = geoip.dat::https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat - source = geosite.dat::https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat - sha256sums = SKIP - sha256sums = SKIP + backup = etc/dae/config.dae + source = dae-kix-git::git+https://gh-proxy.org//https://github.com/olicesx/dae.git sha256sums = SKIP pkgname = dae-kix-git diff --git a/PKGBUILD b/PKGBUILD index 781d154916789..925ce16aa81f5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,32 +2,29 @@ _name=dae pkgname=${_name}-kix-git pkgver=r4baacef -pkgrel=2 +pkgrel=1 pkgdesc="由 kix fork 的 dae 分支版本" arch=('x86_64' 'aarch64') conflicts=($_name) provides=($_name) url="https://github.com/olicesx/dae" +proxy="https://gh-proxy.org/" license=('AGPL-3.0-or-later') +backup=("etc/dae/config.dae") -depends=() -optdepends=( - 'v2ray-geoip: geoip database' - 'v2ray-domain-list-community: domain rules' -) +depends=('v2ray-geoip' 'v2ray-domain-list-community') makedepends=('git' 'go' 'base-devel' 'clang' 'llvm' 'libbpf' 'linux-headers' 'linux-api-headers') -source=( - "${pkgname}::git+${url}.git" - "geoip.dat::https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geoip.dat" - "geosite.dat::https://cdn.jsdelivr.net/gh/Loyalsoldier/v2ray-rules-dat@release/geosite.dat" -) + +source=("${pkgname}::git+${proxy}/${url}.git") + sha256sums=( "SKIP" - "SKIP" - "SKIP" ) + +# Disable debug package generation options=('!debug') +# Generate pkgver from git tags, falling back to commit hash if no tags are present pkgver() { cd "$pkgname" local desc @@ -39,12 +36,14 @@ pkgver() { fi } +# Initializing git submodules prepare() { cd "$pkgname" git submodule update --init --recursive } -build() { +# Build the project using the Makefile, ensuring that CFLAGS do not contain architecture-specific flags +build() { cd "$pkgname" local safe_cflags safe_cflags="${CFLAGS//-march=[^ ]*/}" @@ -54,12 +53,21 @@ build() { package() { cd "$pkgname" + + # Install binary install -Dm755 dae "$pkgdir/usr/bin/dae" + + # Install systemd service file install -Dm644 "install/dae.service" "$pkgdir/usr/lib/systemd/system/dae.service" + + # Install example configuration file install -Dm644 "example.dae" "$pkgdir/etc/dae/example.dae" + + # Install empty configuration file install -Dm640 "install/empty.dae" "${pkgdir}/etc/dae/config.dae" - mkdir -p "${pkgdir}/usr/share/dae/" - cp ../geoip.dat "${pkgdir}/usr/share/dae/geoip.dat" - cp ../geosite.dat "${pkgdir}/usr/share/dae/geosite.dat" -} \ No newline at end of file + # Create symbolic links for geoip.dat & geosite.dat + install -d "${pkgdir}/usr/share/${_pkgname}/" + ln -vs /usr/share/v2ray/geoip.dat "${pkgdir}/usr/share/${_pkgname}/geoip.dat" + ln -vs /usr/share/v2ray/geosite.dat "${pkgdir}/usr/share/${_pkgname}/geosite.dat" +}