* [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61.
@ 2022-08-28 10:35 jcgruenhage
2022-08-28 21:50 ` [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip] Piraty
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: jcgruenhage @ 2022-08-28 10:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rpi-kernel-5.15.61_1
https://github.com/void-linux/void-packages/pull/38958
rpi-kernel,rpi-firmware: update to 5.15.61.
#### Testing the changes
- I tested the changes in this PR: **briefly**
I've built rpi4-kernel and rpi-firmware, and created an image for my CM4. It boots, haven't tested anything more so far. I sadly don't have any other Pi products to test on right now, so I'd need some other people to help on this.
cc @Piraty as current maintainer
Resolves https://github.com/void-linux/void-mklive/issues/264
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38958.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-kernel-5.15.61_1-38958.patch --]
[-- Type: text/x-diff, Size: 10187 bytes --]
From a713a328f2c531b291c21169b64c0f9f98629720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:29:32 +0200
Subject: [PATCH 1/4] rpi-firmware: update to 20220823.
---
srcpkgs/rpi-firmware/template | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 951782411446..ed8529716065 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
# Template file for 'rpi-firmware'
-_githash="8f13114b9ea29bd004151d4a8afa500b2df721be"
+_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
_gitshort="${_githash:0:7}"
pkgname=rpi-firmware
-version=20201123
-revision=5
+version=20220823
+revision=1
archs="armv6l* armv7l* aarch64*"
wrksrc="firmware-${_githash}"
provides="linux-firmware-broadcom-${version}_${revision}"
@@ -14,7 +14,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause, custom:Cypress"
homepage="https://github.com/raspberrypi/firmware"
distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e
+checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909
conf_files="/boot/cmdline.txt /boot/config.txt"
nostrip=yes
@@ -35,39 +35,39 @@ do_install() {
vinstall ${FILESDIR}/cmdline.txt 644 boot
vinstall ${FILESDIR}/config.txt 644 boot
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
vlicense LICENCE.cypress
# Firmware for rpi3 b and zero wifi chip
for f in bin txt; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi3 b and zero bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
# Firmware for rpi3 b+ wifi chip
for f in bin txt clm_blob; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi3 b+ bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
# Firmware for rpi4/rpi400 wifi chip
for f in bin txt clm_blob; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi4/rpi400 bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430B0.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
}
From 0f96c3b8ae99a5ff89473328a5cf438d3a176f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:30:03 +0200
Subject: [PATCH 2/4] rpi-kernel: update to 5.15.61.
---
srcpkgs/rpi-kernel/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 3c2188d2d5bc..a6e614754792 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,9 +1,9 @@
# Template file for 'rpi-kernel'
#
# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspberry Pi OS distribution. This is currently 5.15:
#
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+# https://forums.raspberrypi.com/viewtopic.php?t=322879
#
# Commit hash is picked from latest tag [1], if appropriate, or from latest
# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
@@ -12,22 +12,22 @@
#
# WARNING: keep all rpi*-kernel packages in sync
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="armv6l*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=64ad74084fa44abe8689564071df5729ded4c589
python_version=3
_kernver="${version}_${revision}"
@@ -206,10 +206,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
From 70541b47ba378556a95e2f1845d2cf7ee96e0d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:29:56 +0200
Subject: [PATCH 3/4] rpi3-kernel: update to 5.15.61.
---
srcpkgs/rpi3-kernel/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 937308fc6576..20d51a6b8579 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,22 +1,22 @@
# Template file for 'rpi3-kernel'
# See rpi-kernel for version policy
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi3-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="aarch64*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi 3 / Zero 2 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
_kernver="${version}_${revision}"
@@ -198,10 +198,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
From 21cc197d127d35888a9ce6edb271247b533ee0a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:30:00 +0200
Subject: [PATCH 4/4] rpi4-kernel: update to 5.15.61.
---
srcpkgs/rpi4-kernel/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index e2c8ac19efee..d4fb3c72906e 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,22 +1,22 @@
# Template file for 'rpi4-kernel'
# See rpi-kernel for version policy
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi4-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="aarch64*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
conflicts=rpi3-kernel
@@ -199,10 +199,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
@ 2022-08-28 21:50 ` Piraty
2022-08-28 21:50 ` Piraty
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2022-08-28 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r956785885
Comment:
align with `srcpkgs/linux5.15/template`. align with mainline template on other occasions is wise too.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
2022-08-28 21:50 ` [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip] Piraty
@ 2022-08-28 21:50 ` Piraty
2022-09-02 9:54 ` paper42
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2022-08-28 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r956785825
Comment:
checksum doesn't matcht
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
2022-08-28 21:50 ` [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip] Piraty
2022-08-28 21:50 ` Piraty
@ 2022-09-02 9:54 ` paper42
2022-09-02 12:40 ` [PR REVIEW] " jcgruenhage
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: paper42 @ 2022-09-02 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#issuecomment-1235303367
Comment:
Tested on Raspberry Pi 4 4GB, it's been running for 3 days without any issues.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (2 preceding siblings ...)
2022-09-02 9:54 ` paper42
@ 2022-09-02 12:40 ` jcgruenhage
2022-09-02 12:47 ` jcgruenhage
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2022-09-02 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r961634756
Comment:
I seem to have mis-pasted something here, sorry
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (3 preceding siblings ...)
2022-09-02 12:40 ` [PR REVIEW] " jcgruenhage
@ 2022-09-02 12:47 ` jcgruenhage
2022-09-02 12:48 ` [PR PATCH] [Updated] " jcgruenhage
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2022-09-02 12:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r961641074
Comment:
wdym?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Updated] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (4 preceding siblings ...)
2022-09-02 12:47 ` jcgruenhage
@ 2022-09-02 12:48 ` jcgruenhage
2022-09-02 16:29 ` tsjk
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2022-09-02 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1518 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rpi-kernel-5.15.61_1
https://github.com/void-linux/void-packages/pull/38958
rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
#### Testing the changes
- I tested the changes in this PR: **briefly**
I've built rpi4-kernel and rpi-firmware, and created an image for my CM4. It boots, haven't tested anything more so far. I sadly don't have any other Pi products to test on right now, so I'd need some other people to help on this.
cc @Piraty as current maintainer
Resolves https://github.com/void-linux/void-mklive/issues/264
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38958.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-kernel-5.15.61_1-38958.patch --]
[-- Type: text/x-diff, Size: 11809 bytes --]
From 50978e378eefc0c080657ef11f796bfea0f83d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:29:32 +0200
Subject: [PATCH 1/5] rpi-firmware: update to 20220823.
---
srcpkgs/rpi-firmware/template | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 951782411446..ed8529716065 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,10 +1,10 @@
# Template file for 'rpi-firmware'
-_githash="8f13114b9ea29bd004151d4a8afa500b2df721be"
+_githash="62efc6a69d4e717bf2833c649d622c8298a37e9c"
_gitshort="${_githash:0:7}"
pkgname=rpi-firmware
-version=20201123
-revision=5
+version=20220823
+revision=1
archs="armv6l* armv7l* aarch64*"
wrksrc="firmware-${_githash}"
provides="linux-firmware-broadcom-${version}_${revision}"
@@ -14,7 +14,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
license="BSD-3-Clause, custom:Cypress"
homepage="https://github.com/raspberrypi/firmware"
distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e
+checksum=3fc5ab7155bde7221245f439971217558300dcbc988ade861cfef4e737de9909
conf_files="/boot/cmdline.txt /boot/config.txt"
nostrip=yes
@@ -35,39 +35,39 @@ do_install() {
vinstall ${FILESDIR}/cmdline.txt 644 boot
vinstall ${FILESDIR}/config.txt 644 boot
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/LICENCE.cypress
vlicense LICENCE.cypress
# Firmware for rpi3 b and zero wifi chip
for f in bin txt; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43430-sdio.${f}
vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi3 b and zero bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430A1.hcd
vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
# Firmware for rpi3 b+ wifi chip
for f in bin txt clm_blob; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43455-sdio.${f}
vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi3 b+ bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C0.hcd
vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
# Firmware for rpi4/rpi400 wifi chip
for f in bin txt clm_blob; do
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.${f}
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/buster/brcm/brcmfmac43456-sdio.${f}
vinstall brcmfmac43456-sdio.${f} 0644 usr/lib/firmware/brcm
done
# Firmware for rpi4/rpi400 bluetooth chip
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM4345C5.hcd
vinstall BCM4345C5.hcd 0644 usr/lib/firmware/brcm
- $XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430B0.hcd
+ $XBPS_FETCH_CMD https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/master/broadcom/BCM43430B0.hcd
vinstall BCM43430B0.hcd 0644 usr/lib/firmware/brcm
}
From 2c3a3d158f048885a41ef940d5e392e556c5c091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:30:03 +0200
Subject: [PATCH 2/5] rpi-kernel: update to 5.15.61.
---
srcpkgs/rpi-kernel/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 3c2188d2d5bc..3183183b6a4e 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -1,9 +1,9 @@
# Template file for 'rpi-kernel'
#
# We track the latest Raspberry Pi LTS kernel as that is what is used in the
-# official Raspbian distribution. This is currently 5.10:
+# official Raspberry Pi OS distribution. This is currently 5.15:
#
-# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=288234
+# https://forums.raspberrypi.com/viewtopic.php?t=322879
#
# Commit hash is picked from latest tag [1], if appropriate, or from latest
# "Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y" commit.
@@ -12,22 +12,22 @@
#
# WARNING: keep all rpi*-kernel packages in sync
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="armv6l*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
_kernver="${version}_${revision}"
@@ -206,10 +206,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
From ad4b2ae4dce9aaf967f083f7bbb5dbdb615d380a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Fri, 2 Sep 2022 14:45:42 +0200
Subject: [PATCH 3/5] rpi2-kernel: update to 5.10.110.
---
srcpkgs/rpi2-kernel/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/rpi2-kernel/template b/srcpkgs/rpi2-kernel/template
index 228b6d2c5551..8963b855a4de 100644
--- a/srcpkgs/rpi2-kernel/template
+++ b/srcpkgs/rpi2-kernel/template
@@ -1,7 +1,7 @@
# Template file for 'rpi2-kernel'
# See rpi-kernel for version policy
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi2-kernel
@@ -16,7 +16,7 @@ homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi 2 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
_kernver="${version}_${revision}"
@@ -198,10 +198,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
From b2bcecbc8d6ce04a399664037500dd6f0765c25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:29:56 +0200
Subject: [PATCH 4/5] rpi3-kernel: update to 5.15.61.
---
srcpkgs/rpi3-kernel/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rpi3-kernel/template b/srcpkgs/rpi3-kernel/template
index 937308fc6576..20d51a6b8579 100644
--- a/srcpkgs/rpi3-kernel/template
+++ b/srcpkgs/rpi3-kernel/template
@@ -1,22 +1,22 @@
# Template file for 'rpi3-kernel'
# See rpi-kernel for version policy
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi3-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="aarch64*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi 3 / Zero 2 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
_kernver="${version}_${revision}"
@@ -198,10 +198,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
From 4b6ee5bc31efdc68c4dab7c894422c4ab99e9f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sun, 28 Aug 2022 12:30:00 +0200
Subject: [PATCH 5/5] rpi4-kernel: update to 5.15.61.
---
srcpkgs/rpi4-kernel/template | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rpi4-kernel/template b/srcpkgs/rpi4-kernel/template
index e2c8ac19efee..d4fb3c72906e 100644
--- a/srcpkgs/rpi4-kernel/template
+++ b/srcpkgs/rpi4-kernel/template
@@ -1,22 +1,22 @@
# Template file for 'rpi4-kernel'
# See rpi-kernel for version policy
-_githash="82c6f8643398e222099066bfffb2070772f0696f"
+_githash="64ad74084fa44abe8689564071df5729ded4c589"
_gitshort="${_githash:0:7}"
pkgname=rpi4-kernel
-version=5.10.110
+version=5.15.61
revision=1
archs="aarch64*"
wrksrc="linux-${_githash}"
-hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz"
makedepends="ncurses-devel"
maintainer="Piraty <piraty1@inbox.ru>"
homepage="http://www.kernel.org"
license="GPL-2.0-only"
short_desc="Linux kernel for Raspberry Pi 4 (${version%.*} series [git ${_gitshort}])"
distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f3ee7782c90ecb3e468e89602248a1de45b466d5d4c1af4748f7ca088c0fcab3
+checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244
python_version=3
conflicts=rpi3-kernel
@@ -199,10 +199,6 @@ do_install() {
mkdir -p ${hdrdest}/net/mac80211/
cp net/mac80211/*.h ${hdrdest}/net/mac80211
- # add dvb headers for external modules
- mkdir -p ${hdrdest}/include/config/dvb/
- cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
# Remove unneeded architectures
# (save the correct one + Kconfig and delete all others)
mkdir -p arch-backup
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (5 preceding siblings ...)
2022-09-02 12:48 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-09-02 16:29 ` tsjk
2022-09-02 22:03 ` paper42
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tsjk @ 2022-09-02 16:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by tsjk on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#issuecomment-1235696970
Comment:
This is awesome. Looking forward to the merge.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (6 preceding siblings ...)
2022-09-02 16:29 ` tsjk
@ 2022-09-02 22:03 ` paper42
2022-09-05 2:23 ` [PR PATCH] [Merged]: " the-maldridge
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: paper42 @ 2022-09-02 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by tsjk on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#issuecomment-1235696970
Comment:
This is awesome. Looking forward to the merge.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR PATCH] [Merged]: rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (7 preceding siblings ...)
2022-09-02 22:03 ` paper42
@ 2022-09-05 2:23 ` the-maldridge
2022-09-06 13:50 ` [PR REVIEW] " Piraty
2022-09-06 13:50 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2022-09-05 2:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]
There's a merged pull request on the void-packages repository
rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
https://github.com/void-linux/void-packages/pull/38958
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
I've built rpi4-kernel and rpi-firmware, and created an image for my CM4. It boots, haven't tested anything more so far. I sadly don't have any other Pi products to test on right now, so I'd need some other people to help on this.
cc @Piraty as current maintainer
Resolves https://github.com/void-linux/void-mklive/issues/264
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (8 preceding siblings ...)
2022-09-05 2:23 ` [PR PATCH] [Merged]: " the-maldridge
@ 2022-09-06 13:50 ` Piraty
2022-09-06 13:50 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2022-09-06 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r963735486
Comment:
work of many board kernels is duplicated work of the mainline template, so taking inspiration from the corresponding mainline template is nice , avoids hard-to-read diffs later on too
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip]
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
` (9 preceding siblings ...)
2022-09-06 13:50 ` [PR REVIEW] " Piraty
@ 2022-09-06 13:50 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2022-09-06 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/38958#discussion_r963729876
Comment:
`5.10` -->`5.15` ...
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-09-06 13:50 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-28 10:35 [PR PATCH] rpi-kernel,rpi-firmware: update to 5.15.61 jcgruenhage
2022-08-28 21:50 ` [PR REVIEW] rpi-kernel,rpi-firmware: update to 5.15.61. [ci skip] Piraty
2022-08-28 21:50 ` Piraty
2022-09-02 9:54 ` paper42
2022-09-02 12:40 ` [PR REVIEW] " jcgruenhage
2022-09-02 12:47 ` jcgruenhage
2022-09-02 12:48 ` [PR PATCH] [Updated] " jcgruenhage
2022-09-02 16:29 ` tsjk
2022-09-02 22:03 ` paper42
2022-09-05 2:23 ` [PR PATCH] [Merged]: " the-maldridge
2022-09-06 13:50 ` [PR REVIEW] " Piraty
2022-09-06 13:50 ` Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).