Skip to content

Commit 48b31fd

Browse files
AngryLokiAngryLoki
committed
dev-libs/xdna-driver: fix live ebuild
Signed-off-by: Sv. Lockal <lockalsash@gmail.com>
1 parent a8b4944 commit 48b31fd

2 files changed

Lines changed: 40 additions & 22 deletions

File tree

‎dev-libs/xdna-driver/Manifest‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
DIST 82da0a-1502_00__npu.dev.sbin 248592 BLAKE2B c7388450f546a69ffbd363f4fd1a6f415f8faa7b4badd9c2656707cfbacc6bf07e67fe605f6cb8670ea79ed3ade20021ea9a26979fbd55fc9bfbc15137cd13bf SHA512 fa49ab6bbbb23479d6493d85a6372cac84e3a3edb93bc82c63ce95c30d6e1e3d0fe304ea134734f052d37d86e19d26085a672b340858e9ab1fd8b093b76633cf
2-
DIST 82da0a-17f0_00__npu.dev.sbin 287712 BLAKE2B ae2ce2b54dfd86b02288a41ace66d08d8ac614dcfde4ce8537204613fb57e677b495ef37eaa6e435a53ffad7fac6fe3126c89132ed6df7a53b2011b5e84c79aa SHA512 888a4fbcd932978ad9c77f3c2e9c42de5c2f9a09ae76db2791dc0dea22b08de823917a79974a4660eec6d5c9fe5aed6f1f77123cb11e4574b45c8131934ecf96
3-
DIST 82da0a-17f0_10__npu.dev.sbin 429680 BLAKE2B c7a1070b861d4bd84f9884721a0df1442cb9586ab6d7522af165055d1e649ec18859119b99f45665ef1735ccab1a18327d98cd98c9d1c0abac4aa159f9c070d3 SHA512 a926cf11cdc979b6cd13ebe4b6ec33540af0a69d547788f2d10e5f652593885e9eefb10849ededb1f26a2b3f9f4ee34524bdc5f2811942e3cfeb62c37245c46b
4-
DIST 82da0a-17f0_11__npu.dev.sbin 429680 BLAKE2B 87f1b3b38165152df748df5497491519987a12b4258e8c06a46ec597e1b2bd3850c7543762e854d1a0b6594603067c15c70ef47ffabc4adfbf5c6b9d0f302c64 SHA512 6c5ac85efe21895a77e3ea267acbca6c04494700c433e317b7586bf29a90a5791be13537d17d001f712afc0684fd7a560b55170d8f40f5675b92491c48408d10
1+
DIST 5c0409-1502_00__npu.dev.sbin 248592 BLAKE2B c7388450f546a69ffbd363f4fd1a6f415f8faa7b4badd9c2656707cfbacc6bf07e67fe605f6cb8670ea79ed3ade20021ea9a26979fbd55fc9bfbc15137cd13bf SHA512 fa49ab6bbbb23479d6493d85a6372cac84e3a3edb93bc82c63ce95c30d6e1e3d0fe304ea134734f052d37d86e19d26085a672b340858e9ab1fd8b093b76633cf
2+
DIST 5c0409-17f0_10__npu.dev.sbin 429680 BLAKE2B 2da026df4e683dd0055872442ffd5974a59909e820ddf2ec8b148056ac998ce360ce117ad75beda5768059e6ac740d2b329676ec1e03886c96e020e077a8c13e SHA512 e15ea99bbc9a22e294626891cb9c0e06bc8ed328b3c3271f5628718f71a9d730f6a8a300bb9c4f7024cbd9d825ed1b34596beb0068bbebbed27fe7e9dbc4abe7
3+
DIST 5c0409-17f0_11__npu.dev.sbin 429680 BLAKE2B 5addee1d5bb7563b9a06bf70f9d027f0363b97f7edd31754f2ecd9030bd2465163f0ba660e21a15917521404e453e2d6dbeb09e6049341b91ba3535ac3e87d3d SHA512 d1f0181305191c3f2e3a66f734a9c0c6f4413b28de1be724903f1b430298a2134211166165842b24ce7895f2faa36d46864f00c7498b1385bbf2155da07c21f4
4+
DIST 5c0409-17f1_10__cert.dev.sbin 28576 BLAKE2B 747e6372802b227b7493408cc9394eaaf8f948f123527051a27797c3ef43f27197091613b0fcf5b26d7bbbaa856a70fd6266b867aadeaf31aca28e838dc35ea7 SHA512 e159c6af33b5c65fc25bec66814e8294146b9660e7fcd9d8363192375d1ebf709681fa797c02260d9e5ac91e9c1de5783ee6fd0a262ecf599673921c99a60c16
5+
DIST 5c0409-17f1_10__npu.dev.sbin 252064 BLAKE2B 53a0f612b4bc59cb639d052dab088b08a0d9714325d74095f3c50d053058d8fda48336626b3fa9c5865671bfeaf3ae496d3b5b784c258bd514fc05adec043388 SHA512 753fbf62e98fc4500b337281a77633621f3bb0b1955bcd048639ddb23d199b0fc032a015a45f225b8ce6e93e94e59cf00224a44a41c76295a102e7625f830e37
6+
DIST 5c0409-17f2_10__cert.dev.sbin 28576 BLAKE2B 747e6372802b227b7493408cc9394eaaf8f948f123527051a27797c3ef43f27197091613b0fcf5b26d7bbbaa856a70fd6266b867aadeaf31aca28e838dc35ea7 SHA512 e159c6af33b5c65fc25bec66814e8294146b9660e7fcd9d8363192375d1ebf709681fa797c02260d9e5ac91e9c1de5783ee6fd0a262ecf599673921c99a60c16
7+
DIST 5c0409-17f2_10__npu.dev.sbin 252064 BLAKE2B 53a0f612b4bc59cb639d052dab088b08a0d9714325d74095f3c50d053058d8fda48336626b3fa9c5865671bfeaf3ae496d3b5b784c258bd514fc05adec043388 SHA512 753fbf62e98fc4500b337281a77633621f3bb0b1955bcd048639ddb23d199b0fc032a015a45f225b8ce6e93e94e59cf00224a44a41c76295a102e7625f830e37
58
DIST 886e89-1502_00__npu.dev.sbin 248592 BLAKE2B c7388450f546a69ffbd363f4fd1a6f415f8faa7b4badd9c2656707cfbacc6bf07e67fe605f6cb8670ea79ed3ade20021ea9a26979fbd55fc9bfbc15137cd13bf SHA512 fa49ab6bbbb23479d6493d85a6372cac84e3a3edb93bc82c63ce95c30d6e1e3d0fe304ea134734f052d37d86e19d26085a672b340858e9ab1fd8b093b76633cf
69
DIST 886e89-17f0_00__npu.dev.sbin 287712 BLAKE2B ae2ce2b54dfd86b02288a41ace66d08d8ac614dcfde4ce8537204613fb57e677b495ef37eaa6e435a53ffad7fac6fe3126c89132ed6df7a53b2011b5e84c79aa SHA512 888a4fbcd932978ad9c77f3c2e9c42de5c2f9a09ae76db2791dc0dea22b08de823917a79974a4660eec6d5c9fe5aed6f1f77123cb11e4574b45c8131934ecf96
710
DIST 886e89-17f0_10__npu.dev.sbin 492720 BLAKE2B 477bc7004ce13e2ad13a6bb214cd75438255f6f863c3e0bd261e6b3f26c42f88aa649fc5ec9273b032cf644a097bfcc8dcc9fdc7770647a4863e94bed6d19ec8 SHA512 6eded0563b4a247e32a8e21e8cb1d45233660586ea78dabdb3a0e8ec0871290df6c72ea2bf9348abb5022008d926642b53e10691d88fa500d0ce8a9d81867961

‎dev-libs/xdna-driver/xdna-driver-999999.ebuild‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,19 @@ EAPI=8
55

66
inherit linux-mod-r1 toolchain-funcs
77

8-
# FWAPI=https://gitlab.com/api/v4/projects/kernel-firmware%2Fdrm-firmware/repository/branches/amd-ipu-staging
9-
# curl -s "$FWAPI" | jq -r '.commit.id'
10-
FW_COMMIT=82da0aea7f8f20e4c058195cc695e01aaa4b99f8
8+
# To regenerate, run:
9+
# ebuild xdna-driver-999999.ebuild info
10+
FW_COMMIT=5c040900cb08fe65c4f76c0c63ce5d7f318eae93
11+
12+
declare -A FIRMWARES=(
13+
[1502_00/npu.sbin.1.5.5.391]=npu.dev.sbin
14+
[17f1_10/npu.sbin.0.0.20.173]=npu.dev.sbin
15+
[17f1_10/cert.sbin.20260217]=cert.dev.sbin
16+
[17f2_10/npu.sbin.0.0.20.173]=npu.dev.sbin
17+
[17f2_10/cert.sbin.20260217]=cert.dev.sbin
18+
[17f0_10/npu.sbin.255.0.11.69]=npu.dev.sbin
19+
[17f0_11/npu.sbin.255.0.11.71]=npu.dev.sbin
20+
)
1121

1222
DESCRIPTION="AMD XDNA Driver"
1323
HOMEPAGE="https://github.com/amd/xdna-driver"
@@ -21,21 +31,11 @@ else
2131
KEYWORDS="~amd64"
2232
fi
2333

24-
# INFO_FILE=https://raw.githubusercontent.com/amd/xdna-driver/main/tools/info.json
25-
# COMMON_PREFIX=https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/
26-
# curl -s "$INFO_FILE" | jq -r ".firmwares[] | .url | sub(\"${COMMON_PREFIX}\"; \"\")"
27-
FIRMWARES=(
28-
1502_00/npu.sbin.1.5.5.391
29-
17f0_00/npu.sbin.0.7.22.185
30-
17f0_10/1.7_npu.sbin.1.1.0.59
31-
17f0_11/1.7_npu.sbin.1.1.0.60
32-
)
33-
3434
FW_URI_PREFIX=https://gitlab.com/kernel-firmware/drm-firmware/-/raw/${FW_COMMIT}/amdnpu
3535

3636
SRC_URI+=" firmware? ( "
37-
for fw in "${FIRMWARES[@]}"; do
38-
SRC_URI+="${FW_URI_PREFIX}/${fw} -> ${FW_COMMIT:0:6}-${fw%%/*}__npu.dev.sbin "
37+
for fw in "${!FIRMWARES[@]}"; do
38+
SRC_URI+="${FW_URI_PREFIX}/${fw} -> ${FW_COMMIT:0:6}-${fw%%/*}__${FIRMWARES[${fw}]} "
3939
done
4040
SRC_URI+=")"
4141

@@ -44,12 +44,27 @@ LICENSE="GPL-2 firmware? ( linux-fw-redistributable )"
4444
SLOT="0"
4545
IUSE="+firmware"
4646

47+
pkg_info() {
48+
local FWAPI=https://gitlab.com/api/v4/projects/kernel-firmware%2Fdrm-firmware/repository/branches/amd-ipu-staging
49+
local FW_COMMIT=$(curl -s "$FWAPI" | jq -r '.commit.id')
50+
local INFO_FILE=https://raw.githubusercontent.com/amd/xdna-driver/main/tools/info.json
51+
local COMMON_PREFIX=https://gitlab.com/kernel-firmware/drm-firmware/-/raw/amd-ipu-staging/amdnpu/
52+
# shellcheck disable=SC2016
53+
local JQ_EXPR='.firmwares[] | (.url | sub($prefix; "")) as $p | " [" + $p + "]=" + .fw_name'
54+
55+
printf "FW_COMMIT=%s\n\n" "$FW_COMMIT"
56+
echo 'declare -A FIRMWARES=('
57+
curl -s "$INFO_FILE" | jq -r --arg prefix "$COMMON_PREFIX" "$JQ_EXPR"
58+
echo ')'
59+
}
60+
4761
src_prepare() {
4862
sed -e "s/-Werror//" -i Kbuild || die
4963

5064
# Forward clang compiler, otherwise fails when kernel is compiled with clang cflags
5165
# shellcheck disable=SC2016
5266
sed -e 's/make -s /make -s CC="${CC}" /' \
67+
-e 's:>/dev/null 2>&1::' \
5368
-i "${WORKDIR}/${P}"/src/driver/tools/configure_kernel.sh || die
5469

5570
default
@@ -69,11 +84,11 @@ src_compile() {
6984
}
7085

7186
src_install() {
72-
for fw in "${FIRMWARES[@]}"; do
87+
for fw in "${!FIRMWARES[@]}"; do
7388
local dir="${fw%%/*}"
74-
local src_filename="${FW_COMMIT:0:6}-${dir}__npu.dev.sbin"
89+
local src_filename="${FW_COMMIT:0:6}-${dir}__${FIRMWARES[${fw}]}"
7590
insinto "/lib/firmware/amdnpu/${dir}"
76-
newins "${DISTDIR}/${src_filename}" npu.dev.sbin
91+
newins "${DISTDIR}/${src_filename}" "${FIRMWARES[${fw}]}"
7792
done
7893

7994
insinto /usr/lib/modules-load.d

0 commit comments

Comments
 (0)