webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 11:35:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-08-16 19:20:21 +02:00
parent 09e756f8f2 40228ef46f
commit d97b2de4a1
46 changed files with 6523 additions and 5156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/kernel/kernel.config.i586-ipfire
View File

@@ -3208,7 +3208,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_EZUSB=y
# CONFIG_USB_SERIAL_GENERIC is not set
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m

2
config/kernel/kernel.config.i586-ipfire-xen
View File

@@ -2958,7 +2958,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_EZUSB=y
# CONFIG_USB_SERIAL_GENERIC is not set
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m

4
config/rootfiles/common/ipaddr
View File

@@ -1,2 +1,2 @@
#usr/lib/python2.4/ipaddr.py
usr/lib/python2.4/ipaddr.pyc
#usr/lib/python2.7/ipaddr.py
usr/lib/python2.7/ipaddr.pyc

27
config/rootfiles/common/kudzu
View File

@@ -24,13 +24,26 @@ sbin/kudzu
#usr/include/kudzu/usb.h
#usr/lib/libkudzu.a
#usr/lib/libkudzu_loader.a
#usr/lib/python2.4/site-packages/_kudzumodule.so
#usr/lib/python2.4/site-packages/drv_libxml2.pyc
#usr/lib/python2.4/site-packages/kudzu.py
#usr/lib/python2.4/site-packages/kudzu.pyc
#usr/lib/python2.4/site-packages/libxslt.pyc
#usr/lib/python2.4/site-packages/libxml2.pyc
#usr/lib/python2.4/site-packages/snack.pyc
#usr/lib/python2.7/lib2to3/tests/data/bom.pyc
#usr/lib/python2.7/lib2to3/tests/data/crlf.pyc
#usr/lib/python2.7/lib2to3/tests/data/different_encoding.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/__init__.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_explicit.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_first.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_last.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_parrot.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_preorder.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/no_fixer_cls.pyc
#usr/lib/python2.7/lib2to3/tests/data/fixers/parrot_example.pyc
#usr/lib/python2.7/lib2to3/tests/data/infinite_recursion.pyc
#usr/lib/python2.7/lib2to3/tests/data/py2_test_grammar.pyc
#usr/lib/python2.7/site-packages/_kudzumodule.so
#usr/lib/python2.7/site-packages/drv_libxml2.pyc
#usr/lib/python2.7/site-packages/kudzu.py
#usr/lib/python2.7/site-packages/kudzu.pyc
#usr/lib/python2.7/site-packages/libxslt.pyc
#usr/lib/python2.7/site-packages/snack.pyc
usr/sbin/kudzu
#usr/share/locale/ar
#usr/share/locale/ar/LC_MESSAGES

10
config/rootfiles/common/libxml2
View File

@@ -56,11 +56,11 @@ usr/lib/libxml2.so
usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.6.26
#usr/lib/pkgconfig/libxml-2.0.pc
usr/lib/python2.4/site-packages/drv_libxml2.py
usr/lib/python2.4/site-packages/libxml2.py
#usr/lib/python2.4/site-packages/libxml2mod.a
#usr/lib/python2.4/site-packages/libxml2mod.la
usr/lib/python2.4/site-packages/libxml2mod.so
usr/lib/python2.7/site-packages/drv_libxml2.py
usr/lib/python2.7/site-packages/libxml2.py
#usr/lib/python2.7/site-packages/libxml2mod.a
#usr/lib/python2.7/site-packages/libxml2mod.la
usr/lib/python2.7/site-packages/libxml2mod.so
#usr/lib/xml2Conf.sh
#usr/man/man1/xml2-config.1
#usr/man/man1/xmlcatalog.1

10
config/rootfiles/common/libxslt
View File

@@ -38,11 +38,11 @@ usr/lib/libxslt.so.1
usr/lib/libxslt.so.1.1.17
#usr/lib/pkgconfig/libexslt.pc
#usr/lib/pkgconfig/libxslt.pc
usr/lib/python2.4/site-packages/libxml2.pyc
usr/lib/python2.4/site-packages/libxslt.py
#usr/lib/python2.4/site-packages/libxsltmod.a
#usr/lib/python2.4/site-packages/libxsltmod.la
usr/lib/python2.4/site-packages/libxsltmod.so
usr/lib/python2.7/site-packages/libxml2.pyc
#usr/lib/python2.7/site-packages/libxslt.py
#usr/lib/python2.7/site-packages/libxsltmod.a
#usr/lib/python2.7/site-packages/libxsltmod.la
usr/lib/python2.7/site-packages/libxsltmod.so
#usr/lib/xsltConf.sh
#usr/man/man1/xsltproc.1
#usr/man/man3/libexslt.3

4
config/rootfiles/common/newt
View File

@@ -4,5 +4,5 @@
usr/lib/libnewt.so
usr/lib/libnewt.so.0.51
usr/lib/libnewt.so.0.51.6
#usr/lib/python2.4/site-packages/_snackmodule.so
#usr/lib/python2.4/site-packages/snack.py
#usr/lib/python2.7/site-packages/_snackmodule.so
#usr/lib/python2.7/site-packages/snack.py

7244
config/rootfiles/common/python
View File

File diff suppressed because it is too large Load Diff

90
config/rootfiles/common/python-setuptools
View File

@@ -1,87 +1,5 @@
#usr/bin/easy_install
#usr/bin/easy_install-2.4
#usr/lib/python2.4/site-packages/easy-install.pth
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/PKG-INFO
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/SOURCES.txt
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/dependency_links.txt
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/entry_points.txt
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/not-zip-safe
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/EGG-INFO/top_level.txt
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/easy_install.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/easy_install.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/pkg_resources.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/pkg_resources.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/__init__.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/__init__.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/archive_util.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/archive_util.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/cli.exe
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/__init__.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/__init__.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/alias.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/alias.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_egg.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_egg.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_rpm.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_rpm.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_wininst.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/bdist_wininst.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_ext.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_ext.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_py.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/build_py.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/develop.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/develop.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/easy_install.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/easy_install.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/egg_info.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/egg_info.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_egg_info.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_egg_info.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_lib.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_lib.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_scripts.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/install_scripts.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/register.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/register.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/rotate.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/rotate.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/saveopts.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/saveopts.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/sdist.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/sdist.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/setopt.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/setopt.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/test.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/test.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/upload.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/command/upload.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/depends.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/depends.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/dist.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/dist.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/extension.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/extension.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/gui.exe
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/package_index.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/package_index.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/sandbox.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/sandbox.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/__init__.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/__init__.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/doctest.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/doctest.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_packageindex.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_packageindex.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_resources.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/setuptools/tests/test_resources.pyc
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/site.py
#usr/lib/python2.4/site-packages/setuptools-0.6c8-py2.4.egg/site.pyc
#usr/lib/python2.4/site-packages/setuptools.pth
#usr/bin/easy_install-2.7
#usr/lib/python2.7/site-packages/easy-install.pth
#usr/lib/python2.7/site-packages/setuptools-0.6c11-py2.7.egg
#usr/lib/python2.7/site-packages/setuptools.pth

18
config/rootfiles/core/40/filelists/compat-wireless
View File

@@ -47,6 +47,7 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
@@ -65,6 +66,14 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
@@ -149,6 +158,7 @@ lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
@@ -167,6 +177,14 @@ lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/liberta
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko

12
config/rootfiles/core/40/filelists/files
View File

@@ -4,5 +4,17 @@ var/ipfire/langs/de.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/dhcp/dhcpd.conf.local
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/functions
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/time.cgi
usr/lib/python2.7/ipaddr.pyc
usr/lib/python2.7/site-packages/drv_libxml2.py
usr/lib/python2.7/site-packages/libxml2.py
usr/lib/python2.7/site-packages/libxml2mod.so
usr/lib/python2.7/site-packages/libxml2.pyc
usr/lib/python2.7/site-packages/libxsltmod.so
lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/option.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/option.ko
lib/modules/2.6.32.15-ipfire/kernel/drivers/usb/serial/usbserial.ko
lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko

1
config/rootfiles/core/40/filelists/python Symbolic link
View File

@@ -0,0 +1 @@
../../../common/python

4
config/rootfiles/core/40/update.sh
View File

@@ -30,6 +30,10 @@
#
#Extract files
extract_files
#
#Remove old python files...
rm -rf /usr/lib/python2.4
#
#Start services

3
config/rootfiles/packages/alsa
View File

@@ -164,6 +164,9 @@ usr/lib/alsa-lib/smixer/smixer-ac97.so
#usr/lib/alsa-lib/smixer/smixer-hda.a
#usr/lib/alsa-lib/smixer/smixer-hda.la
usr/lib/alsa-lib/smixer/smixer-hda.so
#usr/lib/alsa-lib/smixer/smixer-python.a
#usr/lib/alsa-lib/smixer/smixer-python.la
usr/lib/alsa-lib/smixer/smixer-python.so
#usr/lib/alsa-lib/smixer/smixer-sbase.a
#usr/lib/alsa-lib/smixer/smixer-sbase.la
usr/lib/alsa-lib/smixer/smixer-sbase.so

6
config/rootfiles/packages/fetchmail
View File

@@ -2,9 +2,9 @@ etc/rc.d/init.d/fetchmail
root/.fetchmailrc
usr/bin/fetchmail
#usr/bin/fetchmailconf
#usr/lib/python2.4/site-packages/fetchmailconf.py
#usr/lib/python2.4/site-packages/fetchmailconf.pyc
#usr/lib/python2.4/site-packages/fetchmailconf.pyo
#usr/lib/python2.7/site-packages/fetchmailconf.py
#usr/lib/python2.7/site-packages/fetchmailconf.pyc
#usr/lib/python2.7/site-packages/fetchmailconf.pyo
#usr/share/man/man1/fetchmail.1
#usr/share/man/man1/fetchmailconf.1
var/ipfire/backup/addons/includes/fetchmail

2
config/rootfiles/packages/ipfireseeder
View File

@@ -1,5 +1,5 @@
etc/rc.d/init.d/ipfireseeder
#var/ipfire/seeder
var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent
var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent
#var/log/seeder
var/log/seeder/info

2
config/rootfiles/packages/python-clientform
View File

@@ -1 +1 @@
usr/lib/python2.4/site-packages/ClientForm-0.2.9-py2.4.egg
usr/lib/python2.7/site-packages/ClientForm-0.2.9-py2.7.egg

5
config/rootfiles/packages/python-feedparser
View File

@@ -1,2 +1,3 @@
usr/lib/python2.4/site-packages/feedparser.py
usr/lib/python2.4/site-packages/feedparser.pyc
#usr/lib/python2.7/site-packages/feedparser-4.1-py2.7.egg-info
#usr/lib/python2.7/site-packages/feedparser.py
usr/lib/python2.7/site-packages/feedparser.pyc

2
config/rootfiles/packages/python-mechanize
View File

@@ -1 +1 @@
usr/lib/python2.4/site-packages/mechanize-0.1.8-py2.4.egg
usr/lib/python2.7/site-packages/mechanize-0.1.8-py2.7.egg

5
config/rootfiles/packages/python-rssdler
View File

@@ -1,3 +1,4 @@
usr/bin/rssdler
usr/lib/python2.4/site-packages/rssdler.py
usr/lib/python2.4/site-packages/rssdler.pyc
#usr/lib/python2.7/site-packages/rssdler-0.4.0-py2.7.egg-info
usr/lib/python2.7/site-packages/rssdler.py
usr/lib/python2.7/site-packages/rssdler.pyc

34
config/rootfiles/packages/urlgrabber
View File

@@ -1,22 +1,20 @@
usr/bin/urlgrabber
usr/lib/python2.4/httplib.pyc
usr/lib/python2.4/socket.pyc
usr/lib/python2.4/encodings/idna.pyc
#usr/lib/python2.4/site-packages/urlgrabber
#usr/lib/python2.4/site-packages/urlgrabber/__init__.py
usr/lib/python2.4/site-packages/urlgrabber/__init__.pyc
#usr/lib/python2.4/site-packages/urlgrabber/byterange.py
usr/lib/python2.4/site-packages/urlgrabber/byterange.pyc
#usr/lib/python2.4/site-packages/urlgrabber/grabber.py
usr/lib/python2.4/site-packages/urlgrabber/grabber.pyc
#usr/lib/python2.4/site-packages/urlgrabber/keepalive.py
usr/lib/python2.4/site-packages/urlgrabber/keepalive.pyc
#usr/lib/python2.4/site-packages/urlgrabber/mirror.py
usr/lib/python2.4/site-packages/urlgrabber/mirror.pyc
#usr/lib/python2.4/site-packages/urlgrabber/progress.py
usr/lib/python2.4/site-packages/urlgrabber/progress.pyc
#usr/lib/python2.4/site-packages/urlgrabber/sslfactory.py
usr/lib/python2.4/site-packages/urlgrabber/sslfactory.pyc
#usr/lib/python2.7/site-packages/urlgrabber
#usr/lib/python2.7/site-packages/urlgrabber-3.1.0-py2.7.egg-info
#usr/lib/python2.7/site-packages/urlgrabber/__init__.py
usr/lib/python2.7/site-packages/urlgrabber/__init__.pyc
#usr/lib/python2.7/site-packages/urlgrabber/byterange.py
usr/lib/python2.7/site-packages/urlgrabber/byterange.pyc
#usr/lib/python2.7/site-packages/urlgrabber/grabber.py
usr/lib/python2.7/site-packages/urlgrabber/grabber.pyc
#usr/lib/python2.7/site-packages/urlgrabber/keepalive.py
usr/lib/python2.7/site-packages/urlgrabber/keepalive.pyc
#usr/lib/python2.7/site-packages/urlgrabber/mirror.py
usr/lib/python2.7/site-packages/urlgrabber/mirror.pyc
#usr/lib/python2.7/site-packages/urlgrabber/progress.py
usr/lib/python2.7/site-packages/urlgrabber/progress.pyc
#usr/lib/python2.7/site-packages/urlgrabber/sslfactory.py
usr/lib/python2.7/site-packages/urlgrabber/sslfactory.pyc
#usr/share/doc/urlgrabber-3.1.0
#usr/share/doc/urlgrabber-3.1.0/ChangeLog
#usr/share/doc/urlgrabber-3.1.0/LICENSE

8
doc/packages-list.txt
View File

@@ -30,7 +30,7 @@
* Net-SSLeay-1.36
* Net-Server-0.97
* Pound-2.5
* Python-2.4.3
* Python-2.7
* SDL-1.2.11
* Text-Tabs+Wrap-2005.0824
* URI-1.35
@@ -68,8 +68,8 @@
* clamav-0.96.1
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire
* compat-wireless-2.6.34.1-kmod-2.6.32.15-ipfire-xen
* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire
* compat-wireless-2.6.35-1-kmod-2.6.32.15-ipfire-xen
* coreutils-5.96
* cpio-2.11
* cpufrequtils-007
@@ -304,7 +304,7 @@
* sdparm-1.01
* sed-4.1.5
* setserial-2.17
* setuptools-0.6c8
* setuptools-0.6c11
* shadow-4.0.15
* slang-1.4.9
* smartmontools-5.39.1

4
html/cgi-bin/pakfire.cgi
View File

@@ -64,7 +64,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
system("$command");
system("/bin/sleep 1");
} else {
&Header::openbox("100%", "center", "Abfrage");
&Header::openbox("100%", "center", $Lang::tr{'request'});
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
print <<END;
<table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
@@ -104,7 +104,7 @@ END
system("$command");
system("/bin/sleep 1");
} else {
&Header::openbox("100%", "center", "Abfrage");
&Header::openbox("100%", "center", $Lang::tr{'request'});
my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
print <<END;
<table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}

1
langs/de/cgi-bin/de.pl
View File

@@ -1445,6 +1445,7 @@
'remove x509' => 'Lösche x509',
'reportfile' => 'Reportfile',
'reportlevel' => 'Report Level',
'request' => 'Abfrage',
'requested data' => '1. Verbindungs Einstellungen',
'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:',
'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:',

1
langs/en/cgi-bin/en.pl
View File

@@ -1475,6 +1475,7 @@
'remove x509' => 'Remove x509',
'reportfile' => 'Reportfile',
'reportlevel' => 'Reportlevel',
'request' => 'Request',
'requested data' => '1. Connection Settings:',
'reserved dst port' => 'Destination port is reserved for IPFire use only:',
'reserved src port' => 'Source port is reserved for IPFire use only:',

1
langs/es/cgi-bin/es.pl
View File

@@ -1465,6 +1465,7 @@
'remove x509' => 'Remover x509',
'reportfile' => 'Archivo de reporte',
'reportlevel' => 'Nivel reporte',
'request' => 'Consulta',
'requested data' => 'Configuraciones de conexión:',
'reserved dst port' => 'Puerto de destino está reservado para uso exclusivo de IPFire',
'reserved src port' => 'Puerto de orígen está reservado para uso exclusivo de IPFire:',

4027
langs/fr/cgi-bin/fr.pl
View File

File diff suppressed because it is too large Load Diff

2
langs/list
View File

@@ -1,4 +1,4 @@
en:English:English
de:Deutsch:German
fr:Français:French-wip
fr:Français:French
es:Español:Spanish

2
lfs/alsa
View File

@@ -40,7 +40,7 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PROG = alsa
PAK_VER = 7
PAK_VER = 8
DEPS = ""

4
lfs/compat-wireless
View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.34.1
VER = 2.6.35-1
THISAPP = compat-wireless-$(VER)
DL_FILE = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505
install : $(TARGET)

6
lfs/ipfireseeder
View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.7.i586-full-core38.iso.torrent
DL_FILE = ipfire-2.7.i586-full-core39.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 12
PAK_VER = 13
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863
$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6
install : $(TARGET)

12
lfs/libaal
View File

@@ -30,11 +30,7 @@ THISAPP = libaal-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
@@ -74,14 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

3
lfs/linux
View File

@@ -147,6 +147,9 @@ endif
# Huawei (Vodafone) K3765 & K4505 Usbids
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
# Cleanup kernel source
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config

1
lfs/madwifi
View File

@@ -88,6 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Blacklist ath5k or madwifi for switching between the drivers
echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi
echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi
echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi
# create madwifi symlink for hostapd build
cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi

6
lfs/python
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.3
VER = 2.7
THISAPP = Python-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 141c683447d5e76be1d2bd4829574f02
$(DL_FILE)_MD5 = 0e8c9ec32abf5b732bea7d91b38c3339
install : $(TARGET)
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared --disable-nls
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

2
lfs/python-clientform
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-clientform
PAK_VER = 1
PAK_VER = 2
DEPS = ""

2
lfs/python-feedparser
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-feedparser
PAK_VER = 1
PAK_VER = 2
DEPS = "python-mechanize"

2
lfs/python-mechanize
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-mechanize
PAK_VER = 1
PAK_VER = 2
DEPS = "python-clientform"

2
lfs/python-rssdler
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/rssdler040
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-rssdler
PAK_VER = 1
PAK_VER = 2
DEPS = "python-feedparser python-mechanize"

8
lfs/python-setuptools
View File

@@ -24,15 +24,15 @@
include Config
VER = 0.6c8
VER = 0.6c11
THISAPP = setuptools-$(VER)
DL_FILE = $(THISAPP)-py2.4.egg
DL_FILE = $(THISAPP)-py2.7.egg
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-setuptools
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = cba38d74f7d483c06e9daa6070cce6de
$(DL_FILE)_MD5 = fe1f997bc722265116870bc7919059ea
install : $(TARGET)

16
lfs/reiser4progs
View File

@@ -30,11 +30,7 @@ THISAPP = reiser4progs-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
@@ -74,18 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc \
--with-libaal=/opt/$(MACHINE)-uClibc \
--without-readline --disable-shared \
--sbindir=/install/initrd/sbin
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
-rm -f /install/initrd/{debugfs.,measurefs.,make_}reiser4
else
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
make.sh
View File

@@ -682,8 +682,6 @@ buildinstaller() {
installmake popt
installmake sysvinit
installmake misc-progs
installmake libaal
installmake reiser4progs
installmake reiserfsprogs
installmake sysfsutils
installmake util-linux

8
src/initscripts/init.d/dnsmasq
View File

@@ -15,6 +15,11 @@
. /etc/sysconfig/rc
. ${rc_functions}
# Pull custom configuration file
if [ -e "/etc/sysconfig/dnsmasq" ]; then
. /etc/sysconfig/dnsmasq
fi
SHOW_SRV=1
case "${1}" in
@@ -41,7 +46,8 @@ case "${1}" in
[ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"
ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`"
ARGS="$ARGS $CUSTOM_ARGS"
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then

32
src/patches/Python-2.4.3-gdbm-1.patch
View File

@@ -1,32 +0,0 @@
Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
Date: 2003-12-26
Initial Package Version: 2.3.3
Origin: Greg Schafer and Jim Gifford
Description: Fixes Python build issue with gdbm
*** WARNING: renaming "dbm" since importing it failed:
build/lib.linux-i686-2.3/dbm.so: undefined symbol: dbm_firstkey
$LastChangedBy: dnicholson $
$Date: 2006-04-20 10:08:34 -0600 (Thu, 20 Apr 2006) $
diff -Naur Python-2.3.2.orig/setup.py Python-2.3.2/setup.py
--- Python-2.3.2.orig/setup.py 2003-09-22 01:19:45.000000000 +0000
+++ Python-2.3.2/setup.py 2003-10-13 06:28:34.000000000 +0000
@@ -596,12 +596,12 @@
if self.compiler.find_library_file(lib_dirs, 'ndbm'):
ndbm_libs = ['ndbm']
else:
- ndbm_libs = []
+ ndbm_libs = ['gdbm', 'gdbm_compat']
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_NDBM_H',None)],
libraries = ndbm_libs ) )
elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
+ and find_file("ndbm.h", inc_dirs, []) is not None):
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_GDBM_NDBM_H',None)],
libraries = ['gdbm'] ) )

21
src/patches/Python-2.7-gdbm-1.patch Normal file
View File

@@ -0,0 +1,21 @@
diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
--- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200
+++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200
@@ -1125,7 +1125,7 @@
'ndbm'):
ndbm_libs = ['ndbm']
else:
- ndbm_libs = []
+ ndbm_libs = ['gdbm', 'gdbm_compat' ]
print "building dbm using ndbm"
dbmext = Extension('dbm', ['dbmmodule.c'],
define_macros=[
@@ -1140,7 +1140,7 @@
if self.compiler.find_library_file(lib_dirs,
'gdbm_compat'):
gdbm_libs.append('gdbm_compat')
- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
+ if find_file("ndbm.h", inc_dirs, []) is not None:
print "building dbm using gdbm"
dbmext = Extension(
'dbm', ['dbmmodule.c'],

19
src/patches/linux-2.6.32.15-option_add_huawei_android.patch Normal file
View File

@@ -0,0 +1,19 @@
diff -Naur linux-2.6.32.15.org/drivers/usb/serial/option.c linux-2.6.32.15/drivers/usb/serial/option.c
--- linux-2.6.32.15.org/drivers/usb/serial/option.c 2010-06-01 18:56:03.000000000 +0200
+++ linux-2.6.32.15/drivers/usb/serial/option.c 2010-08-02 22:38:11.000000000 +0200
@@ -102,6 +102,7 @@
#define HUAWEI_PRODUCT_E600 0x1001
#define HUAWEI_PRODUCT_E220 0x1003
#define HUAWEI_PRODUCT_E220BIS 0x1004
+#define HUAWEI_PRODUCT_ANDROID 0x1035
#define HUAWEI_PRODUCT_E1401 0x1401
#define HUAWEI_PRODUCT_E1402 0x1402
#define HUAWEI_PRODUCT_E1403 0x1403
@@ -380,6 +381,7 @@
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ANDROID, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1402, 0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403, 0xff, 0xff, 0xff) },