This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via f508c3c5d903b63c9acdbfd28db80c97ac935872 (commit) via dd667dd58707ff7498a6d83ae89f752875fbe56e (commit) from ef7d03bb34fb5e86ac495d4eb698a80e6ed784af (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit f508c3c5d903b63c9acdbfd28db80c97ac935872 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Aug 13 07:11:21 2010 +0200
Fix xen build.
commit dd667dd58707ff7498a6d83ae89f752875fbe56e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Aug 13 07:09:01 2010 +0200
Initrd: fix some file not found errors at buildlog.
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.i586-ipfire | 5 +- config/kernel/kernel.config.i586-ipfire-xen | 54 +++++++------------------- doc/packages-list.txt | 13 ++++++ lfs/initrd | 2 +- lfs/linux | 8 ++-- make.sh | 52 ++++++------------------- 6 files changed, 49 insertions(+), 85 deletions(-)
Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 4fce3ec..ac38a78 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.15 -# Thu Jul 22 17:12:33 2010 +# Linux kernel version: 2.6.32.18 +# Thu Aug 12 21:04:01 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -934,6 +934,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 0b1bbcd..1ff15a8 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.11 -# Mon Apr 19 11:38:34 2010 +# Linux kernel version: 2.6.32.18 +# Thu Aug 12 20:32:37 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -49,8 +49,6 @@ CONFIG_X86_NO_TSS=y CONFIG_X86_NO_IDT=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y -CONFIG_SUSE_KERNEL=y -# CONFIG_KERNEL_DESKTOP is not set CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y
@@ -132,11 +130,11 @@ CONFIG_AIO=y # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_COMPAT_BRK=y -CONFIG_SLAB=y -# CONFIG_SLUB is not set +CONFIG_SLUB_DEBUG=y +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_DEFAULT_VM_DIRTY_RATIO=40 # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y # CONFIG_KPROBES is not set @@ -163,7 +161,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y -# CONFIG_UTRACE is not set CONFIG_BLOCK=y CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set @@ -219,10 +216,10 @@ CONFIG_M586TSC=y # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=128 -CONFIG_X86_INTERNODE_CACHE_BYTES=128 +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set CONFIG_X86_WP_WORKS_OK=y @@ -263,6 +260,7 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_X86_PAE=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set @@ -279,13 +277,10 @@ CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y # CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_PRECACHE is not set -# CONFIG_PRESWAP is not set # CONFIG_HIGHPTE is not set CONFIG_MTRR=y # CONFIG_X86_PAT is not set CONFIG_SECCOMP=y -# CONFIG_SECCOMP_DISABLE_TSC is not set # CONFIG_CC_STACKPROTECTOR is not set CONFIG_HZ_100=y # CONFIG_HZ_250 is not set @@ -501,7 +496,6 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CONNTRACK_SLP=m CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m @@ -572,7 +566,6 @@ CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_MATCH_IPV4OPTIONS=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m CONFIG_IP_NF_TARGET_LOG=m @@ -821,6 +814,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y @@ -834,7 +828,6 @@ CONFIG_RFKILL=m CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y # CONFIG_NET_9P is not set -# CONFIG_NETVM is not set
# # Device Drivers @@ -976,7 +969,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set CONFIG_ATA_OVER_ETH=m -# CONFIG_CIPHER_TWOFISH is not set # CONFIG_BLK_DEV_HD is not set CONFIG_MISC_DEVICES=y # CONFIG_IBM_ASM is not set @@ -1117,7 +1109,6 @@ CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_HPSA=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m @@ -1297,14 +1288,12 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_QL=m CONFIG_DM_MULTIPATH_ST=m CONFIG_DM_DELAY=m -CONFIG_DM_RAID45=m CONFIG_DM_UEVENT=y CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_MAX_FC_SGE=256 CONFIG_FUSION_CTL=m # CONFIG_FUSION_LOGGING is not set
@@ -2627,11 +2616,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y - -# -# Bootsplash configuration -# -# CONFIG_BOOTSPLASH is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y @@ -3019,7 +3003,6 @@ CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m -# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_APPLEDISPLAY is not set @@ -3218,7 +3201,6 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030207 CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_DOMCTL=y CONFIG_XEN_XENBUS_DEV=y CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL=y CONFIG_XEN_BACKEND=y @@ -3345,7 +3327,6 @@ CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_INTEL_MENLOW=m CONFIG_ACPI_WMI=m -CONFIG_MSI_WMI=m CONFIG_ACPI_ASUS=m CONFIG_TOPSTAR_LAPTOP=m CONFIG_ACPI_TOSHIBA=m @@ -3373,7 +3354,6 @@ CONFIG_EXT3_FS=m # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y -# CONFIG_EXT3_FS_NFS4ACL is not set CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=m CONFIG_EXT4_FS_XATTR=y @@ -3388,7 +3368,6 @@ CONFIG_REISER4_FS=m CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y -# CONFIG_REISERFS_DEFAULTS_TO_BARRIERS_ENABLED is not set CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y @@ -3398,10 +3377,8 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y -# CONFIG_FS_NFS4ACL is not set CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y -# CONFIG_XFS_DMAPI is not set CONFIG_XFS_POSIX_ACL=y # CONFIG_XFS_RT is not set CONFIG_XFS_DEBUG=y @@ -3414,7 +3391,6 @@ CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -# CONFIG_DMAPI is not set CONFIG_QUOTA=y CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_PRINT_QUOTA_WARNING=y @@ -3507,7 +3483,6 @@ CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -# CONFIG_NFS_SWAP is not set # CONFIG_NFS_V4_1 is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y @@ -3521,7 +3496,6 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m -# CONFIG_SUNRPC_SWAP is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -3613,11 +3587,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_UNUSED_SYMBOLS=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set +# CONFIG_SLUB_DEBUG_ON is not set +CONFIG_SLUB_STATS=y CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 5e40131..6f9da0f 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -68,16 +68,19 @@ * cmake-2.4.8 * collectd-4.9.1 * compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire +* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 * cryptodev-20091126-kmod-2.6.32.18-ipfire +* cryptodev-20091126-kmod-2.6.32.18-ipfire-xen * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 * dahdi-2.2.1 * dahdi-2.2.1-kmod-2.6.32.18-ipfire +* dahdi-2.2.1-kmod-2.6.32.18-ipfire-xen * db-4.4.20 * dbus-1.0.3 * ddrescue-1.12 @@ -88,7 +91,9 @@ * dosfstools-3.0.9 * dracut-006 * e1000-8.0.19-kmod-2.6.32.18-ipfire +* e1000-8.0.19-kmod-2.6.32.18-ipfire-xen * e1000e-1.1.19-kmod-2.6.32.18-ipfire +* e1000e-1.1.19-kmod-2.6.32.18-ipfire-xen * e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 @@ -158,6 +163,7 @@ * jpegsrc.v6b * kbd-1.12 * kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire-xen * kudzu-1.2.64 * l7-protocols-2009-05-10 * lame-3.97 @@ -192,6 +198,7 @@ * libxml2-2.6.26 * libxslt-1.1.17 * linux-2.6.32.18-ipfire +* linux-2.6.32.18-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@ -203,8 +210,10 @@ * lzo-2.02 * m4-1.4.4 * mISDN-20100525-kmod-2.6.32.18-ipfire +* mISDN-20100525-kmod-2.6.32.18-ipfire-xen * mISDNuser-20100525 * madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -274,8 +283,11 @@ * qemu-0.11.1-kqemu * qemu-0.12.3 * r8101-1.016.00-kmod-2.6.32.18-ipfire +* r8101-1.016.00-kmod-2.6.32.18-ipfire-xen * r8168-8.018.00-kmod-2.6.32.18-ipfire +* r8168-8.018.00-kmod-2.6.32.18-ipfire-xen * r8169-6.013.00-kmod-2.6.32.18-ipfire +* r8169-6.013.00-kmod-2.6.32.18-ipfire-xen * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@ -330,6 +342,7 @@ * usbutils-0.72 * util-linux-2.12r * v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire +* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.7 * vim-7.0 diff --git a/lfs/initrd b/lfs/initrd index eba2670..cf2dc3f 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -55,7 +55,7 @@ $(TARGET) : cd /install/initrd && lzma -d -c /boot/ipfirerd-$(KVER).img | cpio -i
# Copy Files packages for installer - find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat > /tmp/ROOTFILES + find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat | grep -v "^#" > /tmp/ROOTFILES -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
cd /install/initrd/etc && rm -f fstab diff --git a/lfs/linux b/lfs/linux index 953ba15..b2d71fc 100644 --- a/lfs/linux +++ b/lfs/linux @@ -57,21 +57,21 @@ objects =$(DL_FILE) \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \ - xen-patches-2.6.32-2a.tar.bz2 + xen-patches-2.6.32-2b.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 -xen-patches-2.6.32-2a.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 +xen-patches-2.6.32-2b.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2
$(DL_FILE)_MD5 = 8c8b82d4bf607ddb233deaf7f1c44f0f netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4 -xen-patches-2.6.32-2a.tar.bz2_MD5 = bccb78b9712cb538c6ddadff1dae0ddc +xen-patches-2.6.32-2b.tar.bz2_MD5 = a1798dc2de1ce4329c9580730f6c0096
install : $(TARGET)
@@ -109,7 +109,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2a.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2b.tar.bz2
for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ diff --git a/make.sh b/make.sh index 15f569b..7ee503b 100755 --- a/make.sh +++ b/make.sh @@ -342,19 +342,19 @@ buildipfire() { ipfiremake which ipfiremake xz ipfiremake linux-firmware -# ipfiremake linux XEN=1 -# ipfiremake kqemu XEN=1 -# ipfiremake v4l-dvb XEN=1 -# ipfiremake madwifi XEN=1 -# ipfiremake mISDN XEN=1 -# ipfiremake dahdi XEN=1 KMOD=1 -# ipfiremake cryptodev XEN=1 -# ipfiremake compat-wireless XEN=1 -# ipfiremake r8169 XEN=1 -# ipfiremake r8168 XEN=1 -# ipfiremake r8101 XEN=1 -# ipfiremake e1000 XEN=1 -# ipfiremake e1000e XEN=1 + ipfiremake linux XEN=1 + ipfiremake kqemu XEN=1 + ipfiremake v4l-dvb XEN=1 + ipfiremake madwifi XEN=1 + ipfiremake mISDN XEN=1 + ipfiremake dahdi XEN=1 KMOD=1 + ipfiremake cryptodev XEN=1 + ipfiremake compat-wireless XEN=1 + ipfiremake r8169 XEN=1 + ipfiremake r8168 XEN=1 + ipfiremake r8101 XEN=1 + ipfiremake e1000 XEN=1 + ipfiremake e1000e XEN=1 ipfiremake linux ipfiremake kqemu # ipfiremake kvm-kmod @@ -667,32 +667,6 @@ buildinstaller() { ipfiremake as86 ipfiremake mbr ipfiremake memtest -# installmake linux-libc-header -# installmake binutils -# ipfiremake uClibc PASS=1 -# ipfiremake gcc INST=1 -# installmake uClibc PASS=2 -# installmake gcc INST=2 -# installmake uClibc PASS=3 -# ipfiremake busybox -# installmake udev -# installmake slang -# installmake newt -# installmake gettext -# installmake kbd -# installmake popt -# installmake sysvinit -# installmake misc-progs -# installmake reiserfsprogs -# installmake sysfsutils -# installmake util-linux -# installmake pciutils -# installmake zlib -# installmake mtd -# installmake wget -# installmake hwdata -# installmake kudzu -# installmake pcmciautils ipfiremake installer installmake strip ipfiremake initrd
hooks/post-receive -- IPFire 2.x development tree