#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.42
-# Tue Feb 27 18:11:07 2007
+# Linux kernel version: 2.6.16.42-ipfire
+# Sat Mar 3 20:27:00 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCIEPORTBUS=y
-# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_LEGACY_PROC=y
# CONFIG_PCI_DEBUG is not set
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
#
# PCCARD (PCMCIA/CardBus) support
#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_IOCTL is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_PCCARD is not set
#
# PCI Hotplug Support
# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
+# CONFIG_IP_ROUTE_FWMARK is not set
CONFIG_IP_ROUTE_MULTIPATH=y
# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_IP_NF_CT_PROTO_SCTP=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_NETBIOS_NS=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_H323=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_LAYER7=m
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
-# CONFIG_IP_NF_MATCH_MULTIPORT is not set
+CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
-# CONFIG_IP_NF_MATCH_DSCP is not set
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_POLICY is not set
+CONFIG_IP_NF_MATCH_POLICY=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_NAT_PPTP=m
CONFIG_IP_NF_NAT_H323=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
-# CONFIG_IP_NF_TARGET_DSCP is not set
+CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_TARGET_TARPIT=m
-CONFIG_IP_NF_NAT_MMS=m
-CONFIG_IP_NF_MMS=m
CONFIG_IP_NF_NAT_SIP=m
CONFIG_IP_NF_SIP=m
CONFIG_IEEE80211_CRYPT_WEP=m
# CONFIG_IEEE80211_CRYPT_CCMP is not set
# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_KLIPS=m
-
-#
-# KLIPS options
-#
-CONFIG_KLIPS_ESP=y
-CONFIG_KLIPS_AH=y
-CONFIG_KLIPS_AUTH_HMAC_MD5=y
-CONFIG_KLIPS_AUTH_HMAC_SHA1=y
-CONFIG_KLIPS_ENC_CRYPTOAPI=y
-CONFIG_KLIPS_ENC_1DES=y
-CONFIG_KLIPS_ENC_3DES=y
-CONFIG_KLIPS_ENC_AES=y
-CONFIG_KLIPS_ENC_NULL=y
-CONFIG_KLIPS_IPCOMP=y
-CONFIG_KLIPS_DEBUG=y
#
# Device Drivers
# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 is not set
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=y
CONFIG_SCSI_AIC7XXX=m
CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-CONFIG_AIC7XXX_PROBE_EISA_VL=y
+# CONFIG_AIC7XXX_PROBE_EISA_VL is not set
# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
CONFIG_AIC7XXX_DEBUG_MASK=0
CONFIG_AIC79XX_CMDS_PER_DEVICE=32
CONFIG_AIC79XX_RESET_DELAY_MS=15000
# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_ENABLE_RD_STRM=y
+# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
# CONFIG_AIC79XX_DEBUG_ENABLE is not set
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
CONFIG_SCSI_NSP32=m
# CONFIG_SCSI_DEBUG is not set
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_PCMCIA_XIRTULIP is not set
CONFIG_AT1700=m
CONFIG_DEPCA=m
CONFIG_HP100=m
# CONFIG_STRIP is not set
CONFIG_ARLAN=m
CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-CONFIG_PCMCIA_RAYCS=m
#
# Wireless 802.11b ISA/PCI cards support
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y
-#
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
-
#
# Wan interfaces
#
CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
# Serial drivers
#
CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_ACPI=y
+# CONFIG_SERIAL_8250_ACPI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_FTAPE is not set
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
CONFIG_MWAVE=m
# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
#
# USB Device Class drivers
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
# CONFIG_REISER4_DEBUG is not set
-CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_SECURITY=y
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
+CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
CONFIG_FUSE_FS=m
#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
-# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=y
+# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_VMALLOC=y
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_TEST is not set
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.42
-# Tue Feb 27 18:10:45 2007
+# Linux kernel version: 2.6.16.42-ipfire
+# Sat Mar 3 20:27:11 2007
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_CPU_FREQ_TABLE=y
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCIEPORTBUS=y
# CONFIG_PCI_MSI is not set
-# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_LEGACY_PROC=y
# CONFIG_PCI_DEBUG is not set
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
#
# PCCARD (PCMCIA/CardBus) support
#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_IOCTL is not set
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_PCCARD is not set
#
# PCI Hotplug Support
# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
+# CONFIG_IP_ROUTE_FWMARK is not set
CONFIG_IP_ROUTE_MULTIPATH=y
# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
+# CONFIG_NETFILTER_XT_MATCH_STATE is not set
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_IP_NF_CT_PROTO_SCTP=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-# CONFIG_IP_NF_TFTP is not set
-# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_NETBIOS_NS=m
+CONFIG_IP_NF_TFTP=m
+CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_H323=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_LAYER7=m
# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
-# CONFIG_IP_NF_MATCH_MULTIPORT is not set
+CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
-# CONFIG_IP_NF_MATCH_DSCP is not set
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
-# CONFIG_IP_NF_MATCH_POLICY is not set
+CONFIG_IP_NF_MATCH_POLICY=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_NAT_PPTP=m
CONFIG_IP_NF_NAT_H323=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
-# CONFIG_IP_NF_TARGET_DSCP is not set
+CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_IP_NF_TARGET_TARPIT=m
-CONFIG_IP_NF_NAT_MMS=m
-CONFIG_IP_NF_MMS=m
CONFIG_IP_NF_NAT_SIP=m
CONFIG_IP_NF_SIP=m
CONFIG_IEEE80211_CRYPT_WEP=m
# CONFIG_IEEE80211_CRYPT_CCMP is not set
# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_KLIPS=m
-
-#
-# KLIPS options
-#
-CONFIG_KLIPS_ESP=y
-CONFIG_KLIPS_AH=y
-CONFIG_KLIPS_AUTH_HMAC_MD5=y
-CONFIG_KLIPS_AUTH_HMAC_SHA1=y
-CONFIG_KLIPS_ENC_CRYPTOAPI=y
-CONFIG_KLIPS_ENC_1DES=y
-CONFIG_KLIPS_ENC_3DES=y
-CONFIG_KLIPS_ENC_AES=y
-CONFIG_KLIPS_ENC_NULL=y
-CONFIG_KLIPS_IPCOMP=y
-CONFIG_KLIPS_DEBUG=y
#
# Device Drivers
# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 is not set
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=y
# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=y
CONFIG_SCSI_AIC7XXX=m
CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-CONFIG_AIC7XXX_PROBE_EISA_VL=y
+# CONFIG_AIC7XXX_PROBE_EISA_VL is not set
# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
CONFIG_AIC7XXX_DEBUG_MASK=0
CONFIG_AIC79XX_CMDS_PER_DEVICE=32
CONFIG_AIC79XX_RESET_DELAY_MS=15000
# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-CONFIG_AIC79XX_ENABLE_RD_STRM=y
+# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
# CONFIG_AIC79XX_DEBUG_ENABLE is not set
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
CONFIG_SCSI_NSP32=m
# CONFIG_SCSI_DEBUG is not set
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_AHA152X is not set
-# CONFIG_PCMCIA_FDOMAIN is not set
-# CONFIG_PCMCIA_NINJA_SCSI is not set
-# CONFIG_PCMCIA_QLOGIC is not set
-# CONFIG_PCMCIA_SYM53C500 is not set
-
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
CONFIG_AT1700=m
CONFIG_DEPCA=m
CONFIG_HP100=m
# CONFIG_STRIP is not set
CONFIG_ARLAN=m
CONFIG_WAVELAN=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-CONFIG_PCMCIA_RAYCS=m
#
# Wireless 802.11b ISA/PCI cards support
CONFIG_ATMEL=m
CONFIG_PCI_ATMEL=m
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y
-#
-# PCMCIA network device support
-#
-# CONFIG_NET_PCMCIA is not set
-
#
# Wan interfaces
#
CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
CONFIG_ISDN_DRV_AVMB1_T1ISA=m
CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
# Serial drivers
#
CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_ACPI=y
+# CONFIG_SERIAL_8250_ACPI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
#
# CONFIG_AGP is not set
# CONFIG_DRM is not set
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
CONFIG_MWAVE=m
# CONFIG_CS5535_GPIO is not set
# CONFIG_RAW_DRIVER is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
#
# USB Device Class drivers
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
# CONFIG_REISER4_DEBUG is not set
-CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_FS=y
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_SECURITY=y
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
-# CONFIG_XFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_EXPORT=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
# CONFIG_QUOTA is not set
+CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
CONFIG_FUSE_FS=m
#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
-# CONFIG_MSDOS_FS is not set
+CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=y
+# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=y
-CONFIG_SQUASHFS_EMBEDDED=y
+# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-CONFIG_SQUASHFS_VMALLOC=y
+# CONFIG_SQUASHFS_VMALLOC is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_ANUBIS is not set
CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_TEST is not set
#etc/fcdsl
etc/fcdsl/fcdsl.conf
#lib/modules/KVER-ipfire/extra
-lib/modules/KVER-ipfire/extra/fcdsl.ko
-lib/modules/KVER-ipfire-smp/extra/fcdsl.ko
+#lib/modules/KVER-ipfire/extra/fcdsl.ko
+#lib/modules/KVER-ipfire-smp/extra/fcdsl.ko
#usr/lib/isdn
usr/lib/isdn/fdslbase.bin
#etc/drdsl/drdsl
etc/drdsl/drdsl.ini
etc/fcdsl/fcdsl2.conf
-lib/modules/KVER-ipfire/extra/fcdsl2.ko
-lib/modules/KVER-ipfire-smp/extra/fcdsl2.ko
+#lib/modules/KVER-ipfire/extra/fcdsl2.ko
+#lib/modules/KVER-ipfire-smp/extra/fcdsl2.ko
usr/lib/isdn/fds2base.bin
etc/fcdsl/fcdslsl.conf
-lib/modules/KVER-ipfire/extra/fcdslsl.ko
-lib/modules/KVER-ipfire-smp/extra/fcdslsl.ko
+#lib/modules/KVER-ipfire/extra/fcdslsl.ko
+#lib/modules/KVER-ipfire-smp/extra/fcdslsl.ko
usr/lib/isdn/fdssbase.bin
-boot/System.map
+boot/System.map-ipfire
boot/System.map-KVER-ipfire
-boot/vmlinuz
+boot/vmlinuz-ipfire
boot/vmlinuz-KVER-ipfire
lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/build
* rp-pppoe-3.8
* rrdtool-1.2.15
* rsync-2.6.8
+* samba-3.0.23d
* samba-3.0.24
* screen-4.0.2
* sed-4.1.5
* sox-12.18.1
* spandsp-0.0.3pre24
* squashfs3.0
+* squashfs3.2-r2
* squid-2.6.STABLE9
* squid-graph-3.2
* squidGuard-1.2.0
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire/' \
- -e 's/`uname -r`/$(KVER)/' \
+ -e 's/`uname -r`/$(KVER)-ipfire/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
cd $(DIR_APP) && sed -i \
-e 's/$$(shell uname -m)/$(MACHINE)/' \
-e 's/$$(shell uname -r)/$(KVER)-ipfire-smp/' \
- -e 's/`uname -r`/$(KVER)-smp/' \
+ -e 's/`uname -r`/$(KVER)-ipfire-smp/' \
-e 's/^\(CCFLAGS.*\)$$/\1 \\/' \
-e '\+^CCFLAGS+a\ \
-include \$$(KRNLINCL)/linux/modversions.h' \
VER = 0.97
THISAPP = grub-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP)-reiser4-20050808.tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cd3f3eb54446be6003156158d51f4884
+$(DL_FILE)_MD5 = c5a860a4cd81cffc95a3b9ca5624aa7b
install : $(TARGET)
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- # Reiser4
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-reiser4-20050808.diff
-
# This fails, but doesn't matter
-cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
-
- ### WHICH ONE OF THESE PATCHES DO WE REALLY NEED? CAN WE DELETE ANY?
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-path-patch
- #cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.97/use_ferror.diff
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-R
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/bad-assert-sideeffect
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.97/grub-gfxmenu-v8.diff
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-devicemap.diff
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-linux-setup-fix
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/fix-uninitialized
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/force-LBA-off.diff
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-initrdaddr.diff
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-0.97-protexec.patch
- #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97/grub-path-cfg.diff
cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac
- cd $(DIR_APP) && autoreconf --install --force
+ cd $(DIR_APP) && aclocal && autoheader && autoconf && automake --add-missing
cd $(DIR_APP) && CFLAGS="-Os -s -fno-strict-aliasing" ./configure --prefix=/usr
-
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
###############################################################################
objects =$(DL_FILE) \
mISDN-CVS-2007-01-26.tar.bz2 \
- squashfs3.0.tar.gz \
+ squashfs3.2-r2.tar.gz \
iptables-1.3.5.tar.bz2 \
patch-o-matic-ng-20061210.tar.bz2 \
- netfilter-layer7-v2.6.tar.gz \
+ netfilter-layer7-v2.9.tar.gz \
patch-2.6.16-nath323-1.3.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2
iptables-1.3.5.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2
-netfilter-layer7-v2.6.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
+netfilter-layer7-v2.9.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
-squashfs3.0.tar.gz = $(URL_IPFIRE)/squashfs3.0.tar.gz
+squashfs3.2-r2.tar.gz = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz
mISDN-CVS-2007-01-26.tar.bz2 = $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2
-$(DL_FILE)_MD5 = 87e998bb87839b962702815dd5aecc73
-patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393
-iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5
-netfilter-layer7-v2.6.tar.gz_MD5 = 58135cd1aafaf4ae2fa478159206f064
-patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
-squashfs3.0.tar.gz_MD5 = 9fd05d0bfbb712f5fb95edafea5bc733
-mISDN-CVS-2007-01-26.tar.bz2_MD5 = 844c70dc851faffcae7549fd738c7b49
+$(DL_FILE)_MD5 = 87e998bb87839b962702815dd5aecc73
+patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393
+iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5
+netfilter-layer7-v2.9.tar.gz_MD5 = ebf9043a5352ebe6dbd721989ef83dee
+patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
+squashfs3.2-r2.tar.gz_MD5 = bf360b92eba9e6d5610196ce2e02fcd1
+mISDN-CVS-2007-01-26.tar.bz2_MD5 = 844c70dc851faffcae7549fd738c7b49
install : $(TARGET)
cd $(DIR_SRC) && rm -rf openswan-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.7.tar.gz
#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-natt.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
+ #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.7.kernel-2.6-klips.patch
cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc
# H323 conntrack
cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
- # SquashFS
- cd $(DIR_SRC) && rm -rf squashfs*
- cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.0.tar.gz
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.0/linux-2.6.15/squashfs3.0-patch
-
# Reiser4
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.16-5.patch
+ # SquashFS
+ cd $(DIR_SRC) && rm -rf squashfs*
+ cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-patch
+
# Patch-o-matic
- cd $(DIR_SRC) && rm -rf iptables-*
+ cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic*
cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
cd $(DIR_SRC) && ln -sf iptables-1.3.5 iptables
- cd $(DIR_SRC) && rm -rf patch-o-matic*
cd $(DIR_SRC) && tar xfj $(DIR_DL)/patch-o-matic-ng-20061210.tar.bz2
cd $(DIR_SRC)/patch-o-matic-ng* && \
./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ \
--iptables-path=$(ROOT)/usr/src/iptables/ \
- TARPIT sip-conntrack-nat rtsp-conntrack-nat \
+ sip-conntrack-nat rtsp-conntrack-nat \
mms-conntrack-nat
# Layer7-patch
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire
cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire
cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
- ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz
- ln -sf System.map-$(VER)-ipfire /boot/System.map
+ ln -sf vmlinuz-$(VER)-ipfire /boot/vmlinuz-ipfire
+ ln -sf System.map-$(VER)-ipfire /boot/System-ipfire.map
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
- cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
+ cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
- cd $(DIR_APP) && ./configure --prefix=/ --sbindir=/bin
+ cd $(DIR_APP) && ./configure --prefix=/ --sbindir=/sbin
cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && install -v -m 755 mkreiserfs/mkreiserfs /install/initrd/bin/mkreiserfs
+ cd $(DIR_APP) && install -v -m 755 mkreiserfs/mkreiserfs /install/initrd/sbin/mkreiserfs
else
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
cd $(DIR_APP) && make $(MAKETUNING)
include Config
-VER = 3.0
+VER = 3.2-r2
THISAPP = squashfs$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9fd05d0bfbb712f5fb95edafea5bc733
+$(DL_FILE)_MD5 = bf360b92eba9e6d5610196ce2e02fcd1
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squashfstools-3.0.patch
- cd $(DIR_APP)/squashfs-tools && make "CC=g++" mksquashfs
+ cd $(DIR_APP)/squashfs-tools && make mksquashfs
cd $(DIR_APP)/squashfs-tools && cp -f mksquashfs /bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)
installmake e2fsprogs
installmake libaal
installmake reiser4progs
+ installmake reiserfsprogs
installmake sysfsutils
installmake util-linux
installmake pciutils
boot_mesg "Remounting root file system in read-write mode..."
mount -n -o remount,rw / &>/dev/null
evaluate_retval
+ sleep 1
# Remove fsck-related file system watermarks.
rm -f /fastboot /forcefsck
mysystem("/bin/mount --bind /dev /harddisk/dev");
-
/* if we detected SCSI then fixup */
/* doesn't really work cause it sometimes creates a ramdisk on ide systems */
/* mysystem("/bin/probecntrl.sh");
+++ /dev/null
-diff -u squashfs3.0old/squashfs-tools/mksquashfs.c squashfs3.0/squashfs-tools/mksquashfs.c
---- squashfs3.0old/squashfs-tools/mksquashfs.c 2006-03-15 21:36:20.000000000 +0000
-+++ squashfs3.0/squashfs-tools/mksquashfs.c 2006-04-17 10:58:49.000000000 +0100
-@@ -72,7 +72,7 @@
- #define EXIT_MKSQUASHFS() do {\
- if(restore)\
- restorefs();\
-- if(delete && destination_file && !block_device)\
-+ if(deletesquash && destination_file && !block_device)\
- unlink(destination_file);\
- exit(1);\
- } while(0)
-@@ -81,7 +81,7 @@
- EXIT_MKSQUASHFS();\
- } while(0)
-
--int delete = FALSE;
-+int deletesquash = FALSE;
- long long total_compressed = 0, total_uncompressed = 0;
- int fd;
-
-@@ -251,6 +251,7 @@
- squashfs_fragment_entry **fragment_table);
- int get_sorted_inode(squashfs_inode *inode, struct stat *buf);
- int read_sort_file(char *filename, int source, char *source_path[]);
-+int dir_scan2(squashfs_inode *inode, struct dir_info *dir_info);
- void sort_files_and_write(struct dir_info *dir);
- struct file_info *duplicate(char *(get_next_file_block)(struct duplicate_buffer_handle *, unsigned int), struct duplicate_buffer_handle *file_start, long long bytes, unsigned int **block_list, long long *start, int blocks, struct fragment **fragment, char *frag_data, int frag_bytes);
- struct dir_info *dir_scan1(char *, int (_readdir)(char *, char *, struct dir_info *));
-@@ -285,7 +286,7 @@
- }
-
-
--void sighandler()
-+void sighandler(int signal)
- {
- if(interrupted == 1)
- restorefs();
-@@ -297,7 +298,7 @@
- }
-
-
--void sighandler2()
-+void sighandler2(int signal)
- {
- EXIT_MKSQUASHFS();
- }
-@@ -693,7 +694,7 @@
-
- void scan2_init_dir(struct directory *dir)
- {
-- if((dir->buff = malloc(SQUASHFS_METADATA_SIZE)) == NULL) {
-+ if((dir->buff = (unsigned char *)malloc(SQUASHFS_METADATA_SIZE)) == NULL) {
- BAD_ERROR("Out of memory allocating directory buffer\n");
- }
-
-@@ -720,7 +721,7 @@
- }
-
- if(dir->p + sizeof(squashfs_dir_entry) + size + sizeof(squashfs_dir_header) >= dir->buff + dir->size) {
-- if((buff = realloc(dir->buff, dir->size += SQUASHFS_METADATA_SIZE)) == NULL) {
-+ if((buff = (unsigned char *)realloc(dir->buff, dir->size += SQUASHFS_METADATA_SIZE)) == NULL) {
- BAD_ERROR("Out of memory reallocating directory buffer\n");
- }
-
-@@ -737,7 +738,7 @@
-
- if((dir->p + sizeof(squashfs_dir_entry) + size - dir->index_count_p) > SQUASHFS_METADATA_SIZE) {
- if(dir->i_count % I_COUNT_SIZE == 0)
-- if((dir->index = realloc(dir->index, (dir->i_count + I_COUNT_SIZE) * sizeof(struct cached_dir_index))) == NULL)
-+ if((dir->index = (struct cached_dir_index *)realloc(dir->index, (dir->i_count + I_COUNT_SIZE) * sizeof(struct cached_dir_index))) == NULL)
- BAD_ERROR("Out of memory in directory index table reallocation!\n");
- dir->index[dir->i_count].index.index = dir->p - dir->buff;
- dir->index[dir->i_count].index.size = size - 1;
-@@ -1175,7 +1176,7 @@
- int blocks = (read_size + block_size - 1) >> block_log, allocated_blocks = blocks;
- unsigned int *block_list, *block_listp;
-
-- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL)
-+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL)
- BAD_ERROR("Out of memory allocating block_list\n");
- block_listp = block_list;
-
-@@ -1329,7 +1330,7 @@
- inode = inode->next;
- }
-
-- if((inode = malloc(sizeof(struct inode_info))) == NULL)
-+ if((inode = (struct inode_info *)malloc(sizeof(struct inode_info))) == NULL)
- BAD_ERROR("Out of memory in inode hash table entry allocation\n");
-
- memcpy(&inode->buf, buf, sizeof(struct stat));
-@@ -1350,10 +1351,10 @@
- inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
- {
- if((dir->count % DIR_ENTRIES) == 0)
-- if((dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
-+ if((dir->list = (struct dir_ent **)realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
- BAD_ERROR("Out of memory in add_dir_entry\n");
-
-- if((dir->list[dir->count] = malloc(sizeof(struct dir_ent))) == NULL)
-+ if((dir->list[dir->count] = (struct dir_ent *)malloc(sizeof(struct dir_ent))) == NULL)
- BAD_ERROR("Out of memory in linux_opendir\n");
-
- if(sub_dir)
-@@ -1363,7 +1364,7 @@
- dir->list[dir->count]->inode = inode_info;
- dir->list[dir->count]->dir = sub_dir;
- dir->list[dir->count]->our_dir = dir;
-- dir->list[dir->count++]->data = data;
-+ dir->list[dir->count++]->data = (struct old_root_entry_info *)data;
- dir->byte_count += strlen(name) + sizeof(squashfs_dir_entry);
- }
-
-@@ -1392,7 +1393,7 @@
- struct dirent *d_name;
- struct dir_info *dir;
-
-- if((dir = malloc(sizeof(struct dir_info))) == NULL)
-+ if((dir = (struct dir_info *)malloc(sizeof(struct dir_info))) == NULL)
- return NULL;
-
- if(pathname[0] != '\0' && (dir->linuxdir = opendir(pathname)) == NULL) {
-@@ -1527,10 +1528,10 @@
- if(dir_info == NULL)
- return;
-
-- if((dir_ent = malloc(sizeof(struct dir_ent))) == NULL)
-+ if((dir_ent = (struct dir_ent *)malloc(sizeof(struct dir_ent))) == NULL)
- BAD_ERROR("Out of memory in dir_scan\n");
-
-- if((inode_info = malloc(sizeof(struct inode_info))) == NULL)
-+ if((inode_info = (struct inode_info *)malloc(sizeof(struct inode_info))) == NULL)
- BAD_ERROR("Out of memory in dir_scan\n");
-
- dir_ent->name = dir_ent->pathname = strdup(pathname);
-@@ -1929,7 +1930,7 @@
- break;
-
- else if(strcmp(argv[i], "-noappend") == 0)
-- delete = TRUE;
-+ deletesquash = TRUE;
-
- else if(strcmp(argv[i], "-keep-as-directory") == 0)
- keep_as_directory = TRUE;
-@@ -1996,7 +1997,7 @@
- perror("Could not create destination file");
- exit(1);
- }
-- delete = TRUE;
-+ deletesquash = TRUE;
- } else {
- perror("Could not stat destination file");
- exit(1);
-@@ -2011,7 +2012,7 @@
- block_device = 1;
-
- } else if(S_ISREG(buf.st_mode)) {
-- if((fd = open(argv[source + 1], (delete ? O_TRUNC : 0) | O_RDWR)) == -1) {
-+ if((fd = open(argv[source + 1], (deletesquash ? O_TRUNC : 0) | O_RDWR)) == -1) {
- perror("Could not open regular file for writing as destination");
- exit(1);
- }
-@@ -2023,7 +2024,7 @@
-
- }
-
-- if(!delete) {
-+ if(!deletesquash) {
- if(read_super(fd, &sBlk, &orig_be, argv[source + 1]) == 0) {
- ERROR("Failed to read existing filesystem - will not overwrite - ABORTING!\n");
- EXIT_MKSQUASHFS();
-@@ -2068,7 +2069,7 @@
- else if(strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "-root-becomes") == 0 || strcmp(argv[i], "-ef") == 0)
- i++;
-
-- if(delete) {
-+ if(deletesquash) {
- printf("Creating %s %d.%d filesystem on %s, block size %d.\n",
- be ? "big endian" : "little endian", SQUASHFS_MAJOR, SQUASHFS_MINOR, argv[source + 1], block_size);
- bytes = sizeof(squashfs_super_block);
-@@ -2176,7 +2177,7 @@
-
- block_offset = check_data ? 3 : 2;
-
-- if(delete && !keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
-+ if(deletesquash && !keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
- dir_scan(&inode, source_path[0], scan1_readdir);
- else if(!keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
- dir_scan(&inode, source_path[0], scan1_single_readdir);
-diff -u squashfs3.0old/squashfs-tools/read_fs.c squashfs3.0/squashfs-tools/read_fs.c
---- squashfs3.0old/squashfs-tools/read_fs.c 2006-03-15 21:36:21.000000000 +0000
-+++ squashfs3.0/squashfs-tools/read_fs.c 2006-04-17 11:01:56.000000000 +0100
-@@ -61,14 +61,14 @@
- fprintf(stderr, s, ## args); \
- } while(0)
-
--int swap;
-+int swapsquash;
-
- int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk)
- {
- unsigned short c_byte;
- int offset = 2;
-
-- if(swap) {
-+ if(swapsquash) {
- read_bytes(fd, start, 2, (char *) block);
- ((unsigned char *) &c_byte)[1] = block[0];
- ((unsigned char *) &c_byte)[0] = block[1];
-@@ -125,7 +125,7 @@
- *root_inode_block = bytes;
- }
- if((size - bytes < SQUASHFS_METADATA_SIZE) &&
-- ((*inode_table = realloc(*inode_table, size += SQUASHFS_METADATA_SIZE)) == NULL))
-+ ((*inode_table = (unsigned char *)realloc(*inode_table, size += SQUASHFS_METADATA_SIZE)) == NULL))
- return FALSE;
- TRACE("scan_inode_table: reading block 0x%llx\n", start);
- if((byte = read_block(fd, start, &start, *inode_table + bytes, sBlk)) == 0) {
-@@ -145,14 +145,14 @@
- */
- *root_inode_size = bytes - (*root_inode_block + root_inode_offset);
- bytes = *root_inode_block + root_inode_offset;
-- if(swap) {
-+ if(swapsquash) {
- squashfs_base_inode_header sinode;
- memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->base));
- SQUASHFS_SWAP_BASE_INODE_HEADER(&dir_inode->base, &sinode, sizeof(squashfs_base_inode_header));
- } else
- memcpy(&dir_inode->base, *inode_table + bytes, sizeof(dir_inode->base));
- if(dir_inode->base.inode_type == SQUASHFS_DIR_TYPE) {
-- if(swap) {
-+ if(swapsquash) {
- squashfs_dir_inode_header sinode;
- memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->dir));
- SQUASHFS_SWAP_DIR_INODE_HEADER(&dir_inode->dir, &sinode);
-@@ -160,7 +160,7 @@
- memcpy(&dir_inode->dir, *inode_table + bytes, sizeof(dir_inode->dir));
- directory_start_block = dir_inode->dir.start_block;
- } else {
-- if(swap) {
-+ if(swapsquash) {
- squashfs_ldir_inode_header sinode;
- memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->ldir));
- SQUASHFS_SWAP_LDIR_INODE_HEADER(&dir_inode->ldir, &sinode);
-@@ -170,7 +170,7 @@
- }
-
- for(cur_ptr = *inode_table; cur_ptr < *inode_table + bytes; files ++) {
-- if(swap) {
-+ if(swapsquash) {
- squashfs_reg_inode_header sinode;
- memcpy(&sinode, cur_ptr, sizeof(inode));
- SQUASHFS_SWAP_REG_INODE_HEADER(&inode, &sinode);
-@@ -191,13 +191,13 @@
-
- TRACE("scan_inode_table: regular file, file_size %lld, blocks %d\n", inode.file_size, blocks);
-
-- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL) {
-+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL) {
- ERROR("Out of memory in block list malloc\n");
- goto failed;
- }
-
- cur_ptr += sizeof(inode);
-- if(swap) {
-+ if(swapsquash) {
- unsigned int sblock_list[blocks];
- memcpy(sblock_list, cur_ptr, blocks * sizeof(unsigned int));
- SQUASHFS_SWAP_INTS(block_list, sblock_list, blocks);
-@@ -222,7 +222,7 @@
- int i, start;
- unsigned int *block_list;
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_lreg_inode_header sinodep;
- memcpy(&sinodep, cur_ptr, sizeof(sinodep));
- SQUASHFS_SWAP_LREG_INODE_HEADER(&inode, &sinodep);
-@@ -238,12 +238,12 @@
- sBlk->block_log;
- start = inode.start_block;
-
-- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL) {
-+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL) {
- ERROR("Out of memory in block list malloc\n");
- goto failed;
- }
-
-- if(swap) {
-+ if(swapsquash) {
- unsigned int sblock_list[blocks];
- memcpy(sblock_list, cur_ptr, blocks * sizeof(unsigned int));
- SQUASHFS_SWAP_INTS(block_list, sblock_list, blocks);
-@@ -263,7 +263,7 @@
- case SQUASHFS_SYMLINK_TYPE: {
- squashfs_symlink_inode_header inodep;
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_symlink_inode_header sinodep;
- memcpy(&sinodep, cur_ptr, sizeof(sinodep));
- SQUASHFS_SWAP_SYMLINK_INODE_HEADER(&inodep, &sinodep);
-@@ -276,7 +276,7 @@
- case SQUASHFS_DIR_TYPE: {
- squashfs_dir_inode_header dir_inode;
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_dir_inode_header sinode;
- memcpy(&sinode, cur_ptr, sizeof(dir_inode));
- SQUASHFS_SWAP_DIR_INODE_HEADER(&dir_inode, &sinode);
-@@ -292,7 +292,7 @@
- squashfs_ldir_inode_header dir_inode;
- int i;
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_ldir_inode_header sinode;
- memcpy(&sinode, cur_ptr, sizeof(dir_inode));
- SQUASHFS_SWAP_LDIR_INODE_HEADER(&dir_inode, &sinode);
-@@ -304,7 +304,7 @@
- cur_ptr += sizeof(squashfs_ldir_inode_header);
- for(i = 0; i < dir_inode.i_count; i++) {
- squashfs_dir_index index;
-- if(swap) {
-+ if(swapsquash) {
- squashfs_dir_index sindex;
- memcpy(&sindex, cur_ptr, sizeof(squashfs_dir_index));
- SQUASHFS_SWAP_DIR_INDEX(&index, &sindex);
-@@ -348,14 +348,14 @@
- read_bytes(fd, SQUASHFS_START, sizeof(squashfs_super_block), (char *) sBlk);
-
- /* Check it is a SQUASHFS superblock */
-- swap = 0;
-+ swapsquash = 0;
- if(sBlk->s_magic != SQUASHFS_MAGIC) {
- if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) {
- squashfs_super_block sblk;
- ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source);
- SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk);
- memcpy(sBlk, &sblk, sizeof(squashfs_super_block));
-- swap = 1;
-+ swapsquash = 1;
- } else {
- ERROR("Can't find a SQUASHFS superblock on %s\n", source);
- goto failed_mount;
-@@ -373,9 +373,9 @@
- }
-
- #if __BYTE_ORDER == __BIG_ENDIAN
-- *be = !swap;
-+ *be = !swapsquash;
- #else
-- *be = swap;
-+ *be = swapsquash;
- #endif
-
- printf("Found a valid SQUASHFS superblock on %s.\n", source);
-@@ -416,7 +416,7 @@
- long long start = sBlk->directory_table_start + directory_start_block, last_start_block;
-
- size += offset;
-- if((directory_table = malloc((size + SQUASHFS_METADATA_SIZE * 2 - 1) & ~(SQUASHFS_METADATA_SIZE - 1))) == NULL)
-+ if((directory_table = (unsigned char *)malloc((size + SQUASHFS_METADATA_SIZE * 2 - 1) & ~(SQUASHFS_METADATA_SIZE - 1))) == NULL)
- return NULL;
- while(bytes < size) {
- TRACE("squashfs_readdir: reading block 0x%llx, bytes read so far %d\n", start, bytes);
-@@ -433,7 +433,7 @@
-
- bytes = offset;
- while(bytes < size) {
-- if(swap) {
-+ if(swapsquash) {
- squashfs_dir_header sdirh;
- memcpy(&sdirh, directory_table + bytes, sizeof(sdirh));
- SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
-@@ -445,7 +445,7 @@
- bytes += sizeof(dirh);
-
- while(dir_count--) {
-- if(swap) {
-+ if(swapsquash) {
- squashfs_dir_entry sdire;
- memcpy(&sdire, directory_table + bytes, sizeof(sdire));
- SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
-@@ -481,7 +481,7 @@
- return 0;
- }
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_fragment_index sfragment_table_index[indexes];
-
- read_bytes(fd, sBlk->fragment_table_start, SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments), (char *) sfragment_table_index);
-@@ -494,7 +494,7 @@
- TRACE("Read fragment table block %d, from 0x%llx, length %d\n", i, fragment_table_index[i], length);
- }
-
-- if(swap) {
-+ if(swapsquash) {
- squashfs_fragment_entry sfragment;
- for(i = 0; i < sBlk->fragments; i++) {
- SQUASHFS_SWAP_FRAGMENT_ENTRY((&sfragment), (&(*fragment_table)[i]));
-@@ -584,7 +584,7 @@
- }
- memcpy(*directory_data_cache, directory_table, *inode_dir_offset + *inode_dir_file_size);
-
-- if(!swap)
-+ if(!swapsquash)
- read_bytes(fd, sBlk->uid_start, sBlk->no_uids * sizeof(squashfs_uid), (char *) uids);
- else {
- squashfs_uid uids_copy[sBlk->no_uids];
-@@ -593,7 +593,7 @@
- SQUASHFS_SWAP_DATA(uids, uids_copy, sBlk->no_uids, sizeof(squashfs_uid) * 8);
- }
-
-- if(!swap)
-+ if(!swapsquash)
- read_bytes(fd, sBlk->guid_start, sBlk->no_guids * sizeof(squashfs_uid), (char *) guids);
- else {
- squashfs_uid guids_copy[sBlk->no_guids];
-diff -u squashfs3.0old/squashfs-tools/sort.c squashfs3.0/squashfs-tools/sort.c
---- squashfs3.0old/squashfs-tools/sort.c 2006-03-15 21:36:21.000000000 +0000
-+++ squashfs3.0/squashfs-tools/sort.c 2006-04-17 11:01:33.000000000 +0100
-@@ -87,7 +87,7 @@
- struct priority_entry *new_priority_entry;
-
- priority += 32768;
-- if((new_priority_entry = malloc(sizeof(struct priority_entry))) == NULL) {
-+ if((new_priority_entry = (struct priority_entry *)malloc(sizeof(struct priority_entry))) == NULL) {
- ERROR("Out of memory allocating priority entry\n");
- return FALSE;
- }
-@@ -117,7 +117,7 @@
- #define ADD_ENTRY(buf, priority) {\
- int hash = buf.st_ino & 0xffff;\
- struct sort_info *s;\
-- if((s = malloc(sizeof(struct sort_info))) == NULL) {\
-+ if((s = (struct sort_info *)malloc(sizeof(struct sort_info))) == NULL) {\
- ERROR("Out of memory allocating sort list entry\n");\
- return FALSE;\
- }\