wiko-lenny2: use _outdir in linux pmaport (MR 1405)

This commit is contained in:
Oliver Smith 2020-07-09 20:48:15 +02:00
parent ca883ecf9d
commit 1bdafe5aa0
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB

View file

@ -32,15 +32,15 @@ source="$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/linux-wiko-len
$_config $_config
" "
builddir="$srcdir/$pkgname-$_commit" builddir="$srcdir/$pkgname-$_commit"
_outdir="KERNEL_OBJ"
prepare() { prepare() {
default_prepare default_prepare
mkdir KERNEL_OBJ mkdir "$_outdir"
cp "$srcdir/$_config" "$builddir"/KERNEL_OBJ/.config cp "$srcdir/$_config" "$_outdir"/.config
yes "" | make -C "$builddir" ARCH="$_carch" HOSTCC="$HOSTCC" \ yes "" | make ARCH="$_carch" HOSTCC="$HOSTCC" O="$_outdir" oldconfig
O="$builddir"/KERNEL_OBJ oldconfig
} }
@ -49,16 +49,16 @@ build() {
make ARCH="$_carch" CC="${CC:-gcc}" \ make ARCH="$_carch" CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
O="$builddir"/KERNEL_OBJ O="$_outdir"
} }
package() { package() {
# kernel.release # kernel.release
install -D "$builddir/KERNEL_OBJ/include/config/kernel.release" \ install -D "$_outdir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release" "$pkgdir/usr/share/kernel/$_flavor/kernel.release"
# zImage (find the right one) # zImage (find the right one)
cd "$builddir/KERNEL_OBJ/arch/$_carch/boot" cd "$_outdir/arch/$_carch/boot"
_target="$pkgdir/boot/vmlinuz-$_flavor" _target="$pkgdir/boot/vmlinuz-$_flavor"
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
[ -e "$_zimg" ] || continue [ -e "$_zimg" ] || continue