From 822e07e66212eacf035eaaf5ec0cd97de987bc35 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 25 Aug 2021 12:35:59 -0700
Subject: [PATCH] linux-*: don't use 'flavor' in kernel name (MR 2426)
---
device/testing/linux-asus-flo/APKBUILD | 4 ++--
device/testing/linux-asus-z00vd/APKBUILD | 4 ++--
device/testing/linux-fly-iq4404/APKBUILD | 4 ++--
device/testing/linux-google-crosshatch-mainline/APKBUILD | 6 +++---
device/testing/linux-gp-peak/APKBUILD | 4 ++--
device/testing/linux-htc-bravo/APKBUILD | 4 ++--
device/testing/linux-lg-dory/APKBUILD | 4 ++--
device/testing/linux-nokia-n9/APKBUILD | 4 ++--
device/testing/linux-nokia-sand/APKBUILD | 4 ++--
device/testing/linux-ouya-ouya-mainline/APKBUILD | 6 +++---
device/testing/linux-samsung-espresso3g/APKBUILD | 4 ++--
device/testing/linux-samsung-maguro/APKBUILD | 4 ++--
device/testing/linux-samsung-p4wifi/APKBUILD | 6 +++---
device/testing/linux-sony-nicki-mainline/APKBUILD | 6 +++---
device/testing/linux-teclast-x80pro/APKBUILD | 6 +++---
device/testing/linux-wiko-lenny2/APKBUILD | 4 ++--
device/testing/linux-zte-p731a20/APKBUILD | 4 ++--
main/linux-postmarketos-qcom-msm8996/APKBUILD | 6 +++---
main/linux-postmarketos-qcom-sdm660/APKBUILD | 4 ++--
main/linux-postmarketos-rockchip/APKBUILD | 8 ++++----
20 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/device/testing/linux-asus-flo/APKBUILD b/device/testing/linux-asus-flo/APKBUILD
index 1061eaeba6f..8afa4d6604c 100644
--- a/device/testing/linux-asus-flo/APKBUILD
+++ b/device/testing/linux-asus-flo/APKBUILD
@@ -2,7 +2,7 @@ _flavor=asus-flo
_config="config-$_flavor.armv7"
pkgname=linux-$_flavor
pkgver=4.11.12
-pkgrel=4
+pkgrel=5
arch="armv7"
pkgdesc="Upstream stable kernel with patches for Nexus 7 2013 WIFI"
url="https://git.linaro.org/people/john.stultz/flo.git/log/?h=flo-v4.11"
@@ -74,7 +74,7 @@ package() {
cat zImage dts/qcom-apq8064-asus-nexus7-flo.dtb > zImage-dtb
install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$srcdir/build/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/device/testing/linux-asus-z00vd/APKBUILD b/device/testing/linux-asus-z00vd/APKBUILD
index 43b7d09f09b..cbf0b0dd9b4 100644
--- a/device/testing/linux-asus-z00vd/APKBUILD
+++ b/device/testing/linux-asus-z00vd/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-asus-z00vd
pkgver=3.18.41
-pkgrel=5
+pkgrel=6
pkgdesc="ASUS Zenfone Go kernel fork"
arch="armv7"
_carch="arm"
@@ -65,7 +65,7 @@ package() {
# zImage (find the right one)
cd "$_outdir/arch/$_carch/boot"
- _target="$pkgdir/boot/vmlinuz-$_flavor"
+ _target="$pkgdir/boot/vmlinuz"
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
[ -e "$_zimg" ] || continue
msg "zImage found: $_zimg"
diff --git a/device/testing/linux-fly-iq4404/APKBUILD b/device/testing/linux-fly-iq4404/APKBUILD
index fb274b62ccc..65f6e2f190a 100644
--- a/device/testing/linux-fly-iq4404/APKBUILD
+++ b/device/testing/linux-fly-iq4404/APKBUILD
@@ -3,7 +3,7 @@
pkgname=linux-fly-iq4404
pkgver=3.10.89
-pkgrel=4
+pkgrel=5
pkgdesc="Fly Spark kernel fork"
arch="armv7"
_carch="arm"
@@ -47,7 +47,7 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
cd "$builddir/arch/$_carch/boot"
- install -Dm644 zImage "$pkgdir/boot/vmlinuz-$_flavor"
+ install -Dm644 zImage "$pkgdir/boot/vmlinuz"
}
sha512sums="ae53fe32e91a46ddc553ca6ea27bebb9ec3bb0dd01f15336d4570fa789c04ec1a52146fdd03f7ee409f16a11f8f90625546b447a39d7b6d2f10032c91283788e linux-fly-iq4404-a619869f394bc2f00226efa230bc33894648af4e.tar.gz
diff --git a/device/testing/linux-google-crosshatch-mainline/APKBUILD b/device/testing/linux-google-crosshatch-mainline/APKBUILD
index 521060b337d..ad253061f69 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=2
+pkgrel=3
arch="aarch64"
pkgdesc="Google Pixel 3 XL kernel fork, close to mainline"
@@ -85,10 +85,10 @@ package() {
if [ "$CARCH" == "aarch64" ]; then
install -Dm644 "$srcdir/build/arch/$_carch/boot/Image.gz" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
else
install -Dm644 "$srcdir/build/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
fi
install -D "$srcdir/build/include/config/kernel.release" \
diff --git a/device/testing/linux-gp-peak/APKBUILD b/device/testing/linux-gp-peak/APKBUILD
index f9f1b0f7b95..a364f200e45 100644
--- a/device/testing/linux-gp-peak/APKBUILD
+++ b/device/testing/linux-gp-peak/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-gp-peak
pkgver=3.0.21
-pkgrel=7
+pkgrel=8
pkgdesc="Peak kernel fork"
arch="armhf"
_carch="arm"
@@ -52,7 +52,7 @@ package() {
# zImage (find the right one)
cd "$builddir/$_outdir/arch/$_carch/boot"
- _target="$pkgdir/boot/vmlinuz-$_flavor"
+ _target="$pkgdir/boot/vmlinuz"
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
[ -e "$_zimg" ] || continue
msg "zImage found: $_zimg"
diff --git a/device/testing/linux-htc-bravo/APKBUILD b/device/testing/linux-htc-bravo/APKBUILD
index b5f04a7825e..d9de3e5b54c 100644
--- a/device/testing/linux-htc-bravo/APKBUILD
+++ b/device/testing/linux-htc-bravo/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-htc-bravo
pkgver=3.0.16
-pkgrel=14
+pkgrel=15
pkgdesc="HTC Desire kernel from spezi77"
arch="armhf"
_carch="arm"
@@ -45,7 +45,7 @@ build() {
package() {
install -Dm644 "$builddir/arch/arm/boot/zImage" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/device/testing/linux-lg-dory/APKBUILD b/device/testing/linux-lg-dory/APKBUILD
index 08d66eeae8b..ccf78f6f245 100644
--- a/device/testing/linux-lg-dory/APKBUILD
+++ b/device/testing/linux-lg-dory/APKBUILD
@@ -20,7 +20,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=8
+pkgrel=9
arch="armhf"
pkgdesc="Kernel for LG G Watch"
url="https://android.googlesource.com/kernel/msm/+/android-msm-dory-3.10-marshmallow-mr1-wear-release"
@@ -64,7 +64,7 @@ build() {
package() {
install -Dm644 "$builddir/arch/arm/boot/zImage-dtb" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/device/testing/linux-nokia-n9/APKBUILD b/device/testing/linux-nokia-n9/APKBUILD
index c92e0f80ef1..841122af493 100644
--- a/device/testing/linux-nokia-n9/APKBUILD
+++ b/device/testing/linux-nokia-n9/APKBUILD
@@ -12,7 +12,7 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=1
+pkgrel=2
arch="armhf"
pkgdesc="Nokia N9 kernel"
url="https://kernel.org"
@@ -91,7 +91,7 @@ package() {
cat zImage dts/omap3-n9.dtb > zImage-dtb
install -Dm644 "$srcdir/build/arch/arm/boot/zImage-dtb" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$srcdir/build/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/device/testing/linux-nokia-sand/APKBUILD b/device/testing/linux-nokia-sand/APKBUILD
index e716880bfc3..950a443c34c 100644
--- a/device/testing/linux-nokia-sand/APKBUILD
+++ b/device/testing/linux-nokia-sand/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-nokia-sand
pkgver=3.4.0
-pkgrel=3
+pkgrel=4
pkgdesc="Lumia 620 kernel fork"
arch="armv7"
_carch="arm"
@@ -50,7 +50,7 @@ package() {
# zImage (find the right one)
cd "$builddir/arch/$_carch/boot"
- _target="$pkgdir/boot/vmlinuz-$_flavor"
+ _target="$pkgdir/boot/vmlinuz"
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
[ -e "$_zimg" ] || continue
msg "zImage found: $_zimg"
diff --git a/device/testing/linux-ouya-ouya-mainline/APKBUILD b/device/testing/linux-ouya-ouya-mainline/APKBUILD
index 28bc51dc769..b96ca539b5c 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=3
+pkgrel=4
pkgdesc="Ouya kernel fork, close to mainline"
arch="armv7"
_carch="arm"
@@ -45,10 +45,10 @@ package() {
if [ "$CARCH" == "aarch64" ]; then
install -Dm644 "$srcdir/build/arch/$_carch/boot/Image" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
else
install -Dm644 "$srcdir/build/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
fi
install -D "$srcdir/build/include/config/kernel.release" \
diff --git a/device/testing/linux-samsung-espresso3g/APKBUILD b/device/testing/linux-samsung-espresso3g/APKBUILD
index ffb1f8b6ec2..1e5d64ce869 100644
--- a/device/testing/linux-samsung-espresso3g/APKBUILD
+++ b/device/testing/linux-samsung-espresso3g/APKBUILD
@@ -1,6 +1,6 @@
pkgname=linux-samsung-espresso3g
pkgver=5.12_rc1
-pkgrel=0
+pkgrel=1
pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel"
arch="armv7"
_carch="arm"
@@ -30,7 +30,7 @@ build() {
package() {
install -Dm644 "$builddir/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir"/include/config/kernel.release \
"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
diff --git a/device/testing/linux-samsung-maguro/APKBUILD b/device/testing/linux-samsung-maguro/APKBUILD
index cd81e5343b4..5a90405d4ec 100644
--- a/device/testing/linux-samsung-maguro/APKBUILD
+++ b/device/testing/linux-samsung-maguro/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-samsung-maguro
pkgver=3.0.31
-pkgrel=15
+pkgrel=16
pkgdesc="Samsung Galaxy Nexus kernel from LineageOS"
arch="armv7"
_carch="arm"
@@ -46,7 +46,7 @@ build() {
package() {
install -Dm644 "$builddir/arch/arm/boot/zImage" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/device/testing/linux-samsung-p4wifi/APKBUILD b/device/testing/linux-samsung-p4wifi/APKBUILD
index a5d7410bb59..3cc06a62887 100644
--- a/device/testing/linux-samsung-p4wifi/APKBUILD
+++ b/device/testing/linux-samsung-p4wifi/APKBUILD
@@ -2,7 +2,7 @@
pkgname=linux-samsung-p4wifi
pkgver=5.0
-pkgrel=2
+pkgrel=3
pkgdesc="Galaxy Tab 10.1 kernel"
arch="armv7"
_carch="arm"
@@ -45,10 +45,10 @@ package() {
if [ "$CARCH" == "aarch64" ]; then
install -Dm644 "$srcdir/build/arch/$_carch/boot/Image" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
else
install -Dm644 "$srcdir/build/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
fi
install -D "$srcdir/build/include/config/kernel.release" \
diff --git a/device/testing/linux-sony-nicki-mainline/APKBUILD b/device/testing/linux-sony-nicki-mainline/APKBUILD
index f71cf5c2e5e..55202bc7afc 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=4
+pkgrel=5
arch="armv7"
pkgdesc="Sony Xperia M kernel fork, close to mainline"
@@ -83,10 +83,10 @@ package() {
if [ "$CARCH" == "aarch64" ]; then
install -Dm644 "$srcdir/build/arch/$_carch/boot/Image.gz" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
else
install -Dm644 "$srcdir/build/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
fi
install -D "$srcdir/build/include/config/kernel.release" \
diff --git a/device/testing/linux-teclast-x80pro/APKBUILD b/device/testing/linux-teclast-x80pro/APKBUILD
index d8157c3a79f..2ba750189c6 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=5
+pkgrel=6
arch="x86_64"
pkgdesc="Linux for pmOS supported chipsets (stable)"
@@ -99,10 +99,10 @@ package() {
if [ "$CARCH" == "aarch64" ]; then
install -Dm644 "$srcdir/build/arch/$_carch/boot/Image" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
else
install -Dm644 "$srcdir/build/arch/$_carch/boot/"*zImage \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
fi
install -D "$srcdir/build/include/config/kernel.release" \
diff --git a/device/testing/linux-wiko-lenny2/APKBUILD b/device/testing/linux-wiko-lenny2/APKBUILD
index 37128171230..f85289d2768 100644
--- a/device/testing/linux-wiko-lenny2/APKBUILD
+++ b/device/testing/linux-wiko-lenny2/APKBUILD
@@ -4,7 +4,7 @@
pkgname=linux-wiko-lenny2
pkgver=3.10.72
-pkgrel=3
+pkgrel=4
pkgdesc="Wiko Lenny 2 downstream kernel fork"
arch="armv7"
_carch="arm"
@@ -60,7 +60,7 @@ package() {
# zImage (find the right one)
cd "$_outdir/arch/$_carch/boot"
- _target="$pkgdir/boot/vmlinuz-$_flavor"
+ _target="$pkgdir/boot/vmlinuz"
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
[ -e "$_zimg" ] || continue
msg "zImage found: $_zimg"
diff --git a/device/testing/linux-zte-p731a20/APKBUILD b/device/testing/linux-zte-p731a20/APKBUILD
index 193dcd7b965..9780dd96901 100644
--- a/device/testing/linux-zte-p731a20/APKBUILD
+++ b/device/testing/linux-zte-p731a20/APKBUILD
@@ -3,7 +3,7 @@
pkgname=linux-zte-p731a20
pkgver=3.10.17
-pkgrel=4
+pkgrel=5
pkgdesc="ZTE_P731A20 kernel"
arch="armv7"
_carch="arm"
@@ -51,7 +51,7 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
install -Dm644 "$builddir/arch/$_carch/boot/zImage" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
# Master DTB (deviceinfo_bootimg_qcdt)
install -Dm644 "$builddir/arch/arm/boot/dt.img" \
diff --git a/main/linux-postmarketos-qcom-msm8996/APKBUILD b/main/linux-postmarketos-qcom-msm8996/APKBUILD
index fb8769f954f..438052ea1f3 100644
--- a/main/linux-postmarketos-qcom-msm8996/APKBUILD
+++ b/main/linux-postmarketos-qcom-msm8996/APKBUILD
@@ -4,7 +4,7 @@
_flavor="postmarketos-qcom-msm8996"
pkgname=linux-$_flavor
pkgver=5.14_rc4
-pkgrel=0
+pkgrel=1
pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
arch="aarch64"
_carch="arm64"
@@ -35,7 +35,7 @@ build() {
package() {
mkdir -p "$pkgdir"/boot
install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
@@ -47,6 +47,6 @@ package() {
INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
}
sha512sums="
-effd2fa2bbc840cc87330b66d86ca4a044a7394399bfe31f59e3d715ee4b704f4877532661fbdeb77d906a35845acaa1f0b4bd04771cd0ea417a384bf172608f linux-msm8996-v5.14-rc4-msm8996.tar.gz
+0a92ba0c13e4864fcb47369610e32facea6983e50d52579271d138f29f0a8500816b57ebda2435e39947c2f69a49a9c82e7a2585d4356036a3873fadc871206a linux-msm8996-v5.14-rc4-msm8996.tar.gz
7870093b7f14b6b52fb1b1f7a1947cc96a90e63dea10a2f671ea97c5dfc9207ba17aea656ebd0aa982a303c817b34ac2592b8ae5e775b02f6348cbec0a6ec812 config-postmarketos-qcom-msm8996.aarch64
"
diff --git a/main/linux-postmarketos-qcom-sdm660/APKBUILD b/main/linux-postmarketos-qcom-sdm660/APKBUILD
index 9723099d2ad..073433a4c8b 100644
--- a/main/linux-postmarketos-qcom-sdm660/APKBUILD
+++ b/main/linux-postmarketos-qcom-sdm660/APKBUILD
@@ -4,7 +4,7 @@
_flavor="postmarketos-qcom-sdm660"
pkgname=linux-$_flavor
pkgver=5.10_rc6
-pkgrel=1
+pkgrel=2
pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon 660 SoC"
arch="aarch64"
url="https://kernel.org/"
@@ -41,7 +41,7 @@ build() {
package() {
# bootloader requires compressed kernel
install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
- "$pkgdir/boot/vmlinuz-$_flavor"
+ "$pkgdir/boot/vmlinuz"
install -D "$builddir/include/config/kernel.release" \
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
diff --git a/main/linux-postmarketos-rockchip/APKBUILD b/main/linux-postmarketos-rockchip/APKBUILD
index c0bc3f83350..4a8f97fdccb 100644
--- a/main/linux-postmarketos-rockchip/APKBUILD
+++ b/main/linux-postmarketos-rockchip/APKBUILD
@@ -11,7 +11,7 @@
pkgname=linux-postmarketos-rockchip
pkgver=5.13.5
-pkgrel=3
+pkgrel=4
pkgdesc="Mainline kernel for rockchip devices"
arch="aarch64 armv7"
_flavor="${pkgname#linux-}"
@@ -88,10 +88,10 @@ package() {
# not all armv7 devices (google-veyon-jerry) support booting gzipped kernels yet
if [ $_carch = arm64 ]; then
- gzip -v "$pkgdir"/boot/vmlinuz-postmarketos-rockchip
- mv "$pkgdir"/boot/vmlinuz-postmarketos-rockchip.gz "$pkgdir"/boot/vmlinuz-postmarketos-rockchip
+ gzip -v "$pkgdir"/boot/vmlinuz
+ mv "$pkgdir"/boot/vmlinuz.gz "$pkgdir"/boot/vmlinuz
else
- mv "$pkgdir"/boot/vmlinuz-postmarketos-rockchip "$pkgdir"/boot/vmlinuz-postmarketos-rockchip
+ mv "$pkgdir"/boot/vmlinuz "$pkgdir"/boot/vmlinuz
fi
}
--
GitLab