From: Alexandre Oliva Date: Fri, 7 May 2021 10:53:52 +0000 (-0400) Subject: GNU Linux-libre 5.4.117-gnu scripts X-Git-Tag: scripts/v5.4.117-gnu^0 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=81c44dd1df87148f4268dab232c3e1cf75432f3f;p=releases.git GNU Linux-libre 5.4.117-gnu scripts --- diff --git a/deblob-5.4 b/deblob-5.4 index 5850dbbfdb7..22e293ee036 100755 --- a/deblob-5.4 +++ b/deblob-5.4 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2008-2019 Alexandre Oliva +# Copyright (C) 2008-2021 Alexandre Oliva # Copyright (C) 2008 Jeff Moe # Copyright (C) 2009 Rubén Rodríguez # @@ -126,44 +126,12 @@ clean_blob () { else die failed removing blobs from $name fi - check_changed $name && echo $name: removed blobs + check_changed $name && echo $name: removed blobs or mentions thereof else clean_file $1 fi } -dummy_blob () { - #$1 = filename - if test -f $1; then - die $1 exists, something is wrong && return 0 - elif test ! -f firmware/Makefile; then - die firmware/Makefile does not exist, something is wrong && return 0 - fi - - clean_sed "s,`echo $1 | sed s,^firmware/,,`,\$(DEBLOBBED),g" \ - firmware/Makefile "dropped $1" -} - -clean_fw () { - #$1 = firmware text input, $2 = firmware output - filetest $1 || return 0 - if test -f $2; then - die $2 exists, something is wrong && return 0 - fi - clean_blob $1 -s 4 - dummy_blob $2 -} - -drop_fw_file () { - #$1 = firmware text input, $2 = firmware output - filetest $1 || return 0 - if test -f $2; then - die $2 exists, something is wrong && return 0 - fi - clean_file $1 - dummy_blob $2 -} - clean_kconfig () { #$1 = filename $2 = things to remove case $1 in @@ -410,6 +378,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' @@ -810,7 +784,7 @@ clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c clean_kconfig drivers/gpu/drm/amd/amdgpu/Kconfig DRM_AMDGPU_CIK clean_mk CONFIG_DRM_AMDGPU_CIK drivers/gpu/drm/amd/amdgpu/Makefile -announce DRM_AMDGPU_SI - "Enable amdgpu support for CIK parts" +announce DRM_AMDGPU_SI - "Enable amdgpu support for SI parts" reject_firmware drivers/gpu/drm/amd/amdgpu/si_dpm.c clean_blob drivers/gpu/drm/amd/amdgpu/si_dpm.c reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c @@ -3263,7 +3237,7 @@ clean_blob sound/pci/echoaudio/mona.c clean_kconfig sound/pci/Kconfig SND_MONA clean_mk CONFIG_SND_MONA sound/pci/echoaudio/Makefile -announce SND_'<(Echoaudio)>' - "(Echoaudio) all of the above " +announce SND_'<(Echoaudio)>' - "(Echoaudio) all of the above" reject_firmware sound/pci/echoaudio/echoaudio.c clean_blob sound/pci/echoaudio/echoaudio.c