Partially revert "linux-*: install dtbs to /boot/dtbs (MR 3254)

Reverts commit 70efe55031 for kernels that
started failing on bpo. I suspect it's caused by a change in binutils,
since I tried building linux-oneplus-billie2 with gcc6 and got the same
error (after trying other workarounds like disabling selinux for it, but
then it failed elsewhere).
This commit is contained in:
Oliver Smith 2022-10-10 07:32:37 +02:00
parent 4b72fbd9da
commit e1ef261c86
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 13 additions and 4 deletions

View file

@ -1,9 +1,13 @@
# Reference: <https://postmarketos.org/vendorkernel>
# Kernel config based on: arch/arm64/configs/vendor/bengal_defconfig
# FIXME: this kernel doesn't build anymore!
# Once this is fixed, re-apply MR 3254: put dtbs in /boot.
# https://builds.sr.ht/~postmarketos/job/858910
pkgname=linux-oneplus-billie2
pkgver=4.19.95
pkgrel=2
pkgrel=1
pkgdesc="OnePlus Nord N100 kernel fork"
arch="aarch64"
_carch="arm64"
@ -49,8 +53,9 @@ package() {
KERNEL_IMAGE_NAME=Image.gz downstreamkernel_package \
"$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
mkdir -p "$pkgdir/usr/share/dtb"
install -Dm644 "$_outdir/arch/arm64/boot/dts/vendor/20882/bengal-qrd.dtb" \
"$pkgdir/boot/dtbs"
"$pkgdir/usr/share/dtb"
make O="$_outdir" \
ARCH="$_carch" \

View file

@ -7,12 +7,16 @@ _config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
# FIXME: this kernel doesn't build anymore!
# Once this is fixed, re-apply MR 3254: put dtbs in /boot.
# https://builds.sr.ht/~postmarketos/job/858721
pkgver=4.14.73
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
pkgrel=7
pkgrel=6
arch="x86_64"
pkgdesc="Linux for pmOS supported chipsets (stable)"
@ -119,7 +123,7 @@ package() {
make -j1 $_install \
ARCH="$_carch" \
INSTALL_MOD_PATH="$pkgdir" \
INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
}