From 085f3d58e4293806683a49c084ce49181eb97f1d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 20 Jan 2016 05:49:37 +0000 Subject: linux-ti-staging: split out systest defconfig into own recipe Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-ti-staging-4.1/configs/systest | 1 - .../linux/linux-ti-staging-4.1/keystone/configs/systest | 1 - recipes-kernel/linux/linux-ti-staging-systest-4.1/defconfig | 1 + .../linux/linux-ti-staging-systest-4.1/keystone/defconfig | 1 + recipes-kernel/linux/linux-ti-staging-systest_4.1.bb | 5 +++++ recipes-kernel/linux/linux-ti-staging_4.1.bb | 1 - recipes-kernel/linux/setup-defconfig.inc | 10 +++++++++- 7 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/configs/systest delete mode 100644 recipes-kernel/linux/linux-ti-staging-4.1/keystone/configs/systest create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.1/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest-4.1/keystone/defconfig create mode 100644 recipes-kernel/linux/linux-ti-staging-systest_4.1.bb diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/configs/systest b/recipes-kernel/linux/linux-ti-staging-4.1/configs/systest deleted file mode 100644 index cfe4f991..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.1/configs/systest +++ /dev/null @@ -1 +0,0 @@ -use-combined-config=ti_config_fragments/system_test_defconfig_fragment diff --git a/recipes-kernel/linux/linux-ti-staging-4.1/keystone/configs/systest b/recipes-kernel/linux/linux-ti-staging-4.1/keystone/configs/systest deleted file mode 100644 index 68cfc252..00000000 --- a/recipes-kernel/linux/linux-ti-staging-4.1/keystone/configs/systest +++ /dev/null @@ -1 +0,0 @@ -use-combined-config=ti_config_fragments/multi_core_system_test_defconfig_fragment diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.1/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.1/defconfig new file mode 100644 index 00000000..cfe4f991 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.1/defconfig @@ -0,0 +1 @@ +use-combined-config=ti_config_fragments/system_test_defconfig_fragment diff --git a/recipes-kernel/linux/linux-ti-staging-systest-4.1/keystone/defconfig b/recipes-kernel/linux/linux-ti-staging-systest-4.1/keystone/defconfig new file mode 100644 index 00000000..68cfc252 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest-4.1/keystone/defconfig @@ -0,0 +1 @@ +use-combined-config=ti_config_fragments/multi_core_system_test_defconfig_fragment diff --git a/recipes-kernel/linux/linux-ti-staging-systest_4.1.bb b/recipes-kernel/linux/linux-ti-staging-systest_4.1.bb new file mode 100644 index 00000000..30962e69 --- /dev/null +++ b/recipes-kernel/linux/linux-ti-staging-systest_4.1.bb @@ -0,0 +1,5 @@ +require linux-ti-staging_4.1.bb + +# Look in the generic major.minor directory for files +# This will have priority over generic non-rt path +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:" diff --git a/recipes-kernel/linux/linux-ti-staging_4.1.bb b/recipes-kernel/linux/linux-ti-staging_4.1.bb index a6615aaa..e02e5cd0 100644 --- a/recipes-kernel/linux/linux-ti-staging_4.1.bb +++ b/recipes-kernel/linux/linux-ti-staging_4.1.bb @@ -7,7 +7,6 @@ inherit kernel require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/multi-kernel.inc require recipes-kernel/linux/cmem.inc # Look in the generic major.minor directory for files diff --git a/recipes-kernel/linux/setup-defconfig.inc b/recipes-kernel/linux/setup-defconfig.inc index 2b67bfc8..cfad14b2 100644 --- a/recipes-kernel/linux/setup-defconfig.inc +++ b/recipes-kernel/linux/setup-defconfig.inc @@ -1,6 +1,14 @@ # KERNEL_LOCALVERSION can be set to add a tag to the end of the # kernel version string. such as the commit id -KERNEL_LOCALVERSION ?= "" +def get_git_revision(p): + import subprocess + + try: + return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE).communicate()[0].rstrip() + except OSError: + return None + +KERNEL_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}" # Check the defconfig file and see if it points to an in kernel # defconfig that should be used, or if it is a complete config file -- cgit v1.2.3-54-g00ecf