diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index d9dca5a..0c87027 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,4 +1,2 @@ -71d37eea250fee076ae28aa51542f5aa82cb127a SOURCES/2fab54c74bf956951e61c6d4fe473995e8d07010.tar.gz +145855409b8fedf39acbf7058ba0eaf40f00c03a SOURCES/d89b3f22cf7b6bba8081f6d16c9087019fdcf586.tar.gz b9d628cb0c1307eac2b7b599e786eec9bb61a2ae SOURCES/9e2193537c48abf8225e02e15e319a209cca558a.tar.gz -a2199e5fb76d17e7d1334896cc38b4f3661870bf SOURCES/patch-4.19.108-109.xz -ec3e4a77c8405fa29c2f1b15fb64a93cc93cf988 SOURCES/patch-4.19.109-110.xz diff --git a/SOURCES/bcm2709_selinux_config.patch b/SOURCES/bcm2709_selinux_config.patch index 1a4fd4b..935249a 100644 --- a/SOURCES/bcm2709_selinux_config.patch +++ b/SOURCES/bcm2709_selinux_config.patch @@ -1,6 +1,7 @@ ---- a/arch/arm/configs/bcm2709_defconfig 2019-06-13 09:02:10.000000000 +0000 -+++ b/arch/arm/configs/bcm2709_defconfig 2019-06-15 11:15:24.095024052 +0000 -@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v7" +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= # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -8,7 +9,7 @@ CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -122,6 +123,7 @@ CONFIG_IPV6_SUBTREES=y +@@ -115,6 +116,7 @@ CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_PIMSM_V2=y @@ -16,7 +17,7 @@ CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -169,6 +171,7 @@ CONFIG_NFT_FIB_NETDEV=m +@@ -162,6 +164,7 @@ CONFIG_NFT_FIB_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XT_SET=m @@ -24,7 +25,7 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -@@ -280,6 +283,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -269,6 +272,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m @@ -32,7 +33,7 @@ CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -305,6 +309,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -290,6 +294,7 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -40,7 +41,7 @@ CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1350,6 +1355,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y +@@ -1323,6 +1328,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y @@ -48,7 +49,7 @@ CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1392,6 +1398,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1365,6 +1371,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -56,7 +57,7 @@ CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1440,7 +1447,14 @@ CONFIG_NLS_ISO8859_15=m +@@ -1412,7 +1419,14 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -71,7 +72,7 @@ CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1467,3 +1481,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1441,3 +1455,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 044d4c7..4ab2d0a 100644 --- a/SOURCES/bcm2711_selinux_config.patch +++ b/SOURCES/bcm2711_selinux_config.patch @@ -1,6 +1,6 @@ -diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig ---- a/arch/arm/configs/bcm2711_defconfig 2019-06-25 09:04:03.000000000 +0000 -+++ b/arch/arm/configs/bcm2711_defconfig 2019-07-12 23:19:32.386788624 +0000 +diff -Naurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig +--- a/arch/arm/configs/bcm2711_defconfig 2020-03-20 11:43:40.000000000 +0000 ++++ b/arch/arm/configs/bcm2711_defconfig 2020-03-20 16:49:57.845295276 +0000 @@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v7l" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y @@ -9,7 +9,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -130,6 +131,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,15 +17,15 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -177,6 +179,7 @@ CONFIG_NFT_FIB_NETDEV=m - CONFIG_NF_FLOW_TABLE_INET=m - CONFIG_NF_FLOW_TABLE=m +@@ -138,6 +140,7 @@ CONFIG_NF_CONNTRACK_SIP=m + CONFIG_NF_CONNTRACK_TFTP=m + CONFIG_NF_CT_NETLINK=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 -@@ -288,6 +291,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -241,6 +244,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 -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -313,6 +317,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -259,6 +263,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 -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1388,6 +1393,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y +@@ -1322,6 +1327,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y @@ -49,7 +49,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1430,6 +1436,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1364,6 +1370,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -57,7 +57,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1479,6 +1486,13 @@ CONFIG_NLS_ISO8859_15=m +@@ -1412,6 +1419,13 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -71,7 +71,7 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1505,3 +1519,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1440,3 +1454,9 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_KGDB=y CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y @@ -81,10 +81,10 @@ diff -aurp a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defco +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_NET_TEAM_MODE_RANDOM=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m -diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig ---- a/arch/arm64/configs/bcm2711_defconfig 2019-11-16 13:47:33.867996642 +0000 -+++ b/arch/arm64/configs/bcm2711_defconfig 2019-11-16 13:55:19.882362227 +0000 -@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION= +diff -Naurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig +--- a/arch/arm64/configs/bcm2711_defconfig 2020-03-20 11:43:40.000000000 +0000 ++++ b/arch/arm64/configs/bcm2711_defconfig 2020-03-20 16:44:49.430793984 +0000 +@@ -2,6 +2,7 @@ CONFIG_LOCALVERSION="-v8" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y @@ -92,7 +92,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_GENERIC_IRQ_DEBUGFS=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -@@ -126,6 +127,7 @@ CONFIG_IPV6_SUBTREES=y +@@ -120,6 +121,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 -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_NETFILTER=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_ZONES=y -@@ -173,6 +175,7 @@ CONFIG_NFT_FIB_NETDEV=m +@@ -167,6 +169,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 -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -@@ -284,6 +287,7 @@ CONFIG_IP_NF_TARGET_CLUSTERIP=m +@@ -274,6 +277,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 -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -@@ -309,6 +313,7 @@ CONFIG_IP6_NF_FILTER=m +@@ -295,6 +299,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 -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_IP6_NF_NAT=m CONFIG_IP6_NF_TARGET_MASQUERADE=m CONFIG_IP6_NF_TARGET_NPT=m -@@ -1381,6 +1386,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y +@@ -1353,6 +1358,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y @@ -132,7 +132,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_AUTOFS4_FS=y -@@ -1423,6 +1429,7 @@ CONFIG_NFS_FSCACHE=y +@@ -1395,6 +1401,7 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -140,7 +140,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_CIFS=m CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y -@@ -1472,6 +1479,13 @@ CONFIG_NLS_ISO8859_15=m +@@ -1443,6 +1450,13 @@ CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_DLM=m @@ -154,7 +154,7 @@ diff -aurp a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_d CONFIG_CRYPTO_USER=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_TGR192=m -@@ -1497,3 +1511,9 @@ CONFIG_FUNCTION_PROFILER=y +@@ -1470,3 +1484,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 7f158f0..475d78d 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,7 +1,5 @@ %global commit_firmware_long 9e2193537c48abf8225e02e15e319a209cca558a -#%global commit_firmware_short %(c=%{commit_firmware_long}; echo ${c:0:7}) -%global commit_linux_long 2fab54c74bf956951e61c6d4fe473995e8d07010 -#%global commit_linux_short %(c=%{commit_linux_long}; echo ${c:0:7}) +%global commit_linux_long d89b3f22cf7b6bba8081f6d16c9087019fdcf586 ExclusiveArch: aarch64 armv7hl @@ -34,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl %define extra_version 1 Name: raspberrypi2 -Version: 4.19.110 +Version: 5.4.24 Release: %{local_version}.%{extra_version}%{?dist} Summary: Specific kernel and bootcode for Raspberry Pi @@ -43,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 -Patch109: patch-4.19.108-109.xz -Patch110: patch-4.19.109-110.xz BuildRequires: kmod, patch, bash, sh-utils, tar BuildRequires: bzip2, xz, findutils, gzip, m4, perl, perl-Carp, make, diffutils, gawk @@ -119,8 +115,6 @@ including the kernel bootloader. %patch0 -p1 %patch1 -p1 -%patch109 -p1 -%patch110 -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 @@ -147,7 +141,7 @@ make %{?_smp_mflags} %{build_image} modules dtbs # kernel mkdir -p %{buildroot}/boot/overlays/ mkdir -p %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays -cp -p -v COPYING %{buildroot}/boot/COPYING.linux-4.19 +cp -p -v COPYING %{buildroot}/boot/COPYING.linux-5.4 %ifarch aarch64 cp -p -v arch/%{Arch}/boot/dts/broadcom/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot %else @@ -215,7 +209,7 @@ popd /boot/overlays/ /usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays/* %attr(0755,root,root) /boot/kernel-%{version}-%{release}.img -%doc /boot/COPYING.linux-4.19 +%doc /boot/COPYING.linux-5.4 %posttrans kernel%{?ksuffix} @@ -250,6 +244,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog +* Mon Mar 16 2020 Pablo Greco - 5.4.24 +- Update to version v5.4.24 + * Mon Mar 16 2020 Pablo Greco - 4.19.110-v7.1.el7 - Update to version v4.19.110