* [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 60d3e6f6358b0cec3cd95383484f5ca638051af6
@ 2012-10-20 17:02 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-10-20 17:02 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 14934 bytes --]
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, thirteen has been updated
via 60d3e6f6358b0cec3cd95383484f5ca638051af6 (commit)
via c553d34f6ab2f2ad5847dcd381561c5e6ee64b4a (commit)
via e103515ad83e7f55258ff390053972a7f004eb0b (commit)
via ef82c2682fe47788601c81030a99e615ad32db4f (commit)
from 55fa19b0fed06561253e8c0faaa68e5607d8bcb1 (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 60d3e6f6358b0cec3cd95383484f5ca638051af6
Merge: c553d34 55fa19b
Author: Arne Fitzenreiter <arne_f(a)git.ipfire.org>
Date: Sat Oct 20 19:01:47 2012 +0200
Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen
commit c553d34f6ab2f2ad5847dcd381561c5e6ee64b4a
Author: Arne Fitzenreiter <arne_f(a)git.ipfire.org>
Date: Sat Oct 20 19:00:54 2012 +0200
kernel: enabled CONFIG_CC_STACKPROTECTOR.
commit e103515ad83e7f55258ff390053972a7f004eb0b
Author: Arne Fitzenreiter <arne_f(a)git.ipfire.org>
Date: Sat Oct 20 18:54:54 2012 +0200
mpd: depends on flac.
commit ef82c2682fe47788601c81030a99e615ad32db4f
Author: Arne Fitzenreiter <arne_f(a)git.ipfire.org>
Date: Sat Oct 20 13:07:45 2012 +0200
kvm-kmod: update to 3.6.
-----------------------------------------------------------------------
Summary of changes:
.../kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +-
config/kernel/kernel.config.armv5tel-ipfire-omap | 7 +--
config/kernel/kernel.config.armv5tel-ipfire-rpi | 9 +---
config/kernel/kernel.config.i586-ipfire | 6 +-
config/kernel/kernel.config.i586-ipfire-pae | 6 +-
config/kernel/kernel.config.i586-ipfire-xen | 16 ++-----
lfs/kvm-kmod | 5 +-
lfs/mpd | 4 +-
make.sh | 4 +-
...6_remove_pvclock_scale_delta_redifinition.patch | 45 --------------------
...b_remove_pvclock_scale_delta_redefinition.patch | 12 -----
11 files changed, 23 insertions(+), 93 deletions(-)
delete mode 100644 src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
delete mode 100644 src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index 133ac1a..eb40528 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -392,7 +392,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
#
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-omap b/config/kernel/kernel.config.armv5tel-ipfire-omap
index 739958e..fe943a3 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-omap
+++ b/config/kernel/kernel.config.armv5tel-ipfire-omap
@@ -468,8 +468,8 @@ CONFIG_FORCE_MAX_ZONEORDER=11
# CONFIG_LEDS is not set
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
-# CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
#
@@ -1546,9 +1546,6 @@ CONFIG_USB_NET_RNDIS_WLAN=m
# CONFIG_ATH_COMMON is not set
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
-# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
# CONFIG_BRCMFMAC is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index fb5517f..e19ea4d 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.31 Kernel Configuration
+# Linux/arm 3.2.32 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -350,8 +350,8 @@ CONFIG_NEED_PER_CPU_KM=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
-# CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
#
@@ -1433,9 +1433,6 @@ CONFIG_USB_NET_RNDIS_WLAN=m
# CONFIG_ATH_COMMON is not set
# CONFIG_B43 is not set
# CONFIG_B43LEGACY is not set
-# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
# CONFIG_BRCMFMAC is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 78de471..3b85773 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.20 Kernel Configuration
+# Linux/i386 3.2.32 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -47,7 +47,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -408,7 +407,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
# CONFIG_EFI is not set
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -2488,6 +2487,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_GPIO=m
CONFIG_I2C_INTEL_MID=m
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 7186e73..d56e066 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 2.6.42.20 Kernel Configuration
+# Linux/i386 3.2.32 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -47,7 +47,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_HAVE_INTEL_TXT=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
@@ -427,7 +426,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
# CONFIG_EFI is not set
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -2529,6 +2528,7 @@ CONFIG_I2C_SCMI=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_GPIO=m
CONFIG_I2C_INTEL_MID=m
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 53496b0..7ba0b87 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.41-ipfire-xen
-# Mon May 31 15:00:00 2011
+# Linux kernel version: 2.6.32.60-ipfire-xen
+# Sat Oct 20 11:32:41 2012
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -47,7 +47,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_X86_32_SMP=y
CONFIG_X86_NO_TSS=y
CONFIG_X86_NO_IDT=y
-CONFIG_X86_32_LAZY_GS=y
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -283,8 +282,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_HIGHPTE is not set
CONFIG_MTRR=y
# CONFIG_X86_PAT is not set
+CONFIG_ARCH_RANDOM=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
CONFIG_HZ_300=y
@@ -2140,10 +2140,9 @@ CONFIG_SSB_POSSIBLE=y
#
CONFIG_SSB=m
CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST_POSSIBLE=y
CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
+# CONFIG_SSB_B43_PCI_BRIDGE is not set
CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
CONFIG_SSB_PCMCIAHOST=y
CONFIG_SSB_SDIOHOST_POSSIBLE=y
@@ -2797,7 +2796,6 @@ CONFIG_USB_ISP116X_HCD=m
# CONFIG_USB_ISP1760_HCD is not set
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_SSB=y
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -2810,10 +2808,6 @@ CONFIG_USB_WHCI_HCD=m
CONFIG_USB_HWA_HCD=m
#
-# Enable Host or Gadget support to see Inventra options
-#
-
-#
# USB Device Class drivers
#
CONFIG_USB_ACM=m
diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index 0280b5e..90bd790 100644
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -26,7 +26,7 @@ include Config
VERSUFIX=ipfire$(KCFG)
-VER = 3.0b
+VER = 3.6
THISAPP = kvm-kmod-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
+$(DL_FILE)_MD5 = 3e51d395d6a0ecac6ae600a0515880c2
install : $(TARGET)
@@ -76,7 +76,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch
cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 x86/*.ko \
diff --git a/lfs/mpd b/lfs/mpd
index 1f57f18..7b2c54d 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
PAK_VER = 14
-DEPS = "alsa faad2 ffmpeg-libs lame libmad libshout libogg libid3tag libvorbis"
+DEPS = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis"
###############################################################################
# Top-level Rules
diff --git a/make.sh b/make.sh
index 208ddf6..0fe6cb4 100755
--- a/make.sh
+++ b/make.sh
@@ -393,7 +393,7 @@ buildipfire() {
# x86-pae (Native and new XEN) kernel build
ipfiremake linux KCFG="-pae"
-# ipfiremake kvm-kmod KCFG="-pae"
+ ipfiremake kvm-kmod KCFG="-pae"
ipfiremake v4l-dvb KCFG="-pae"
ipfiremake alsa KCFG="-pae" KMOD=1
ipfiremake mISDN KCFG="-pae"
@@ -407,7 +407,7 @@ buildipfire() {
# x86 kernel build
ipfiremake linux KCFG=""
-# ipfiremake kvm-kmod KCFG=""
+ ipfiremake kvm-kmod KCFG=""
ipfiremake v4l-dvb KCFG=""
ipfiremake alsa KCFG="" KMOD=1
ipfiremake mISDN KCFG=""
diff --git a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
deleted file mode 100644
index 331e8a1..0000000
--- a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h
---- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200
-+++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200
-@@ -1064,41 +1064,6 @@
-
- #endif /* >= 2.6.36 */
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
--static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
--{
-- u64 product;
--#ifdef __i386__
-- u32 tmp1, tmp2;
--#endif
--
-- if (shift < 0)
-- delta >>= -shift;
-- else
-- delta <<= shift;
--
--#ifdef __i386__
-- __asm__ (
-- "mul %5 ; "
-- "mov %4,%%eax ; "
-- "mov %%edx,%4 ; "
-- "mul %5 ; "
-- "xor %5,%5 ; "
-- "add %4,%%eax ; "
-- "adc %5,%%edx ; "
-- : "=A" (product), "=r" (tmp1), "=r" (tmp2)
-- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
--#elif defined(__x86_64__)
-- __asm__ (
-- "mul %%rdx ; shrd $32,%%rdx,%%rax"
-- : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
--#else
--#error implement me!
--#endif
--
-- return product;
--}
--#endif
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \
- LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64)
diff --git a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
deleted file mode 100644
index 87effb3..0000000
--- a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kvm-kmod-3.0b.org/x86/external-module-compat.h kvm-kmod-3.0b/x86/external-module-compat.h
---- kvm-kmod-3.0b.org/x86/external-module-compat.h 2011-07-23 16:39:10.000000000 +0200
-+++ kvm-kmod-3.0b/x86/external-module-compat.h 2011-08-13 21:37:56.046677541 +0200
-@@ -1095,7 +1095,7 @@
-
- #endif /* >= 2.6.36 */
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) || \
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
- (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32) && KERNEL_EXTRAVERSION < 40)
- static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
- {
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-20 17:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-20 17:02 [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 60d3e6f6358b0cec3cd95383484f5ca638051af6 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox