[meta-baryon][PATCH 0/3] respect EXTRA_IMAGE_FEATURES

[meta-baryon][PATCH 0/3] respect EXTRA_IMAGE_FEATURES

[Kevin Strasser]

Changes introduced by this patchset:
  * change the IMAGE_FEATURES assignment in baryon-image to append, 
  allowing the EXTRA_IMAGE_FEATUES variable to actually have an affect 
  on the final image. 
  * trimmed down the profile and testapps packagegroup features so they 
  can be pulled in without needing to build x11.
  * util-linux has been swapped out for parted to get around the reset 
  command conflict.

The following changes since commit ad1dfa139195f39a72b8e0fb47de5c3339397b8b:

  proftpd: add initscript and tidy up recipe (2012-10-28 01:47:32 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib strassek/baryon-image-features
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-image-features

Kevin Strasser (3):
  packagegroup-core-tools: exclude packages that depend on x11
  baryon-image: use parted instead of util-linux
  baryon-image: change IMAGE_FEATURES assignment to "+="

 .../packagegroup-core-tools-profile.bbappend       |   15 +++++++++++++++
 .../packagegroup-core-tools-testapps.bbappend      |   12 ++++++++++++
 recipes-extended/images/baryon-image.bb            |    4 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
 create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend

-- 
1.7.9.5

[meta-baryon][PATCH 1/3] packagegroup-core-tools: exclude packages that depend on x11

[Kevin Strasser]

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 .../packagegroup-core-tools-profile.bbappend       |   15 +++++++++++++++
 .../packagegroup-core-tools-testapps.bbappend      |   12 ++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
 create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend

diff --git a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
new file mode 100644
index 0000000..0d13a45
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
@@ -0,0 +1,15 @@
+# Only include packages that are useful on a headless device
+
+PROFILETOOLS = " \
+    oprofile \
+    oprofileui-server \
+    powertop \
+    lttng-control \
+    "
+
+RRECOMMENDS_${PN} = " \
+    perf \
+    trace-cmd \
+    kernel-module-oprofile \
+    blktrace \
+    "
diff --git a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
new file mode 100644
index 0000000..86c7eb5
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
@@ -0,0 +1,12 @@
+# Only include packages that are useful on a headless device
+
+RDEPENDS_${PN} = " \
+    blktool \
+    tslib-calibrate \
+    tslib-tests \
+    lrzsz \
+    ${KEXECTOOLS} \
+    alsa-utils-amixer \
+    alsa-utils-aplay \
+    ltp \
+    "
-- 
1.7.9.5

Re: [meta-baryon][PATCH 1/3] packagegroup-core-tools: exclude packages that depend on x11

[Paul Eggleton]

On Monday 19 November 2012 12:20:27 Kevin Strasser wrote:
> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> ---
>  .../packagegroup-core-tools-profile.bbappend       |   15 +++++++++++++++
>  .../packagegroup-core-tools-testapps.bbappend      |   12 ++++++++++++
>  2 files changed, 27 insertions(+)
>  create mode 100644
> recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend create
> mode 100644
> recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
> 
> diff --git
> a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
> b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new
> file mode 100644
> index 0000000..0d13a45
> --- /dev/null
> +++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
> @@ -0,0 +1,15 @@
> +# Only include packages that are useful on a headless device
> +
> +PROFILETOOLS = " \
> +    oprofile \
> +    oprofileui-server \
> +    powertop \
> +    lttng-control \
> +    "
> +
> +RRECOMMENDS_${PN} = " \
> +    perf \
> +    trace-cmd \
> +    kernel-module-oprofile \
> +    blktrace \
> +    "
> diff --git
> a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
> b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend new
> file mode 100644
> index 0000000..86c7eb5
> --- /dev/null
> +++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
> @@ -0,0 +1,12 @@
> +# Only include packages that are useful on a headless device
> +
> +RDEPENDS_${PN} = " \
> +    blktool \
> +    tslib-calibrate \
> +    tslib-tests \
> +    lrzsz \
> +    ${KEXECTOOLS} \
> +    alsa-utils-amixer \
> +    alsa-utils-aplay \
> +    ltp \
> +    "

This would work, but in this instance I think it would be better if we fixed 
the packagegroup-core-tools-* recipes in OE-Core so that the items that 
require X11 are only included when x11 is in DISTRO_FEATURES, rather than 
making the change here.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-baryon][PATCH 1/3] packagegroup-core-tools: exclude packages that depend on x11

[Burton, Ross]

On 20 November 2012 14:39, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:
> On Monday 19 November 2012 12:20:27 Kevin Strasser wrote:
>> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
>> ---
>>  .../packagegroup-core-tools-profile.bbappend       |   15 +++++++++++++++
>>  .../packagegroup-core-tools-testapps.bbappend      |   12 ++++++++++++
>>  2 files changed, 27 insertions(+)
>>  create mode 100644
>> recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend create
>> mode 100644
>> recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
>>
>> diff --git
>> a/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
>> b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new
>> file mode 100644
>> index 0000000..0d13a45
>> --- /dev/null
>> +++ b/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
>> @@ -0,0 +1,15 @@
>> +# Only include packages that are useful on a headless device
>> +
>> +PROFILETOOLS = " \
>> +    oprofile \
>> +    oprofileui-server \
>> +    powertop \
>> +    lttng-control \
>> +    "
>> +
>> +RRECOMMENDS_${PN} = " \
>> +    perf \
>> +    trace-cmd \
>> +    kernel-module-oprofile \
>> +    blktrace \
>> +    "
>> diff --git
>> a/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
>> b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend new
>> file mode 100644
>> index 0000000..86c7eb5
>> --- /dev/null
>> +++ b/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend
>> @@ -0,0 +1,12 @@
>> +# Only include packages that are useful on a headless device
>> +
>> +RDEPENDS_${PN} = " \
>> +    blktool \
>> +    tslib-calibrate \
>> +    tslib-tests \
>> +    lrzsz \
>> +    ${KEXECTOOLS} \
>> +    alsa-utils-amixer \
>> +    alsa-utils-aplay \
>> +    ltp \
>> +    "
>
> This would work, but in this instance I think it would be better if we fixed
> the packagegroup-core-tools-* recipes in OE-Core so that the items that
> require X11 are only included when x11 is in DISTRO_FEATURES, rather than
> making the change here.

Isn't this what Jack Mitchell's commit (poky
627fd60c8c01bbc14ad375f6aa195469eab73d86) did, which make sysprof
optional on X11?

Ross

Re: [meta-baryon][PATCH 1/3] packagegroup-core-tools: exclude packages that depend on x11

[kevin.strasser]

> On 20 November 2012 14:39, Paul Eggleton <paul.eggleton@linux.intel.com>
> wrote:
>>
>> This would work, but in this instance I think it would be better if we
>> fixed
>> the packagegroup-core-tools-* recipes in OE-Core so that the items that
>> require X11 are only included when x11 is in DISTRO_FEATURES, rather
>> than
>> making the change here.
>
> Isn't this what Jack Mitchell's commit (poky
> 627fd60c8c01bbc14ad375f6aa195469eab73d86) did, which make sysprof
> optional on X11?
>
> Ross
>

Ah, I was building against danny. That patch should fix
packagegroup-core-tools-profile, but packagegroup-core-tools-testapps
looks like it still always includes packages that depend on X11.

-Kevin

[meta-baryon][PATCH 2/3] baryon-image: use parted instead of util-linux

[Kevin Strasser]

util-linux replaces the 'reset' command provided by busybox with
a script that uses 'tset', which fails because it isn't installed.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 recipes-extended/images/baryon-image.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/images/baryon-image.bb b/recipes-extended/images/baryon-image.bb
index 56b160c..656fdba 100644
--- a/recipes-extended/images/baryon-image.bb
+++ b/recipes-extended/images/baryon-image.bb
@@ -2,7 +2,7 @@ IMAGE_FEATURES = "nfs-server package-management ssh-server-dropbear debug-tweaks
 
 inherit core-image
 
-IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs util-linux \
+IMAGE_INSTALL += "samba procps mdadm e2fsprogs-mke2fs parted \
                      webmin \
                      webmin-module-status \
                      webmin-module-proc \
-- 
1.7.9.5

[meta-baryon][PATCH 3/3] baryon-image: change IMAGE_FEATURES assignment to "+="

[Kevin Strasser]

this will allow EXTRA_IMAGE_FEATURES to have an affect on the image.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 recipes-extended/images/baryon-image.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/images/baryon-image.bb b/recipes-extended/images/baryon-image.bb
index 656fdba..d5fd8a5 100644
--- a/recipes-extended/images/baryon-image.bb
+++ b/recipes-extended/images/baryon-image.bb
@@ -1,4 +1,4 @@
-IMAGE_FEATURES = "nfs-server package-management ssh-server-dropbear debug-tweaks"
+IMAGE_FEATURES += "nfs-server package-management ssh-server-dropbear"
 
 inherit core-image
 
-- 
1.7.9.5