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

This commit is contained in:
Stefan Schantl
2010-01-20 23:58:08 +01:00
4 changed files with 2606 additions and 119 deletions

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.41
# Thu Dec 10 21:31:08 2009
# Linux kernel version: 2.6.27.42
# Tue Jan 19 21:40:07 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -59,7 +59,6 @@ CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SUSE_KERNEL=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -450,7 +449,7 @@ CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_ACCT=y
CONFIG_NF_CT_ACCT=y
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_CT_PROTO_DCCP=m
@@ -505,6 +504,8 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
CONFIG_NETFILTER_XT_MATCH_LAYER7=m
# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -1674,7 +1675,6 @@ CONFIG_HANGCHECK_TIMER=m
# CONFIG_TCG_TPM is not set
# CONFIG_TELCLOCK is not set
CONFIG_DEVPORT=y
# CONFIG_CRASHER is not set
CONFIG_I2C=m
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=m
@@ -2791,7 +2791,6 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_DEVMEM=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_SCRUB_PAGES=y
# CONFIG_STAGING is not set
#
# Firmware Drivers
@@ -2848,6 +2847,7 @@ CONFIG_INOTIFY_USER=y
CONFIG_QUOTA=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_QUOTA_TREE=m
CONFIG_QFMT_V1=m
CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
@@ -2958,7 +2958,6 @@ CONFIG_CIFS_XATTR=y
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
# CONFIG_NOVFS is not set
#
# Partition Types
@@ -3038,7 +3037,6 @@ CONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_KERNEL is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_UNWIND_INFO is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_HAVE_FTRACE=y

View File

@@ -3,76 +3,75 @@ boot/System.map-ipfire-xen
boot/config-KVER-ipfire-xen
boot/vmlinuz-KVER-ipfire-xen
boot/vmlinuz-ipfire-xen
#lib/firmware/KVER-ipfire-xen
#lib/firmware/KVER-ipfire-xen/atmsar11.fw
#lib/firmware/KVER-ipfire-xen/cpia2
#lib/firmware/KVER-ipfire-xen/cpia2/stv0672_vp4.bin
#lib/firmware/KVER-ipfire-xen/dabusb
#lib/firmware/KVER-ipfire-xen/dabusb/bitstream.bin
#lib/firmware/KVER-ipfire-xen/dabusb/firmware.fw
#lib/firmware/KVER-ipfire-xen/dsp56k
#lib/firmware/KVER-ipfire-xen/dsp56k/bootstrap.bin
#lib/firmware/KVER-ipfire-xen/edgeport
#lib/firmware/KVER-ipfire-xen/edgeport/boot.fw
#lib/firmware/KVER-ipfire-xen/edgeport/boot2.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down2.fw
#lib/firmware/KVER-ipfire-xen/edgeport/down3.bin
#lib/firmware/KVER-ipfire-xen/emi26
#lib/firmware/KVER-ipfire-xen/emi26/bitstream.fw
#lib/firmware/KVER-ipfire-xen/emi26/firmware.fw
#lib/firmware/KVER-ipfire-xen/emi26/loader.fw
#lib/firmware/KVER-ipfire-xen/emi62
#lib/firmware/KVER-ipfire-xen/emi62/bitstream.fw
#lib/firmware/KVER-ipfire-xen/emi62/loader.fw
#lib/firmware/KVER-ipfire-xen/emi62/midi.fw
#lib/firmware/KVER-ipfire-xen/emi62/spdif.fw
#lib/firmware/KVER-ipfire-xen/ess
#lib/firmware/KVER-ipfire-xen/ess/maestro3_assp_kernel.fw
#lib/firmware/KVER-ipfire-xen/ess/maestro3_assp_minisrc.fw
#lib/firmware/KVER-ipfire-xen/intelliport2.bin
#lib/firmware/KVER-ipfire-xen/kaweth
#lib/firmware/KVER-ipfire-xen/kaweth/new_code.bin
#lib/firmware/KVER-ipfire-xen/kaweth/new_code_fix.bin
#lib/firmware/KVER-ipfire-xen/kaweth/trigger_code.bin
#lib/firmware/KVER-ipfire-xen/kaweth/trigger_code_fix.bin
#lib/firmware/KVER-ipfire-xen/keyspan
#lib/firmware/KVER-ipfire-xen/keyspan/mpr.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa18x.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19qi.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19qw.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa19w.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28x.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28xa.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa28xb.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa49w.fw
#lib/firmware/KVER-ipfire-xen/keyspan/usa49wlc.fw
#lib/firmware/KVER-ipfire-xen/keyspan_pda
#lib/firmware/KVER-ipfire-xen/keyspan_pda/keyspan_pda.fw
#lib/firmware/KVER-ipfire-xen/keyspan_pda/xircom_pgs.fw
#lib/firmware/KVER-ipfire-xen/korg
#lib/firmware/KVER-ipfire-xen/korg/k1212.dsp
#lib/firmware/KVER-ipfire-xen/sb16
#lib/firmware/KVER-ipfire-xen/sb16/alaw_main.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_capture.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_init.csp
#lib/firmware/KVER-ipfire-xen/sb16/ima_adpcm_playback.csp
#lib/firmware/KVER-ipfire-xen/sb16/mulaw_main.csp
#lib/firmware/KVER-ipfire-xen/ti_3410.fw
#lib/firmware/KVER-ipfire-xen/ti_5052.fw
#lib/firmware/KVER-ipfire-xen/tr_smctr.bin
#lib/firmware/KVER-ipfire-xen/ttusb-budget
#lib/firmware/KVER-ipfire-xen/ttusb-budget/dspbootcode.bin
#lib/firmware/KVER-ipfire-xen/vicam
#lib/firmware/KVER-ipfire-xen/vicam/firmware.fw
#lib/firmware/KVER-ipfire-xen/whiteheat.fw
#lib/firmware/KVER-ipfire-xen/whiteheat_loader.fw
#lib/firmware/KVER-ipfire-xen/yamaha
#lib/firmware/KVER-ipfire-xen/yamaha/ds1_ctrl.fw
#lib/firmware/KVER-ipfire-xen/yamaha/ds1_dsp.fw
#lib/firmware/KVER-ipfire-xen/yamaha/ds1e_ctrl.fw
#lib/firmware/atmsar11.fw
#lib/firmware/cpia2
#lib/firmware/cpia2/stv0672_vp4.bin
#lib/firmware/dabusb
#lib/firmware/dabusb/bitstream.bin
#lib/firmware/dabusb/firmware.fw
#lib/firmware/dsp56k
#lib/firmware/dsp56k/bootstrap.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/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/ti_3410.fw
#lib/firmware/ti_5052.fw
#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/yamaha
#lib/firmware/yamaha/ds1_ctrl.fw
#lib/firmware/yamaha/ds1_dsp.fw
#lib/firmware/yamaha/ds1e_ctrl.fw
#lib/modules
lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/build
@@ -798,66 +797,30 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-rhine.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-velocity.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath9k
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath9k/ath9k.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hermes.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_plx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2100.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2200.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_nortel.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_plx.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco_tmd.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54/prism54.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ray_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl8180.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl8187.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/spectrum_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl3501_cs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1201.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/yellowfin.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/parport
#lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport.ko
@@ -1197,6 +1160,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/fs/nfs/nfs.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd/nfsd.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota_tree.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v1.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota_v2.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs

View File

@@ -35,7 +35,7 @@ CFLAGS =
CXXFLAGS =
PROG = linux-xen
PAK_VER = 6
PAK_VER = 7
DEPS = ""
# Normal build or XEN build.
@@ -55,14 +55,14 @@ objects =$(DL_FILE) \
netfilter-layer7-v2.21.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.27.19.patch.bz2 \
linux-$(VER)-suse_xen_patches.tar.bz2
linux-$(VER)-suse_xen_patches-1.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.21.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
linux-$(VER)-suse_xen_patches.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches.tar.bz2
linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches.tar.bz2
$(DL_FILE)_MD5 = a33e6b22d70dd010525fc43cdda36792
@@ -70,7 +70,7 @@ netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
linux-$(VER)-suse_xen_patches.tar.bz2_MD5 = 4de1c2e6b5ca32e681acea4d907cec91
linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = ddbde50f3bc303d947531402017a3055
install : $(TARGET)
@@ -106,9 +106,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(XEN)" "1"
# Apply Xen patches (provided by SuSE)
cd $(DIR_SRC) && tar jxf $(DIR_DL)/linux-$(VER)-suse_xen_patches.tar.bz2
cd $(DIR_SRC) && tar jxf $(DIR_DL)/linux-$(VER)-suse_xen_patches-1.tar.bz2
cp -f $(DIR_SRC)/src/patches/suse_xen_series.conf $(DIR_SRC)/linux-$(VER)-suse_xen_patches/series.conf
cd $(DIR_SRC)/linux-$(VER)-suse_xen_patches && \
for x in $$( ./guards $$( ./arch-symbols) < ./series.conf); do \
echo "*********** [Patch: $$x]"; \
patch -d $(DIR_APP) -p1 < $$x || break; \
done
rm -rf $(DIR_SRC)/linux-*-suse_xen_patches

File diff suppressed because it is too large Load Diff