From 5b7a8be5e49ad8a4093463676c6d2c7756152cef Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jul 2013 21:06:20 -0700 Subject: [PATCH 1/2] feat(sys-kernel/coreos-bootkernel) bump version and add initrd to built kernel image --- .../eclass/cros-kernel/x86_64_defconfig_boot | 148 ++++++++---------- .../coreos-overlay/eclass/cros-kernel2.eclass | 6 + ...ebuild => coreos-bootkernel-3.10.1.ebuild} | 4 +- 3 files changed, 71 insertions(+), 87 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/{coreos-bootkernel-3.9.5.ebuild => coreos-bootkernel-3.10.1.ebuild} (82%) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot index e1ca0a5aef..97828a2965 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.5 Kernel Configuration +# Linux/x86 3.10.1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -22,7 +22,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_AUTOPROBE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y @@ -96,6 +95,10 @@ CONFIG_GENERIC_CMOS_UPDATE=y # Timers subsystem # CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -168,28 +171,32 @@ CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" +CONFIG_INITRAMFS_SOURCE="XXXXX" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set # CONFIG_RD_XZ is not set # CONFIG_RD_LZO is not set +CONFIG_INITRAMFS_COMPRESSION_NONE=y +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -CONFIG_EXPERT=y CONFIG_HAVE_UID16=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_HOTPLUG=y +CONFIG_HAVE_PCSPKR_PLATFORM=y +CONFIG_EXPERT=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set -CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y -CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y -CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -198,6 +205,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -207,7 +215,6 @@ CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set @@ -333,20 +340,7 @@ CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_INTEL_LPSS is not set CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_XEN=y -CONFIG_XEN_DOM0=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PVHVM=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=500 -CONFIG_XEN_SAVE_RESTORE=y -CONFIG_XEN_DEBUG_FS=y -CONFIG_KVM_GUEST=y -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_SPINLOCKS=y -CONFIG_PARAVIRT_CLOCK=y -# CONFIG_PARAVIRT_DEBUG is not set +# CONFIG_HYPERVISOR_GUEST is not set CONFIG_NO_BOOTMEM=y CONFIG_MEMTEST=y # CONFIG_MK8 is not set @@ -479,15 +473,8 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y # Power management and ACPI options # # CONFIG_SUSPEND is not set -CONFIG_HIBERNATE_CALLBACKS=y # CONFIG_HIBERNATION is not set -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set # CONFIG_PM_RUNTIME is not set -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set CONFIG_ACPI=y # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set @@ -538,7 +525,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_PCI=y CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y # CONFIG_PCI_CNB20LE_QUIRK is not set CONFIG_PCIEPORTBUS=y @@ -555,7 +541,6 @@ CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set -CONFIG_XEN_PCIDEV_FRONTEND=y CONFIG_HT_IRQ=y CONFIG_PCI_ATS=y CONFIG_PCI_IOV=y @@ -576,6 +561,7 @@ CONFIG_BINFMT_ELF=y CONFIG_COMPAT_BINFMT_ELF=y CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_COREDUMP=y @@ -614,6 +600,7 @@ CONFIG_IP_ROUTE_VERBOSE=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE_DEMUX is not set +# CONFIG_NET_IP_TUNNEL is not set CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V1=y @@ -752,6 +739,8 @@ CONFIG_DCB=y # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set # CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -797,7 +786,7 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set CONFIG_DEBUG_DEVRES=y -CONFIG_SYS_HYPERVISOR=y +# CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set # CONFIG_DMA_SHARED_BUFFER is not set @@ -830,10 +819,12 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_NVME is not set # CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_XIP is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set -CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RBD is not set @@ -843,6 +834,7 @@ CONFIG_VIRTIO_BLK=y # Misc devices # # CONFIG_SENSORS_LIS3LV02D is not set +# CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set # CONFIG_PHANTOM is not set # CONFIG_INTEL_MID_PTI is not set @@ -851,8 +843,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_ATMEL_SSC is not set # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_HP_ILO is not set -CONFIG_VMWARE_BALLOON=y # CONFIG_PCH_PHUB is not set +# CONFIG_SRAM is not set # CONFIG_C2PORT is not set # @@ -939,7 +931,6 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_BUSLOGIC is not set CONFIG_VMWARE_PVSCSI=y -CONFIG_HYPERV_STORAGE=y # CONFIG_LIBFC is not set # CONFIG_LIBFCOE is not set # CONFIG_FCOE is not set @@ -1082,6 +1073,7 @@ CONFIG_MD_AUTODETECT=y # CONFIG_MD_RAID456 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set +# CONFIG_BCACHE is not set CONFIG_BLK_DEV_DM=y CONFIG_DM_DEBUG=y # CONFIG_DM_CRYPT is not set @@ -1134,6 +1126,7 @@ CONFIG_VIRTIO_NET=y # # CAIF transport drivers # +# CONFIG_VHOST_NET is not set # # Distributed Switch Architecture drivers @@ -1156,9 +1149,7 @@ CONFIG_VIRTIO_NET=y # Enable WiMAX (Networking options) to see the WiMAX drivers # # CONFIG_WAN is not set -CONFIG_XEN_NETDEV_FRONTEND=y CONFIG_VMXNET3=y -CONFIG_HYPERV_NET=y # CONFIG_ISDN is not set # @@ -1215,7 +1206,6 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_CMA3000 is not set -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y # # Hardware I/O ports @@ -1239,7 +1229,6 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y @@ -1288,9 +1277,6 @@ CONFIG_CONSOLE_POLL=y # CONFIG_SERIAL_RP2 is not set # CONFIG_TTY_PRINTK is not set CONFIG_HVC_DRIVER=y -CONFIG_HVC_IRQ=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y CONFIG_VIRTIO_CONSOLE=y # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -1307,6 +1293,11 @@ CONFIG_HPET_MMAP=y CONFIG_DEVPORT=y # CONFIG_I2C is not set # CONFIG_SPI is not set + +# +# Qualcomm MSM SSBI bus support +# +# CONFIG_SSBI is not set # CONFIG_HSI is not set # @@ -1361,17 +1352,19 @@ CONFIG_BCMA_POSSIBLE=y # Multifunction device drivers # # CONFIG_MFD_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_RTSX_PCI is not set -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_ABX500_CORE is not set # CONFIG_MFD_CS5535 is not set -# CONFIG_LPC_SCH is not set +# CONFIG_MFD_CROS_EC is not set +# CONFIG_HTC_PASIC3 is not set # CONFIG_LPC_ICH is not set -# CONFIG_MFD_RDC321X is not set +# CONFIG_LPC_SCH is not set # CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RTSX_PCI is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_TMIO is not set # CONFIG_MFD_VX855 is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -1394,13 +1387,11 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -# CONFIG_FB_WMT_GE_ROPS is not set -CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -1446,7 +1437,6 @@ CONFIG_FB_VESA=y # CONFIG_FB_GEODE is not set # CONFIG_FB_GOLDFISH is not set # CONFIG_FB_VIRTUAL is not set -CONFIG_XEN_FBDEV_FRONTEND=y # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set @@ -1548,8 +1538,10 @@ CONFIG_DMADEVICES=y # CONFIG_DW_DMAC is not set # CONFIG_TIMB_DMA is not set # CONFIG_PCH_DMA is not set +CONFIG_DMA_ACPI=y # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set +# CONFIG_VIRT_DRIVERS is not set CONFIG_VIRTIO=y # @@ -1563,29 +1555,6 @@ CONFIG_VIRTIO_MMIO=y # # Microsoft Hyper-V guest support # -CONFIG_HYPERV=y -CONFIG_HYPERV_UTILS=y -CONFIG_HYPERV_BALLOON=y - -# -# Xen driver support -# -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SELFBALLOONING=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=y -# CONFIG_XEN_BACKEND is not set -CONFIG_XENFS=y -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -# CONFIG_XEN_GNTDEV is not set -CONFIG_XEN_GRANT_DEV_ALLOC=y -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_TMEM=y -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_MCE_LOG=y -CONFIG_XEN_HAVE_PVMMU=y # CONFIG_STAGING is not set # CONFIG_X86_PLATFORM_DEVICES is not set @@ -1609,7 +1578,6 @@ CONFIG_IOMMU_SUPPORT=y # # Rpmsg drivers # -# CONFIG_VIRT_DRIVERS is not set # CONFIG_PM_DEVFREQ is not set # CONFIG_EXTCON is not set # CONFIG_MEMORY is not set @@ -1618,6 +1586,7 @@ CONFIG_IOMMU_SUPPORT=y # CONFIG_VME_BUS is not set # CONFIG_PWM is not set # CONFIG_IPACK_BUS is not set +# CONFIG_RESET_CONTROLLER is not set # # Firmware Drivers @@ -1842,6 +1811,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set CONFIG_LATENCYTOP=y +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y @@ -1869,7 +1840,8 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y -# CONFIG_TRACER_SNAPSHOT is not set +CONFIG_TRACER_SNAPSHOT=y +# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set @@ -1884,6 +1856,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_MMIOTRACE is not set # CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y @@ -1902,6 +1875,7 @@ CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_STRING_HELPERS is not set CONFIG_TEST_KSTRTOX=y CONFIG_STRICT_DEVMEM=y # CONFIG_X86_VERBOSE_BOOTUP is not set @@ -1929,7 +1903,6 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 CONFIG_DEBUG_BOOT_PARAMS=y # CONFIG_CPA_DEBUG is not set CONFIG_OPTIMIZE_INLINING=y -# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_NMI_SELFTEST is not set # @@ -1971,6 +1944,7 @@ CONFIG_CRYPTO_CRYPTD=y # CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_TEST is not set CONFIG_CRYPTO_ABLK_HELPER_X86=y +CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Authenticated Encryption with Associated Data @@ -1993,6 +1967,7 @@ CONFIG_CRYPTO_XTS=y # # Hash modes # +# CONFIG_CRYPTO_CMAC is not set CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_XCBC is not set # CONFIG_CRYPTO_VMAC is not set @@ -2014,6 +1989,8 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_RMD320 is not set CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA1_SSSE3 is not set +# CONFIG_CRYPTO_SHA256_SSSE3 is not set +# CONFIG_CRYPTO_SHA512_SSSE3 is not set CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_TGR192 is not set @@ -2033,6 +2010,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y # CONFIG_CRYPTO_CAMELLIA is not set # CONFIG_CRYPTO_CAMELLIA_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 is not set +# CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST5_AVX_X86_64 is not set # CONFIG_CRYPTO_CAST6 is not set @@ -2046,6 +2024,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set # CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set +# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set @@ -2075,7 +2054,6 @@ CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_HAVE_KVM=y CONFIG_VIRTUALIZATION=y # CONFIG_KVM is not set -# CONFIG_VHOST_NET is not set CONFIG_BINARY_PRINTF=y # diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass index 25951a1822..9de768c567 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass @@ -278,6 +278,12 @@ cros-kernel2_src_configure() { fi fi + # if this is the boot kernel, set up the initrd location + if [ "$(get_boot_kernel)" = "true" ]; then + cp "${ROOT}"/usr/share/bootengine/bootengine.cpio "${S}" || die "copy of dracut cpio failed." + sed -i -e 's/XXXXX/\/build\/amd64-generic\/usr\/share\/bootengine\/bootengine\.cpio/g' "$(get_build_cfg)" || die "sed failed" + fi + # Use default for any options not explitly set in splitconfig yes "" | kmake oldconfig diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.9.5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.10.1.ebuild similarity index 82% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.9.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.10.1.ebuild index 95978ba7e9..04186ef204 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.9.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-bootkernel/coreos-bootkernel-3.10.1.ebuild @@ -3,14 +3,14 @@ # $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="da3093ad9f44ba53c3f254b4392f3c742dee41d3" -CROS_WORKON_TREE="0ff44b050e7f57e7d3743a44af2c9211da30bdb4" +CROS_WORKON_COMMIT="60757f78d6dbd86e935b4de43d61547174228cb7" CROS_WORKON_REPO="git://github.com" CROS_WORKON_PROJECT="coreos/linux" inherit cros-workon cros-kernel2 DEPEND=" sys-devel/bc + coreos-base/bootengine " DESCRIPTION="CoreOS kernel" From 6f26999e0651eff7bbd77c321298357a8eabc282 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Jul 2013 22:19:34 -0700 Subject: [PATCH 2/2] feat(sys-kernel/coreos-bootkernel) fix up the cpio file location This lets us rely on the kernel configuration, and not have to edit it "by hand" with the location of the cpio file, as the cpio initrd is now placed within the kernel output directory, where the build system picks it up automatically. --- .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot | 2 +- .../third_party/coreos-overlay/eclass/cros-kernel2.eclass | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot index 97828a2965..4103722600 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig_boot @@ -171,7 +171,7 @@ CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="XXXXX" +CONFIG_INITRAMFS_SOURCE="bootengine.cpio" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 CONFIG_RD_GZIP=y diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass index 9de768c567..117a018a72 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel2.eclass @@ -278,10 +278,10 @@ cros-kernel2_src_configure() { fi fi - # if this is the boot kernel, set up the initrd location + # if this is the boot kernel, copy the cpio initrd to the output build + # directory so we can tack it onto the kernel image itself. if [ "$(get_boot_kernel)" = "true" ]; then - cp "${ROOT}"/usr/share/bootengine/bootengine.cpio "${S}" || die "copy of dracut cpio failed." - sed -i -e 's/XXXXX/\/build\/amd64-generic\/usr\/share\/bootengine\/bootengine\.cpio/g' "$(get_build_cfg)" || die "sed failed" + cp "${ROOT}"/usr/share/bootengine/bootengine.cpio "$(cros-workon_get_build_dir)" || die "copy of dracut cpio failed." fi # Use default for any options not explitly set in splitconfig