From d3adfbdf2619285ca44390d1141ea8e1eb1927f0 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mar 13 2019 10:55:37 +0000 Subject: Import 4.19 from redsleeve --- diff --git a/.gitignore b/.gitignore index 261d45c..ca71a8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ SOURCES/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f] SOURCES/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].zip +SOURCES/[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].tar.gz SOURCES/patch-*.xz BUILD/ BUILDROOT/ diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata index 770f710..b4bb27f 100644 --- a/.raspberrypi2.metadata +++ b/.raspberrypi2.metadata @@ -1,8 +1,2 @@ -0c408a3d3c3109e46e49b6f6855162f4d73d1294 SOURCES/5d63a4595d32a8505590d5fea5c4ec1ca79fd49d -10876526d8d5d6efee6d1d7b0a2e00f9323838bd SOURCES/83977fe3b6ef54c1d29c83b0a778d330f523441f -d899d197a41382c50fab113787b9788ba10e8b66 SOURCES/patch-4.14.100-101.xz -c2494e145278e7ff6d218815c0c1d44ad0a26040 SOURCES/patch-4.14.101-102.xz -ced2cbf884317bdb9501d11ac849dec38fb73db1 SOURCES/patch-4.14.102-103.xz -7c6c1429a74ebddd1a52612fcfa24d8e88487a1a SOURCES/patch-4.14.103-104.xz -8a6efa04d0de9b7aaa176c2873600a53244a7b3e SOURCES/patch-4.14.98-99.xz -d0e71a944598cf0c3078ce25177c6de80651ff9d SOURCES/patch-4.14.99-100.xz +ceaaa00bce499049cbe6941d7a3c8499395c0622 SOURCES/089ae6dda1d91d39f21e223a6413d552be798bce.tar.gz +07afb61a12a4c1a38685923773634310c83ec72e SOURCES/fd15e0700e45d9b7db83e30696aba299b9f2f31d.tar.gz diff --git a/SOURCES/bcm2709_selinux_config.patch b/SOURCES/bcm2709_selinux_config.patch index 1939438..44260e7 100644 --- a/SOURCES/bcm2709_selinux_config.patch +++ b/SOURCES/bcm2709_selinux_config.patch @@ -1,40 +1,73 @@ -From 4da6c7570cdc636eb362e18328ba7da4402fa60f Mon Sep 17 00:00:00 2001 -From: Fabian Arrotin -Date: Tue, 15 Mar 2016 13:48:56 +0000 -Subject: [PATCH] Added selinux support - ---- - arch/arm/configs/bcm2709_defconfig | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig -index 39f9a11..824bf1a 100644 ---- a/arch/arm/configs/bcm2709_defconfig -+++ b/arch/arm/configs/bcm2709_defconfig -@@ -1379,3 +1379,23 @@ CONFIG_CRYPTO_SHA512_ARM_NEON=m - CONFIG_CRYPTO_AES_ARM_BS=m - CONFIG_CRC_ITU_T=y - CONFIG_LIBCRC32C=y +--- a/arch/arm/configs/bcm2709_defconfig 2019-02-25 18:12:55.000000000 +0100 ++++ b/arch/arm/configs/bcm2709_defconfig 2019-03-05 22:48:38.395025344 +0100 +@@ -2,6 +2,7 @@ + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +CONFIG_AUDIT=y -+CONFIG_AUDITSYSCALL=y -+CONFIG_AUDIT_WATCH=y -+CONFIG_AUDIT_TREE=y + CONFIG_GENERIC_IRQ_DEBUGFS=y + CONFIG_NO_HZ=y + CONFIG_HIGH_RES_TIMERS=y +@@ -119,6 +120,7 @@ + CONFIG_IPV6_MROUTE=y + CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y + CONFIG_IPV6_PIMSM_V2=y +CONFIG_NETLABEL=y + CONFIG_NETFILTER=y + CONFIG_NF_CONNTRACK=m + CONFIG_NF_CONNTRACK_ZONES=y +@@ -136,6 +138,7 @@ + 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 +@@ -238,6 +241,7 @@ + CONFIG_IP_NF_TARGET_ECN=m + CONFIG_IP_NF_TARGET_TTL=m + CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_SECURITY=m + CONFIG_IP_NF_ARPTABLES=m + CONFIG_IP_NF_ARPFILTER=m + CONFIG_IP_NF_ARP_MANGLE=m +@@ -256,6 +260,7 @@ + CONFIG_IP6_NF_TARGET_REJECT=m + CONFIG_IP6_NF_MANGLE=m + CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_SECURITY=m -+CONFIG_NETFILTER_XT_TARGET_AUDIT=m + CONFIG_IP6_NF_NAT=m + CONFIG_IP6_NF_TARGET_MASQUERADE=m + CONFIG_IP6_NF_TARGET_NPT=m +@@ -1262,6 +1267,7 @@ + CONFIG_NILFS2_FS=m + CONFIG_F2FS_FS=y + CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y + CONFIG_QFMT_V1=m + CONFIG_QFMT_V2=m + CONFIG_AUTOFS4_FS=y +@@ -1303,6 +1309,7 @@ + CONFIG_NFSD=m + CONFIG_NFSD_V3_ACL=y + CONFIG_NFSD_V4=y +CONFIG_NFSD_V4_SECURITY_LABEL=y + CONFIG_CIFS=m + CONFIG_CIFS_WEAK_PW_HASH=y + CONFIG_CIFS_UPCALL=y +@@ -1351,7 +1358,14 @@ + CONFIG_NLS_KOI8_R=m + CONFIG_NLS_KOI8_U=m + CONFIG_DLM=m +CONFIG_SECURITY=y + # CONFIG_SECURITYFS is not set +CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_PATH=y -+CONFIG_LSM_MMAP_MIN_ADDR=32768 +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_DISABLE=y -+CONFIG_SECURITY_SELINUX_DEVELOP=y -+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 --- -1.8.3.1 - + CONFIG_CRYPTO_USER=m + CONFIG_CRYPTO_CBC=y + CONFIG_CRYPTO_CTS=m diff --git a/SOURCES/raspberrypi-upstream.patch b/SOURCES/raspberrypi-upstream.patch deleted file mode 100644 index 4ccb4fc..0000000 --- a/SOURCES/raspberrypi-upstream.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 35edb61a12847fbd800281e3b8226aac14c85706 Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Wed, 16 Jan 2019 12:22:32 +0100 -Subject: [PATCH] bcm2835-mmc: Fix DMA channel leak - -The BCM2835 MMC host driver requests a DMA channel on probe but neglects -to release the channel in the probe error path and on driver unbind. - -I'm seeing this happen on every boot of the Compute Module 3: On first -driver probe, DMA channel 2 is allocated and then leaked with a "could -not get clk, deferring probe" message. On second driver probe, channel 4 -is allocated. - -Fix it. - -Signed-off-by: Lukas Wunner -Cc: Frank Pavlic ---- - drivers/mmc/host/bcm2835-mmc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index b7f5fd96ecb6c..6c37fb0b57135 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -1505,6 +1505,8 @@ static int bcm2835_mmc_probe(struct platform_device *pdev) - - return 0; - err: -+ if (host->dma_chan_rxtx) -+ dma_release_channel(host->dma_chan_rxtx); - mmc_free_host(mmc); - - return ret; -@@ -1550,6 +1552,9 @@ static int bcm2835_mmc_remove(struct platform_device *pdev) - - tasklet_kill(&host->finish_tasklet); - -+ if (host->dma_chan_rxtx) -+ dma_release_channel(host->dma_chan_rxtx); -+ - mmc_free_host(host->mmc); - platform_set_drvdata(pdev, NULL); - -From c2d680f8bc195dd8456bc191178de27a178199d7 Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Sat, 19 Jan 2019 08:06:48 +0100 -Subject: [PATCH] bcm2835-mmc: Fix struct mmc_host leak on probe - -The BCM2835 MMC host driver requests the bus address of the host's -register map on probe. If that fails, the driver leaks the struct -mmc_host allocated earlier. - -Fix it. - -Signed-off-by: Lukas Wunner -Cc: Frank Pavlic ---- - drivers/mmc/host/bcm2835-mmc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index 6c37fb0b57135..64abe5d6aec1a 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -1441,7 +1441,8 @@ static int bcm2835_mmc_probe(struct platform_device *pdev) - addr = of_get_address(node, 0, NULL, NULL); - if (!addr) { - dev_err(dev, "could not get DMA-register address\n"); -- return -ENODEV; -+ ret = -ENODEV; -+ goto err; - } - host->bus_addr = be32_to_cpup(addr); - pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n", -From c60ad3359c42bbc20c02fbb61bd4f7f2a8b2e360 Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Sat, 19 Jan 2019 09:00:26 +0100 -Subject: [PATCH] bcm2835-mmc: Fix duplicate free_irq() on remove - -The BCM2835 MMC host driver requests its interrupt as a device-managed -resource, so the interrupt is automatically freed after the driver is -unbound. - -However on driver unbind, bcm2835_mmc_remove() frees the interrupt -explicitly to avoid invocation of the interrupt handler after driver -structures have been torn down. - -The interrupt is thus freed twice, leading to a WARN splat in -__free_irq(). Fix by not requesting the interrupt as a device-managed -resource. - -Signed-off-by: Lukas Wunner -Cc: Frank Pavlic ---- - drivers/mmc/host/bcm2835-mmc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index 64abe5d6aec1a..9a3654d1836c4 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -1391,9 +1391,9 @@ static int bcm2835_mmc_add_host(struct bcm2835_host *host) - init_waitqueue_head(&host->buf_ready_int); - - bcm2835_mmc_init(host, 0); -- ret = devm_request_threaded_irq(dev, host->irq, bcm2835_mmc_irq, -- bcm2835_mmc_thread_irq, IRQF_SHARED, -- mmc_hostname(mmc), host); -+ ret = request_threaded_irq(host->irq, bcm2835_mmc_irq, -+ bcm2835_mmc_thread_irq, IRQF_SHARED, -+ mmc_hostname(mmc), host); - if (ret) { - dev_err(dev, "Failed to request IRQ %d: %d\n", host->irq, ret); - goto untasklet; -From f7837b0daf0e9ef899da0271391c91bdfe488fb6 Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Tue, 22 Jan 2019 12:29:45 +0100 -Subject: [PATCH] bcm2835-mmc: Handle mmc_add_host() errors - -The BCM2835 MMC host driver calls mmc_add_host() but doesn't check its -return value. Errors occurring in that function are therefore not -handled. Fix it. - -Signed-off-by: Lukas Wunner -Cc: Frank Pavlic ---- - drivers/mmc/host/bcm2835-mmc.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index 9a3654d1836c4..b9f7b6d45999e 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -1400,10 +1400,16 @@ static int bcm2835_mmc_add_host(struct bcm2835_host *host) - } - - mmiowb(); -- mmc_add_host(mmc); -+ ret = mmc_add_host(mmc); -+ if (ret) { -+ dev_err(dev, "could not add MMC host\n"); -+ goto free_irq; -+ } - - return 0; - -+free_irq: -+ free_irq(host->irq, host); - untasklet: - tasklet_kill(&host->finish_tasklet); - -From d4c5c9d8d0dc5c344655e31046a558372f0e50c6 Mon Sep 17 00:00:00 2001 -From: Lukas Wunner -Date: Sat, 19 Jan 2019 08:42:40 +0100 -Subject: [PATCH] bcm2835-mmc: Deduplicate reset of driver data on remove - -The BCM2835 MMC host driver sets the device's driver data pointer to -NULL on ->remove() even though the driver core subsequently does the -same in __device_release_driver(). Drop the duplicate assignment. - -Signed-off-by: Lukas Wunner -Cc: Frank Pavlic ---- - drivers/mmc/host/bcm2835-mmc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c -index b9f7b6d45999e..98a2d807b6acb 100644 ---- a/drivers/mmc/host/bcm2835-mmc.c -+++ b/drivers/mmc/host/bcm2835-mmc.c -@@ -1563,7 +1563,6 @@ static int bcm2835_mmc_remove(struct platform_device *pdev) - dma_release_channel(host->dma_chan_rxtx); - - mmc_free_host(host->mmc); -- platform_set_drvdata(pdev, NULL); - - return 0; - } -From 877656cd145497db7c09a7de06ea85db98bd72a3 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Mon, 18 Feb 2019 15:43:30 +0000 -Subject: [PATCH] Revert "brcmfmac: Mute expected startup 'errors'" - -This reverts commit 34eba9138ccf8d84552ab9dae37d8f348640e663. - -Upstream patch 26e537884a ("brcmfmac: Do not complain about country code "00") -fixes the same issue, so drop this downstream patch. - -Signed-off-by: Phil Elwell ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 2b671d03387b9..48733c5f343da 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6890,8 +6890,6 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, - /* ignore non-ISO3166 country codes */ - for (i = 0; i < 2; i++) - if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { -- if (req->alpha2[0] == '0' && req->alpha2[1] == '0') -- return; - brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n", - req->alpha2[0], req->alpha2[1]); - return; diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec index 50395bc..6717f8d 100644 --- a/SPECS/raspberrypi2.spec +++ b/SPECS/raspberrypi2.spec @@ -1,23 +1,21 @@ -%global commit_firmware_long 83977fe3b6ef54c1d29c83b0a778d330f523441f -%global commit_firmware_short %(c=%{commit_firmware_long}; echo ${c:0:7}) -#wget https://github.com/raspberrypi/firmware/tarball/%{commit_firmware_long} -%global commit_linux_long 5d63a4595d32a8505590d5fea5c4ec1ca79fd49d -%global commit_linux_short %(c=%{commit_linux_long}; echo ${c:0:7}) -#wget https://github.com/raspberrypi/linux/tarball/%{commit_linux_long} +%global commit_firmware_long fd15e0700e45d9b7db83e30696aba299b9f2f31d +#%global commit_firmware_short %(c=%{commit_firmware_long}; echo ${c:0:7}) +%global commit_linux_long 089ae6dda1d91d39f21e223a6413d552be798bce +#%global commit_linux_short %(c=%{commit_linux_long}; echo ${c:0:7}) %define Arch arm %define local_version v7 %define extra_version 1 Name: raspberrypi2 -Version: 4.14.104 +Version: 4.19.27 Release: %{local_version}.%{extra_version}%{?dist} Summary: Specific kernel and bootcode for Raspberry Pi License: GPLv2 URL: https://github.com/raspberrypi/linux -Source0: https://github.com/raspberrypi/linux/tarball/%{commit_linux_long} -Source1: https://github.com/raspberrypi/firmware/tarball/%{commit_firmware_long} +Source0: https://github.com/raspberrypi/linux/archive/%{commit_linux_long}.tar.gz +Source1: https://github.com/raspberrypi/firmware/archive/%{commit_firmware_long}.tar.gz 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 @@ -25,17 +23,10 @@ BuildRequires: net-tools, hostname, bc BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison flex xz-devel BuildRequires: audit-libs-devel BuildRequires: pciutils-devel gettext ncurses-devel +BuildRequires: openssl-devel # Compile with SELinux but disable per default Patch0: bcm2709_selinux_config.patch -Patch1: patch-4.14.98-99.xz -Patch2: patch-4.14.99-100.xz -Patch3: patch-4.14.100-101.xz -Patch4: patch-4.14.101-102.xz -Patch5: patch-4.14.102-103.xz -Patch6: patch-4.14.103-104.xz - -Patch100: raspberrypi-upstream.patch %description Specific kernel and bootcode for Raspberry Pi @@ -58,7 +49,6 @@ input and output, etc. Group: System Environment/Kernel Summary: Development package for building kernel modules to match the kernel Provides: kernel-devel = %{version}-%{release} -Provides: kernel-devel-uname-r = %{version}-%{release} %description kernel-devel This package provides kernel headers and makefiles sufficient to build modules @@ -86,33 +76,26 @@ including the kernel bootloader. %prep -%setup -q -n raspberrypi-linux-%{commit_linux_short} +%setup -q -n linux-%{commit_linux_long} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -%patch100 -p1 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}/" Makefile perl -p -i -e "s/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=/" arch/%{Arch}/configs/bcm2709_defconfig %build export KERNEL=kernel7 make bcm2709_defconfig -make -j4 zImage modules dtbs +make %{?_smp_mflags} zImage modules dtbs %install # 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 +cp -p -v COPYING %{buildroot}/boot/COPYING.linux-4.19 cp -p -v arch/%{Arch}/boot/dts/*.dtb %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot cp -p -v arch/%{Arch}/boot/dts/overlays/*.dtb* %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays cp -p -v arch/%{Arch}/boot/dts/overlays/README %{buildroot}/usr/share/%{name}-kernel/%{version}-%{release}/boot/overlays -scripts/mkknlimg arch/%{Arch}/boot/zImage %{buildroot}/boot/kernel-%{version}-%{release}.img +#scripts/mkknlimg arch/%{Arch}/boot/zImage %{buildroot}/boot/kernel-%{version}-%{release}.img +cp -p -v arch/%{Arch}/boot/zImage %{buildroot}/boot/kernel-%{version}-%{release}.img make INSTALL_MOD_PATH=%{buildroot} modules_install # kernel-devel @@ -154,11 +137,11 @@ ln -T -s build %{buildroot}/lib/modules/%{version}-%{release}/source --force # firmware # precompiled GPU firmware and bootloader pushd %{buildroot} -tar -xf %{_sourcedir}/%{commit_firmware_long} \ - raspberrypi-firmware-%{commit_firmware_short}/boot/start* \ - raspberrypi-firmware-%{commit_firmware_short}/boot/fixup* \ - raspberrypi-firmware-%{commit_firmware_short}/boot/LICENCE.broadcom \ - raspberrypi-firmware-%{commit_firmware_short}/boot/bootcode.bin \ +tar -xf %{_sourcedir}/%{commit_firmware_long}.tar.gz \ + firmware-%{commit_firmware_long}/boot/start* \ + firmware-%{commit_firmware_long}/boot/fixup* \ + firmware-%{commit_firmware_long}/boot/LICENCE.broadcom \ + firmware-%{commit_firmware_long}/boot/bootcode.bin \ --strip-components=1 popd @@ -171,7 +154,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 +%doc /boot/COPYING.linux-4.19 %posttrans kernel @@ -187,6 +170,7 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/*.dtb /boot/ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/*.dtb* /boot/overlays/ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README /boot/overlays/ + %files kernel-devel %defattr(-,root,root) /usr/src/kernels/%{version}-%{release} @@ -205,90 +189,86 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README %doc /boot/LICENCE.broadcom %changelog -* Sun Mar 2 2019 Pablo Greco - 4.14.104-v1.el7 -- Rebase to LTS 4.14.104 -- Fix postun script (https://lists.centos.org/pipermail/arm-dev/2019-March/003748.html) - -* Sun Feb 24 2019 Pablo Greco - 4.14.103-v1.el7 -- Rebase to LTS 4.14.103 -- Add README to /boot/overlays to fix userspace tool - -* Fri Feb 15 2019 Pablo Greco - 4.14.101-v1.el7 -- Rebase to LTS 4.14.101 +* Sat Mar 09 2019 Jacco Ligthart - 4.19.27-v7.1.el7 +- update to version 4.19.27 +- added 'sort -V' to the scripts +- changed download location from 'tarball' to 'archive' +- moves from 'post' script to 'posttrans' +- moved 'COPYING.linux' to 'COPYING.linux-4.19' +- added 'README' to the overlays dir -* Thu Jan 17 2019 Pablo Greco - 4.14.94-v1.el7 -- Rebase to LTS 4.14.94 +* Thu Dec 20 2018 Jacco Ligthart - 4.14.89-v7.1.el7 +- update to version 4.14.89 -* Sat Dec 29 2018 Pablo Greco - 4.14.91-v1.el7 -- Rebase to LTS 4.14.91 +* Wed Oct 10 2018 Jacco Ligthart - 4.14.74-v7.1.el7 +- update to version 4.14.74 -* Wed Nov 21 2018 Pablo Greco - 4.14.82-v1.el7 -- Rebase to LTS 4.14.82 +* Fri Aug 10 2018 Jacco Ligthart - 4.14.61-v7.1.el7 +- update to version 4.14.61 -* Sat Oct 20 2018 Pablo Greco - 4.14.78-v1.el7 -- Rebase to LTS 4.14.78 +* Fri Jun 15 2018 Jacco Ligthart - 4.14.49-v7.1.el7 +- update to version 4.14.49 -* Thu Oct 18 2018 Pablo Greco - 4.14.77-v1.el7 -- Rebase to LTS 4.14.77 +* Thu May 24 2018 Jacco Ligthart - 4.14.42-v7.1.el7 +- update to version 4.14.42 +- stop makeing the kernel-firmware subpackage -* Wed Sep 19 2018 Pablo Greco - 4.14.71-v1.el7 -- Rebase to LTS 4.14.71 +* Fri Mar 16 2018 Jacco Ligthart - 4.9.80-v7.2.el7 +- update to latest git for raspberry pi 3 B+ support -* Mon Aug 20 2018 Pablo Greco - 4.14.65-v1.el7 -- updated to 4.14.65 +* Wed Feb 28 2018 Jacco Ligthart - 4.9.80-v7.1.el7 +- update to version 4.9.80, probably the last in the 4.9 series -* Tue Aug 7 2018 Pablo Greco - 4.14.61-v1.el7 -- updated to 4.14.61 +* Sat Jan 27 2018 Jacco Ligthart - 4.9.78-v7.1.el7 +- update to version 4.9.78 -* Mon Jul 30 2018 Pablo Greco - 4.14.58-v1.el7 -- updated to 4.14.58 -- added kernel-devel-uname-r +* Sun Dec 17 2017 Jacco Ligthart - 4.9.69-v7.1.el7 +- update to version 4.9.69 -* Thu Jun 28 2018 Fabian Arrotin - 4.14.52-v1.el7 -- updated to 4.14.52 (fixes CVE-2018-5803) +* Mon Nov 27 2017 Jacco Ligthart - 4.9.65-v7.1.el7 +- update to version 4.9.65 -* Sat May 26 2018 Fabian Arrotin - 4.14.43-v1.el7 -- updated to 4.14.43 +* Sun Oct 29 2017 Jacco Ligthart - 4.9.59-v7.1.el7 +- update to version 4.9.59 -* Sun Mar 18 2018 Fabian Arrotin - 4.14.27-v1.el7 -- Bumped to 4.14.x LTS branch (used now by rpi foundation too) +* Mon Oct 02 2017 Jacco Ligthart - 4.9.52-v7.1.el7 +- update to version 4.9.52 -* Thu Mar 15 2018 Fabian Arrotin - 4.9.80-v1.el7 -- updated to 4.9.80 LTS -- initial DTS support for rpi3 model B +* Thu Aug 17 2017 Jacco Ligthart - 4.9.43-v7.1.el7 +- update to version 4.9.43 -* Tue Jan 9 2018 Fabian Arrotin - 4.9.75-v1.el7 -- updated to 4.9.75 LTS +* Sat Jul 22 2017 Jacco Ligthart - 4.9.39-v7.1.el7 +- update to version 4.9.39 -* Tue Dec 19 2017 Fabian Arrotin - 4.9.70-v1.el7 -- updated to 4.9.70 (fixes CVE-2017-1000407 , CVE-2017-0861) +* Sat Jul 01 2017 Jacco Ligthart - 4.9.35-v7.1.el7 +- update to version 4.9.35 -* Thu Nov 23 2017 Fabian Arrotin - 4.9.63-v1.el7 -- updated to 4.9.64 +* Mon Jun 19 2017 Jacco Ligthart - 4.9.33-v7.1.el7 +- update to version 4.9.33 -* Thu Sep 14 2017 Fabian Arrotin - 4.9.50-v1.el7 -- updated to 4.9.50 (fixes CVE-2017-1000250) +* Mon Jun 05 2017 Jacco Ligthart - 4.9.30-v7.1.el7 +- update to version 4.9.30 -* Tue Aug 8 2017 Fabian Arrotin - 4.9.40-v1.el7 -- updated to 4.9.40 +* Fri May 12 2017 Jacco Ligthart - 4.9.27-v7.1.el7 +- update to version 4.9.27 -* Tue Jun 6 2017 Fabian Arrotin - 4.9.30-v1.el7 -- updated to 4.9.30 (LTS) +* Wed Apr 19 2017 Jacco Ligthart - 4.9.23-v7.1.el7 +- update to version 4.9.23 -* Mon Feb 27 2017 Fabian Arrotin - 4.9.13-v1.el7 -- update to 4.9.13 (include dccp fix, even if not in rpi config) +* Thu Mar 30 2017 Jacco Ligthart - 4.9.19-v7.1.el7 +- update to version 4.9.19 -* Sat Feb 25 2017 Fabian Arrotin - 4.9.12-v1.el7 -- rebase to LTS 4.9.x (to follow rpi foundation) +* Wed Mar 15 2017 Jacco Ligthart - 4.9.14-v7.1.el7 +- update tp version 4.9.14 -* Thu Feb 23 2017 Fabian Arrotin - 4.4.50-v7.1.el7 -- update to 4.4.50 +* Mon Feb 27 2017 Jacco Ligthart - 4.9.13-v7.1.el7 +- update to version 4.9.13 -* Fri Jan 13 2017 Fabian Arrotin - 4.4.41-v7.1.el7 -- update to upstream version 4.4.41 +* Sat Dec 24 2016 Jacco Ligthart - 4.4.39-v7.1.el7 +- update to version 4.4.39 -* Mon Nov 21 2016 Fabian Arrotin - 4.4.33-v7.1.el7 -- update to upstream version 4.4.33 +* Wed Nov 16 2016 Jacco Ligthart - 4.4.32-v7.1.el7 +- update to version 4.4.32 * Fri Oct 21 2016 Jacco Ligthart - 4.4.26-v7.1.el7 - update to version 4.4.26 which includes a fix for CVE-2016-5195