From 0866d4cad68057fbab2dd73efaf806c4874f012e Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 23 Aug 2020 22:38:15 -0400 Subject: [PATCH 1/2] rpi-kernel: update to 5.4.59. [ci skip] - Built for armv6l, armv7l, and aarch64. - Tested on armv6l, armv7l. --- ...5debc1925397f78db8bbfc9f488b0ce4e009.patch | 85 ------------------- srcpkgs/rpi-kernel/template | 12 +-- 2 files changed, 6 insertions(+), 91 deletions(-) delete mode 100644 srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch diff --git a/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch b/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch deleted file mode 100644 index ac160b1e74f..00000000000 --- a/srcpkgs/rpi-kernel/patches/fe915debc1925397f78db8bbfc9f488b0ce4e009.patch +++ /dev/null @@ -1,85 +0,0 @@ -From fe915debc1925397f78db8bbfc9f488b0ce4e009 Mon Sep 17 00:00:00 2001 -From: digital -Date: Fri, 26 Jun 2020 17:30:49 +0200 -Subject: [PATCH] Enable nf_tables support for aarch64 - ---- - arch/arm64/configs/bcmrpi3_defconfig | 44 ++++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - -diff --git arch/arm64/configs/bcmrpi3_defconfig arch/arm64/configs/bcmrpi3_defconfig -index 63e0cc8ab89f9..d66d80f95c001 100644 ---- arch/arm64/configs/bcmrpi3_defconfig -+++ arch/arm64/configs/bcmrpi3_defconfig -@@ -132,6 +132,33 @@ CONFIG_NF_CONNTRACK_SANE=m - CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m -+CONFIG_NF_TABLES=m -+CONFIG_NF_TABLES_SET=m -+CONFIG_NF_TABLES_INET=y -+CONFIG_NF_TABLES_NETDEV=y -+CONFIG_NFT_NUMGEN=m -+CONFIG_NFT_CT=m -+CONFIG_NFT_COUNTER=m -+CONFIG_NFT_CONNLIMIT=m -+CONFIG_NFT_LOG=m -+CONFIG_NFT_LIMIT=m -+CONFIG_NFT_MASQ=m -+CONFIG_NFT_REDIR=m -+CONFIG_NFT_NAT=m -+CONFIG_NFT_TUNNEL=m -+CONFIG_NFT_OBJREF=m -+CONFIG_NFT_QUEUE=m -+CONFIG_NFT_QUOTA=m -+CONFIG_NFT_REJECT=m -+CONFIG_NFT_COMPAT=m -+CONFIG_NFT_HASH=m -+CONFIG_NFT_FIB_INET=m -+CONFIG_NFT_SOCKET=m -+CONFIG_NFT_OSF=m -+CONFIG_NFT_TPROXY=m -+CONFIG_NFT_DUP_NETDEV=m -+CONFIG_NFT_FWD_NETDEV=m -+CONFIG_NFT_FIB_NETDEV=m - CONFIG_NETFILTER_XT_SET=m - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m - CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -@@ -220,6 +247,14 @@ CONFIG_IP_VS_SED=m - CONFIG_IP_VS_NQ=m - CONFIG_IP_VS_FTP=m - CONFIG_IP_VS_PE_SIP=m -+CONFIG_NFT_CHAIN_ROUTE_IPV4=m -+CONFIG_NFT_DUP_IPV4=m -+CONFIG_NFT_FIB_IPV4=m -+CONFIG_NF_TABLES_ARP=y -+CONFIG_NF_LOG_ARP=m -+CONFIG_NFT_CHAIN_NAT_IPV4=m -+CONFIG_NFT_MASQ_IPV4=m -+CONFIG_NFT_REDIR_IPV4=m - CONFIG_IP_NF_IPTABLES=m - CONFIG_IP_NF_MATCH_AH=m - CONFIG_IP_NF_MATCH_ECN=m -@@ -239,6 +274,12 @@ CONFIG_IP_NF_RAW=m - CONFIG_IP_NF_ARPTABLES=m - CONFIG_IP_NF_ARPFILTER=m - CONFIG_IP_NF_ARP_MANGLE=m -+CONFIG_NFT_CHAIN_ROUTE_IPV6=m -+CONFIG_NFT_CHAIN_NAT_IPV6=m -+CONFIG_NFT_MASQ_IPV6=m -+CONFIG_NFT_REDIR_IPV6=m -+CONFIG_NFT_DUP_IPV6=m -+CONFIG_NFT_FIB_IPV6=m - CONFIG_IP6_NF_IPTABLES=m - CONFIG_IP6_NF_MATCH_AH=m - CONFIG_IP6_NF_MATCH_EUI64=m -@@ -257,6 +298,9 @@ CONFIG_IP6_NF_RAW=m - CONFIG_IP6_NF_NAT=m - CONFIG_IP6_NF_TARGET_MASQUERADE=m - CONFIG_IP6_NF_TARGET_NPT=m -+CONFIG_NF_TABLES_BRIDGE=y -+CONFIG_NFT_BRIDGE_REJECT=m -+CONFIG_NF_LOG_BRIDGE=m - CONFIG_BRIDGE_NF_EBTABLES=m - CONFIG_BRIDGE_EBT_BROUTE=m - CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index a406f6a1178..22a1eec8e53 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -1,23 +1,23 @@ # 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 4.19: +# official Raspbian distribution. This is currently 5.4: # -# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=224931 +# https://www.raspberrypi.org/forums/viewtopic.php?f=29&t=269769 -_githash="abaa3760da89d6fb38e55473fffc9a31dd0b1d7a" +_githash="1e6f676b6946c01b9c3f217426e83e0761d34b9f" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=4.19.127 -revision=3 +version=5.4.59 +revision=1 wrksrc="linux-${_githash}" maintainer="Peter Bui " homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="The Linux kernel for Raspberry Pi (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=b7345333ee90949dabc8e7fa184c443dc43781bdd3703e2203ad084274b50f24 +checksum=195d7326c033747558061265f6f32b61dfadb45d9cea210a7fd745773e16ed6b python_version=2 _kernver="${version}_${revision}" From 69516702a52435b0ea8c1d6632f00c4828ca5212 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Sun, 23 Aug 2020 23:09:14 -0400 Subject: [PATCH 2/2] rpi-firmware: update to 20200819. [ci skip] --- srcpkgs/rpi-firmware/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index faa8fa28222..10e7ca7d089 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -1,9 +1,9 @@ # Template file for 'rpi-firmware' -_githash="5574077183389cd4c65077ba18b59144ed6ccd6d" +_githash="f293685f683c48b1872beeb38c2f7da1f46141a0" _gitshort="${_githash:0:7}" pkgname=rpi-firmware -version=20200326 +version=20200819 revision=1 archs=noarch wrksrc="firmware-${_githash}" @@ -12,7 +12,7 @@ maintainer="Peter Bui " license="BSD-3-Clause, custom:Cypress" homepage="https://github.com/raspberrypi/firmware" distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz" -checksum=0596505f529677906fed30e6c3c1d2387a5d287f668a719484e2f9d8a3059176 +checksum=dd825e8ccbd524182f7e06c5301f2ed2f8a68200e80cf61b1095271dcfbe0e55 conf_files="/boot/cmdline.txt /boot/config.txt"