Skip to contentSkip to conversation

linux-yocto: consolidate pull request

PATCH In review Bruce Ashfield 4 participants 13 messages Dec 18, 2015 – Dec 22, 2015

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidate pull request

Hi all,

To get some of the prep out of the way early for the 2.1 release, consider this a "needs more builds and testing" pull request. I've built for all arches (both with -dev and 4.1), booted core-image-minimal and sato, and built core-image-kernel-dev .. but when you are balancing all the combos, some things can slip through.

4.4 is the next LTSI kernel, and will be the newest versioned/named recipe for the release, so this series does the following:

- updated -dev to 4.4-rc5
- removed 3.14 and 3.19
- fixes recipes/package that broke during 4.4/4.1 testing
- has a minor regression fix for kernel checkouts

I'll follow up with patches to the yocto mailing list to remove references to the 3.14 and 3.19 kernels.

Cheers,

Bruce

The following changes since commit 5f406915b5e26761faa4ea5e0edd887ac5ae6e2f:

bitbake: toaster: remove 2 confusing parameters (2015-12-18 13:51:54 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (5):
yaffs2: fix checkpoint functionality
lttng-modules: fix build issue against kernel 4.4
linux-yocto-dev: bump to 4.4-rcX linux-yocto/4.1: update to v4.1.15
linux-yocto: remove 3.14 and 3.19 recipes

Jianxun Zhang (1):
kernel-yocto: fix checkout bare-cloned kernel repositories

 meta/classes/kernel-yocto.bbclass                  | 13 +++++--
 meta/recipes-kernel/linux/linux-yocto-dev.bb       |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   | 29 ---------------
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb    |  6 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 23 ------------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 23 ------------
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb  |  6 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 42 ----------------------
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 42 ----------------------
 meta/recipes-kernel/linux/linux-yocto_4.1.bb       | 20 +++++------
 meta/recipes-kernel/lttng/lttng-modules_git.bb     |  2 +-
 11 files changed, 28 insertions(+), 180 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.19.bb
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/6 yaffs2: fix checkpoint functionality

Updating the linux-yocto SRCREVs to pull in the following change:

Author: He Zhe <[email protected]>
Date: Wed Dec 2 01:31:31 2015 -0500

fs/yaffs2: fix missing checkpoint on yaffs

For yaffs file system, the mode of reading or writing is restricted at four pointer where are mnt->mnt_flags,mnt->mnt_sb->s_flags,mtd->flags and dev->read_only,the first three is used handle file and file system(eg,remount) operation, and last one(dev->read_only) almost is used handle checkpoint of yaffs2. However, in current code, the dev->read_only only can be changed at first time when the yaffs2 file system is mounted, later it can't be changed again(eg,mount -o remount), the result is that the checkpoint's saving operation always can't succeed if you set readonly mode for yaffs2 file system when it is mounted at the first time.

To fix this issue, we implement yaffs_remount_fs() which allows the rootfs to be remounted as r/w.

Signed-off-by Wenlin Kang <[email protected]>
Signed-off-by He Zhe <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +2 -2
index 6bb38f8c059b..1eb032bfe6ac 100644
@@ -2,8 +2,8 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "190c42da30140d227cc948ed5fa8fee8467d55f3"
-SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4"
+SRCREV_machine ?= "ed3fa3e6d62c1fb3411099478c69cef4e3d4f415"
+SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +2 -2
index cd4f2acff69a..66c8a6575e5e 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.13"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4"
+SRCREV_machine ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +9 -9
index 776620261f60..12245295a3f3 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "2494184ad34764bdfa1bfd9a57eabfb34d170c0e"
-SRCREV_machine_qemuarm64 ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_machine_qemumips ?= "85a76c24f5aaa99618fdb15d5f3966a2e03cd572"
-SRCREV_machine_qemuppc ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_machine_qemux86 ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_machine_qemux86-64 ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_machine_qemumips64 ?= "79181dc5284d9831d240d7ba58a2b574f6528b90"
-SRCREV_machine ?= "2c30f87db7824e90b0b096eee3a5b7f93c84b079"
-SRCREV_meta ?= "30c4b4bd79c5d774de6dcf23d0deab554e31f3d4"
+SRCREV_machine_qemuarm ?= "c19d15710a9e0a01a83a1ac03356390bc26a01f7"
+SRCREV_machine_qemuarm64 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine_qemumips ?= "ca7ddd2ce6e7c3fb599512bcc31a1de23ecb589d"
+SRCREV_machine_qemuppc ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine_qemux86 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine_qemux86-64 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine_qemumips64 ?= "5945b7d7abce3ede46ae133a24420751d99ea55b"
+SRCREV_machine ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
Signature · 1 line
2.1.0
author
#2 lore raw

PATCH 2/6 lttng-modules: fix build issue against kernel 4.4

In reply to Bruce Ashfield

Updating to the latest 2.7 stable commit which incorporates changes for building against the 4.4-rc kernel series.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/lttng/lttng-modules_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/lttng/lttng-modules_git.bb +1 -1
index 46cc1f012909..33aa12551e2e 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=362844633a08753bd96ab322a6c7f9f6 \
 
 inherit module
 
-SRCREV = "4247236df9113aca059d79c78d85779c1ff4edb0"
+SRCREV = "f4b27072a77b43af2fea72d6700bd64eb59a39f1"
 PV = "2.7.0+git${SRCPV}"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
Signature · 1 line
2.1.0
#3 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

Quoted 1 line · Bruce Ashfield

f4b27072

Use this revision on commit log; latest is not accurate as it moves during time.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#4 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

Quoted 9 lines · Otavio Salvador
Quoted 1 line · Bruce Ashfield

f4b27072

Use this revision on commit log; latest is not accurate as it moves during time.

We'll disagree on that. The patch has the commit hash, repeating it in the commit message is not necessary. It's like patches saying "this patch", or explaining what is obvious from the patch. Both are not necessary.

If Ross wants to change the commit during merge, I won't complain, but I'm happy with it, as is.

Bruce

Quoted 10 lines

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
#5 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

Quoted 14 lines · Bruce Ashfield
Quoted 9 lines · Otavio Salvador
Quoted 1 line · Bruce Ashfield

f4b27072

Use this revision on commit log; latest is not accurate as it moves during time.

Quoted 7 lines

We'll disagree on that. The patch has the commit hash, repeating it in the commit message is not necessary. It's like patches saying "this patch", or explaining what is obvious from the patch. Both are not necessary.

If Ross wants to change the commit during merge, I won't complain, but I'm happy with it, as is.

That and I'm now far away from my development machines until mid next week, so
I can't easily rebase to change the log until then .. and this would be better under
test, since without it, I can't bump to 4.4-rcX.

(and yes, I can at least use a date versus "latest" in any future updates).

Cheers,

Bruce

Quoted 21 lines

Bruce

Quoted 10 lines

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
#6 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

In reply to Bruce Ashfield

Hello Bruce,

Quoted 12 lines · Bruce Ashfield
Quoted 9 lines · Otavio Salvador
Quoted 1 line · Bruce Ashfield

f4b27072

Use this revision on commit log; latest is not accurate as it moves during time.

Quoted 6 lines

We'll disagree on that. The patch has the commit hash, repeating it in the commit message is not necessary. It's like patches saying "this patch", or explaining what is obvious from the patch. Both are not necessary.

If Ross wants to change the commit during merge, I won't complain, but I'm happy with it, as is.

Commit logs are suppose to have the information useful to understand the reason of the change. Latest hides all behind it and does not communicate anything. I don't think expect people to read the code to know you bumped (and to which) revision is right.

I am not the OE-Core maintainer but for any layer I am, I require this to be recorded.

From me, this is a NACK!

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#7 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

Quoted 4 lines · Otavio Salvador

Commit logs are suppose to have the information useful to understand the reason of the change. Latest hides all behind it and does not communicate anything. I don't think expect people to read the code to know you bumped (and to which) revision is right.

Having the exact upstream commit id - a bunch of random numbers and letters - in the commit message does not make the commit message any more useful, readable, or searchable. You can't even click on that id to open a gitweb webpage with the upstream patch (having that kind of link *would* be useful though).

The change to the recipe is short, and no one should be overwhelmed by looking at it if they need the commit id.

Alex

#8 lore raw

Re: [PATCH 2/6] lttng-modules: fix build issue against kernel 4.4

Quoted 8 lines · Alexander Kanavin

On 12/21/2015 01:27 PM, Otavio Salvador wrote:

Commit logs are suppose to have the information useful to understand

Quoted 4 lines

the reason of the change. Latest hides all behind it and does not communicate anything. I don't think expect people to read the code to know you bumped (and to which) revision is right.

Quoted 9 lines

Having the exact upstream commit id - a bunch of random numbers and letters - in the commit message does not make the commit message any more useful, readable, or searchable. You can't even click on that id to open a gitweb webpage with the upstream patch (having that kind of link *would* be useful though).

The change to the recipe is short, and no one should be overwhelmed by looking at it if they need the commit id.

We are of like minds on those points. It is more important to say why a change
was required, which is all that I look for in anything that I maintain.

That, and I'm always concerned that if someone contributes a patch that fixes
a real problem, or is part of a larger feature, and all they get are nit-pick comments
about more minor elements, it is a barrier to entry. Hence, why I'll also just
fix commit messages on the way into my queues if they need a tweak.

But I digress. I'll see if this passes autobuilder sanity, and if there's a chance,
I'll add a date to the log (but of course the commit also carries that info).

Cheers,

Bruce

Quoted 9 lines

Alex

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
author
#9 lore raw

PATCH 3/6 linux-yocto-dev: bump to 4.4-rcX

In reply to Bruce Ashfield
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-dev.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto-dev.bb +1 -1
index afe482ac6556..694e6bde95d5 100644
@@ -36,7 +36,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name
 SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}'
 
-LINUX_VERSION ?= "4.2-rc+"
+LINUX_VERSION ?= "4.4-rc+"
 LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
author
#10 lore raw

PATCH 4/6 linux-yocto/4.1: update to v4.1.15

In reply to Bruce Ashfield

Updating the 4.1 kernel repo to the latest 4.1.x stable.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb   |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_4.1.bb      | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +2 -2
index 1eb032bfe6ac..b441bf681154 100644
@@ -2,13 +2,13 @@ KBRANCH ?= "standard/preempt-rt/base"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "ed3fa3e6d62c1fb3411099478c69cef4e3d4f415"
+SRCREV_machine ?= "3188436876d5eaff8d48f82064367d4a65c3aa97"
 SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.1.13"
+LINUX_VERSION ?= "4.1.15"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +2 -2
index 66c8a6575e5e..4caa2523b30e 100644
@@ -4,12 +4,12 @@ KCONFIG_MODE = "--allnoconfig"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_VERSION ?= "4.1.13"
+LINUX_VERSION ?= "4.1.15"
 
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
 SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_4.1.bb +9 -9
index 12245295a3f3..b81458b3c057 100644
@@ -11,20 +11,20 @@ KBRANCH_qemux86  ?= "standard/base"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "c19d15710a9e0a01a83a1ac03356390bc26a01f7"
-SRCREV_machine_qemuarm64 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
-SRCREV_machine_qemumips ?= "ca7ddd2ce6e7c3fb599512bcc31a1de23ecb589d"
-SRCREV_machine_qemuppc ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
-SRCREV_machine_qemux86 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
-SRCREV_machine_qemux86-64 ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
-SRCREV_machine_qemumips64 ?= "5945b7d7abce3ede46ae133a24420751d99ea55b"
-SRCREV_machine ?= "4e659b86ffcf20ece27f42a671853d5f42d52a6c"
+SRCREV_machine_qemuarm ?= "cf760f381c5e1e58d0c3372d66f4dfdc33f0984c"
+SRCREV_machine_qemuarm64 ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
+SRCREV_machine_qemumips ?= "aa46295ab927bd5c960930c377855dbc4e57b195"
+SRCREV_machine_qemuppc ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
+SRCREV_machine_qemux86 ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
+SRCREV_machine_qemux86-64 ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
+SRCREV_machine_qemumips64 ?= "949c0f2cbb4cf902478d009a7d38b6e4fb29e7c4"
+SRCREV_machine ?= "788dfc9859321c09f1c58696bf8998f90ccb4f51"
 SRCREV_meta ?= "46bb64d605fd336d99fa05bab566b9553b40b4b4"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
 
-LINUX_VERSION ?= "4.1.13"
+LINUX_VERSION ?= "4.1.15"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.1.0
author
#11 lore raw

PATCH 5/6 kernel-yocto: fix checkout bare-cloned kernel repositories

In reply to Bruce Ashfield

From: Jianxun Zhang <[email protected]>

The existing code doesn't tell regular (with .git) and bare cases and just move the unpacked repo to the place of kernel source. But later steps will fail on a bare-cloned repo because we can not checkout directly in a bare cloned repo.

This change performs another clone to fix the issue.

Note: This change doesn't cover the case that S and WORKDIR are same and the repo is bare cloned.

Signed-off-by Jianxun Zhang <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/classes/kernel-yocto.bbclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
meta/classes/kernel-yocto.bbclass +10 -3
index 00d9667fe0a6..c2d0d3076f45 100644
@@ -184,11 +184,18 @@ do_kernel_checkout() {
 	source_dir=`echo ${S} | sed 's%/$%%'`
 	source_workdir="${WORKDIR}/git"
 	if [ -d "${WORKDIR}/git/" ]; then
-		# case: git repository (bare or non-bare)
+		# case: git repository
 		# if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
 		if [ "${source_dir}" != "${source_workdir}" ]; then
-			rm -rf ${S}
-			mv ${WORKDIR}/git ${S}
+			if [ -d "${source_workdir}/.git" ]; then
+				# regular git repository with .git
+				rm -rf ${S}
+				mv ${WORKDIR}/git ${S}
+			else
+				# create source for bare cloned git repository
+				git clone ${WORKDIR}/git ${S}
+				rm -rf ${WORKDIR}/git
+			fi
 		fi
 		cd ${S}
 	else
Signature · 1 line
2.1.0
author
#12 lore raw

PATCH 6/6 linux-yocto: remove 3.14 and 3.19 recipes

In reply to Bruce Ashfield

In preparation for the introduction of new (supported) kernel versions, we remove the 3.14 and 3.19 variants.

The kernel trees will still be available, but the recipes are removed from master. These versions can still be built on older releases, or with private copies of the recipes.

3.14 LTSI is replaced by the 4.1 LTSI kernel, and 3.19 will be replaced by 4.4+.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   | 29 ---------------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 23 ------------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 23 ------------
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 42 ----------------------
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 42 ----------------------
 5 files changed, 159 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.14.bb
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.19.bb
meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb deleted +0 -29
deleted file mode 100644
index bfeabbec0354..000000000000
@@ -1,29 +0,0 @@
-KBRANCH ?= "standard/preempt-rt/base"
-KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-SRCREV_machine ?= "8281915527ba8d79e59906c02f28e7aa11424723"
-SRCREV_machine_qemuppc ?= "5e7d372ebc327f28656fc972fab55605eea8aec3"
-SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine \
-           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
-
-LINUX_VERSION ?= "3.14.36"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
-
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb deleted +0 -23
deleted file mode 100644
index e13cb80ce51e..000000000000
@@ -1,23 +0,0 @@
-KBRANCH ?= "standard/tiny/base"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-LINUX_VERSION ?= "3.14.36"
-
-KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
-
-SRCREV_machine ?= "578602a722dbfb260801f3b37c6eafd2abb2340d"
-SRCREV_meta ?= "060fa80b7996250001ee90c50a4978c8fdb87fc4"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;branch=${KBRANCH};name=machine; \
-           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.14;destsuffix=${KMETA}"
-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""
meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb deleted +0 -23
deleted file mode 100644
index a6a58a2ed84f..000000000000
@@ -1,23 +0,0 @@
-KBRANCH ?= "standard/tiny/base"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-require recipes-kernel/linux/linux-yocto.inc
-
-LINUX_VERSION ?= "3.19.5"
-
-KMETA = "kernel-meta"
-KCONF_BSP_AUDIT_LEVEL = "2"
-
-SRCREV_machine ?= "e152349de59b43b2a75f2c332b44171df461d5a0"
-SRCREV_meta ?= "1016714868249d64fc16692fd7679672b1efa17b"
-
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;branch=${KBRANCH};name=machine \
-           git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-3.19;destsuffix=${KMETA}"
-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""
meta/recipes-kernel/linux/linux-yocto_3.14.bb deleted +0 -42

42 lines not on this page · raw message

meta/recipes-kernel/linux/linux-yocto_3.19.bb deleted +0 -42

42 lines not on this page · raw message

Signature · 1 line
2.1.0