From: Arne Fitzenreiter Date: Wed, 4 Aug 2010 19:20:10 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~133 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1eaae07281a33fbdb31c6d2c4d0c9313cea2beb1;hp=9c6192caf91165d9b25f9830bb51b509790cac91 Merge branch 'master' into next --- diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 381979858f..c5ca9a8209 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -4,7 +4,9 @@ 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 @@ -12,3 +14,5 @@ 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 diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 6f1af88338..3d1a32fa37 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,7 +27,7 @@ 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) diff --git a/lfs/libaal b/lfs/libaal index 99ede17b01..08d8ac1efb 100644 --- a/lfs/libaal +++ b/lfs/libaal @@ -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) diff --git a/lfs/linux b/lfs/linux index 8a6e7e44e5..8c22914aa6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -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 diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 92a9338d78..99cbb84342 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -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) diff --git a/make.sh b/make.sh index a00832c278..aaf90b2bbf 100755 --- a/make.sh +++ b/make.sh @@ -680,8 +680,6 @@ buildinstaller() { installmake popt installmake sysvinit installmake misc-progs - installmake libaal - installmake reiser4progs installmake reiserfsprogs installmake sysfsutils installmake util-linux diff --git a/src/patches/linux-2.6.32.15-option_add_huawei_android.patch b/src/patches/linux-2.6.32.15-option_add_huawei_android.patch new file mode 100644 index 0000000000..a6bb66bcca --- /dev/null +++ b/src/patches/linux-2.6.32.15-option_add_huawei_android.patch @@ -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) },