nnd
/
ports
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix kflavour being incorrect for flavours with dashes in them

This commit is contained in:
Alex D. 2023-05-14 12:53:52 +00:00
parent 4c13dee4b9
commit fe01f8d49e
Signed by: caskd
GPG Key ID: E5AE8A47B8EFC7ED
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/linux/APKBUILD
View File

@ -37,7 +37,7 @@ source="
" "
_kabi= _klocalver= _kconfig= _kbdmain= _kbddev= _kflavor= _kabi= _klocalver= _kconfig= _kbdmain= _kbddev= _kflavour=
_kdir_src="$srcdir/$_kbdir" _kdir_src="$srcdir/$_kbdir"
arch="noarch" arch="noarch"
@ -93,20 +93,20 @@ _archflavors() {
} }
_bvars() { _bvars() {
_kconfig="config-$_kflavor.$CARCH" _kconfig="config-$_kflavour.$CARCH"
_kdir_main="$srcdir/build-$_kflavor.$CARCH" _kdir_main="$srcdir/build-$_kflavour.$CARCH"
_kdir_dev="$srcdir/build-$_kflavor-dev.$CARCH" _kdir_dev="$srcdir/build-$_kflavour-dev.$CARCH"
_ksaf="$_kflavor" _ksaf="$_kflavour"
_kabi="$pkgver-$pkgrel-$_ksaf" _kabi="$pkgver-$pkgrel-$_ksaf"
_klocalver="-$pkgrel-$_ksaf" _klocalver="-$pkgrel-$_ksaf"
} }
_spvars() { _spvars() {
_kflavor="$(echo $subpkgname | cut -d- -f2)" _kflavour="$(echo $subpkgname | cut -d- -f2-)"
} }
for _kflavor in $(_archflavors); do for _kflavour in $(_archflavors); do
_bvars _bvars
@ -122,7 +122,7 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP
prepare() { prepare() {
default_prepare default_prepare
for _kflavor in $(_archflavors); do for _kflavour in $(_archflavors); do
_bvars _bvars
@ -146,12 +146,12 @@ prepare() {
build() { build() {
unset LDFLAGS unset LDFLAGS
for _kflavor in $(_archflavors); do for _kflavour in $(_archflavors); do
_bvars _bvars
# Build kernel and modules # Build kernel and modules
msg "Building $_kflavor for $CARCH" msg "Building $_kflavour for $CARCH"
cd "$_kdir_main" cd "$_kdir_main"
make \ make \
ARCH="$_carch" \ ARCH="$_carch" \
@ -159,7 +159,7 @@ build() {
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
# Build out-of-tree builder # Build out-of-tree builder
msg "Building $_kflavor-dev for $CARCH" msg "Building $_kflavour-dev for $CARCH"
cd "$_kdir_dev" cd "$_kdir_dev"
make syncconfig \ make syncconfig \
ARCH="$_carch" ARCH="$_carch"
@ -210,7 +210,7 @@ _pkg_kernel() {
# Install release file # Install release file
install -D -m644 include/config/kernel.release \ install -D -m644 include/config/kernel.release \
"$_outdir"/usr/share/kernel/"$_kflavor"/kernel.release "$_outdir"/usr/share/kernel/"$_kflavour"/kernel.release
} }
_pkg_extmod() { _pkg_extmod() {