mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 01:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151 from philips/bump-kernel-to-3.10.5

Browse Source 
bump(sys-kernel/coreos-kernel): bump to 3.10.5
This commit is contained in:
Greg Kroah-Hartman 2013-08-05 17:41:43 -07:00
commit 1ca0a5b2ad
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig vendored
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 3.10.4 Kernel Configuration # Linux/x86 3.10.5 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
CONFIG_X86_64=y CONFIG_X86_64=y
@ -1173,7 +1173,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
# CONFIG_SCSI_BNX2X_FCOE is not set # CONFIG_SCSI_BNX2X_FCOE is not set
# CONFIG_BE2ISCSI is not set # CONFIG_BE2ISCSI is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_HPSA is not set CONFIG_SCSI_HPSA=m
# CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_3W_SAS is not set # CONFIG_SCSI_3W_SAS is not set
# CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ACARD is not set
@ -1432,9 +1432,11 @@ CONFIG_E100=m
CONFIG_E1000=m CONFIG_E1000=m
CONFIG_E1000E=m CONFIG_E1000E=m
CONFIG_IGB=m CONFIG_IGB=m
CONFIG_IGB_DCA=y
CONFIG_IGBVF=m CONFIG_IGBVF=m
CONFIG_IXGB=m CONFIG_IXGB=m
CONFIG_IXGBE=m CONFIG_IXGBE=m
CONFIG_IXGBE_DCA=y
# CONFIG_IXGBE_DCB is not set # CONFIG_IXGBE_DCB is not set
CONFIG_IXGBEVF=m CONFIG_IXGBEVF=m
# CONFIG_NET_VENDOR_I825XX is not set # CONFIG_NET_VENDOR_I825XX is not set
@ -2289,11 +2291,20 @@ CONFIG_DMADEVICES=y
# DMA Devices # DMA Devices
# #
# CONFIG_INTEL_MID_DMAC is not set # CONFIG_INTEL_MID_DMAC is not set
# CONFIG_INTEL_IOATDMA is not set CONFIG_INTEL_IOATDMA=m
# CONFIG_DW_DMAC is not set # CONFIG_DW_DMAC is not set
# CONFIG_TIMB_DMA is not set # CONFIG_TIMB_DMA is not set
# CONFIG_PCH_DMA is not set # CONFIG_PCH_DMA is not set
CONFIG_DMA_ENGINE=y
CONFIG_DMA_ACPI=y CONFIG_DMA_ACPI=y
#
# DMA Clients
#
CONFIG_NET_DMA=y
# CONFIG_ASYNC_TX_DMA is not set
# CONFIG_DMATEST is not set
CONFIG_DCA=m
# CONFIG_AUXDISPLAY is not set # CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set # CONFIG_UIO is not set
# CONFIG_VIRT_DRIVERS is not set # CONFIG_VIRT_DRIVERS is not set

2
sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass vendored
View File

@ -413,9 +413,7 @@ cros-workon_src_unpack() {
# Hack around this by using empty branch. This will cause git fetch to # Hack around this by using empty branch. This will cause git fetch to
# pull all branches instead. Note that the branch has to be a space, # pull all branches instead. Note that the branch has to be a space,
# rather than empty, for this trick to work. # rather than empty, for this trick to work.
if [[ -z ${EGIT_BRANCH} ]] ; then
EGIT_BRANCH=" " EGIT_BRANCH=" "
fi
for (( i = 0; i < project_count; ++i )); do for (( i = 0; i < project_count; ++i )); do
EGIT_REPO_URI="${repo[i]}/${project[i]}.git" EGIT_REPO_URI="${repo[i]}/${project[i]}.git"
EGIT_PROJECT="${project[i]}${CROS_WORKON_GIT_SUFFIX}" EGIT_PROJECT="${project[i]}${CROS_WORKON_GIT_SUFFIX}"

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.4-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild vendored
View File

@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.7.5.ebuild,v 1.1 2013/01/28 13:18:54 ago Exp $
EAPI=4 EAPI=4
CROS_WORKON_COMMIT="4b0b1d4d4d0a50ceed5e92e933cb9cfaa4a14886" CROS_WORKON_COMMIT="42e65fc40aa591e7a4446a6953e73eecbfbfb954"
CROS_WORKON_REPO="git://github.com" CROS_WORKON_REPO="git://github.com"
CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_PROJECT="coreos/linux"
CROS_WORKON_LOCALNAME="linux" CROS_WORKON_LOCALNAME="linux"