linux-yocto: Update linux-yocto for 3.2 and 3.4

PATCH Superseded Saul Wold 2 participants 7 messages Sep 4, 2012 – Sep 5, 2012

lore

Share & tools

lore

Saul Wold

author

2012-09-04 20:57 UTC #0 lore raw

PATCH 1/3 linux-yocto: Update linux-yocto for 3.2 and 3.4

Signed-off-by Saul Wold <[email protected]>

---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    2 ++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    6 ++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    6 ++++++
 3 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend
 create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend

meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -0

index 58a6541..138cc21 100644
@@ -2,3 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 # enable the time limited kernel configuration options
 SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +6 -0

new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +6 -0

new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-09-04 20:57 UTC #1 lore raw

PATCH 2/3 base-files: add /etc/motd with TLK info

This adds infomation about how to disable the Time Limited Kernel

[YOCTO #2704]

Signed-off-by Saul Wold <[email protected]>

---
 .../base-files/base-files_3.0.14.bbappend          |    3 +++
 meta-tlk/recipes-core/base-files/files/motd        |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta-tlk/recipes-core/base-files/base-files_3.0.14.bbappend
 create mode 100644 meta-tlk/recipes-core/base-files/files/motd

meta-tlk/recipes-core/base-files/base-files_3.0.14.bbappend new file +3 -0

new file mode 100644
index 0000000..248b225
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR .= ".1"

meta-tlk/recipes-core/base-files/files/motd new file +7 -0

new file mode 100644
index 0000000..a6a6270
@@ -0,0 +1,7 @@
+This image contains a time limited kernel and will halt the machine
+automatically in 10 days. Do not include this image in a product.
+
+Use the image for evaluation purposes only.
+
+Please see http://www.yoctoproject.org/tlk for instructions on how to
+eliminate the timeout.

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-09-04 21:39 UTC #2 lore raw

Re: [PATCH 2/3] base-files: add /etc/motd with TLK info

Quoted 27 lines · Saul Wold

This adds infomation about how to disable the Time Limited Kernel
[YOCTO #2704]
Signed-off-by Saul Wold <[email protected]>
---
  .../base-files/base-files_3.0.14.bbappend          |    3 +++
  meta-tlk/recipes-core/base-files/files/motd        |    7 +++++++
  2 files changed, 10 insertions(+), 0 deletions(-)
create mode 100644 meta-tlk/recipes-core/base-files/base-files_3.0.14.bbappend create mode 100644 meta-tlk/recipes-core/base-files/files/motd
meta-tlk/recipes-core/base-files/base-files_3.0.14.bbappend new file +3 -0
new file mode 100644
index 0000000..248b225
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+PR .= ".1"
meta-tlk/recipes-core/base-files/files/motd new file +0 -0
new file mode 100644
index 0000000..a6a6270

meta-tlk/recipes-core/base-files/files/motd line 3

Quoted 3 lines

meta-tlk/recipes-core/base-files/files/motd new file +3 -0

@@ -0,0 +1,7 @@
+This image contains a time limited kernel and will halt the machine
+automatically in 10 days. Do not include this image in a product.
+

Tom, Please hold these for 24 hours, I need to confirm with Bruce on if it HALTS the machine or Reboots it.

Thanks
Sau!

Quoted 5 lines

meta-tlk/recipes-core/base-files/files/motd new file +4 -0

+Use the image for evaluation purposes only.
+
+Please see http://www.yoctoproject.org/tlk for instructions on how to
+eliminate the timeout.

Saul Wold

author

2012-09-04 20:57 UTC #3 lore raw

PATCH 3/3 psplash: Add TLK info to psplash image

In reply to Saul Wold

This adds some text to the splash screen when running the Time Limited Kernel

[YOCTO #2704]

Signed-off-by Saul Wold <[email protected]>

---
 .../recipes-core/psplash/files/psplash-tlk.png     |  Bin 0 -> 73743 bytes
 meta-tlk/recipes-core/psplash/psplash_git.bbappend |   10 ++++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 meta-tlk/recipes-core/psplash/files/psplash-tlk.png
 create mode 100644 meta-tlk/recipes-core/psplash/psplash_git.bbappend

meta-tlk/recipes-core/psplash/files/psplash-tlk.png new file binary +0 -0

new file mode 100644
index 0000000000000000000000000000000000000000..104da8400fa2d4748593a9b81acdb3e739c75d27
GIT binary patch

meta-tlk/recipes-core/psplash/psplash_git.bbappend new file +10 -0

new file mode 100644
index 0000000..6b5258e
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+DEPENDS += "gdk-pixbuf-native"
+
+PRINC = "6"
+
+# NB: this is only for the main logo image; if you add multiple images here,
+# poky will build multiple psplash packages with 'outsuffix' in name for
+# each of these ...
+SPLASH_IMAGES = "file://psplash-tlk.png;outsuffix=default"

Signature · 1 line

1.7.7.6

Martin Jansa

2012-09-04 21:00 UTC #4 lore raw

In reply to Saul Wold

Quoted 14 lines · Saul Wold

Signed-off-by Saul Wold <[email protected]>

---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    2 ++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    6 ++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    6 ++++++
 3 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend
 create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend

meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +0 -0

index 58a6541..138cc21 100644

meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" · line 6

Quoted 5 lines

meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -0

@@ -2,3 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 # enable the time limited kernel configuration options
 SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

why not
PRINC := "${@int(PRINC) + 1}"
?

Quoted 31 lines

meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +6 -0

new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +6 -0

new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"

Signature · 6 lines

1.7.7.6

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Saul Wold

author

2012-09-05 04:18 UTC #5 lore raw

Quoted 16 lines · Martin Jansa

Quoted 15 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    2 ++
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    6 ++++++
  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    6 ++++++
  3 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +0 -0
index 58a6541..138cc21 100644
@@ -2,3 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 

Quoted 8 lines

meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" · line 6
Quoted 4 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -0
  # enable the time limited kernel configuration options
  SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
why not
PRINC := "${@int(PRINC) + 1}"
?

I understood that the .1 adds more finer granularity instead of incrementing the base PR itself. You end up with a potential r1.2.1 which is still legal.

What happens with a r1.2 and the above @int(PRINC) + 1?

I would need to test it, done for the day right now.

Sau!

Quoted 32 lines

Quoted 31 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +6 -0
new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +6 -1
new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
--
1.7.7.6
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Martin Jansa

2012-09-05 19:44 UTC #6 lore raw

Quoted 26 lines · Saul Wold

Quoted 16 lines · Martin Jansa
Quoted 15 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    2 ++
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    6 ++++++
  .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    6 ++++++
  3 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend create mode 100644 meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +0 -0
index 58a6541..138cc21 100644
@@ -2,3 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
Quoted 8 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" · line 6
Quoted 4 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.0.bbappend +2 -0
  # enable the time limited kernel configuration options
  SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
why not
PRINC := "${@int(PRINC) + 1}"
?

Quoted 3 lines

I understood that the .1 adds more finer granularity instead of incrementing the base PR itself. You end up with a potential r1.2.1 which is still legal.

Yes but also makes order of .bbappends applied even more important.

In case one layer has
PR .= ".2"

and other
PR .= ".1"

Then it will provide r1.2.1 or r1.1.2 depending on order of bbappends applied. Hopefully you want change order of layers to break every upgrade path, but why not use PRINC which does not suffer from this?

Quoted 1 line

What happens with a r1.2 and the above @int(PRINC) + 1?

I guess it will produce r2.2

    princ = d.getVar('PRINC', True)
    if princ and princ != "0":
        pr = d.getVar('PR', True)
        pr_prefix = re.search("\D+",pr)
        prval = re.search("\d+",pr)
        if pr_prefix is None or prval is None:
            bb.error("Unable to analyse format of PR variable: %s" % pr)
        nval = int(prval.group(0)) + int(princ)
        pr = pr_prefix.group(0) + str(nval) + pr[prval.end():]
        d.setVar('PR', pr)

Cheers,

Quoted 38 lines

I would need to test it, done for the day right now.
Sau!
Quoted 32 lines
Quoted 31 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +6 -0
new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +6 -1
new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
--
1.7.7.6
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]