From: lxoliva Date: Mon, 4 Aug 2008 10:04:00 +0000 (+0000) Subject: Forward-port depends-on-NONFREE marks for sound devices from 2.6.22. X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=09c3db739f5f81f8225a798d98323613804b3cfc;p=releases.git Forward-port depends-on-NONFREE marks for sound devices from 2.6.22. git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@4082 559672b5-ba27-0410-b829-e8f1faed8b1b --- diff --git a/deblob-2.6.23 b/deblob-2.6.23 index 0c7a978510d..4adce4f7f7e 100755 --- a/deblob-2.6.23 +++ b/deblob-2.6.23 @@ -44,7 +44,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=2.6.23 extra=3 +kver=2.6.23 extra=3++ if unifdef /dev/null; then :; else echo unifdef is required >&2 @@ -608,24 +608,27 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX' # sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO -clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_blob sound/pci/korg1212/korg1212-firmware.h +clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL' # SND_MAESTRO3 - ESS Allegro/Maestro3 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL' # SND_YMFPCI - Yamaha YMF724/740/744/754 clean_blob sound/pci/ymfpci/ymfpci_image.h clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL' # SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor clean_blob sound/isa/sb/sb16_csp_codecs.h -clean_kconfig sound/isa/Kconfig SND_SB16_CSP_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL' # SND_WAVEFRONT_FIRMWARE_IN_KERNEL # Most of this file is not matched by deblob-check because of WAIT_IDLE. # Just remove it. clean_file sound/isa/wavefront/yss225.c -clean_kconfig sound/isa/Kconfig SND_WAVEFRONT_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL' exit 0 diff --git a/deblob-2.6.24 b/deblob-2.6.24 index e266430674d..5ad33cac5f8 100755 --- a/deblob-2.6.24 +++ b/deblob-2.6.24 @@ -44,7 +44,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=2.6.24 extra=3 +kver=2.6.24 extra=3++ if unifdef /dev/null; then :; else echo unifdef is required >&2 @@ -608,24 +608,27 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX' # sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO -clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_blob sound/pci/korg1212/korg1212-firmware.h +clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL' # SND_MAESTRO3 - ESS Allegro/Maestro3 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL' # SND_YMFPCI - Yamaha YMF724/740/744/754 clean_blob sound/pci/ymfpci/ymfpci_image.h clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL' # SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor clean_blob sound/isa/sb/sb16_csp_codecs.h -clean_kconfig sound/isa/Kconfig SND_SB16_CSP_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL' # SND_WAVEFRONT_FIRMWARE_IN_KERNEL # Most of this file is not matched by deblob-check because of WAIT_IDLE. # Just remove it. clean_file sound/isa/wavefront/yss225.c -clean_kconfig sound/isa/Kconfig SND_WAVEFRONT_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL' exit 0 diff --git a/deblob-2.6.25 b/deblob-2.6.25 index ba50621f39e..2d056f7e710 100755 --- a/deblob-2.6.25 +++ b/deblob-2.6.25 @@ -44,7 +44,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=2.6.25 extra=3 +kver=2.6.25 extra=3++ if unifdef /dev/null; then :; else echo unifdef is required >&2 @@ -612,24 +612,27 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX' # sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO -clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_blob sound/pci/korg1212/korg1212-firmware.h +clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL' # SND_MAESTRO3 - ESS Allegro/Maestro3 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL' # SND_YMFPCI - Yamaha YMF724/740/744/754 clean_blob sound/pci/ymfpci/ymfpci_image.h clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL' # SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor clean_blob sound/isa/sb/sb16_csp_codecs.h -clean_kconfig sound/isa/Kconfig SND_SB16_CSP_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL' # SND_WAVEFRONT_FIRMWARE_IN_KERNEL # Most of this file is not matched by deblob-check because of WAIT_IDLE. # Just remove it. clean_file sound/isa/wavefront/yss225.c -clean_kconfig sound/isa/Kconfig SND_WAVEFRONT_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL' exit 0 diff --git a/deblob-2.6.26 b/deblob-2.6.26 index 9cf4403154f..2ff4656310c 100755 --- a/deblob-2.6.26 +++ b/deblob-2.6.26 @@ -44,7 +44,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=2.6.26 extra=1 +kver=2.6.26 extra=1++ if unifdef /dev/null; then :; else echo unifdef is required >&2 @@ -612,24 +612,27 @@ clean_kconfig sound/pci/Kconfig 'SND_CS46XX' # sed -i '/cs46xx\/ \\/d' sound/pci/Makefile # SND_KORG1212 - Korg 1212 IO -clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL clean_blob sound/pci/korg1212/korg1212-firmware.h +clean_ifdef sound/pci/korg1212/korg1212.c CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_KORG1212_FIRMWARE_IN_KERNEL' # SND_MAESTRO3 - ESS Allegro/Maestro3 clean_ifdef sound/pci/maestro3.c CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_MAESTRO3_FIRMWARE_IN_KERNEL' # SND_YMFPCI - Yamaha YMF724/740/744/754 clean_blob sound/pci/ymfpci/ymfpci_image.h clean_ifdef sound/pci/ymfpci/ymfpci_main.c CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL +clean_kconfig sound/pci/Kconfig 'SND_YMFPCI_FIRMWARE_IN_KERNEL' # SND_SB16_CSP_FIRMWARE_IN_KERNEL - SB16 Advanced Signal Processor clean_blob sound/isa/sb/sb16_csp_codecs.h -clean_kconfig sound/isa/Kconfig SND_SB16_CSP_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_SB16_CSP_FIRMWARE_IN_KERNEL' # SND_WAVEFRONT_FIRMWARE_IN_KERNEL # Most of this file is not matched by deblob-check because of WAIT_IDLE. # Just remove it. clean_file sound/isa/wavefront/yss225.c -clean_kconfig sound/isa/Kconfig SND_WAVEFRONT_FIRMWARE_IN_KERNEL +clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL' exit 0 diff --git a/deblob-2.6.27 b/deblob-2.6.27 index d503430fda7..f1c7991a880 100755 --- a/deblob-2.6.27 +++ b/deblob-2.6.27 @@ -734,6 +734,7 @@ dummy_blob firmware/sb16/ima_adpcm_playback.csp # Most of this file is not matched by deblob-check because of WAIT_IDLE. # Just remove it. clean_file sound/isa/wavefront/yss225.c +clean_kconfig sound/isa/Kconfig 'SND_WAVEFRONT_FIRMWARE_IN_KERNEL' hack_fwmk 'fw-shipped-y := $(filter-out $(NONFREE_FW), $(fw-shipped-y))' hack_fwmk 'fw-shipped-m := $(filter-out $(NONFREE_FW), $(fw-shipped-m))'