From d75dbbb2ec225dffac54c7247764c3256f2753dc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 5 Apr 2010 16:03:13 +0200 Subject: [PATCH] Build PC-Speaker as modul to be able to blacklist. --- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-xen | 2 +- config/rootfiles/common/linux | 8 +- config/rootfiles/packages/linux-xen | 172 +------------------- doc/packages-list.txt | 8 +- 5 files changed, 8 insertions(+), 184 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 606bf8ee11..957999dbb1 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -2135,7 +2135,7 @@ CONFIG_KEYBOARD_XTKBD=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y +CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m # CONFIG_INPUT_WISTRON_BTNS is not set # CONFIG_INPUT_ATLAS_BTNS is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 3c26cd90d2..036bfc62ac 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1884,7 +1884,7 @@ CONFIG_KEYBOARD_XTKBD=m # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y +CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m # CONFIG_INPUT_WISTRON_BTNS is not set # CONFIG_INPUT_ATLAS_BTNS is not set diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux index fea66f75c7..5175f05cf6 100644 --- a/config/rootfiles/common/linux +++ b/config/rootfiles/common/linux @@ -3,15 +3,8 @@ boot/System.map-ipfire boot/config-KVER-ipfire boot/vmlinuz-KVER-ipfire boot/vmlinuz-ipfire -#lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw -#lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw -#lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw -#lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw #lib/firmware/bnx2x-e1-5.0.21.0.fw #lib/firmware/bnx2x-e1h-5.0.21.0.fw -#lib/firmware/cxgb3/ael2005_opt_edc.bin -#lib/firmware/keyspan/usa28x.fw -#lib/firmware/keyspan/usa49w.fw lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/build #lib/modules/KVER-ipfire/kernel @@ -549,6 +542,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/input/misc/cm109.ko #lib/modules/KVER-ipfire/kernel/drivers/input/misc/keyspan_remote.ko #lib/modules/KVER-ipfire/kernel/drivers/input/misc/pcf50633-input.ko +#lib/modules/KVER-ipfire/kernel/drivers/input/misc/pcspkr.ko #lib/modules/KVER-ipfire/kernel/drivers/input/misc/powermate.ko #lib/modules/KVER-ipfire/kernel/drivers/input/misc/winbond-cir.ko #lib/modules/KVER-ipfire/kernel/drivers/input/misc/wm831x-on.ko diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen index 7b15223f94..3e1f01a1ed 100644 --- a/config/rootfiles/packages/linux-xen +++ b/config/rootfiles/packages/linux-xen @@ -3,183 +3,12 @@ boot/System.map-ipfire-xen boot/config-KVER-ipfire-xen boot/vmlinuz-KVER-ipfire-xen boot/vmlinuz-ipfire-xen -#lib/firmware/3com -#lib/firmware/3com/3C359.bin -#lib/firmware/3com/typhoon.bin -#lib/firmware/acenic -#lib/firmware/acenic/tg1.bin -#lib/firmware/acenic/tg2.bin -#lib/firmware/adaptec -#lib/firmware/adaptec/starfire_rx.bin -#lib/firmware/adaptec/starfire_tx.bin -#lib/firmware/advansys -#lib/firmware/advansys/3550.bin -#lib/firmware/advansys/38C0800.bin -#lib/firmware/advansys/38C1600.bin -#lib/firmware/advansys/mcode.bin -#lib/firmware/atmsar11.fw -#lib/firmware/av7110 -#lib/firmware/av7110/bootcode.bin -#lib/firmware/bnx2 #lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw #lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw -#lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw #lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw #lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw #lib/firmware/bnx2x-e1-5.2.13.0.fw #lib/firmware/bnx2x-e1h-5.2.13.0.fw -#lib/firmware/cis -#lib/firmware/cis/3CCFEM556.cis -#lib/firmware/cis/3CXEM556.cis -#lib/firmware/cis/COMpad2.cis -#lib/firmware/cis/COMpad4.cis -#lib/firmware/cis/DP83903.cis -#lib/firmware/cis/LA-PCM.cis -#lib/firmware/cis/MT5634ZLX.cis -#lib/firmware/cis/NE2K.cis -#lib/firmware/cis/PCMLM28.cis -#lib/firmware/cis/PE-200.cis -#lib/firmware/cis/RS-COM-2P.cis -#lib/firmware/cis/SW_555_SER.cis -#lib/firmware/cis/SW_7xx_SER.cis -#lib/firmware/cis/SW_8xx_SER.cis -#lib/firmware/cis/tamarack.cis -#lib/firmware/cpia2 -#lib/firmware/cpia2/stv0672_vp4.bin -#lib/firmware/cxgb3 -#lib/firmware/cxgb3/ael2005_opt_edc.bin -#lib/firmware/cxgb3/ael2005_twx_edc.bin -#lib/firmware/cxgb3/ael2020_twx_edc.bin -#lib/firmware/cxgb3/t3b_psram-1.1.0.bin -#lib/firmware/cxgb3/t3c_psram-1.1.0.bin -#lib/firmware/cxgb3/t3fw-7.4.0.bin -#lib/firmware/dabusb -#lib/firmware/dabusb/bitstream.bin -#lib/firmware/dabusb/firmware.fw -#lib/firmware/dsp56k -#lib/firmware/dsp56k/bootstrap.bin -#lib/firmware/e100 -#lib/firmware/e100/d101m_ucode.bin -#lib/firmware/e100/d101s_ucode.bin -#lib/firmware/e100/d102e_ucode.bin -#lib/firmware/edgeport -#lib/firmware/edgeport/boot.fw -#lib/firmware/edgeport/boot2.fw -#lib/firmware/edgeport/down.fw -#lib/firmware/edgeport/down2.fw -#lib/firmware/edgeport/down3.bin -#lib/firmware/emi26 -#lib/firmware/emi26/bitstream.fw -#lib/firmware/emi26/firmware.fw -#lib/firmware/emi26/loader.fw -#lib/firmware/emi62 -#lib/firmware/emi62/bitstream.fw -#lib/firmware/emi62/loader.fw -#lib/firmware/emi62/midi.fw -#lib/firmware/emi62/spdif.fw -#lib/firmware/ess -#lib/firmware/ess/maestro3_assp_kernel.fw -#lib/firmware/ess/maestro3_assp_minisrc.fw -#lib/firmware/intelliport2.bin -#lib/firmware/kaweth -#lib/firmware/kaweth/new_code.bin -#lib/firmware/kaweth/new_code_fix.bin -#lib/firmware/kaweth/trigger_code.bin -#lib/firmware/kaweth/trigger_code_fix.bin -#lib/firmware/keyspan -#lib/firmware/keyspan/mpr.fw -#lib/firmware/keyspan/usa18x.fw -#lib/firmware/keyspan/usa19.fw -#lib/firmware/keyspan/usa19qi.fw -#lib/firmware/keyspan/usa19qw.fw -#lib/firmware/keyspan/usa19w.fw -#lib/firmware/keyspan/usa28.fw -#lib/firmware/keyspan/usa28x.fw -#lib/firmware/keyspan/usa28xa.fw -#lib/firmware/keyspan/usa28xb.fw -#lib/firmware/keyspan/usa49w.fw -#lib/firmware/keyspan/usa49wlc.fw -#lib/firmware/keyspan_pda -#lib/firmware/keyspan_pda/keyspan_pda.fw -#lib/firmware/keyspan_pda/xircom_pgs.fw -#lib/firmware/korg -#lib/firmware/korg/k1212.dsp -#lib/firmware/matrox -#lib/firmware/matrox/g200_warp.fw -#lib/firmware/matrox/g400_warp.fw -#lib/firmware/mts_cdma.fw -#lib/firmware/mts_edge.fw -#lib/firmware/mts_gsm.fw -#lib/firmware/myricom -#lib/firmware/myricom/lanai.bin -#lib/firmware/ositech -#lib/firmware/ositech/Xilinx7OD.bin -#lib/firmware/qlogic -#lib/firmware/qlogic/1040.bin -#lib/firmware/qlogic/12160.bin -#lib/firmware/qlogic/1280.bin -#lib/firmware/qlogic/isp1000.bin -#lib/firmware/r128 -#lib/firmware/r128/r128_cce.bin -#lib/firmware/radeon -#lib/firmware/radeon/R100_cp.bin -#lib/firmware/radeon/R200_cp.bin -#lib/firmware/radeon/R300_cp.bin -#lib/firmware/radeon/R420_cp.bin -#lib/firmware/radeon/R520_cp.bin -#lib/firmware/radeon/R600_me.bin -#lib/firmware/radeon/R600_pfp.bin -#lib/firmware/radeon/RS600_cp.bin -#lib/firmware/radeon/RS690_cp.bin -#lib/firmware/radeon/RS780_me.bin -#lib/firmware/radeon/RS780_pfp.bin -#lib/firmware/radeon/RV610_me.bin -#lib/firmware/radeon/RV610_pfp.bin -#lib/firmware/radeon/RV620_me.bin -#lib/firmware/radeon/RV620_pfp.bin -#lib/firmware/radeon/RV630_me.bin -#lib/firmware/radeon/RV630_pfp.bin -#lib/firmware/radeon/RV635_me.bin -#lib/firmware/radeon/RV635_pfp.bin -#lib/firmware/radeon/RV670_me.bin -#lib/firmware/radeon/RV670_pfp.bin -#lib/firmware/radeon/RV710_me.bin -#lib/firmware/radeon/RV710_pfp.bin -#lib/firmware/radeon/RV730_me.bin -#lib/firmware/radeon/RV730_pfp.bin -#lib/firmware/radeon/RV770_me.bin -#lib/firmware/radeon/RV770_pfp.bin -#lib/firmware/sb16 -#lib/firmware/sb16/alaw_main.csp -#lib/firmware/sb16/ima_adpcm_capture.csp -#lib/firmware/sb16/ima_adpcm_init.csp -#lib/firmware/sb16/ima_adpcm_playback.csp -#lib/firmware/sb16/mulaw_main.csp -#lib/firmware/sun -#lib/firmware/sun/cassini.bin -#lib/firmware/tehuti -#lib/firmware/tehuti/bdx.bin -#lib/firmware/ti_3410.fw -#lib/firmware/ti_5052.fw -#lib/firmware/tigon -#lib/firmware/tigon/tg3.bin -#lib/firmware/tigon/tg3_tso.bin -#lib/firmware/tigon/tg3_tso5.bin -#lib/firmware/tr_smctr.bin -#lib/firmware/ttusb-budget -#lib/firmware/ttusb-budget/dspbootcode.bin -#lib/firmware/vicam -#lib/firmware/vicam/firmware.fw -#lib/firmware/whiteheat.fw -#lib/firmware/whiteheat_loader.fw -#lib/firmware/yam -#lib/firmware/yam/1200.bin -#lib/firmware/yam/9600.bin -#lib/firmware/yamaha -#lib/firmware/yamaha/ds1_ctrl.fw -#lib/firmware/yamaha/ds1_dsp.fw -#lib/firmware/yamaha/ds1e_ctrl.fw -#lib/firmware/yamaha/yss225_registers.bin #lib/modules lib/modules/KVER-ipfire-xen #lib/modules/KVER-ipfire-xen/build @@ -673,6 +502,7 @@ lib/modules/KVER-ipfire-xen #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/cm109.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/keyspan_remote.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcf50633-input.ko +#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcspkr.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/powermate.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/winbond-cir.ko #lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/wm831x-on.ko diff --git a/doc/packages-list.txt b/doc/packages-list.txt index ae5cd45d07..416113e1f8 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -85,8 +85,8 @@ * dhcpcd-5.1.3 * diffutils-2.8.1 * dnsmasq-2.45 -* dosfstools-2.11 -* e2fsprogs-1.39 +* dosfstools-3.0.9 +* e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 * eject-2.1.5 @@ -274,8 +274,8 @@ * qemu-0.11.0-kqemu * qemu-0.12.2 * readline-5.1 -* reiser4progs-1.0.5 -* reiserfsprogs-3.6.19 +* reiser4progs-1.0.6 +* reiserfsprogs-3.6.21 * rp-pppoe-3.8 * rrdtool-1.2.30 * rssdler-0.4.0a -- 2.39.2