From 70efe5503190d0f0d29df229b6c1968714005355 Mon Sep 17 00:00:00 2001 From: Newbyte Date: Sat, 30 Jul 2022 14:11:01 -0400 Subject: [PATCH] linux-*: install dtbs to /boot/dtbs (MR 3254) [ci:ignore-count]: Too many packages probably [ci:skip-build]: No way this would finish in time --- device/community/linux-nokia-n900/APKBUILD | 4 ++-- device/community/linux-postmarketos-exynos4/APKBUILD | 4 ++-- device/community/linux-postmarketos-qcom-msm8916/APKBUILD | 4 ++-- device/community/linux-postmarketos-qcom-msm8996/APKBUILD | 5 ++--- device/community/linux-postmarketos-qcom-sdm845/APKBUILD | 6 ++---- device/community/linux-postmarketos-qcom-sm6350/APKBUILD | 6 ++---- device/community/linux-samsung-espresso3g/APKBUILD | 4 ++-- device/main/linux-postmarketos-allwinner/APKBUILD | 4 ++-- device/main/linux-purism-librem5/APKBUILD | 4 ++-- device/testing/linux-google-crosshatch-mainline/APKBUILD | 4 ++-- device/testing/linux-kobo-clara-mainline/APKBUILD | 4 ++-- device/testing/linux-kobo-clara/APKBUILD | 4 ++-- device/testing/linux-oneplus-billie2/APKBUILD | 5 ++--- device/testing/linux-ouya-ouya-mainline/APKBUILD | 4 ++-- device/testing/linux-postmarketos-exynos5/APKBUILD | 4 ++-- device/testing/linux-postmarketos-grate/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-apq8064/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-msm8939/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-msm8953/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-msm8974/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-msm8994/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-msm8998/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-sdm660/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-sm6125/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-sm8150/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-sm8250/APKBUILD | 4 ++-- device/testing/linux-postmarketos-qcom-sm8350/APKBUILD | 4 ++-- device/testing/linux-postmarketos-stericsson/APKBUILD | 4 ++-- device/testing/linux-sony-nicki-mainline/APKBUILD | 4 ++-- device/testing/linux-sourceparts-pocketpc/APKBUILD | 4 ++-- device/testing/linux-teclast-x80pro/APKBUILD | 4 ++-- device/testing/linux-tokio-techbook/APKBUILD | 4 ++-- 32 files changed, 64 insertions(+), 70 deletions(-) diff --git a/device/community/linux-nokia-n900/APKBUILD b/device/community/linux-nokia-n900/APKBUILD index a71573bf9..4bc88bb24 100644 --- a/device/community/linux-nokia-n900/APKBUILD +++ b/device/community/linux-nokia-n900/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-nokia-n900 pkgver=5.18.16 -pkgrel=1 +pkgrel=2 pkgdesc="Mainline kernel fork for Nokia N900" arch="armv7" url="https://kernel.org/" @@ -53,7 +53,7 @@ package() { INSTALL_MOD_STRIP=1 \ INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" install -D "$builddir"/include/config/kernel.release \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" diff --git a/device/community/linux-postmarketos-exynos4/APKBUILD b/device/community/linux-postmarketos-exynos4/APKBUILD index 27f623201..741116b51 100644 --- a/device/community/linux-postmarketos-exynos4/APKBUILD +++ b/device/community/linux-postmarketos-exynos4/APKBUILD @@ -4,7 +4,7 @@ pkgname=linux-postmarketos-exynos4 pkgver=5.18.0 -pkgrel=3 +pkgrel=4 pkgdesc="Mainline kernel fork for Samsung Exynos4 devices" arch="armv7" _carch="arm" @@ -81,7 +81,7 @@ package() { INSTALL_MOD_STRIP=1 \ INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" install -D "$builddir"/include/config/kernel.release \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" diff --git a/device/community/linux-postmarketos-qcom-msm8916/APKBUILD b/device/community/linux-postmarketos-qcom-msm8916/APKBUILD index fb98e01bf..9dd5a9625 100644 --- a/device/community/linux-postmarketos-qcom-msm8916/APKBUILD +++ b/device/community/linux-postmarketos-qcom-msm8916/APKBUILD @@ -5,7 +5,7 @@ _flavor="postmarketos-qcom-msm8916" pkgname=linux-$_flavor pkgver=5.18 -pkgrel=1 +pkgrel=2 pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices" arch="aarch64 armv7" url="https://github.com/msm8916-mainline/linux" @@ -59,7 +59,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD index 3edd651cf..429820221 100644 --- a/device/community/linux-postmarketos-qcom-msm8996/APKBUILD +++ b/device/community/linux-postmarketos-qcom-msm8996/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-msm8996" pkgname=linux-$_flavor pkgver=5.18.15 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices" arch="aarch64" _carch="arm64" @@ -36,7 +36,6 @@ build() { } package() { - mkdir -p "$pkgdir"/boot install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \ "$pkgdir/boot/vmlinuz" @@ -47,7 +46,7 @@ package() { ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs } sha512sums=" c15a5ea9643ca745b23a7f4d53906b0586a2f962ef185e57af78b38ca058e49b8f5535f5f7493fba83686011f8ccaa269a93351fdc58c6a0cb3305b1b1cc12e9 linux-v5.18.15-msm8996.tar.gz diff --git a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD index b3feb333f..1d0a50451 100644 --- a/device/community/linux-postmarketos-qcom-sdm845/APKBUILD +++ b/device/community/linux-postmarketos-qcom-sdm845/APKBUILD @@ -6,7 +6,7 @@ _flavor="postmarketos-qcom-sdm845" pkgname=linux-$_flavor pkgver=5.19.12 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline Kernel fork for SDM845 devices" arch="aarch64" _carch="arm64" @@ -39,8 +39,6 @@ build() { } package() { - mkdir -p "$pkgdir"/boot - install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \ "$pkgdir/boot/vmlinuz" @@ -49,7 +47,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/community/linux-postmarketos-qcom-sm6350/APKBUILD b/device/community/linux-postmarketos-qcom-sm6350/APKBUILD index f5c5188f5..adce51887 100644 --- a/device/community/linux-postmarketos-qcom-sm6350/APKBUILD +++ b/device/community/linux-postmarketos-qcom-sm6350/APKBUILD @@ -3,7 +3,7 @@ _flavor="postmarketos-qcom-sm6350" pkgname=linux-$_flavor pkgver=6.0.0_rc1 -pkgrel=2 +pkgrel=3 pkgdesc="Mainline Kernel fork for SM6350 devices" arch="aarch64" _carch="arm64" @@ -38,8 +38,6 @@ build() { } package() { - mkdir -p "$pkgdir"/boot - install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \ "$pkgdir/boot/vmlinuz" @@ -48,7 +46,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/community/linux-samsung-espresso3g/APKBUILD b/device/community/linux-samsung-espresso3g/APKBUILD index a9991c006..ac2c4e371 100644 --- a/device/community/linux-samsung-espresso3g/APKBUILD +++ b/device/community/linux-samsung-espresso3g/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Antoni Aloy pkgname=linux-samsung-espresso3g pkgver=5.17.0 -pkgrel=2 +pkgrel=3 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel" arch="armv7" _carch="arm" @@ -50,7 +50,7 @@ package() { make modules_install dtbs_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } sha512sums=" diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index c3b082eb4..27cd322b7 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.19.8_git20220909 -pkgrel=1 +pkgrel=2 _tag="orange-pi-5.19-20220909-1622" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -79,7 +79,7 @@ package() { ARCH="$_carch" \ INSTALL_MOD_STRIP=1 \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } dev() { diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index 288d6da4f..b1c164e55 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Bhushan Shah pkgname=linux-purism-librem5 pkgver=5.18.11 -pkgrel=1 +pkgrel=2 _purismrel=1 # . _purismver=${pkgver}pureos$_purismrel @@ -63,7 +63,7 @@ package() { make modules_install dtbs_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } diff --git a/device/testing/linux-google-crosshatch-mainline/APKBUILD b/device/testing/linux-google-crosshatch-mainline/APKBUILD index ad253061f..dafea83e9 100644 --- a/device/testing/linux-google-crosshatch-mainline/APKBUILD +++ b/device/testing/linux-google-crosshatch-mainline/APKBUILD @@ -13,7 +13,7 @@ _kernver=${pkgver%_rc*} _mainver=${_kernver%.*} _patchlevel=${_kernver/$_mainver./} _basever=$_mainver.$((_patchlevel-1)) -pkgrel=3 +pkgrel=4 arch="aarch64" pkgdesc="Google Pixel 3 XL kernel fork, close to mainline" @@ -105,7 +105,7 @@ package() { make -j1 $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } diff --git a/device/testing/linux-kobo-clara-mainline/APKBUILD b/device/testing/linux-kobo-clara-mainline/APKBUILD index b0a169755..762107173 100644 --- a/device/testing/linux-kobo-clara-mainline/APKBUILD +++ b/device/testing/linux-kobo-clara-mainline/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-kobo-clara-mainline pkgver=5.19.11 -pkgrel=0 +pkgrel=1 pkgdesc="Kobo Clara HD kernel fork, close to mainline" arch="armv7" _carch="arm" @@ -63,7 +63,7 @@ package() { make modules_install dtbs_install \ O="$_outdir" ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" install -Dm644 "$_rtl8189fs_dir"/8189fs.ko "$pkgdir/lib/modules/$pkgver/kernel/drivers/net/wireless" } diff --git a/device/testing/linux-kobo-clara/APKBUILD b/device/testing/linux-kobo-clara/APKBUILD index 11e7b6113..c7c9235ef 100644 --- a/device/testing/linux-kobo-clara/APKBUILD +++ b/device/testing/linux-kobo-clara/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-kobo-clara pkgver=4.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Kobo Clara HD kernel fork" arch="armv7" _carch="arm" @@ -51,7 +51,7 @@ package() { make modules_install dtbs_install \ O="$_outdir" ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } sha512sums=" diff --git a/device/testing/linux-oneplus-billie2/APKBUILD b/device/testing/linux-oneplus-billie2/APKBUILD index 60a8b8e6d..ff4e2af62 100644 --- a/device/testing/linux-oneplus-billie2/APKBUILD +++ b/device/testing/linux-oneplus-billie2/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-oneplus-billie2 pkgver=4.19.95 -pkgrel=1 +pkgrel=2 pkgdesc="OnePlus Nord N100 kernel fork" arch="aarch64" _carch="arm64" @@ -49,9 +49,8 @@ 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/usr/share/dtb" + "$pkgdir/boot/dtbs" make O="$_outdir" \ ARCH="$_carch" \ diff --git a/device/testing/linux-ouya-ouya-mainline/APKBUILD b/device/testing/linux-ouya-ouya-mainline/APKBUILD index b96ca539b..26905bbac 100644 --- a/device/testing/linux-ouya-ouya-mainline/APKBUILD +++ b/device/testing/linux-ouya-ouya-mainline/APKBUILD @@ -2,7 +2,7 @@ pkgname=linux-ouya-ouya-mainline pkgver=5.0 -pkgrel=4 +pkgrel=5 pkgdesc="Ouya kernel fork, close to mainline" arch="armv7" _carch="arm" @@ -65,7 +65,7 @@ package() { make -j1 $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } diff --git a/device/testing/linux-postmarketos-exynos5/APKBUILD b/device/testing/linux-postmarketos-exynos5/APKBUILD index 1ddcc7912..ac248dd3c 100644 --- a/device/testing/linux-postmarketos-exynos5/APKBUILD +++ b/device/testing/linux-postmarketos-exynos5/APKBUILD @@ -4,7 +4,7 @@ pkgname=linux-postmarketos-exynos5 pkgver=5.16.1 -pkgrel=3 +pkgrel=4 pkgdesc="Mainline kernel fork for Samsung Exynos5 devices" arch="armv7" _carch="arm" @@ -97,7 +97,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-grate/APKBUILD b/device/testing/linux-postmarketos-grate/APKBUILD index 5fad22ca9..17d89371b 100644 --- a/device/testing/linux-postmarketos-grate/APKBUILD +++ b/device/testing/linux-postmarketos-grate/APKBUILD @@ -1,6 +1,6 @@ pkgname=linux-postmarketos-grate pkgver=5.19.0_rc8 -pkgrel=0 +pkgrel=1 arch="armv7" pkgdesc="Linux kernel with experimental patches for Tegra" url="https://postmarketos.org" @@ -40,7 +40,7 @@ package() { O="$_outdir" ARCH="$_carch" \ INSTALL_MOD_STRIP=1 \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } sha512sums=" diff --git a/device/testing/linux-postmarketos-qcom-apq8064/APKBUILD b/device/testing/linux-postmarketos-qcom-apq8064/APKBUILD index cbc712474..05905355f 100644 --- a/device/testing/linux-postmarketos-qcom-apq8064/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-apq8064/APKBUILD @@ -1,7 +1,7 @@ _flavor=postmarketos-qcom-apq8064 pkgname=linux-$_flavor pkgver=5.10.98 -pkgrel=0 +pkgrel=1 _commit=217c7ff0a7127d28f024f75fd267752ca4180559 arch="armv7" pkgdesc="Upstream unstable kernel with patches for APQ8064 devices" @@ -36,7 +36,7 @@ package() { ARCH="$_carch" \ INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs install -D "$builddir"/include/config/kernel.release \ "$pkgdir"/usr/share/kernel/$_flavor/kernel.release diff --git a/device/testing/linux-postmarketos-qcom-msm8939/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8939/APKBUILD index 3e8551610..223e97a56 100644 --- a/device/testing/linux-postmarketos-qcom-msm8939/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-msm8939/APKBUILD @@ -5,7 +5,7 @@ _flavor="postmarketos-qcom-msm8939" pkgname=linux-$_flavor pkgver=5.15_git20220114 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for Qualcomm MSM8939 devices" arch="aarch64" _carch="arm64" @@ -58,7 +58,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD index fe310d72a..0e25ff075 100644 --- a/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-msm8953" pkgname=linux-$_flavor pkgver=5.18.3 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for Qualcomm MSM8953 devices" arch="aarch64" url="https://github.com/msm8953-mainline/linux" @@ -49,7 +49,7 @@ package() { ARCH="$_carch" \ INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD index 44a36658f..23606c214 100644 --- a/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD @@ -5,7 +5,7 @@ _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.19.9 -pkgrel=0 +pkgrel=1 _tag="v5.19.9-msm8974" pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices" arch="armv7" @@ -56,7 +56,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir/include/config/kernel.release" \ diff --git a/device/testing/linux-postmarketos-qcom-msm8994/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8994/APKBUILD index 157348640..3fe84817a 100644 --- a/device/testing/linux-postmarketos-qcom-msm8994/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-msm8994/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-msm8994" pkgname=linux-$_flavor pkgver=5.17.2 -pkgrel=0 +pkgrel=1 pkgdesc="Kernel mainline Qualcomm MSM8994 and MSM8992 devices" arch="aarch64" _carch="arm64" @@ -59,7 +59,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir/include/config/kernel.release" \ diff --git a/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD index 46e51e10a..37ca87d62 100644 --- a/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-msm8998/APKBUILD @@ -5,7 +5,7 @@ _flavor="postmarketos-qcom-msm8998" pkgname=linux-$_flavor pkgver=5.16.0_rc6 -pkgrel=1 +pkgrel=2 _commit="01325bd3a73b47a34b97c2757056b1cb9e4fdcc1" pkgdesc="Mainline Kernel fork for MSM8998 devices" arch="aarch64" @@ -57,7 +57,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD index 27bcbb75d..9062825c8 100644 --- a/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sdm660/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-sdm660" pkgname=linux-$_flavor pkgver=5.19.0 -pkgrel=0 +pkgrel=1 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon 660 SoC" arch="aarch64" url="https://kernel.org/" @@ -59,7 +59,7 @@ package() { INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir/include/config/kernel.release" \ diff --git a/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD b/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD index 13fd26a80..f4cb05454 100644 --- a/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sm6125/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: mint pkgname=linux-postmarketos-qcom-sm6125 pkgver=5.18_rc4 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline Kernel fork for SM6125 devices" arch="aarch64" _carch="arm64" @@ -54,7 +54,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-sm8150/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8150/APKBUILD index 42b711b77..d630d98a2 100644 --- a/device/testing/linux-postmarketos-qcom-sm8150/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sm8150/APKBUILD @@ -7,7 +7,7 @@ _flavor="postmarketos-qcom-sm8150" pkgname=linux-$_flavor pkgver=5.17.0 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline Kernel fork for SM8150 devices" arch="aarch64" _carch="arm64" @@ -55,7 +55,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD index b8731eaf0..b77efde72 100644 --- a/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sm8250/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-sm8250" pkgname=linux-$_flavor pkgver=5.19.0 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for SM8250" arch="aarch64" _carch="arm64" @@ -53,7 +53,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD b/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD index 1843354c0..2dae889e5 100644 --- a/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD +++ b/device/testing/linux-postmarketos-qcom-sm8350/APKBUILD @@ -4,7 +4,7 @@ _flavor="postmarketos-qcom-sm8350" pkgname=linux-$_flavor pkgver=5.16.0_rc1 -pkgrel=0 +pkgrel=1 pkgdesc="Mainline kernel fork for SM8350" arch="aarch64" _carch="arm64" @@ -57,7 +57,7 @@ package() { INSTALL_PATH="$pkgdir"/boot/ \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_MOD_STRIP=1 \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-postmarketos-stericsson/APKBUILD b/device/testing/linux-postmarketos-stericsson/APKBUILD index 521a53ec0..996828499 100644 --- a/device/testing/linux-postmarketos-stericsson/APKBUILD +++ b/device/testing/linux-postmarketos-stericsson/APKBUILD @@ -6,7 +6,7 @@ _flavor="postmarketos-stericsson" _config="config-$_flavor.armv7" pkgname=linux-$_flavor pkgver=5.19_rc2 -pkgrel=2 +pkgrel=3 pkgdesc="Mainline kernel for ST-Ericsson NovaThor devices" arch="armv7" _carch="arm" @@ -62,7 +62,7 @@ package() { ARCH="$_carch" \ INSTALL_PATH="$pkgdir"/boot \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb + INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source install -D "$builddir"/include/config/kernel.release \ diff --git a/device/testing/linux-sony-nicki-mainline/APKBUILD b/device/testing/linux-sony-nicki-mainline/APKBUILD index 55202bc7a..7ec2d0d34 100644 --- a/device/testing/linux-sony-nicki-mainline/APKBUILD +++ b/device/testing/linux-sony-nicki-mainline/APKBUILD @@ -13,7 +13,7 @@ _kernver=${pkgver%_rc*} _mainver=${_kernver%.*} _patchlevel=${_kernver/$_mainver./} _basever=$_mainver.$((_patchlevel-1)) -pkgrel=5 +pkgrel=6 arch="armv7" pkgdesc="Sony Xperia M kernel fork, close to mainline" @@ -103,7 +103,7 @@ package() { make -j1 $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } sha512sums="31e9ef9b3e956df38824865c291530fa5dda067bfea8b0169a3871d7876cfe192a42ae631e51a8a02f7c64319269c8af2688d8ae180805173bf2c1c84c390a59 linux-sony-nicki-mainline-ad6ab7f8c57896cb3829e6a80408e0912d6096c2.tar.gz diff --git a/device/testing/linux-sourceparts-pocketpc/APKBUILD b/device/testing/linux-sourceparts-pocketpc/APKBUILD index f9b53a5bf..bca541549 100644 --- a/device/testing/linux-sourceparts-pocketpc/APKBUILD +++ b/device/testing/linux-sourceparts-pocketpc/APKBUILD @@ -3,7 +3,7 @@ _flavor=sourceparts-pocketpc _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.14.6_git20210920 -pkgrel=0 +pkgrel=1 _tag="81a7953afc5cd1001b727701dc99625ec656160a" _wifi_ref="1b6ddd544b4a829ed2b7feb32575359b6443cd3d" pkgdesc="Kernel fork for the Pocket P.C." @@ -69,7 +69,7 @@ package() { ARCH="$_carch" \ INSTALL_MOD_STRIP=1 \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } dev() { diff --git a/device/testing/linux-teclast-x80pro/APKBUILD b/device/testing/linux-teclast-x80pro/APKBUILD index 2ba750189..9f321d9ee 100644 --- a/device/testing/linux-teclast-x80pro/APKBUILD +++ b/device/testing/linux-teclast-x80pro/APKBUILD @@ -12,7 +12,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=6 +pkgrel=7 arch="x86_64" pkgdesc="Linux for pmOS supported chipsets (stable)" @@ -119,7 +119,7 @@ package() { make -j1 $_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } diff --git a/device/testing/linux-tokio-techbook/APKBUILD b/device/testing/linux-tokio-techbook/APKBUILD index 5385111ff..2356d9e13 100644 --- a/device/testing/linux-tokio-techbook/APKBUILD +++ b/device/testing/linux-tokio-techbook/APKBUILD @@ -3,7 +3,7 @@ pkgname=linux-tokio-techbook pkgver=4.3.0 -pkgrel=4 +pkgrel=5 pkgdesc="Tokio Techbook kernel fork, close to mainline" arch="armv7" _carch="arm" @@ -46,7 +46,7 @@ package() { make modules_install dtbs_install \ ARCH="$_carch" \ INSTALL_MOD_PATH="$pkgdir" \ - INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb" + INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" }