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

Merge branch 'master' into next

Browse Source 
Conflicts:
	config/rootfiles/core/40/filelists/compat-wireless
	config/rootfiles/core/40/filelists/files
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-08-11 18:08:51 +02:00
parent 6cf9e77034 9f3e557b55
commit 99555458ad
12 changed files with 2008 additions and 2099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3210,7 +3210,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

0
config/rootfiles/core/40/exclude
View File

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

@@ -1,16 +0,0 @@
etc/system-release
var/ipfire/langs/en.pl
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

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

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

1
config/rootfiles/core/40/meta
View File

@@ -1 +0,0 @@
DEPS=""

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

@@ -1,51 +0,0 @@
#!/bin/bash
############################################################################
# #
# This file is part of the IPFire Firewall. #
# #
# IPFire is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 3 of the License, or #
# (at your option) any later version. #
# #
# IPFire is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
#Stop services
#
#Extract files
extract_files
#
#Remove old python files...
rm -rf /usr/lib/python2.4
#
#Start services
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#
#Rebuild module dep's
depmod 2.6.32.15-ipfire
depmod 2.6.32.15-ipfire-xen
#
#Finish
#Don't report the exitcode last command
exit 0

1
doc/packages-list.txt
View File

@@ -68,6 +68,7 @@
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.34.1-kmod-2.6.32.17-ipfire
* compat-wireless-2.6.35-1-kmod-2.6.32.17-ipfire
* coreutils-5.96
* cpio-2.11
* cpufrequtils-007

4026
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

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)

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