X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-5.10;h=8a9cc2c57e97f7ac63af22b8e1d92723620045c5;hb=c4321796818ef79f6c8a7ec455f5d45135f7cebd;hp=4daec0ba7bb88b1580c327dbf32c0cfcdc9b072c;hpb=b6198aac466fabb662d155fe7be4e596806a9413;p=releases.git diff --git a/deblob-5.10 b/deblob-5.10 index 4daec0ba7bb8..8a9cc2c57e97 100755 --- a/deblob-5.10 +++ b/deblob-5.10 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2008-2020 Alexandre Oliva +# Copyright (C) 2008-2022 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -48,7 +48,7 @@ # For each kver release, start extra with an empty string, then count # from 1 if changes are needed that require rebuilding the tarball. -kver=5.10 extra= +kver=5.10 extra=1 case $1 in --force) @@ -387,6 +387,12 @@ What is GNU Linux-libre?\ contribution to the entire system, so its mascot deserves more\ promotion. See our web page for their images.\ http://linux-libre.fsfla.org/\ +\ + If you are the author of an awesome program and want to join us in\ + writing Free (libre) Software, please consider making it an official\ + GNU program and become a GNU Maintainer. You can find instructions\ + on how to do so at https://www.gnu.org/help/evaluation. We look\ + forward to hacking with you! :)\ ' Documentation/admin-guide/README.rst 'added blurb about GNU Linux-libre' @@ -410,9 +416,12 @@ clean_sed ' s,git://git\..*torvalds/linux\.git,/*(DEBLOBBED)*/, ' scripts/package/mkdebian 'upstream development repo' -clean_sed ' -s,Name: kernel,&-libre, -' scripts/package/mkspec 'package name' +# The tarball name and its expansion do not include -libre. +# We could change KERNELPATH and keep this, but what else would break? +# Enabling this would require the other commented-out mkspec bits below. +# clean_sed ' +# s,Name: kernel,&-libre, +# ' scripts/package/mkspec 'package name' clean_sed ' s,The Linux,The GNU Linux-libre, @@ -426,13 +435,22 @@ clean_sed ' s,https\?://www\.kernel\.org,https://linux-libre.fsfla.org, ' scripts/package/mkspec 'home page' +# clean_sed ' +# s,\(%description\) -n kernel-,\1 , +# ' scripts/package/mkspec '-libre subpackages' + +# clean_sed ' +# /Provides: kernel-/{p;s,kernel-,&libre-,;} +# ' scripts/package/mkspec '-libre provides' + +# As with rpms, we leave the package name as kernel. clean_sed ' -s,\(%description\) -n kernel-,\1 , -' scripts/package/mkspec '-libre subpackages' +s,The upstream Linux kernel,The GNU Linux-libre kernel, +' scripts/package/snapcraft.template 'description' clean_sed ' -/Provides: kernel-/{p;s,kernel-,&libre-,;} -' scripts/package/mkspec '-libre provides' +s,Linux kernel,GNU Linux-libre, +' scripts/package/snapcraft.template 'summary' # Add reject_firmware and maybe_reject_firmware grep -q _LINUX_LIBRE_FIRMWARE_H include/linux/firmware.h || @@ -447,7 +465,7 @@ clean_sed '$i\ static inline int\ is_nonfree_firmware(const char *name)\ {\ - return strstr(name, NONFREE_FIRMWARE) != 0;\ + return strstr(name, NONFREE_FIRMWARE) != 0;\ }\ \ static inline int\ @@ -463,6 +481,7 @@ firmware_reject_nowarn(const struct firmware **fw,\ {\ const struct firmware *xfw = NULL;\ int retval, retval0 = -ENOENT;\ + if (fw) *fw = xfw;\ retval = firmware_request_nowarn(&xfw, NONFREE_FIRMWARE, device);\ if (!retval) {\ release_firmware(xfw);\ @@ -497,6 +516,7 @@ reject_firmware_direct(const struct firmware **fw,\ {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (fw) *fw = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware_direct(&xfw, NONFREE_FIRMWARE, device);\ if (!retval) {\ @@ -537,6 +557,7 @@ reject_firmware_into_buf(const struct firmware **firmware_p, const char *name,\ {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (firmware_p) *firmware_p = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size);\ if (!retval) {\ @@ -560,6 +581,7 @@ reject_partial_firmware_into_buf(const struct firmware **firmware_p, const char {\ const struct firmware *xfw = NULL;\ int retval, retval0;\ + if (firmware_p) *firmware_p = xfw;\ retval0 = report_missing_free_firmware(dev_name(device), NULL);\ retval = request_partial_firmware_into_buf(&xfw, NONFREE_FIRMWARE, device, buf, size, offset);\ if (!retval) {\ @@ -613,23 +635,41 @@ s,\(timeout = \)\(firmware_loading_timeout()\),\1is_nonfree_firmware(name) ? 1 : announce MICROCODE_AMD - "AMD microcode patch loading support" reject_firmware arch/x86/kernel/cpu/microcode/amd.c clean_blob arch/x86/kernel/cpu/microcode/amd.c +if grep -q -i zenbleed.*microcode arch/x86/kernel/cpu/amd.c; then + clean_blob arch/x86/kernel/cpu/amd.c +fi clean_kconfig arch/x86/Kconfig MICROCODE_AMD clean_mk CONFIG_MICROCODE_AMD arch/x86/kernel/cpu/microcode/Makefile announce MICROCODE_INTEL - "Intel microcode patch loading support" reject_firmware arch/x86/kernel/cpu/microcode/intel.c clean_blob arch/x86/kernel/cpu/microcode/intel.c -clean_blob arch/x86/events/intel/core.c clean_kconfig arch/x86/Kconfig MICROCODE_INTEL clean_mk CONFIG_MICROCODE_INTEL arch/x86/kernel/cpu/microcode/Makefile announce MICROCODE - "CPU microcode loading support" clean_blob Documentation/x86/microcode.rst -clean_blob arch/x86/kernel/apic/apic.c -clean_blob drivers/hwmon/coretemp.c clean_kconfig arch/x86/Kconfig MICROCODE clean_mk CONFIG_MICROCODE arch/x86/kernel/cpu/Makefile +# Do no recommend non-Free microcode update. +announce X86_LOCAL_APIC - Undocumented +clean_blob arch/x86/kernel/apic/apic.c +clean_kconfig arch/x86/Kconfig X86_LOCAL_APIC +clean_mk CONFIG_X86_LOCAL_APIC arch/x86/kernel/apic/Makefile + +# Do no recommend non-Free microcode update. +announce CPU_SUP_INTEL - "Support Intel processors" +clean_blob arch/x86/events/intel/core.c +clean_kconfig arch/x86/Kconfig.cpu CPU_SUP_INTEL +clean_mk CONFIG_CPU_SUP_INTEL arch/x86/events/intel/Makefile + +# Do no recommend non-Free microcode update. +announce SENSORS_CORETEMP - "Intel Core/Core2/Atom temperature sensor" +clean_blob drivers/hwmon/coretemp.c +clean_kconfig drivers/hwmon/Kconfig SENSORS_CORETEMP +clean_mk CONFIG_SENSORS_CORETEMP drivers/hwmon/Makefile + # arm announce IXP4XX_NPE - "IXP4xx Network Processor Engine support" @@ -648,6 +688,25 @@ clean_blob arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts clean_kconfig arch/arm/mach-sunxi/Kconfig MACH_SUN8I clean_mk CONFIG_MACH_SUN8I arch/arm/boot/dts/Makefile +# ppc + +announce UCODE_PATCH - "ppc microcode" +clean_blob arch/powerpc/platforms/8xx/micropatch.c +clean_kconfig arch/powerpc/platforms/8xx/Kconfig UCODE_PATCH +clean_mk CONFIG_UCODE_PATCH arch/powerpc/platforms/8xx/Makefile + +announce USB_SOF_UCODE_PATCH - "USB SOF patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig USB_SOF_UCODE_PATCH + +announce I2C_SPI_UCODE_PATCH - "I2C/SPI relocation patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig I2C_SPI_UCODE_PATCH + +announce I2C_SPI_SMC1_UCODE_PATCH - "I2C/SPI/SMC1 relocation patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig I2C_SPI_SMC1_UCODE_PATCH + +announce SMC_UCODE_PATCH - "SMC relocation patch" +clean_kconfig arch/powerpc/platforms/8xx/Kconfig SMC_UCODE_PATCH + ####### # ATM # ####### @@ -1602,6 +1661,11 @@ clean_blob drivers/media/i2c/s5k5baf.c clean_kconfig drivers/media/i2c/Kconfig VIDEO_S5K5BAF clean_mk CONFIG_VIDEO_S5K5BAF drivers/media/i2c/Makefile +announce VIDEO_VS6624 - "ST VS6624 sensor support" +clean_blob drivers/media/i2c/vs6624.c +clean_kconfig drivers/media/i2c/Kconfig VIDEO_VS6624 +clean_mk CONFIG_VIDEO_VS6624 drivers/media/i2c/Makefile + announce VIDEO_SAMSUNG_S5P_MFC - "Samsung S5P MFC 5.1 Video Codec" reject_firmware drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c clean_blob drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1687,7 +1751,10 @@ clean_sed ' -EINVAL) }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware' clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -clean_sed ' +if grep -q loaded_fw_major drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c; then + clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +else + clean_sed ' /^int bnx2x_compare_fw_ver/,/^}$/{ /^ u32 my_fw = /i\ /*(DEBLOBBED)*/ @@ -1698,6 +1765,7 @@ clean_sed ' u32 my_fw = ~loaded_fw; } }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test' +fi clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h clean_sed ' /static void bnx2x_init_wr_wb/{ @@ -2773,6 +2841,9 @@ clean_mk CONFIG_NET_DSA_LANTIQ_GSWIP drivers/net/dsa/Makefile announce MICROSEMI_PHY - "Microsemi PHYs" reject_firmware drivers/net/phy/mscc/mscc_main.c +if grep -q MODULE_FIRMWARE drivers/net/phy/mscc/mscc_main.c; then + clean_blob drivers/net/phy/mscc/mscc_main.c +fi clean_blob drivers/net/phy/mscc/mscc.h clean_kconfig drivers/net/phy/Kconfig MICROSEMI_PHY clean_mk CONFIG_MICROSEMI_PHY drivers/net/phy/mscc/Makefile @@ -3044,6 +3115,7 @@ announce SCSI_LPFC - "Emulex LightPulse Fibre Channel Support" # this is the hardware or the software inducing to the installation of # non-Free firmware. reject_firmware drivers/scsi/lpfc/lpfc_init.c +clean_blob drivers/scsi/lpfc/lpfc_init.c clean_kconfig drivers/scsi/Kconfig SCSI_LPFC clean_mk CONFIG_SCSI_LPFC drivers/scsi/lpfc/Makefile @@ -3093,8 +3165,12 @@ clean_mk CONFIG_USB_UEAGLEATM drivers/usb/atm/Makefile # host -announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firwmare" -reject_firmware drivers/usb/host/xhci-pci-renesas.c +announce USB_XHCI_PCI_RENESAS - "Support for additional Renesas xHCI controller with firmware" +if grep -q 'firmware_request_nowarn' drivers/usb/host/xhci-pci-renesas.c; then + reject_firmware_nowarn drivers/usb/host/xhci-pci-renesas.c +else + reject_firmware drivers/usb/host/xhci-pci-renesas.c +fi clean_kconfig drivers/usb/host/Kconfig USB_XHCI_PCI_RENESAS clean_mk CONFIG_USB_XHCI_PCI_RENESAS drivers/usb/host/Makefile @@ -3232,10 +3308,13 @@ announce WKUP_M3_RPROC - "AMx3xx Wakeup M3 remoteproc support" clean_blob Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt clean_blob arch/arm/boot/dts/am33xx.dtsi clean_blob arch/arm/boot/dts/am4372.dtsi +if grep -q 'Block system suspend' arch/arm/mach-omap2/pm33xx-core.c; then + clean_blob arch/arm/mach-omap2/pm33xx-core.c +fi clean_kconfig drivers/remoteproc/Kconfig WKUP_M3_RPROC clean_mk CONFIG_WKUP_M3_RPROC drivers/remoteproc/Makefile -announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripherial Image Loader" +announce QCOM_Q6V5_ADSP - "Qualcomm Technology Inc ADSP Peripheral Image Loader" clean_blob drivers/remoteproc/qcom_q6v5_adsp.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_ADSP clean_mk CONFIG_QCOM_Q6V5_ADSP drivers/remoteproc/Makefile @@ -3246,7 +3325,7 @@ clean_blob drivers/remoteproc/qcom_q6v5_mss.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_MSS clean_mk CONFIG_QCOM_Q6V5_MSS drivers/remoteproc/Makefile -announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripherial Authentication Service support" +announce QCOM_Q6V5_PAS - "Qualcomm Hexagon V5 Peripheral Authentication Service support" clean_blob drivers/remoteproc/qcom_q6v5_pas.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_PAS clean_mk CONFIG_QCOM_Q6V5_PAS drivers/remoteproc/Makefile @@ -3256,7 +3335,7 @@ clean_blob drivers/remoteproc/qcom_q6v5_wcss.c clean_kconfig drivers/remoteproc/Kconfig QCOM_Q6V5_WCSS clean_mk CONFIG_QCOM_Q6V5_WCSS drivers/remoteproc/Makefile -announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripherial Image Loader" +announce QCOM_WCNSS_PIL - "Qualcomm WCNSS Peripheral Image Loader" clean_blob drivers/remoteproc/qcom_wcnss.c clean_kconfig drivers/remoteproc/Kconfig QCOM_WCNSS_PIL clean_mk CONFIG_QCOM_WCNSS_PIL drivers/remoteproc/Makefile @@ -3554,7 +3633,7 @@ announce SND_SOC_INTEL_CATPT - undocumented reject_firmware sound/soc/intel/catpt/loader.c clean_blob sound/soc/intel/catpt/loader.c clean_kconfig sound/soc/intel/Kconfig SND_SOC_INTEL_CATPT -clean_mk CONFIG_SND_SOC_INTEL_CATPT sound/soc/intel/haswell/Makefile +clean_mk CONFIG_SND_SOC_INTEL_CATPT sound/soc/intel/catpt/Makefile announce SND_SOC_INTEL_SKYLAKE - "All Skylake/SST Platforms" reject_firmware sound/soc/intel/skylake/skl-sst.c @@ -3572,12 +3651,12 @@ announce SND_SST_ATOM_HIFI2_PLATFORM - "HiFi2 Platforms" reject_firmware sound/soc/intel/atom/sst/sst.c reject_firmware sound/soc/intel/atom/sst/sst_loader.c clean_kconfig sound/soc/intel/Kconfig SND_SST_ATOM_HIFI2_PLATFORM -clean_mk CONFIG_SND_ATOM_HIFI2_PLATFORM sound/soc/intel/atom/sst/Makefile +clean_mk CONFIG_SND_SST_ATOM_HIFI2_PLATFORM sound/soc/intel/atom/sst/Makefile announce SND_SST_ATOM_HIFI2_PLATFORM_PCI - "PCI HiFi2 (Merrifield) Platforms" clean_blob sound/soc/intel/atom/sst/sst_pci.c clean_kconfig sound/soc/intel/Kconfig SND_SST_ATOM_HIFI2_PLATFORM_PCI -clean_mk CONFIG_SND_ATOM_HIFI2_PLATFORM_PCI sound/soc/intel/atom/sst/Makefile +clean_mk CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI sound/soc/intel/atom/sst/Makefile announce SND_SOC_RT5514 - undocumented reject_firmware sound/soc/codecs/rt5514.c @@ -3748,7 +3827,7 @@ clean_mk CONFIG_KEYSTONE_NAVIGATOR_QMSS drivers/soc/ti/Makefile announce BRCMSTB_DPFE - "Broadcom STM DPFE driver" reject_firmware_nowarn drivers/memory/brcmstb_dpfe.c clean_blob drivers/memory/brcmstb_dpfe.c -clean_kconfig arch/arm/mach-bcm/Kconfig BRCMSTB_DPFE +clean_kconfig drivers/memory/Kconfig BRCMSTB_DPFE clean_mk CONFIG_BRCMSTB_DPFE drivers/memory/Makefile announce ARCH_MEDIATEK - "MediaTek SoC Support" @@ -3769,6 +3848,15 @@ clean_sed s,usb8388,whatever,g drivers/base/firmware_loader/Kconfig 'removed blo if $errors; then echo errors above were ignored because of --force >&2 +else + echo cleaning up has completed successfully, without verification >&2 + # Verification is largely manual, comparing the changes with + # those of a previous known (presumed) good version, e.g. + # git merge the previous known good version onto the current base + # version, and then git diff with this cleaned-up version. + # Creating a tarball of this version, named linux-*.*.tar, + # and running deblob-check on it may also help catch cleaning-up + # errors: .../deblob-check --use-awk -B linux-*.*.tar. fi exit 0