From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 60d3e6f6358b0cec3cd95383484f5ca638051af6 Date: Sat, 20 Oct 2012 19:02:04 +0200 Message-ID: <20121020170205.0A0C720133@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5517435281385968038==" List-Id: --===============5517435281385968038== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Sat Oct 20 19:01:47 2012 +0200 Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirte= en commit c553d34f6ab2f2ad5847dcd381561c5e6ee64b4a Author: Arne Fitzenreiter Date: Sat Oct 20 19:00:54 2012 +0200 kernel: enabled CONFIG_CC_STACKPROTECTOR. commit e103515ad83e7f55258ff390053972a7f004eb0b Author: Arne Fitzenreiter Date: Sat Oct 20 18:54:54 2012 +0200 mpd: depends on flac. commit ef82c2682fe47788601c81030a99e615ad32db4f Author: Arne Fitzenreiter 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_rede= finition.patch Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke= rnel/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=3D11 CONFIG_ALIGNMENT_TRAP=3Dy CONFIG_UACCESS_WITH_MEMCPY=3Dy CONFIG_SECCOMP=3Dy -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_DEPRECATED_PARAM_STRUCT is not set =20 # 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=3D11 # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=3Dy CONFIG_UACCESS_WITH_MEMCPY=3Dy -# CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_SECCOMP=3Dy +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_DEPRECATED_PARAM_STRUCT is not set =20 # @@ -1546,9 +1546,6 @@ CONFIG_USB_NET_RNDIS_WLAN=3Dm # 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=3Dm CONFIG_HOSTAP_FIRMWARE=3Dy 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=3Dy CONFIG_SYS_SUPPORTS_APM_EMULATION=3Dy @@ -350,8 +350,8 @@ CONFIG_NEED_PER_CPU_KM=3Dy CONFIG_FORCE_MAX_ZONEORDER=3D11 CONFIG_ALIGNMENT_TRAP=3Dy CONFIG_UACCESS_WITH_MEMCPY=3Dy -# CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_SECCOMP=3Dy +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_DEPRECATED_PARAM_STRUCT is not set =20 # @@ -1433,9 +1433,6 @@ CONFIG_USB_NET_RNDIS_WLAN=3Dm # 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=3Dm CONFIG_HOSTAP_FIRMWARE=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.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=3Dy @@ -47,7 +47,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=3Dy CONFIG_HAVE_INTEL_TXT=3Dy CONFIG_X86_32_SMP=3Dy CONFIG_X86_HT=3Dy -CONFIG_X86_32_LAZY_GS=3Dy CONFIG_ARCH_HWEIGHT_CFLAGS=3D"-fcall-saved-ecx -fcall-saved-edx" CONFIG_KTIME_SCALAR=3Dy CONFIG_ARCH_CPU_PROBE_RELEASE=3Dy @@ -408,7 +407,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=3Dy CONFIG_ARCH_RANDOM=3Dy # CONFIG_EFI is not set CONFIG_SECCOMP=3Dy -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=3Dy @@ -2488,6 +2487,7 @@ CONFIG_I2C_SCMI=3Dm # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=3Dm CONFIG_I2C_DESIGNWARE_PCI=3Dm CONFIG_I2C_GPIO=3Dm CONFIG_I2C_INTEL_MID=3Dm diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.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=3Dy @@ -47,7 +47,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=3Dy CONFIG_HAVE_INTEL_TXT=3Dy CONFIG_X86_32_SMP=3Dy CONFIG_X86_HT=3Dy -CONFIG_X86_32_LAZY_GS=3Dy CONFIG_ARCH_HWEIGHT_CFLAGS=3D"-fcall-saved-ecx -fcall-saved-edx" CONFIG_KTIME_SCALAR=3Dy CONFIG_ARCH_CPU_PROBE_RELEASE=3Dy @@ -427,7 +426,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=3Dy CONFIG_ARCH_RANDOM=3Dy # CONFIG_EFI is not set CONFIG_SECCOMP=3Dy -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=3Dy @@ -2529,6 +2528,7 @@ CONFIG_I2C_SCMI=3Dm # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=3Dm CONFIG_I2C_DESIGNWARE_PCI=3Dm CONFIG_I2C_GPIO=3Dm CONFIG_I2C_INTEL_MID=3Dm diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kern= el.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=3Dy @@ -47,7 +47,6 @@ CONFIG_USE_GENERIC_SMP_HELPERS=3Dy CONFIG_X86_32_SMP=3Dy CONFIG_X86_NO_TSS=3Dy CONFIG_X86_NO_IDT=3Dy -CONFIG_X86_32_LAZY_GS=3Dy CONFIG_KTIME_SCALAR=3Dy CONFIG_ARCH_CPU_PROBE_RELEASE=3Dy CONFIG_DEFCONFIG_LIST=3D"/lib/modules/$UNAME_RELEASE/.config" @@ -283,8 +282,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=3D4096 # CONFIG_HIGHPTE is not set CONFIG_MTRR=3Dy # CONFIG_X86_PAT is not set +CONFIG_ARCH_RANDOM=3Dy CONFIG_SECCOMP=3Dy -# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR=3Dy # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=3Dy @@ -2140,10 +2140,9 @@ CONFIG_SSB_POSSIBLE=3Dy # CONFIG_SSB=3Dm CONFIG_SSB_SPROM=3Dy -CONFIG_SSB_BLOCKIO=3Dy CONFIG_SSB_PCIHOST_POSSIBLE=3Dy CONFIG_SSB_PCIHOST=3Dy -CONFIG_SSB_B43_PCI_BRIDGE=3Dy +# CONFIG_SSB_B43_PCI_BRIDGE is not set CONFIG_SSB_PCMCIAHOST_POSSIBLE=3Dy CONFIG_SSB_PCMCIAHOST=3Dy CONFIG_SSB_SDIOHOST_POSSIBLE=3Dy @@ -2797,7 +2796,6 @@ CONFIG_USB_ISP116X_HCD=3Dm # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=3Dm CONFIG_USB_OHCI_HCD=3Dy -CONFIG_USB_OHCI_HCD_SSB=3Dy # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=3Dy @@ -2810,10 +2808,6 @@ CONFIG_USB_WHCI_HCD=3Dm CONFIG_USB_HWA_HCD=3Dm =20 # -# Enable Host or Gadget support to see Inventra options -# - -# # USB Device Class drivers # CONFIG_USB_ACM=3Dm 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 =20 VERSUFIX=3Dipfire$(KCFG) =20 -VER =3D 3.0b +VER =3D 3.6 =20 THISAPP =3D kvm-kmod-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -43,7 +43,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 19792041adc25779b31ea5c5fdca7d8c +$(DL_FILE)_MD5 =3D 3e51d395d6a0ecac6ae600a0515880c2 =20 install : $(TARGET) =20 @@ -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_pvcl= ock_scale_delta_redefinition.patch cd $(DIR_APP) && ./configure --kerneldir=3D/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 = # +# Copyright (C) 2007-2012 IPFire Team = # # = # # 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 =3D $(DIR_INFO)/$(THISAPP) PROG =3D mpd PAK_VER =3D 14 =20 -DEPS =3D "alsa faad2 ffmpeg-libs lame libmad libshout libogg libid3tag= libvorbis" +DEPS =3D "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libi= d3tag libvorbis" =20 ############################################################################= ### # 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() { =20 # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG=3D"-pae" -# ipfiremake kvm-kmod KCFG=3D"-pae" + ipfiremake kvm-kmod KCFG=3D"-pae" ipfiremake v4l-dvb KCFG=3D"-pae" ipfiremake alsa KCFG=3D"-pae" KMOD=3D1 ipfiremake mISDN KCFG=3D"-pae" @@ -407,7 +407,7 @@ buildipfire() { =20 # x86 kernel build ipfiremake linux KCFG=3D"" -# ipfiremake kvm-kmod KCFG=3D"" + ipfiremake kvm-kmod KCFG=3D"" ipfiremake v4l-dvb KCFG=3D"" ipfiremake alsa KCFG=3D"" KMOD=3D1 ipfiremake mISDN KCFG=3D"" diff --git a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifin= ition.patch b/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifi= nition.patch deleted file mode 100644 index 331e8a1..0000000 --- a/src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.p= atch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.3= 8.6/x86/external-module-compat.h ---- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.0= 00000000 +0200 -+++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.52946= 9540 +0200 -@@ -1064,41 +1064,6 @@ -=20 - #endif /* >=3D 2.6.36 */ -=20 --#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 >>=3D -shift; -- else -- delta <<=3D shift; -- --#ifdef __i386__ -- __asm__ ( -- "mul %5 ; " -- "mov %4,%%eax ; " -- "mov %%edx,%4 ; " -- "mul %5 ; " -- "xor %5,%5 ; " -- "add %4,%%eax ; " -- "adc %5,%%edx ; " -- : "=3DA" (product), "=3Dr" (tmp1), "=3Dr" (tmp2) -- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); --#elif defined(__x86_64__) -- __asm__ ( -- "mul %%rdx ; shrd $32,%%rdx,%%rax" -- : "=3Da" (product) : "0" (delta), "d" ((u64)mul_frac) ); --#else --#error implement me! --#endif -- -- return product; --} --#endif -=20 - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \ - LINUX_VERSION_CODE !=3D KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64) diff --git a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinitio= n.patch b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.p= atch 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.00000= 0000 +0200 -+++ kvm-kmod-3.0b/x86/external-module-compat.h 2011-08-13 21:37:56.046677541= +0200 -@@ -1095,7 +1095,7 @@ -=20 - #endif /* >=3D 2.6.36 */ -=20 --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) || \ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \ - (LINUX_VERSION_CODE =3D=3D KERNEL_VERSION(2,6,32) && KERNEL_EXTRAVERSIO= N < 40) - static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) - { hooks/post-receive -- IPFire 2.x development tree --===============5517435281385968038==--