From: <da...@sy...> - 2007-05-30 04:28:14
|
Author: dannf Date: 2007-05-29 23:28:02 -0500 (Tue, 29 May 2007) New Revision: 84 Added: trunk/patches/04_x86-64-linux-config-update.patch Modified: trunk/debian/changelog trunk/debian/rules trunk/patches/02_use-pruned-kernel.patch Log: * Merge amd64 support from gvallee-3.8 branch Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-05-25 14:50:36 UTC (rev 83) +++ trunk/debian/changelog 2007-05-30 04:28:02 UTC (rev 84) @@ -28,8 +28,9 @@ is including something similar * Merge patches/17_coreutils-tee.patch from gvallee-3.8 branch * Add build-dep on python2.4-dev, needed by cx_Freeze build + * Merge amd64 support from gvallee-3.8 branch - -- dann frazier <da...@de...> Thu, 24 May 2007 23:01:42 -0600 + -- dann frazier <da...@de...> Tue, 29 May 2007 22:27:22 -0600 systemimager (3.6.3dfsg1-2) unstable; urgency=medium Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2007-05-25 14:50:36 UTC (rev 83) +++ trunk/debian/rules 2007-05-30 04:28:02 UTC (rev 84) @@ -23,7 +23,7 @@ -p $(PKG)-server-flamethrowerd \ -p $(PKG)-bittorrent -BOOTARCHS = i386 ia64 +BOOTARCHS = i386 ia64 amd64 PATCHES=$(sort $(shell find $(CURDIR)/patches -name "*.patch")) Modified: trunk/patches/02_use-pruned-kernel.patch =================================================================== --- trunk/patches/02_use-pruned-kernel.patch 2007-05-25 14:50:36 UTC (rev 83) +++ trunk/patches/02_use-pruned-kernel.patch 2007-05-30 04:28:02 UTC (rev 84) @@ -1,5 +1,5 @@ ---- systemimager-3.7.5/make.d/kernel.rul.orig 2006-10-17 14:17:24.000000000 -0400 -+++ systemimager-3.7.5/make.d/kernel.rul 2006-12-07 16:58:35.911120160 -0500 +--- systemimager-3.8.0/make.d/kernel.rul.orig 2006-10-17 14:17:24.000000000 -0400 ++++ systemimager-3.8.0/make.d/kernel.rul 2007-05-18 05:11:36.000000000 -0400 @@ -12,17 +12,17 @@ # @@ -22,6 +22,19 @@ endif ifeq ($(ARCH),parisc) +@@ -40,10 +40,10 @@ + endif + + ifeq ($(ARCH),x86_64) +- LINUX_VERSION = 2.6.18.1 ++ LINUX_VERSION = 2.6.20 + LINUX_IMAGE = $(LINUX_SRC)/arch/x86_64/boot/bzImage + LINUX_TARGET = bzImage +- LINUX_DIR = linux-$(LINUX_VERSION) ++ LINUX_DIR = linux-source-$(LINUX_VERSION) + endif + + # currently ppc only supports rs6k machines. Help is welcome to @@ -76,7 +76,7 @@ endif Copied: trunk/patches/04_x86-64-linux-config-update.patch (from rev 83, branches/gvallee-3.8/patches/04_x86-64-linux-config-update.patch) =================================================================== --- trunk/patches/04_x86-64-linux-config-update.patch (rev 0) +++ trunk/patches/04_x86-64-linux-config-update.patch 2007-05-30 04:28:02 UTC (rev 84) @@ -0,0 +1,527 @@ +--- systemimager-3.8.0/patches/linux.x86_64.config.orig 2007-05-18 05:15:42.000000000 -0400 ++++ systemimager-3.8.0/patches/linux.x86_64.config 2007-05-18 05:15:58.000000000 -0400 +@@ -1,11 +1,12 @@ + # + # Automatically generated make config: don't edit +-# Linux kernel version: 2.6.18.1 +-# Tue Oct 17 19:11:53 2006 ++# Linux kernel version: 2.6.20-boel_v3.8.0 ++# Fri May 18 05:15:09 2007 + # + CONFIG_X86_64=y + CONFIG_64BIT=y + CONFIG_X86=y ++CONFIG_ZONE_DMA32=y + CONFIG_LOCKDEP_SUPPORT=y + CONFIG_STACKTRACE_SUPPORT=y + CONFIG_SEMAPHORE_SLEEPERS=y +@@ -18,8 +19,12 @@ + CONFIG_GENERIC_ISA_DMA=y + CONFIG_GENERIC_IOMAP=y + CONFIG_ARCH_MAY_HAVE_PC_FDC=y ++CONFIG_ARCH_POPULATES_NODE_MAP=y + CONFIG_DMI=y + CONFIG_AUDIT_ARCH=y ++CONFIG_GENERIC_BUG=y ++# CONFIG_ARCH_HAS_ILOG2_U32 is not set ++# CONFIG_ARCH_HAS_ILOG2_U64 is not set + CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + + # +@@ -36,17 +41,21 @@ + CONFIG_LOCALVERSION_AUTO=y + CONFIG_SWAP=y + CONFIG_SYSVIPC=y ++# CONFIG_IPC_NS is not set + CONFIG_POSIX_MQUEUE=y + # CONFIG_BSD_PROCESS_ACCT is not set + # CONFIG_TASKSTATS is not set ++# CONFIG_UTS_NS is not set + # CONFIG_AUDIT is not set + # CONFIG_IKCONFIG is not set ++CONFIG_SYSFS_DEPRECATED=y + # CONFIG_RELAY is not set + CONFIG_INITRAMFS_SOURCE="" + # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set ++CONFIG_SYSCTL=y + # CONFIG_EMBEDDED is not set + CONFIG_UID16=y +-CONFIG_SYSCTL=y ++CONFIG_SYSCTL_SYSCALL=y + CONFIG_KALLSYMS=y + CONFIG_KALLSYMS_EXTRA_PASS=y + CONFIG_HOTPLUG=y +@@ -76,9 +85,8 @@ + # + # Block layer + # +-CONFIG_LBD=y ++CONFIG_BLOCK=y + # CONFIG_BLK_DEV_IO_TRACE is not set +-CONFIG_LSF=y + + # + # IO Schedulers +@@ -100,6 +108,7 @@ + # CONFIG_X86_VSMP is not set + # CONFIG_MK8 is not set + # CONFIG_MPSC is not set ++# CONFIG_MCORE2 is not set + CONFIG_GENERIC_CPU=y + CONFIG_X86_L1_CACHE_BYTES=128 + CONFIG_X86_L1_CACHE_SHIFT=7 +@@ -131,6 +140,7 @@ + CONFIG_HPET_TIMER=y + CONFIG_IOMMU=y + CONFIG_CALGARY_IOMMU=y ++CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y + CONFIG_SWIOTLB=y + CONFIG_X86_MCE=y + # CONFIG_X86_MCE_INTEL is not set +@@ -139,8 +149,10 @@ + # CONFIG_CRASH_DUMP is not set + CONFIG_PHYSICAL_START=0x200000 + # CONFIG_SECCOMP is not set ++# CONFIG_CC_STACKPROTECTOR is not set + # CONFIG_HZ_100 is not set + CONFIG_HZ_250=y ++# CONFIG_HZ_300 is not set + # CONFIG_HZ_1000 is not set + CONFIG_HZ=250 + # CONFIG_REORDER is not set +@@ -155,6 +167,7 @@ + CONFIG_PM=y + CONFIG_PM_LEGACY=y + # CONFIG_PM_DEBUG is not set ++# CONFIG_PM_SYSFS_DEPRECATED is not set + # CONFIG_SOFTWARE_SUSPEND is not set + + # +@@ -196,7 +209,9 @@ + CONFIG_PCI_DIRECT=y + CONFIG_PCI_MMCONFIG=y + CONFIG_PCIEPORTBUS=y ++CONFIG_PCIEAER=y + # CONFIG_PCI_MSI is not set ++CONFIG_HT_IRQ=y + + # + # PCCARD (PCMCIA/CardBus) support +@@ -250,6 +265,7 @@ + CONFIG_UNIX=y + CONFIG_XFRM=y + # CONFIG_XFRM_USER is not set ++# CONFIG_XFRM_SUB_POLICY is not set + CONFIG_NET_KEY=y + CONFIG_INET=y + CONFIG_IP_MULTICAST=y +@@ -268,10 +284,13 @@ + # CONFIG_INET_TUNNEL is not set + # CONFIG_INET_XFRM_MODE_TRANSPORT is not set + # CONFIG_INET_XFRM_MODE_TUNNEL is not set ++CONFIG_INET_XFRM_MODE_BEET=y + CONFIG_INET_DIAG=y + CONFIG_INET_TCP_DIAG=y + # CONFIG_TCP_CONG_ADVANCED is not set +-CONFIG_TCP_CONG_BIC=y ++CONFIG_TCP_CONG_CUBIC=y ++CONFIG_DEFAULT_TCP_CONG="cubic" ++# CONFIG_TCP_MD5SIG is not set + # CONFIG_IPV6 is not set + # CONFIG_INET6_XFRM_TUNNEL is not set + # CONFIG_INET6_TUNNEL is not set +@@ -354,7 +373,6 @@ + # Block devices + # + CONFIG_BLK_DEV_FD=y +-CONFIG_BLK_CPQ_DA=m + CONFIG_BLK_CPQ_CISS_DA=m + # CONFIG_CISS_SCSI_TAPE is not set + CONFIG_BLK_DEV_DAC960=m +@@ -374,6 +392,13 @@ + # CONFIG_ATA_OVER_ETH is not set + + # ++# Misc devices ++# ++# CONFIG_IBM_ASM is not set ++# CONFIG_SGI_IOC4 is not set ++# CONFIG_TIFM_CORE is not set ++ ++# + # ATA/ATAPI/MFM/RLL support + # + CONFIG_IDE=m +@@ -422,6 +447,7 @@ + CONFIG_BLK_DEV_HPT34X=m + # CONFIG_HPT34X_AUTODMA is not set + CONFIG_BLK_DEV_HPT366=m ++# CONFIG_BLK_DEV_JMICRON is not set + CONFIG_BLK_DEV_SC1200=m + CONFIG_BLK_DEV_PIIX=m + CONFIG_BLK_DEV_IT821X=m +@@ -446,6 +472,8 @@ + # + CONFIG_RAID_ATTRS=m + CONFIG_SCSI=m ++# CONFIG_SCSI_TGT is not set ++CONFIG_SCSI_NETLINK=y + CONFIG_SCSI_PROC_FS=y + + # +@@ -464,14 +492,16 @@ + CONFIG_SCSI_MULTI_LUN=y + # CONFIG_SCSI_CONSTANTS is not set + # CONFIG_SCSI_LOGGING is not set ++# CONFIG_SCSI_SCAN_ASYNC is not set + + # +-# SCSI Transport Attributes ++# SCSI Transports + # + CONFIG_SCSI_SPI_ATTRS=m + CONFIG_SCSI_FC_ATTRS=m + CONFIG_SCSI_ISCSI_ATTRS=m + CONFIG_SCSI_SAS_ATTRS=m ++# CONFIG_SCSI_SAS_LIBSAS is not set + + # + # SCSI low-level drivers +@@ -495,28 +525,14 @@ + # CONFIG_AIC79XX_DEBUG_ENABLE is not set + CONFIG_AIC79XX_DEBUG_MASK=0 + # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set ++# CONFIG_SCSI_AIC94XX is not set ++# CONFIG_SCSI_ARCMSR is not set + CONFIG_MEGARAID_NEWGEN=y + CONFIG_MEGARAID_MM=m + CONFIG_MEGARAID_MAILBOX=m + CONFIG_MEGARAID_LEGACY=m + CONFIG_MEGARAID_SAS=m +-CONFIG_SCSI_SATA=m +-CONFIG_SCSI_SATA_AHCI=m +-CONFIG_SCSI_SATA_SVW=m +-CONFIG_SCSI_ATA_PIIX=m +-# CONFIG_SCSI_SATA_MV is not set +-CONFIG_SCSI_SATA_NV=m +-CONFIG_SCSI_PDC_ADMA=m + CONFIG_SCSI_HPTIOP=m +-CONFIG_SCSI_SATA_QSTOR=m +-CONFIG_SCSI_SATA_PROMISE=m +-CONFIG_SCSI_SATA_SX4=m +-CONFIG_SCSI_SATA_SIL=m +-CONFIG_SCSI_SATA_SIL24=m +-CONFIG_SCSI_SATA_SIS=m +-CONFIG_SCSI_SATA_ULI=m +-CONFIG_SCSI_SATA_VIA=m +-CONFIG_SCSI_SATA_VITESSE=m + CONFIG_SCSI_BUSLOGIC=m + # CONFIG_SCSI_OMIT_FLASHPOINT is not set + CONFIG_SCSI_DMX3191D=m +@@ -529,20 +545,20 @@ + CONFIG_SCSI_IPS=m + CONFIG_SCSI_INITIO=m + CONFIG_SCSI_INIA100=m ++# CONFIG_SCSI_STEX is not set + CONFIG_SCSI_SYM53C8XX_2=m + CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 + CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 + CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 + CONFIG_SCSI_SYM53C8XX_MMIO=y +-CONFIG_SCSI_IPR=m +-# CONFIG_SCSI_IPR_TRACE is not set +-# CONFIG_SCSI_IPR_DUMP is not set + CONFIG_SCSI_QLOGIC_1280=m + CONFIG_SCSI_QLA_FC=m ++# CONFIG_SCSI_QLA_ISCSI is not set + CONFIG_SCSI_LPFC=m + CONFIG_SCSI_DC395x=m + CONFIG_SCSI_DC390T=m + # CONFIG_SCSI_DEBUG is not set ++# CONFIG_SCSI_SRP is not set + + # + # PCMCIA SCSI adapter support +@@ -552,6 +568,11 @@ + # CONFIG_PCMCIA_SYM53C500 is not set + + # ++# Serial ATA (prod) and Parallel ATA (experimental) drivers ++# ++# CONFIG_ATA is not set ++ ++# + # Multi-device support (RAID and LVM) + # + CONFIG_MD=y +@@ -565,6 +586,7 @@ + # CONFIG_MD_MULTIPATH is not set + # CONFIG_MD_FAULTY is not set + CONFIG_BLK_DEV_DM=m ++# CONFIG_DM_DEBUG is not set + # CONFIG_DM_CRYPT is not set + # CONFIG_DM_SNAPSHOT is not set + # CONFIG_DM_MIRROR is not set +@@ -601,6 +623,11 @@ + # CONFIG_I2O_PROC is not set + + # ++# Macintosh device drivers ++# ++# CONFIG_MAC_EMUMOUSEBTN is not set ++ ++# + # Network device support + # + CONFIG_NETDEVICES=y +@@ -649,6 +676,7 @@ + CONFIG_HP100=y + CONFIG_NET_PCI=y + CONFIG_PCNET32=y ++# CONFIG_PCNET32_NAPI is not set + CONFIG_AMD8111_ETH=y + # CONFIG_AMD8111E_NAPI is not set + CONFIG_ADAPTEC_STARFIRE=y +@@ -697,16 +725,20 @@ + CONFIG_VIA_VELOCITY=y + CONFIG_TIGON3=y + CONFIG_BNX2=y ++# CONFIG_QLA3XXX is not set + + # + # Ethernet (10000 Mbit) + # + CONFIG_CHELSIO_T1=y ++# CONFIG_CHELSIO_T1_1G is not set ++CONFIG_CHELSIO_T1_NAPI=y + CONFIG_IXGB=y + # CONFIG_IXGB_NAPI is not set + CONFIG_S2IO=y + # CONFIG_S2IO_NAPI is not set + CONFIG_MYRI10GE=y ++# CONFIG_NETXEN_NIC is not set + + # + # Token Ring devices +@@ -759,6 +791,7 @@ + # Input device support + # + CONFIG_INPUT=y ++# CONFIG_INPUT_FF_MEMLESS is not set + + # + # Userland interfaces +@@ -781,6 +814,7 @@ + # CONFIG_KEYBOARD_LKKBD is not set + # CONFIG_KEYBOARD_XTKBD is not set + # CONFIG_KEYBOARD_NEWTON is not set ++# CONFIG_KEYBOARD_STOWAWAY is not set + # CONFIG_INPUT_MOUSE is not set + # CONFIG_INPUT_JOYSTICK is not set + # CONFIG_INPUT_TOUCHSCREEN is not set +@@ -843,11 +877,6 @@ + # CONFIG_DTLK is not set + # CONFIG_R3964 is not set + # CONFIG_APPLICOM is not set +- +-# +-# Ftape, the floppy tape device driver +-# +-# CONFIG_FTAPE is not set + CONFIG_AGP=y + CONFIG_AGP_AMD64=y + # CONFIG_AGP_INTEL is not set +@@ -936,6 +965,7 @@ + # + # Dallas's 1-wire bus + # ++# CONFIG_W1 is not set + + # + # Hardware Monitoring support +@@ -944,15 +974,9 @@ + # CONFIG_HWMON_VID is not set + + # +-# Misc devices +-# +-# CONFIG_IBM_ASM is not set +- +-# + # Multimedia devices + # + # CONFIG_VIDEO_DEV is not set +-CONFIG_VIDEO_V4L2=y + + # + # Digital Video Broadcasting Devices +@@ -981,6 +1005,11 @@ + # CONFIG_SOUND is not set + + # ++# HID Devices ++# ++CONFIG_HID=y ++ ++# + # USB support + # + CONFIG_USB_ARCH_HAS_HCD=y +@@ -1033,7 +1062,6 @@ + # USB Input Devices + # + CONFIG_USB_HID=y +-CONFIG_USB_HIDINPUT=y + # CONFIG_USB_HIDINPUT_POWERBOOK is not set + # CONFIG_HID_FF is not set + # CONFIG_USB_HIDDEV is not set +@@ -1063,6 +1091,7 @@ + CONFIG_USB_KAWETH=y + CONFIG_USB_PEGASUS=y + # CONFIG_USB_RTL8150 is not set ++# CONFIG_USB_USBNET_MII is not set + # CONFIG_USB_USBNET is not set + # CONFIG_USB_MON is not set + +@@ -1080,6 +1109,7 @@ + # + # CONFIG_USB_EMI62 is not set + # CONFIG_USB_EMI26 is not set ++# CONFIG_USB_ADUTUX is not set + # CONFIG_USB_AUERSWALD is not set + # CONFIG_USB_RIO500 is not set + # CONFIG_USB_LEGOTOWER is not set +@@ -1087,12 +1117,13 @@ + # CONFIG_USB_LED is not set + # CONFIG_USB_CYPRESS_CY7C63 is not set + # CONFIG_USB_CYTHERM is not set +-# CONFIG_USB_PHIDGETKIT is not set +-# CONFIG_USB_PHIDGETSERVO is not set ++# CONFIG_USB_PHIDGET is not set + # CONFIG_USB_IDMOUSE is not set ++# CONFIG_USB_FTDI_ELAN is not set + # CONFIG_USB_APPLEDISPLAY is not set + # CONFIG_USB_SISUSBVGA is not set + # CONFIG_USB_LD is not set ++# CONFIG_USB_TRANCEVIBRATOR is not set + + # + # USB DSL modem support +@@ -1130,6 +1161,8 @@ + CONFIG_INFINIBAND_ADDR_TRANS=y + CONFIG_INFINIBAND_MTHCA=y + CONFIG_INFINIBAND_MTHCA_DEBUG=y ++# CONFIG_INFINIBAND_IPATH is not set ++# CONFIG_INFINIBAND_AMSO1100 is not set + CONFIG_INFINIBAND_IPOIB=y + CONFIG_INFINIBAND_IPOIB_DEBUG=y + # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set +@@ -1160,6 +1193,11 @@ + # + + # ++# Virtualization ++# ++# CONFIG_KVM is not set ++ ++# + # Firmware Drivers + # + # CONFIG_EDD is not set +@@ -1174,6 +1212,7 @@ + # CONFIG_EXT2_FS_XIP is not set + CONFIG_EXT3_FS=m + # CONFIG_EXT3_FS_XATTR is not set ++# CONFIG_EXT4DEV_FS is not set + CONFIG_JBD=m + # CONFIG_JBD_DEBUG is not set + CONFIG_REISERFS_FS=m +@@ -1191,6 +1230,7 @@ + # CONFIG_XFS_SECURITY is not set + # CONFIG_XFS_POSIX_ACL is not set + # CONFIG_XFS_RT is not set ++# CONFIG_GFS2_FS is not set + # CONFIG_OCFS2_FS is not set + # CONFIG_MINIX_FS is not set + # CONFIG_ROMFS_FS is not set +@@ -1226,8 +1266,10 @@ + # + CONFIG_PROC_FS=y + CONFIG_PROC_KCORE=y ++CONFIG_PROC_SYSCTL=y + CONFIG_SYSFS=y + CONFIG_TMPFS=y ++# CONFIG_TMPFS_POSIX_ACL is not set + # CONFIG_HUGETLBFS is not set + # CONFIG_HUGETLB_PAGE is not set + CONFIG_RAMFS=y +@@ -1328,6 +1370,11 @@ + # CONFIG_NLS_UTF8 is not set + + # ++# Distributed Lock Manager ++# ++# CONFIG_DLM is not set ++ ++# + # Instrumentation Support + # + # CONFIG_PROFILING is not set +@@ -1338,12 +1385,14 @@ + # + CONFIG_TRACE_IRQFLAGS_SUPPORT=y + # CONFIG_PRINTK_TIME is not set ++CONFIG_ENABLE_MUST_CHECK=y + # CONFIG_MAGIC_SYSRQ is not set + CONFIG_UNUSED_SYMBOLS=y ++# CONFIG_DEBUG_FS is not set ++# CONFIG_HEADERS_CHECK is not set + # CONFIG_DEBUG_KERNEL is not set + CONFIG_LOG_BUF_SHIFT=14 +-# CONFIG_DEBUG_FS is not set +-# CONFIG_UNWIND_INFO is not set ++CONFIG_DEBUG_BUGVERBOSE=y + + # + # Security options +@@ -1355,7 +1404,12 @@ + # Cryptographic options + # + CONFIG_CRYPTO=y ++CONFIG_CRYPTO_ALGAPI=y ++CONFIG_CRYPTO_BLKCIPHER=m ++CONFIG_CRYPTO_HASH=y ++CONFIG_CRYPTO_MANAGER=y + CONFIG_CRYPTO_HMAC=y ++# CONFIG_CRYPTO_XCBC is not set + # CONFIG_CRYPTO_NULL is not set + # CONFIG_CRYPTO_MD4 is not set + CONFIG_CRYPTO_MD5=y +@@ -1364,9 +1418,14 @@ + # CONFIG_CRYPTO_SHA512 is not set + # CONFIG_CRYPTO_WP512 is not set + # CONFIG_CRYPTO_TGR192 is not set ++# CONFIG_CRYPTO_GF128MUL is not set ++CONFIG_CRYPTO_ECB=m ++CONFIG_CRYPTO_CBC=m ++# CONFIG_CRYPTO_LRW is not set + CONFIG_CRYPTO_DES=y + # CONFIG_CRYPTO_BLOWFISH is not set + # CONFIG_CRYPTO_TWOFISH is not set ++# CONFIG_CRYPTO_TWOFISH_X86_64 is not set + # CONFIG_CRYPTO_SERPENT is not set + # CONFIG_CRYPTO_AES is not set + # CONFIG_CRYPTO_AES_X86_64 is not set +@@ -1388,6 +1447,7 @@ + # + # Library routines + # ++CONFIG_BITREVERSE=y + CONFIG_CRC_CCITT=y + # CONFIG_CRC16 is not set + CONFIG_CRC32=y +@@ -1395,3 +1455,4 @@ + CONFIG_ZLIB_INFLATE=y + CONFIG_ZLIB_DEFLATE=y + CONFIG_PLIST=y ++CONFIG_IOMAP_COPY=y |