From ef35830b0719f5fc83af6d0862dded8004a09c44 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 5 Aug 2013 16:22:32 -0700 Subject: [PATCH 1/3] bump(sys-kernel/coreos-kernel): bump to 3.10.5 --- ...reos-kernel-3.10.4-r1.ebuild => coreos-kernel-3.10.5.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-3.10.4-r1.ebuild => coreos-kernel-3.10.5.ebuild} (91%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild index 199859872d..714d918c95 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.4-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-3.10.5.ebuild @@ -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 $ EAPI=4 -CROS_WORKON_COMMIT="4b0b1d4d4d0a50ceed5e92e933cb9cfaa4a14886" +CROS_WORKON_COMMIT="42e65fc40aa591e7a4446a6953e73eecbfbfb954" CROS_WORKON_REPO="git://github.com" CROS_WORKON_PROJECT="coreos/linux" CROS_WORKON_LOCALNAME="linux" From 035cb38bce4959237fe1490d6ac8db24daa431c3 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 5 Aug 2013 16:22:54 -0700 Subject: [PATCH 2/3] feat(eclass/cros-kernel): add hardware support add some more hadware support --- .../eclass/cros-kernel/x86_64_defconfig | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig index f27f3907ed..d8dc877248 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.4 Kernel Configuration +# Linux/x86 3.10.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1173,7 +1173,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_BNX2X_FCOE is not set # CONFIG_BE2ISCSI 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_SAS is not set # CONFIG_SCSI_ACARD is not set @@ -1432,9 +1432,11 @@ CONFIG_E100=m CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IGB=m +CONFIG_IGB_DCA=y CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m +CONFIG_IXGBE_DCA=y # CONFIG_IXGBE_DCB is not set CONFIG_IXGBEVF=m # CONFIG_NET_VENDOR_I825XX is not set @@ -2289,11 +2291,20 @@ CONFIG_DMADEVICES=y # DMA Devices # # CONFIG_INTEL_MID_DMAC is not set -# CONFIG_INTEL_IOATDMA is not set +CONFIG_INTEL_IOATDMA=m # CONFIG_DW_DMAC is not set # CONFIG_TIMB_DMA is not set # CONFIG_PCH_DMA is not set +CONFIG_DMA_ENGINE=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_UIO is not set # CONFIG_VIRT_DRIVERS is not set From 1d9e3cca26e16cf5402e7ccc059e86a25a3120bd Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 5 Aug 2013 16:48:05 -0700 Subject: [PATCH 3/3] fix(eclass/cros-workon): revert EGIT_BRANCH hack this hack didn't seem to work and with the removal of sync-c in the manifest make it all a moot point anyways --- .../src/third_party/coreos-overlay/eclass/cros-workon.eclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass index b197bdbc6b..72b4c140bb 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-workon.eclass @@ -413,9 +413,7 @@ cros-workon_src_unpack() { # 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, # rather than empty, for this trick to work. - if [[ -z ${EGIT_BRANCH} ]] ; then - EGIT_BRANCH=" " - fi + EGIT_BRANCH=" " for (( i = 0; i < project_count; ++i )); do EGIT_REPO_URI="${repo[i]}/${project[i]}.git" EGIT_PROJECT="${project[i]}${CROS_WORKON_GIT_SUFFIX}"