rancher/os-kernel
1
0
Fork 1
mirror of https://github.com/rancher/os-kernel.git synced 2025-08-01 21:07:42 +00:00
Code Issues Releases Wiki Activity

apply rancher TCMU patches on top of Ubuntu-4.2.0-28.33

Browse Source
This commit is contained in:
Ivan Mikushin 2016-02-03 11:18:46 -08:00
parent fa6478da17
commit aa0d18ae43
5 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/kernel-config
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 4.2.6 Kernel Configuration
# Linux/x86 4.2.8-ckt3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@ -1731,7 +1731,13 @@ CONFIG_DM_UEVENT=y
CONFIG_DM_VERITY=m
# CONFIG_DM_SWITCH is not set
# CONFIG_DM_LOG_WRITES is not set
# CONFIG_TARGET_CORE is not set
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
CONFIG_TCM_PSCSI=m
CONFIG_TCM_USER2=m
CONFIG_LOOPBACK_TARGET=m
CONFIG_ISCSI_TARGET=m
CONFIG_FUSION=y
CONFIG_FUSION_SPI=m
# CONFIG_FUSION_FC is not set
@ -1774,6 +1780,7 @@ CONFIG_VIRTIO_NET=y
# CAIF transport drivers
#
CONFIG_VHOST_NET=m
# CONFIG_VHOST_SCSI is not set
CONFIG_VHOST_RING=m
CONFIG_VHOST=m
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
@ -3209,6 +3216,7 @@ CONFIG_USB_F_MASS_STORAGE=m
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
CONFIG_USB_MASS_STORAGE=m
# CONFIG_USB_GADGET_TARGET is not set
# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
@ -3278,7 +3286,9 @@ CONFIG_INFINIBAND_IPOIB_CM=y
CONFIG_INFINIBAND_IPOIB_DEBUG=y
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
CONFIG_INFINIBAND_SRP=m
# CONFIG_INFINIBAND_SRPT is not set
CONFIG_INFINIBAND_ISER=m
# CONFIG_INFINIBAND_ISERT is not set
CONFIG_EDAC_ATOMIC_SCRUB=y
CONFIG_EDAC_SUPPORT=y
CONFIG_EDAC=y
@ -3470,6 +3480,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
CONFIG_SWIOTLB_XEN=y
CONFIG_XEN_TMEM=m
CONFIG_XEN_PCIDEV_BACKEND=m
# CONFIG_XEN_SCSI_BACKEND is not set
CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_ACPI_PROCESSOR=m
CONFIG_XEN_MCE_LOG=y

4
scripts/build-common
View File

@ -1,8 +1,8 @@
#!/bin/bash
set -e
: ${KERNEL_URL:="https://github.com/rancher/linux/archive/Ubuntu-4.2.0-22.27.tar.gz"}
: ${KERNEL_SHA1:="44f46b49a879221b0812bfd4ab1ba2fd6dfc752b"}
: ${KERNEL_URL:="https://github.com/rancher/linux/archive/Ubuntu-4.2.0-28.33-rancher.tar.gz"}
: ${KERNEL_SHA1:="2cf7bf21f84570dc337bfa4eed43570a32e312a4"}
: ${ARTIFACTS:=$(pwd)/assets}
: ${BUILD:=/usr/src}
: ${CONFIG:=$(pwd)/config}

17
scripts/build-kernel
View File

@ -12,22 +12,7 @@ KERNEL=$(basename ${KERNEL_URL})
DIR=${KERNEL/.tar.*//}
FIRMWARE=$(readlink -f scripts/firmware)
mkdir -p ${BUILD}
cd ${BUILD}
if [ ! -e ${DIR} ]; then
echo Extracting ${ARTIFACTS}/${KERNEL}
TEMP=$(mktemp -d -p ${BUILD})
mkdir ${TEMP}/${DIR}
trap "rm -rf ${TEMP}" exit
tar xf ${ARTIFACTS}/${KERNEL} -C ${TEMP}/${DIR} --strip-components=1
mv ${TEMP}/${DIR} ${DIR}
fi
cd ${DIR}
cp ${CONFIG}/kernel-config .config
cd ${BUILD}/${DIR}
# TODO update config/kernel-config for the latest kernel
make oldconfig

1
scripts/ci
View File

@ -4,4 +4,5 @@ set -e
cd $(dirname $0)/..
./scripts/download
./scripts/extract
./scripts/build-kernel

24
scripts/extract Executable file
View File

@ -0,0 +1,24 @@
#!/bin/bash
set -e
cd $(dirname $0)/..
source scripts/build-common
KERNEL=$(basename ${KERNEL_URL})
DIR=${KERNEL/.tar.*//}
mkdir -p ${BUILD}
cd ${BUILD}
if [ ! -e ${DIR} ]; then
echo Extracting ${ARTIFACTS}/${KERNEL}
TEMP=$(mktemp -d -p ${BUILD})
mkdir ${TEMP}/${DIR}
trap "rm -rf ${TEMP}" exit
tar xf ${ARTIFACTS}/${KERNEL} -C ${TEMP}/${DIR} --strip-components=1
mv ${TEMP}/${DIR} ${DIR}
fi
cp ${CONFIG}/kernel-config ${DIR}/.config