fixed conflict

This commit is contained in:
le0nxx 2026-02-22 00:54:29 +08:00
parent 5360ea8304
commit 2a73fe2451
2 changed files with 30 additions and 6 deletions

View file

@ -1,9 +1,10 @@
pkgbase = dae-kix-git
pkgdesc = 由 kix fork 的 dae 分支版本
pkgver = r4baacef
pkgrel = 1
pkgrel = 2
url = https://github.com/olicesx/dae
arch = x86_64
arch = aarch64
license = AGPL-3.0-or-later
makedepends = git
makedepends = go
@ -15,8 +16,14 @@ pkgbase = dae-kix-git
makedepends = linux-api-headers
optdepends = v2ray-geoip: geoip database
optdepends = v2ray-domain-list-community: domain rules
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
sha256sums = SKIP
pkgname = dae-kix-git

View file

@ -1,19 +1,31 @@
# Maintainer: le0nxx <leonlawxx@outlook.sg>
pkgname=dae-kix-git
_name=dae
pkgname=${_name}-kix-git
pkgver=r4baacef
pkgrel=1
pkgrel=2
pkgdesc="由 kix fork 的 dae 分支版本"
arch=('x86_64')
arch=('x86_64' 'aarch64')
conflicts=($_name)
provides=($_name)
url="https://github.com/olicesx/dae"
license=('AGPL-3.0-or-later')
depends=()
optdepends=(
'v2ray-geoip: geoip database'
'v2ray-domain-list-community: domain rules'
)
makedepends=('git' 'go' 'base-devel' 'clang' 'llvm' 'libbpf' 'linux-headers' 'linux-api-headers')
source=("${pkgname}::git+${url}.git")
sha256sums=('SKIP')
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"
)
sha256sums=(
"SKIP"
"SKIP"
"SKIP"
)
options=('!debug')
pkgver() {
@ -45,4 +57,9 @@ package() {
install -Dm755 dae "$pkgdir/usr/bin/dae"
install -Dm644 "install/dae.service" "$pkgdir/usr/lib/systemd/system/dae.service"
install -Dm644 "example.dae" "$pkgdir/etc/dae/example.dae"
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"
}