Skip to content

Commit fb26b1a

Browse files
EbonJaegerEbonJaeger
committed
vhba-module: Rebuild for kernels
Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
1 parent 63d34fc commit fb26b1a

2 files changed

Lines changed: 56 additions & 50 deletions

File tree

‎packages/v/vhba-module/package.yml‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
22
name : vhba-module
33
version : '20260313'
4-
release : 320
4+
release : 321
55
source :
66
- https://sourceforge.net/projects/cdemu/files/vhba-module/vhba-module-20260313.tar.xz#vhba-module.tar.xz : 293003bf5d9dc2b386db0d05f595c5548355a535d6dfc06fd379fd98bb190174
77
extract : false
8+
homepage : https://cdemu.sourceforge.io/
89
license : GPL-2.0-or-later
910
component :
1011
- kernel.drivers
1112
- current : kernel.drivers
12-
homepage : https://cdemu.sourceforge.io/
1313
summary : Provides the vhba_ctl device for CDemu
1414
description: |
1515
Provides the vhba_ctl device for CDemu
@@ -24,56 +24,61 @@ rundeps :
2424
- vhba-module-common
2525
- main :
2626
- vhba-module-common
27-
permanent :
28-
- /lib64/modules
29-
- /usr/lib64/modules
30-
patterns :
31-
- common : /usr/lib64/udev
32-
- common : /usr/lib64/modules-load.d
33-
- current :
34-
- /lib64/modules/*.current
35-
- /usr/lib64/modules/*.current
27+
environment: |
28+
kernels=(
29+
%kernel_version_current%
30+
%kernel_version_lts%
31+
)
3632
setup : |
37-
mkdir lts-build current-build
38-
tar --strip-components=1 -xf $sources/vhba-module.tar.xz -C lts-build
39-
tar --strip-components=1 -xf $sources/vhba-module.tar.xz -C current-build
33+
for _kernel in "${kernels[@]}"; do
34+
mkdir "${_kernel}"
35+
tar -xf ${sources}/vhba-module.tar.xz --strip-components=1 -C "${_kernel}"
36+
done
4037
build : |
41-
pushd lts-build
42-
KERNELRELEASE="%kernel_version_lts%" %make
43-
pushd ../current-build
44-
KERNELRELEASE="%kernel_version_current%" %make
38+
for _kernel in "${kernels[@]}"; do
39+
pushd "${_kernel}"
40+
KERNELRELEASE="${_kernel}" %make
41+
popd
42+
done
4543
install : |
46-
# common files
47-
pushd lts-build
48-
install -D -m 00644 $pkgfiles/60-udev.rules $installdir/%libdir%/udev/rules.d/60-vhba-module.rules
49-
install -D -m 00644 $pkgfiles/modprobe $installdir/%libdir%/modules-load.d/vhba-module.conf
44+
# Kernel modules
45+
for _kernel in "${kernels[@]}"; do
46+
pushd "${_kernel}"
47+
%install_file vhba.ko -t "${installdir}/%libdir%/modules/${_kernel}/extra/drivers/misc"
5048
51-
# lts kernel
52-
export KERNELRELEASE="%kernel_version_lts%"
53-
export KDIR="$installdir/usr/lib64/modules/${KERNELRELEASE}/extra/drivers/misc"
54-
install -D -m 00644 vhba.ko $KDIR/vhba.ko
55-
popd
49+
# Install license here so we don't have to find the subdir
50+
%install_license COPYING
51+
popd
52+
done
5653
57-
# current kernel
58-
pushd current-build
59-
export KERNELRELEASE="%kernel_version_current%"
60-
export KDIR="$installdir/usr/lib64/modules/${KERNELRELEASE}/extra/drivers/misc"
61-
install -D -m 00644 vhba.ko $KDIR/vhba.ko
62-
popd
54+
# common files
55+
%install_file ${pkgfiles}/60-udev.rules ${installdir}/%libdir%/udev/rules.d/60-vhba-module.rules
56+
%install_file ${pkgfiles}/modprobe ${installdir}/%libdir%/modules-load.d/vhba-module.conf
6357
6458
# Compress modules with zstd
65-
find "$installdir" -name '*.ko' -exec strip --strip-debug {} \; -exec zstd {} \; -exec rm -v {} \;
59+
find "${installdir}" -name '*.ko' -exec strip --strip-debug {} \; -exec zstd {} \; -exec rm -v {} \;
6660
6761
# Usr-merge
68-
install -dm00755 $installdir/lib64
69-
pushd $installdir/usr
62+
%install_dir ${installdir}/lib64
63+
pushd ${installdir}/usr
7064
file_list=()
7165
while IFS= read -r -d $'\0'; do
7266
file_list+=("$REPLY")
7367
done < <(find lib64/modules -type f -print0)
7468
for file in "${file_list[@]}"; do
7569
parent=$(dirname "$file")
76-
install -dm00755 "$installdir/$parent"
77-
ln -srv "$installdir/usr/$file" "$installdir/$file"
70+
%install_dir "${installdir}/${parent}"
71+
ln -srv "${installdir}/usr/${file}" "${installdir}/${file}"
7872
done
7973
popd
74+
patterns :
75+
- common :
76+
- /usr/lib64/udev
77+
- /usr/lib64/modules-load.d
78+
- /usr/share/licenses
79+
- current :
80+
- /lib64/modules/*.current
81+
- /usr/lib64/modules/*.current
82+
permanent :
83+
- /lib64/modules
84+
- /usr/lib64/modules

‎packages/v/vhba-module/pspec_x86_64.xml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Name>vhba-module</Name>
44
<Homepage>https://cdemu.sourceforge.io/</Homepage>
55
<Packager>
6-
<Name>Troy Harvey</Name>
7-
<Email>harvey@getsol.us</Email>
6+
<Name>Evan Maddock</Name>
7+
<Email>maddock.evan@vivaldi.net</Email>
88
</Packager>
99
<License>GPL-2.0-or-later</License>
1010
<PartOf>kernel.drivers</PartOf>
@@ -20,11 +20,11 @@
2020
</Description>
2121
<PartOf>kernel.drivers</PartOf>
2222
<RuntimeDependencies>
23-
<Dependency releaseFrom="320">vhba-module-common</Dependency>
23+
<Dependency releaseFrom="321">vhba-module-common</Dependency>
2424
</RuntimeDependencies>
2525
<Files>
26-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/misc/vhba.ko.zst</Path>
27-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/misc/vhba.ko.zst</Path>
26+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/misc/vhba.ko.zst</Path>
27+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/misc/vhba.ko.zst</Path>
2828
</Files>
2929
</Package>
3030
<Package>
@@ -35,6 +35,7 @@
3535
<Files>
3636
<Path fileType="library">/usr/lib64/modules-load.d/vhba-module.conf</Path>
3737
<Path fileType="library">/usr/lib64/udev/rules.d/60-vhba-module.rules</Path>
38+
<Path fileType="data">/usr/share/licenses/vhba-module/COPYING</Path>
3839
</Files>
3940
</Package>
4041
<Package>
@@ -44,20 +45,20 @@
4445
</Description>
4546
<PartOf>kernel.drivers</PartOf>
4647
<RuntimeDependencies>
47-
<Dependency releaseFrom="320">vhba-module-common</Dependency>
48+
<Dependency releaseFrom="321">vhba-module-common</Dependency>
4849
</RuntimeDependencies>
4950
<Files>
50-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/misc/vhba.ko.zst</Path>
51-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/misc/vhba.ko.zst</Path>
51+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/misc/vhba.ko.zst</Path>
52+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/misc/vhba.ko.zst</Path>
5253
</Files>
5354
</Package>
5455
<History>
55-
<Update release="320">
56-
<Date>2026-08-31</Date>
56+
<Update release="321">
57+
<Date>2026-09-08</Date>
5758
<Version>20260313</Version>
5859
<Comment>Packaging update</Comment>
59-
<Name>Troy Harvey</Name>
60-
<Email>harvey@getsol.us</Email>
60+
<Name>Evan Maddock</Name>
61+
<Email>maddock.evan@vivaldi.net</Email>
6162
</Update>
6263
</History>
6364
</PISI>

0 commit comments

Comments
 (0)