RELEASE=3.1
KERNEL_VER=3.10.0
-PKGREL=6
+PKGREL=7
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=2
-RHKVER=54.0.1.el7
+RHKVER=121.el7
KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
check_gcc:
- gcc --version|grep "4.7.2" || false
+ gcc --version|grep "4\.7\.2" || false
${DST_DEB}: data control.in postinst.in copyright changelog.Debian
mkdir -p data/DEBIAN
${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
rm -rf ${KERNEL_SRC}
cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
- cd ${KERNEL_SRC}; patch -p1 <../net-core-always-propagate-flag-changes.patch
#cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.8.diff
#cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab083
#cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
see http://forum.proxmox.com/threads/18238-Windows-7-x64-VMs-crashing-randomly-during-process-termination?p=93273#post93273
+- set CONFIG_CC_STACKPROTECTOR_REGULAR=y
+
+ gcc on debian wheezy does not supportCONFIG_CC_STACKPROTECTOR_STRONG
+
# Note: enable now for testing
#- disable CONFIG_BRIDGE_IGMP_SNOOPING
#
Testing final kernel with kvm
-----------------------------
-kvm -kernel data/boot/vmlinuz-3.10.0-1-pve -initrd initrd.img-3.10.0-1-pve -append "vga=791 video=vesafb:ywrap,mtrr" /dev/zero
+kvm -kernel data/boot/vmlinuz-3.10.0-2-pve -initrd initrd.img-3.10.0-2-pve -append "vga=791 video=vesafb:ywrap,mtrr" /dev/zero
+pve-kernel-3.10.0 (3.10.0-7) unstable; urgency=low
+
+ * update to kernel-3.10.0-121.el7.src.rpm
+
+ * remove net-core-always-propagate-flag-changes.patch (upstream)
+
+ * bump kernal version to 3.10.0-2-pve
+
+ -- Proxmox Support Team <support@proxmox.com> Wed, 23 Apr 2014 09:13:18 +0200
+
pve-kernel-3.10.0 (3.10.0-6) unstable; urgency=low
* set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
---- rh-kernel-src/kernel-3.10.0-x86_64.config 2013-12-16 08:05:07.000000000 +0100
-+++ config-3.10.0 2014-04-10 08:36:55.000000000 +0200
+--- rh-kernel-src/kernel-3.10.0-x86_64.config 2014-04-23 09:14:23.000000000 +0200
++++ config-3.10.0 2014-04-23 09:52:16.000000000 +0200
@@ -1,7 +1,6 @@
-# x86_64
#
#
CONFIG_64BIT=y
CONFIG_X86_64=y
-@@ -283,16 +282,7 @@
+@@ -262,8 +261,8 @@
+ CONFIG_HAVE_CC_STACKPROTECTOR=y
+ CONFIG_CC_STACKPROTECTOR=y
+ # CONFIG_CC_STACKPROTECTOR_NONE is not set
+-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+-CONFIG_CC_STACKPROTECTOR_STRONG=y
++CONFIG_CC_STACKPROTECTOR_REGULAR=y
++# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+ CONFIG_HAVE_CONTEXT_TRACKING=y
+ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+@@ -287,16 +286,7 @@
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
-@@ -583,9 +573,9 @@
+@@ -588,9 +578,9 @@
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-@@ -1122,10 +1112,10 @@
+@@ -1128,10 +1118,10 @@
CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
-@@ -1133,7 +1123,7 @@
+@@ -1139,7 +1129,7 @@
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
-@@ -1431,7 +1421,8 @@
+@@ -1437,7 +1427,8 @@
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
# CONFIG_BLK_DEV_NBD is not set
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
-@@ -1525,10 +1516,10 @@
+@@ -1531,10 +1522,10 @@
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-@@ -1751,7 +1742,7 @@
- # CONFIG_MD_MULTIPATH is not set
+@@ -1754,7 +1745,7 @@
CONFIG_MD_FAULTY=m
# CONFIG_BCACHE is not set
+ CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
CONFIG_DM_DEBUG=y
CONFIG_DM_BUFIO=m
CONFIG_DM_BIO_PRISON=m
-@@ -4529,7 +4520,11 @@
+@@ -4542,7 +4533,11 @@
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=m
# CONFIG_REISERFS_FS is not set
CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
-@@ -4618,8 +4613,8 @@
+@@ -4631,8 +4626,8 @@
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-@@ -4754,7 +4749,7 @@
+@@ -4769,7 +4764,7 @@
CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m
CONFIG_DLM_DEBUG=y
-@@ -4956,9 +4951,8 @@
+@@ -4958,8 +4953,8 @@
+ CONFIG_KEYS=y
+ CONFIG_PERSISTENT_KEYRINGS=y
+ CONFIG_BIG_KEYS=y
+-CONFIG_TRUSTED_KEYS=y
+-CONFIG_ENCRYPTED_KEYS=y
++CONFIG_TRUSTED_KEYS=m
++CONFIG_ENCRYPTED_KEYS=m
+ CONFIG_KEYS_DEBUG_PROC_KEYS=y
+ # CONFIG_SECURITY_DMESG_RESTRICT is not set
+ CONFIG_SECURITY=y
+@@ -4971,9 +4966,8 @@
CONFIG_INTEL_TXT=y
CONFIG_LSM_MMAP_MIN_ADDR=65535
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-@@ -4975,9 +4969,9 @@
- CONFIG_IMA_AUDIT=y
- CONFIG_IMA_LSM_RULES=y
- # CONFIG_IMA_APPRAISE is not set
+@@ -4992,9 +4986,9 @@
+ CONFIG_IMA_APPRAISE=y
+ CONFIG_EVM=y
+ CONFIG_EVM_HMAC_VERSION=2
-CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
-@@ -5049,7 +5043,7 @@
+@@ -5066,7 +5060,7 @@
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
-@@ -5161,7 +5155,7 @@
- CONFIG_PERCPU_RWSEM=y
+@@ -5180,7 +5174,7 @@
+ CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
-@@ -5208,6 +5202,7 @@
+@@ -5227,6 +5221,7 @@
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+++ /dev/null
-From d2615bf450694c1302d86b9cc8a8958edfe4c3a4 Mon Sep 17 00:00:00 2001
-From: Vlad Yasevich <vyasevic@redhat.com>
-Date: Wed, 20 Nov 2013 01:47:15 +0000
-Subject: net: core: Always propagate flag changes to interfaces
-
-The following commit:
- b6c40d68ff6498b7f63ddf97cf0aa818d748dee7
- net: only invoke dev->change_rx_flags when device is UP
-
-tried to fix a problem with VLAN devices and promiscuouse flag setting.
-The issue was that VLAN device was setting a flag on an interface that
-was down, thus resulting in bad promiscuity count.
-This commit blocked flag propagation to any device that is currently
-down.
-
-A later commit:
- deede2fabe24e00bd7e246eb81cd5767dc6fcfc7
- vlan: Don't propagate flag changes on down interfaces
-
-fixed VLAN code to only propagate flags when the VLAN interface is up,
-thus fixing the same issue as above, only localized to VLAN.
-
-The problem we have now is that if we have create a complex stack
-involving multiple software devices like bridges, bonds, and vlans,
-then it is possible that the flags would not propagate properly to
-the physical devices. A simple examle of the scenario is the
-following:
-
- eth0----> bond0 ----> bridge0 ---> vlan50
-
-If bond0 or eth0 happen to be down at the time bond0 is added to
-the bridge, then eth0 will never have promisc mode set which is
-currently required for operation as part of the bridge. As a
-result, packets with vlan50 will be dropped by the interface.
-
-The only 2 devices that implement the special flag handling are
-VLAN and DSA and they both have required code to prevent incorrect
-flag propagation. As a result we can remove the generic solution
-introduced in b6c40d68ff6498b7f63ddf97cf0aa818d748dee7 and leave
-it to the individual devices to decide whether they will block
-flag propagation or not.
-
-Reported-by: Stefan Priebe <s.priebe@profihost.ag>
-Suggested-by: Veaceslav Falico <vfalico@redhat.com>
-Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-(limited to 'net/core/dev.c')
-
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 7e00a73..ba3b7ea 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4996,7 +4996,7 @@ static void dev_change_rx_flags(struct net_device *dev, int flags)
- {
- const struct net_device_ops *ops = dev->netdev_ops;
-
-- if ((dev->flags & IFF_UP) && ops->ndo_change_rx_flags)
-+ if (ops->ndo_change_rx_flags)
- ops->ndo_change_rx_flags(dev, flags);
- }
-
---
-cgit v0.9.2
projects / pve-kernel-3.10.0.git / commitdiff