From a0523750de4fa5ac68442f66a81aaa482b81045e Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 21 2020 12:05:24 +0000 Subject: Update to 5.4.42 --- diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 2b4b810..1e95cd4 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,3 +1,2 @@ -66754dcbf140f36f933e47845d1890c5ae4e336e SOURCES/a5eaf73c42b06af4e8ec52755fdfa1cad05a4ac8.tar.gz -7d0f74c6edd7cdf4ab266e10a795d4650e1aa94f SOURCES/7eff9f6774bb43bfd61e749a0b45ffddc98c2311.tar.gz -795b1af45e56d6453bcb4a572b084c42aceecdd0 SOURCES/patch-centos-5.4.35-38.xz +001d830c7a7d6c851150a7ff31af14dfc4dae42c SOURCES/971a2bb14b459819db1bda8fcdf953e493242b42.tar.gz +4bfa240f609469081c7d772966359615f3ac194a SOURCES/27ba5b9e5aab4a750bb69554aa92c4df53544d80.tar.gz diff --git a/SOURCES/bcm2709_selinux_config.patch b/SOURCES/bcm2709_selinux_config.patch index b37ca8c..2508f9e 100644 --- a/SOURCES/bcm2709_selinux_config.patch +++ b/SOURCES/bcm2709_selinux_config.patch @@ -1,7 +1,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig --- a/arch/arm/configs/bcm2709_defconfig 2020-03-20 16:51:27.175254408 +0000 +++ b/arch/arm/configs/bcm2709_defconfig 2020-03-20 16:53:31.404025537 +0000 -@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION= +@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v7" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -9,7 +9,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -115,6 +116,7 @@ CONFIG_IPV6_SUBTREES=y +@@ -121,6 +122,7 @@ CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y @@ -17,7 +17,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -162,6 +164,7 @@ CONFIG_NFT_FIB_NETDEV=m +@@ -168,6 +170,7 @@ CONFIG_NFT_FIB_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_SET=m @@ -25,7 +25,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -@@ -269,6 +272,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -275,6 +278,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m @@ -33,7 +33,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -290,6 +294,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -296,6 +300,7 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -41,7 +41,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1329,6 +1334,7 @@ CONFIG_NILFS2_FS=m +@@ -1340,6 +1345,7 @@ CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FS_ENCRYPTION=y CONFIG_FANOTIFY=y @@ -49,7 +49,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1371,6 +1377,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1382,6 +1388,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -57,7 +57,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1418,7 +1425,14 @@ CONFIG_NLS_ISO8859_15=m +@@ -1429,7 +1436,14 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -72,7 +72,7 @@ diff -Naurp a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defc CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1447,3 +1461,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1458,3 +1472,9 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_KGDB=y CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y diff --git a/SOURCES/bcm2711_selinux_config.patch b/SOURCES/bcm2711_selinux_config.patch index a67de6d..e0f848b 100644 --- a/SOURCES/bcm2711_selinux_config.patch +++ b/SOURCES/bcm2711_selinux_config.patch @@ -9,7 +9,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -121,6 +122,7 @@ CONFIG_IPV6_SUBTREES=y +@@ -124,6 +125,7 @@ CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y @@ -17,15 +17,15 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -138,6 +140,7 @@ CONFIG_NF_CONNTRACK_SIP=m - CONFIG_NF_CONNTRACK_TFTP=m - CONFIG_NF_CT_NETLINK=m +@@ -171,6 +173,7 @@ CONFIG_NFT_FIB_NETDEV=m + CONFIG_NF_FLOW_TABLE_INET=m + CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_SET=m +CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -@@ -241,6 +244,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -278,6 +281,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m @@ -33,7 +33,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -259,6 +263,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -299,6 +303,7 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -41,7 +41,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1329,6 +1334,7 @@ CONFIG_NILFS2_FS=m +@@ -1378,6 +1383,7 @@ CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FS_ENCRYPTION=y CONFIG_FANOTIFY=y @@ -49,7 +49,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1371,6 +1377,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1420,6 +1426,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -57,7 +57,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1419,6 +1426,13 @@ CONFIG_NLS_ISO8859_15=m +@@ -1468,6 +1475,13 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -71,7 +71,7 @@ diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defc CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1447,3 +1461,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1496,3 +1510,9 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_KGDB=y CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y @@ -92,7 +92,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -119,6 +120,7 @@ CONFIG_IPV6_SUBTREES=y +@@ -123,6 +124,7 @@ CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y @@ -100,7 +100,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -166,6 +168,7 @@ CONFIG_NFT_FIB_NETDEV=m +@@ -170,6 +172,7 @@ CONFIG_NFT_FIB_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_SET=m @@ -108,7 +108,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -@@ -273,6 +276,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -277,6 +280,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m @@ -116,7 +116,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -294,6 +298,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -298,6 +302,7 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -124,7 +124,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1356,6 +1361,7 @@ CONFIG_NILFS2_FS=m +@@ -1369,6 +1374,7 @@ CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FS_ENCRYPTION=y CONFIG_FANOTIFY=y @@ -132,7 +132,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1398,6 +1404,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1411,6 +1417,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -140,7 +140,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1446,6 +1453,13 @@ CONFIG_NLS_ISO8859_15=m +@@ -1459,6 +1466,13 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -154,7 +154,7 @@ diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_ CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1473,3 +1487,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1486,3 +1500,9 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_KGDB=y CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index ccfa0d5..34c077c 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,5 +1,5 @@ -%global commit_firmware_long 7eff9f6774bb43bfd61e749a0b45ffddc98c2311 -%global commit_linux_long a5eaf73c42b06af4e8ec52755fdfa1cad05a4ac8 +%global commit_firmware_long 27ba5b9e5aab4a750bb69554aa92c4df53544d80 +%global commit_linux_long 971a2bb14b459819db1bda8fcdf953e493242b42 ExclusiveArch: aarch64 armv7hl @@ -41,8 +41,6 @@ URL: https://github.com/raspberrypi/linux Source0: https://github.com/raspberrypi/linux/archive/%{commit_linux_long}.tar.gz Source1: https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz -Patch54038: patch-centos-5.4.35-38.xz - BuildRequires: kmod, patch, bash, sh-utils, tar BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc @@ -116,8 +114,6 @@ including the kernel bootloader. %patch0 -p1 %patch1 -p1 -%patch54038 -p1 - perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm%{bcmmodel}_defconfig @@ -246,6 +242,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Thu May 21 2020 Pablo Greco - 5.4.42 +- Update to version v5.4.38 + * Sun May 3 2020 Pablo Greco - 5.4.38 - Update to version v5.4.38