Skip to content

Commit a930a42

Browse files
committed
github: Fix and simplify kernel-apply-patch.sh regarding hv-daemons
This action is kicked off from main for all channels, but the script is run against each branch, so we can assume that hv-daemons is there. COREOS_SOURCE_REVISION isn't in the hv-daemons ebuild, but that doesn't matter. sed will do nothing. Signed-off-by: James Le Cuirot <[email protected]>
1 parent 415fc4a commit a930a42

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

.github/workflows/kernel-apply-patch.sh

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,15 @@ fi
2828
extra_pkgs=(
2929
sys-kernel/coreos-modules
3030
sys-kernel/coreos-kernel
31+
app-emulation/hv-daemons
3132
)
3233

33-
for pkg in sources modules kernel; do
34-
pushd "sys-kernel/coreos-${pkg}"
35-
git mv "coreos-${pkg}"-*.ebuild "coreos-${pkg}-${VERSION_NEW}.ebuild"
36-
sed -i -e '/^COREOS_SOURCE_REVISION=/s/=.*/=""/' "coreos-${pkg}-${VERSION_NEW}.ebuild"
37-
popd
34+
for pkg in sys-kernel/coreos-{sources,modules,kernel} app-emulation/hv-daemons; do
35+
pkg+=/${pkg##*/}
36+
git mv "${pkg}"-*.ebuild "${pkg}-${VERSION_NEW}.ebuild"
37+
sed -i -e '/^COREOS_SOURCE_REVISION=/s/=.*/=""/' "${pkg}-${VERSION_NEW}.ebuild"
3838
done
3939

40-
if [[ -d app-emulation/hv-daemons ]]; then
41-
# Update hyperv daemons ebuild soft-link to reflect new kernel version
42-
find -D exec app-emulation/hv-daemons/ -type l -exec rm '{}' \;
43-
ln --relative -s app-emulation/hv-daemons/hv-daemons-9999.ebuild \
44-
app-emulation/hv-daemons/hv-daemons-${VERSION_NEW}.ebuild
45-
extra_pkgs+=( app-emulation/hv-daemons )
46-
fi
47-
4840
# Leave ebuild repo section of SDK
4941
popd
5042

0 commit comments

Comments
 (0)