diff options
author | Martin Borg <martin.borg@enea.com> | 2017-08-24 15:49:56 +0200 |
---|---|---|
committer | Martin Borg <martin.borg@enea.com> | 2017-08-24 15:50:37 +0200 |
commit | 6d88d7a31b77a965552e33e62cec1598e05dc205 (patch) | |
tree | 90c541ff301e804ca09fc7810356e354b401a635 /recipes-kernel | |
parent | a82616a1d95bcc6bbac036570d2b61b90b0a9d63 (diff) | |
parent | 7a572a7ca2299f67237f870007fe4e547468c3fe (diff) | |
download | meta-enea-bsp-x86-6d88d7a31b77a965552e33e62cec1598e05dc205.tar.gz |
Merge branch 'octeontx-bsp' into pyro
Signed-off-by: Martin Borg <martin.borg@enea.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-common.inc | 14 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-intel.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_4.9.bbappend | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/recipes-kernel/linux/linux-common.inc b/recipes-kernel/linux/linux-common.inc deleted file mode 100644 index 426b0ff..0000000 --- a/recipes-kernel/linux/linux-common.inc +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | kernel_do_deploy[vardepsexclude] = "DATETIME" | ||
2 | kernel_do_deploy_append () { | ||
3 | |||
4 | # | ||
5 | # Drop the regular defconfig along side the others for consistency | ||
6 | # | ||
7 | cp ${B}/.config ${DEPLOYDIR}/config-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.config | ||
8 | |||
9 | # | ||
10 | # add symlink | ||
11 | # | ||
12 | ln -sf config-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}.config ${DEPLOYDIR}/config-${MACHINE}.config | ||
13 | |||
14 | } | ||
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index d9f563c..ec91f34 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | require linux-common.inc | 1 | require recipes-kernel/linux/linux-deploy-kconfig.inc |
2 | 2 | ||
3 | SRCREV_metaenea ?= "28da254d1c5ae012a6e064671aa14850c2a21a25" | 3 | SRCREV_metaenea ?= "28da254d1c5ae012a6e064671aa14850c2a21a25" |
4 | KENEABRANCH = "intel-4.9" | 4 | KENEABRANCH = "intel-4.9" |
diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend index 42ba9f1..41e94c8 100644 --- a/recipes-kernel/linux/linux-yocto_4.9.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend | |||
@@ -1,4 +1,4 @@ | |||
1 | require linux-common.inc | 1 | require recipes-kernel/linux/linux-deploy-kconfig.inc |
2 | 2 | ||
3 | SRCREV_metaenea ?= "5057d9d3837fc35814a402b9c0384a064d260d05" | 3 | SRCREV_metaenea ?= "5057d9d3837fc35814a402b9c0384a064d260d05" |
4 | KENEABRANCH = "yocto-4.9" | 4 | KENEABRANCH = "yocto-4.9" |