Merge branch 'master' into next

diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files
index 381979858fa575dac12b4c87eb125e62dc9f8ca3..c5ca9a8209b2e53d9d67b3a1f366977c96a0dcb3 100644 (file)
--- 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 6f1af88338be426cd73075d53d587e85b5100907..3d1a32fa37e57b94ef22e829367d7e04a1799492 100644 (file)
--- 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 99ede17b016ba748872523bd1600447fb8325285..08d8ac1efb339b29f41fd5b2d5c5cde638c38156 100644 (file)
--- 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 8a6e7e44e586c80ce71a9450a975a6352b458a74..8c22914aa6fc285ba79e750458c4e15f776a719c 100644 (file)
--- 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 92a9338d78c4ce581a0933c4aa583ea5dbb48b1b..99cbb84342fdb3dcc2c9f49517aff19c869892eb 100644 (file)
--- 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 a00832c2781f7b2d8bc196ed78e35126c0654f39..aaf90b2bbf4ce955263713738cb821fcc6d24fe9 100755 (executable)
--- 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 (file)
index 0000000..a6bb66b
--- /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) },