Meta-tlk update

PATCH In review Saul Wold 4 participants 15 messages Sep 5, 2012

lore

Share & tools

lore

Saul Wold

author

2012-09-05 16:56 UTC #0 lore raw

v3 cover Meta-tlk update

The following changes since commit 16a7879b98352b70e8c17181912a26212d716c87:

meta-emenlow: rename recipes-gnome bbappends (2012-09-04 10:04:37 -0500)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/meta-tlk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/meta-tlk

Saul Wold (3):
linux-yocto: Update linux-yocto for 3.2 and 3.4
base-files: add /etc/motd with TLK info
psplash: Add TLK info to psplash image

 .../base-files/base-files_3.0.14.bbappend          |    3 +++
 meta-tlk/recipes-core/base-files/files/motd        |    7 +++++++
 .../recipes-core/psplash/files/psplash-tlk.png     |  Bin 0 -> 42295 bytes
 meta-tlk/recipes-core/psplash/psplash_git.bbappend |   10 ++++++++++
 .../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 ++++++
 7 files changed, 34 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
 create mode 100644 meta-tlk/recipes-core/psplash/files/psplash-tlk.png
 create mode 100644 meta-tlk/recipes-core/psplash/psplash_git.bbappend
 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

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-09-05 16:56 UTC #1 lore raw

PATCH v3 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

Khem Raj

2012-09-05 17:08 UTC #2 lore raw

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

Quoted 37 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 +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 +0 -0

new file mode 100644
index 0000000..138cc21

meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend line 6

Quoted 6 lines

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

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

what will this option do ?

Saul Wold

author

2012-09-05 17:15 UTC #3 lore raw

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

Quoted 38 lines · Khem Raj

Quoted 37 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 +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 +0 -0
new file mode 100644
index 0000000..138cc21
@@ -0,0 +1,6 @@

Quoted 9 lines

meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend line 6
Quoted 6 lines
meta-tlk/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +6 -0
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# enable the time limited kernel configuration options
+SRC_URI += "file://time-limited-kernel.cfg"
+
+PR .= ".1"
what will this option do ?

Khem,

It will add another .1 to the PR, if PR = 4.1, it will become 4.1.1

Sau!

Quoted 1 line

Khem Raj

2012-09-05 17:43 UTC #4 lore raw

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

Quoted 3 lines · Saul Wold

It will add another .1 to the PR, if PR = 4.1, it will become 4.1.1

sorry, I was more interested in the time limited kernel option.

Saul Wold

author

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

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

Quoted 8 lines · Khem Raj

Quoted 3 lines · Saul Wold
It will add another .1 to the PR, if PR = 4.1, it will become 4.1.1
sorry, I was more interested in the time limited kernel option.

Sorry, you had put that right under the PR line and JaMa had also asked about it!

This is to prevent the HW BSP generated by the autobuild from being used in production, it's added by the autobuilder to the HW bsps.

It's a kernel configuration that a patch in the linux-yocto code base, Bruce would have to fill you in on those details.

Sau!

Khem Raj

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

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

Quoted 2 lines · Saul Wold

This is to prevent the HW BSP generated by the autobuild from being used in production, it's added by the autobuilder to the HW bsps.

thats fine. However, I am using linux-yocto unmodified from meta-yocto so this will now
force me to generate my own bsp if I dont want this feature right ?

Bruce Ashfield

2012-09-05 19:06 UTC #7 lore raw

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

Quoted 7 lines · Khem Raj

Quoted 2 lines · Saul Wold
This is to prevent the HW BSP generated by the autobuild from being used in production, it's added by the autobuilder to the HW bsps.
thats fine. However, I am using linux-yocto unmodified from meta-yocto so this will now
force me to generate my own bsp if I dont want this feature right ?

Only the binaries produced by the release builds that use meta-tlk would have this issue. Even then a single rebuild without that layer removes the time limit option.

Cheers,

Bruce

Khem Raj

2012-09-05 19:23 UTC #8 lore raw

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

Quoted 9 lines · Bruce Ashfield

Quoted 8 lines · Khem Raj
Quoted 4 lines · Saul Wold
This is to prevent the HW BSP generated by the autobuild from being used in
production, it's added by the autobuilder to the HW bsps.

Quoted 9 lines

Quoted 3 lines
thats fine. However, I am using linux-yocto unmodified from meta-yocto so this will now
force me to generate my own bsp if I dont want this feature right ?
Only the binaries produced by the release builds that use meta-tlk would have this issue. Even then a single rebuild without that layer removes the time limit option.

diffstats confused me

 .../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 ++++++

and I thought it was being applied to meta-yocto

but then individual diffs showed that it was being applied to meta-tlk prepending
[meta-tlk] in subject instead of just [yocto] would have filtered this message from my
eyes.

Quoted 4 lines

Cheers,
Bruce

Tom Zanussi

Acked-by on v3 1/3

2012-09-05 21:38 UTC #9 lore raw

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

In reply to Saul Wold

Quoted 1 line · Saul Wold

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

Acked-by Tom Zanussi <[email protected]>

Quoted 42 lines

---
 .../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"

Saul Wold

author

2012-09-05 16:56 UTC #10 lore raw

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

In reply to Saul Wold

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..13cd74c
@@ -0,0 +1,7 @@
+This image contains a time limited kernel and will reboot 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

Tom Zanussi

Acked-by on v3 2/3

2012-09-05 21:38 UTC #11 lore raw

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

Quoted 1 line · Saul Wold

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

Acked-by Tom Zanussi <[email protected]>

Quoted 29 lines

---
 .../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..13cd74c
@@ -0,0 +1,7 @@
+This image contains a time limited kernel and will reboot 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.

Saul Wold

author

2012-09-05 16:56 UTC #12 lore raw

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

In reply to Saul Wold

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

---
 .../recipes-core/psplash/files/psplash-tlk.png     |  Bin 0 -> 42295 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..54b8fae7220e12d1a0cbf33cea6dfbe341f0b55a
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

Tom Zanussi

Acked-by on v3 3/3

2012-09-05 21:38 UTC #13 lore raw

Re: [PATCH 3/3] psplash: Add TLK info to psplash image

Quoted 1 line · Saul Wold

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

Acked-by Tom Zanussi <[email protected]>

Quoted 806 lines

---
 .../recipes-core/psplash/files/psplash-tlk.png     |  Bin 0 -> 42295 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..54b8fae7220e12d1a0cbf33cea6dfbe341f0b55a
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"

Tom Zanussi

2012-09-05 21:38 UTC #14 lore raw

In reply to Saul Wold

Quoted 4 lines · Saul Wold

The following changes since commit 16a7879b98352b70e8c17181912a26212d716c87:
meta-emenlow: rename recipes-gnome bbappends (2012-09-04 10:04:37 -0500)

Quoted 9 lines

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/meta-tlk
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/meta-tlk
Saul Wold (3):
linux-yocto: Update linux-yocto for 3.2 and 3.4
base-files: add /etc/motd with TLK info
psplash: Add TLK info to psplash image

Pulled into meta-intel/master, thanks.

Tom

Quoted 15 lines

 .../base-files/base-files_3.0.14.bbappend          |    3 +++
 meta-tlk/recipes-core/base-files/files/motd        |    7 +++++++
 .../recipes-core/psplash/files/psplash-tlk.png     |  Bin 0 -> 42295 bytes
 meta-tlk/recipes-core/psplash/psplash_git.bbappend |   10 ++++++++++
 .../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 ++++++
 7 files changed, 34 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
 create mode 100644 meta-tlk/recipes-core/psplash/files/psplash-tlk.png
 create mode 100644 meta-tlk/recipes-core/psplash/psplash_git.bbappend
 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