[yocto] [PATCH] oeqa/sdkext/devtool: replace v4l2loopback with fbtft kernel module

[Todor Minchev]

The v4l2loopback makefile assumes that the module will only be built
natively and breaks if it is cross-compiled or built in a container.

Signed-off-by: Todor Minchev 
---
 meta/lib/oeqa/sdkext/cases/devtool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py 
b/meta/lib/oeqa/sdkext/cases/devtool.py
index a01bc0bfe2..6975df68be 100644
--- a/meta/lib/oeqa/sdkext/cases/devtool.py
+++ b/meta/lib/oeqa/sdkext/cases/devtool.py
@@ -78,8 +78,8 @@ class DevtoolTest(OESDKExtTestCase):
 @OETestID(1609)
 @OETestDepends(['test_devtool_location'])
 def test_devtool_kernelmodule(self):
-docfile = 'https://github.com/umlaeute/v4l2loopback.git'
-recipe = 'v4l2loopback-driver'
+docfile = 'https://github.com/notro/fbtft.git'
+recipe = 'fbtft-driver'
 self._run('devtool add %s %s' % (recipe, docfile) )
 try:
 self._run('devtool build %s' % recipe)
-- 
2.13.0

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] BB Equivalent for %config(noreplace)

[Andrea Galbusera]

On Wed, May 10, 2017 at 3:59 PM, Chris Trobridge  wrote:

> When applying rpm updates generated by yocto, configuration
> files/directories are overwritten with files from the rpm.
>
> My spec file for generating equivalent native packages with rpmbuild
> specifies these files with %config(noreplace) so that this overwriting does
> no occur.
>
> Is it possible to get this information into the rpm files generated by
> yocto?
>

The usual way is to add the configuration files to the CONFFILES variable
in your recipe. This does what you want in a package management system
agnostic way. See [1] for details.

http://www.yoctoproject.org/docs/latest/mega-manual/mega-manual.html#var-CONFFILES
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH 2/2] mesa-gl: Enable gbm for rpi

[Andrei Gherzan]

Hi,

On Wed, May 10, 2017 at 7:48 AM, Khem Raj  wrote:
> weston needs gbm support which is not
> in userland
>
> Signed-off-by: Khem Raj 
> ---
>  recipes-graphics/mesa/mesa-gl_%.bbappend | 1 +
>  1 file changed, 1 insertion(+)
>  create mode 100644 recipes-graphics/mesa/mesa-gl_%.bbappend
>
> diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend 
> b/recipes-graphics/mesa/mesa-gl_%.bbappend
> new file mode 100644
> index 000..7897125
> --- /dev/null
> +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend
> @@ -0,0 +1 @@
> +PACKAGECONFIG_append_rpi = " gbm"
> --

Merged to master.

--
Andrei Gherzan
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-raspberrypi][PATCH 1/2] userland: Add missing GLES2 defines

[Andrei Gherzan]

Hi,

On Wed, May 10, 2017 at 7:48 AM, Khem Raj  wrote:
> Needed by weston
>
> Signed-off-by: Khem Raj 
> ---
>  ...-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch | 30 
> ++
>  recipes-graphics/userland/userland_git.bb  |  1 +
>  2 files changed, 31 insertions(+)
>  create mode 100644 
> recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
>
> diff --git 
> a/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
>  
> b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
> new file mode 100644
> index 000..2232d4b
> --- /dev/null
> +++ 
> b/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
> @@ -0,0 +1,30 @@
> +From 55a66f56a14eb8c3ae8294860e49efc9c9598c46 Mon Sep 17 00:00:00 2001
> +From: Khem Raj 
> +Date: Wed, 10 May 2017 06:39:34 +
> +Subject: [PATCH] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
> +
> +weston code uses these defines
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj 
> +---
> + interface/khronos/include/GLES2/gl2ext.h | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/interface/khronos/include/GLES2/gl2ext.h 
> b/interface/khronos/include/GLES2/gl2ext.h
> +index 4eacf7f..283e3e1 100644
> +--- a/interface/khronos/include/GLES2/gl2ext.h
>  b/interface/khronos/include/GLES2/gl2ext.h
> +@@ -327,6 +327,9 @@ typedef void* GLeglImageOES;
> + #define GL_RGBX_BRCM0x80EE
> + #endif
> +
> ++#define GL_R8_EXT   0x8229
> ++#define GL_RG8_EXT  0x822B
> ++
> + /* GL_EXT_texture_type_2_10_10_10_REV */
> + #ifndef GL_EXT_texture_type_2_10_10_10_REV
> + #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT  0x8368
> +--
> +1.9.1
> +
> diff --git a/recipes-graphics/userland/userland_git.bb 
> b/recipes-graphics/userland/userland_git.bb
> index 9526fae..1176ef2 100644
> --- a/recipes-graphics/userland/userland_git.bb
> +++ b/recipes-graphics/userland/userland_git.bb
> @@ -33,6 +33,7 @@ SRC_URI = "\
>  file://0011-build-shared-library-for-vchostif.patch \
>  file://0012-implement-buffer-wrapping-interface-for-dispmanx.patch \
>  file://0013-Implement-triple-buffering-for-wayland.patch \
> +file://0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch \
>  "
>  S = "${WORKDIR}/git"
>

Merged to master.

--
Andrei Gherzan
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [sstate question] How does SSTATE_CACHE work when shared?

[Patrick Ohly]

On Thu, 2017-05-11 at 13:22 +, Schmitt, Richard wrote:
> An example of our problem.  We are using a Xilinx BSP.  There is a
> recipe, device-tree-generation, that will deploy dtb files to the
> DEPLOY_IMAGE_DIR.  We are running into a case where other developers
> builds will fail when they run a task (in u-boot-xlnx) which depends
> on the dtb file being available in DEPLOY_IMAGE_DIR.  My assumption is
> that the shared state cache indicated that the dtb file did not need
> to be rebuilt because none of the dependencies changed, hence its
> signature had not changed.  But, it doesn’t actually exist in the
> users workspace (tmp/deploy/images).   
>  
> 
> Do I understand this correctly?

Yes.

>   Is there some step or configuration that I’m missing?  What is
> supposed to happen?  Is some magic supposed to copy a previous version
> of the dtb to the local deploy directory?

A "setscene" task should unpack the build result that was previously
placed into the sstate cache.

This sounds like a bug in the BSP and/or it hasn't been updated for the
version or OE-core that you use.

If this was part of a normal image recipe, my guess would be that the
BSP still copies directly to DEPLOY_DIR_IMAGE (thus bypassing the sstate
machinery) instead of to IMGDEPLOYDIR, and you are using a recent
OE-core. See "image: Deploy images to IMGDEPLOYDIR" (rev 6d969bacc718e2
in OE-core).

But for a separate recipe, it must be using deploy.bbclass incorrectly.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.



-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [sstate question] How does SSTATE_CACHE work when shared?

[Schmitt, Richard]

The writeup in section 4.3.3 of the Yocto reference manual is quite good but 
I'm still left with a question that I'm hoping someone can shed some light into.

We have the SSTATE_CACHE set up as a shared directory on a build machine.  This 
means that multiple developers with their own workspaces will all share the 
same SSTATE_CACHE.  What is not clear is how, or whether the build artifacts 
are actually shared between developers.

An example of our problem.  We are using a Xilinx BSP.  There is a recipe, 
device-tree-generation, that will deploy dtb files to the DEPLOY_IMAGE_DIR.  We 
are running into a case where other developers builds will fail when they run a 
task (in u-boot-xlnx) which depends on the dtb file being available in 
DEPLOY_IMAGE_DIR.  My assumption is that the shared state cache indicated that 
the dtb file did not need to be rebuilt because none of the dependencies 
changed, hence its signature had not changed.  But, it doesn't actually exist 
in the users workspace (tmp/deploy/images).

Do I understand this correctly?  Is there some step or configuration that I'm 
missing?  What is supposed to happen?  Is some magic supposed to copy a 
previous version of the dtb to the local deploy directory?  Is there something 
that was supposed invalidate the cache for the local user?  We can work around 
this by forcing the developer to execute a cleansstate on 
device-tree-generation but what is going wrong.

Thanks,
Rich
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-oracle-java][PATCH] Fix binary paths when setting alternatives

[Maxin B. John]

On Thu, May 11, 2017 at 07:49:16AM +0200, Jan Kiszka wrote:
> Neither the JDK nor the JRE puts binaries under $JAVA_HOME/jre anymore.
> Seen with Java 8, update 131.
> 
> Signed-off-by: Jan Kiszka 
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 12 ++--
>  recipes-devtools/oracle-java/oracle-jse.inc |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc 
> b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index 9fd76e1..935ad9b 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -28,14 +28,14 @@ PROVIDES += "virtual/javac virtual/java-initial"
>  
>  pkg_postinst_${PN} () {
>   update-alternatives --install ${bindir}/jar   jar   ${JDK_HOME}/bin/jar 
> 100
> - update-alternatives --install ${bindir}/java  java  
> ${JDK_HOME}/jre/bin/java 100
> - update-alternatives --install ${bindir}/javac javac 
> ${JDK_HOME}/jre/bin/javac 100
> + update-alternatives --install ${bindir}/java  java  
> ${JDK_HOME}/bin/java 100
> + update-alternatives --install ${bindir}/javac javac 
> ${JDK_HOME}/bin/javac 100
>   update-alternatives --install ${bindir}/javah javah 
> ${JDK_HOME}/bin/javah 100
>  }
>  
>  pkg_prerm_${PN} () {
> - update-alternatives --remove jar   ${JDK_HOME}/jre/bin/jar
> - update-alternatives --remove java  ${JDK_HOME}/jre/bin/java
> - update-alternatives --remove javac ${JDK_HOME}/jre/bin/javac
> - update-alternatives --remove javah ${JDK_HOME}/jre/bin/javah
> + update-alternatives --remove jar   ${JDK_HOME}/bin/jar
> + update-alternatives --remove java  ${JDK_HOME}/bin/java
> + update-alternatives --remove javac ${JDK_HOME}/bin/javac
> + update-alternatives --remove javah ${JDK_HOME}/bin/javah
>  }
> diff --git a/recipes-devtools/oracle-java/oracle-jse.inc 
> b/recipes-devtools/oracle-java/oracle-jse.inc
> index c812cf7..ce8280c 100644
> --- a/recipes-devtools/oracle-java/oracle-jse.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse.inc
> @@ -41,9 +41,9 @@ PROVIDES += "virtual/java"
>  inherit update-alternatives
>  
>  pkg_postinst_${PN} () {
> - update-alternatives --install ${bindir}/java java 
> ${JDK_HOME}/jre/bin/java 75
> + update-alternatives --install ${bindir}/java java ${JDK_HOME}/bin/java 
> 75
>  }
>  
>  pkg_prerm_${PN} () {
> - update-alternatives --remove java ${JDK_HOME}/jre/bin/java
> + update-alternatives --remove java ${JDK_HOME}/bin/java
>  }
> -- 

Pushed, Thanks!

Warm Regards,
Maxin
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-selinux][PATCH V5] rpm: modify the rpm bbappend file to suitable for rpm4

[Joe MacDonald]

[[meta-selinux][PATCH V5] rpm: modify the rpm bbappend file to suitable for 
rpm4] On 17.05.10 (Wed 21:48) Dengke Du wrote:

> Changed in V5:
>   Let the subject more clear.
> 
> Changed in V4:
>   Make the comments more clear.
> Changed in V3:
>   Rebase the patch on the latest master branch.
> 
> Delete the does not exist files when run task do_package.
> 
> Signed-off-by: Dengke Du 
> ---
>  recipes-devtools/rpm/rpm_%.bbappend | 4 
>  1 file changed, 4 deletions(-)

I'll merge this and modify the commit log myself, but please note this
still isn't what I was asking for in the attached.  All of the "Changed
in..." lines should be after the --- line in your email.

-J.

> 
> diff --git a/recipes-devtools/rpm/rpm_%.bbappend 
> b/recipes-devtools/rpm/rpm_%.bbappend
> index 199a7e4..9f3ec90 100644
> --- a/recipes-devtools/rpm/rpm_%.bbappend
> +++ b/recipes-devtools/rpm/rpm_%.bbappend
> @@ -1,8 +1,4 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
> -FILES_${PN} += "${libdir}/rpm/bin/spooktool \
> -${libdir}/rpm/bin/semodule \
> -   "
> -
>  inherit with-selinux
>  PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
-- 
-Joe MacDonald.
:wq
--- Begin Message ---
[[yocto] [meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable 
for rpm4] On 17.05.10 (Wed 03:03) Dengke Du wrote:

> Changed in V3:
>   rebase the patch on the latest master branch.
> 
> 1. change the rpm_5.4.16.bbappend to rpm_git.bbappend, this is
>because the rpm in oe-core has become rpm4 from rpm5.
> 
> 2. drop the patch for rpm5.
> 
> 3. delete the does not exist files when run task do_package.
> 
> Signed-off-by: Dengke Du 
> ---
>  recipes-devtools/rpm/{rpm_%.bbappend => rpm_git.bbappend} | 4 
>  1 file changed, 4 deletions(-)
>  rename recipes-devtools/rpm/{rpm_%.bbappend => rpm_git.bbappend} (56%)

I think I understand what you're looking to do here, but the comments
are completely unclear.  A commit log should look something like:

   rpm: move rpm recipe to rpm_git

   

   Signed-off-by: Dengke Du 
   ---
   

You can accomplish this with the --annotate flag to git-send-email and
then in your editor just ensure the revision history and additional
commentary goes after the --- line.

As for the change, deleting package contents that are no longer present
is fine, but why change % to git in the recipe name?  We moved from a
specific version number to % so we would be somewhat divorced from the
changes in oe-core, this change reverses that decision.

-J.

> diff --git a/recipes-devtools/rpm/rpm_%.bbappend 
> b/recipes-devtools/rpm/rpm_git.bbappend
> similarity index 56%
> rename from recipes-devtools/rpm/rpm_%.bbappend
> rename to recipes-devtools/rpm/rpm_git.bbappend
> index 199a7e4..9f3ec90 100644
> --- a/recipes-devtools/rpm/rpm_%.bbappend
> +++ b/recipes-devtools/rpm/rpm_git.bbappend
> @@ -1,8 +1,4 @@
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  
> -FILES_${PN} += "${libdir}/rpm/bin/spooktool \
> -${libdir}/rpm/bin/semodule \
> -   "
> -
>  inherit with-selinux
>  PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
> -- 
> 2.11.0
> 
-- 
-Joe MacDonald.
:wq


signature.asc
Description: Digital signature
--- End Message ---


signature.asc
Description: Digital signature
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [PATCH] ref-manual: fix typo in 2.3 migration section

[Joshua Lock]

Fix typo "Post-Installtion" → "Post-Installation"

Signed-off-by: Joshua Lock 
---
 documentation/ref-manual/migration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/ref-manual/migration.xml 
b/documentation/ref-manual/migration.xml
index f91b619..442324f 100644
--- a/documentation/ref-manual/migration.xml
+++ b/documentation/ref-manual/migration.xml
@@ -3988,7 +3988,7 @@ $ runqemu qemux86-64 
tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.
 populated into the sysroot for the recipe.
 
 
-Specify Pre-Installation and Post-Installtion
+Specify Pre-Installation and Post-Installation
 Native Tool Dependencies:
 You must specifically specify any special native tool
 dependencies of pkg_preinst and
-- 
2.9.3

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] BB Equivalent for %config(noreplace)

[Chris Trobridge]

When applying rpm updates generated by yocto, configuration files/directories 
are overwritten with files from the rpm.

My spec file for generating equivalent native packages with rpmbuild specifies 
these files with %config(noreplace) so that this overwriting does no occur.

Is it possible to get this information into the rpm files generated by yocto?

Thanks,
Chris
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-measured][PATCH v2] linux-yocto.inc: rename to linux-yocto-measured.inc

[wenzong.fan]

From: Wenzong Fan 

To avoid conflict with the one from oe-core:
  oe-core/meta/recipes-kernel/linux/linux-yocto.inc

Signed-off-by: Wenzong Fan 
---
 recipes-kernel/linux/linux-intel_4.%.bbappend  | 2 +-
 recipes-kernel/linux/{linux-yocto.inc => linux-yocto-measured.inc} | 0
 recipes-kernel/linux/linux-yocto-rt_4.%.bbappend   | 2 +-
 recipes-kernel/linux/linux-yocto_4.%.bbappend  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename recipes-kernel/linux/{linux-yocto.inc => linux-yocto-measured.inc} 
(100%)

diff --git a/recipes-kernel/linux/linux-intel_4.%.bbappend 
b/recipes-kernel/linux/linux-intel_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-intel_4.%.bbappend
+++ b/recipes-kernel/linux/linux-intel_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto.inc 
b/recipes-kernel/linux/linux-yocto-measured.inc
similarity index 100%
rename from recipes-kernel/linux/linux-yocto.inc
rename to recipes-kernel/linux/linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend 
b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend 
b/recipes-kernel/linux/linux-yocto_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
-- 
2.8.1

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-measured][PATCH] linux-yocto.inc: rename to linux-yocto-measured.inc

[wenzong.fan]

From: Wenzong Fan 

To avoid conflict with the one from oe-core:
  oe-core/meta/recipes-kernel/linux/linux-yocto.inc

Signed-off-by: Wenzong Fan 
---
 recipes-kernel/linux/linux-intel_4.%.bbappend|  2 +-
 recipes-kernel/linux/linux-yocto-measured.inc| 13 +
 recipes-kernel/linux/linux-yocto-rt_4.%.bbappend |  2 +-
 recipes-kernel/linux/linux-yocto.inc | 13 -
 recipes-kernel/linux/linux-yocto_4.%.bbappend|  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-yocto-measured.inc
 delete mode 100644 recipes-kernel/linux/linux-yocto.inc

diff --git a/recipes-kernel/linux/linux-intel_4.%.bbappend 
b/recipes-kernel/linux/linux-intel_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-intel_4.%.bbappend
+++ b/recipes-kernel/linux/linux-intel_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto-measured.inc 
b/recipes-kernel/linux/linux-yocto-measured.inc
new file mode 100644
index 000..f6930d1
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-measured.inc
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
+
+# Enable kernel support if the feature is available on the machine.
+SRC_URI += " \
+${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
+${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.cfg', '', d)} \
+${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.scc','', d)} \
+${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.cfg','', d)} \
+${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.scc', '', d)} \
+${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.cfg', '', d)} \
+${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.scc', '', d)} \
+${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.cfg', '', d)} \
+"
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend 
b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
diff --git a/recipes-kernel/linux/linux-yocto.inc 
b/recipes-kernel/linux/linux-yocto.inc
deleted file mode 100644
index f6930d1..000
--- a/recipes-kernel/linux/linux-yocto.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
-
-# Enable kernel support if the feature is available on the machine.
-SRC_URI += " \
-${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.scc', '', d)} \
-${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'file://tpm.cfg', '', d)} \
-${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.scc','', d)} \
-${@bb.utils.contains('MACHINE_FEATURES', 'tpm2','file://tpm2.cfg','', d)} \
-${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.scc', '', d)} \
-${@bb.utils.contains('MACHINE_FEATURES', 'txt', 'file://txt.cfg', '', d)} \
-${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.scc', '', d)} \
-${@bb.utils.contains('DISTRO_FEATURES',  'ima', 'file://ima.cfg', '', d)} \
-"
diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend 
b/recipes-kernel/linux/linux-yocto_4.%.bbappend
index 161f9d3..ab4f961 100644
--- a/recipes-kernel/linux/linux-yocto_4.%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend
@@ -1 +1 @@
-require linux-yocto.inc
+require linux-yocto-measured.inc
-- 
2.8.1

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-oracle-java][PATCH] Fix binary paths when setting alternatives

[Jan Kiszka]

Neither the JDK nor the JRE puts binaries under $JAVA_HOME/jre anymore.
Seen with Java 8, update 131.

Signed-off-by: Jan Kiszka 
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 12 ++--
 recipes-devtools/oracle-java/oracle-jse.inc |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc 
b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index 9fd76e1..935ad9b 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -28,14 +28,14 @@ PROVIDES += "virtual/javac virtual/java-initial"
 
 pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/jar   jar   ${JDK_HOME}/bin/jar 
100
-   update-alternatives --install ${bindir}/java  java  
${JDK_HOME}/jre/bin/java 100
-   update-alternatives --install ${bindir}/javac javac 
${JDK_HOME}/jre/bin/javac 100
+   update-alternatives --install ${bindir}/java  java  
${JDK_HOME}/bin/java 100
+   update-alternatives --install ${bindir}/javac javac 
${JDK_HOME}/bin/javac 100
update-alternatives --install ${bindir}/javah javah 
${JDK_HOME}/bin/javah 100
 }
 
 pkg_prerm_${PN} () {
-   update-alternatives --remove jar   ${JDK_HOME}/jre/bin/jar
-   update-alternatives --remove java  ${JDK_HOME}/jre/bin/java
-   update-alternatives --remove javac ${JDK_HOME}/jre/bin/javac
-   update-alternatives --remove javah ${JDK_HOME}/jre/bin/javah
+   update-alternatives --remove jar   ${JDK_HOME}/bin/jar
+   update-alternatives --remove java  ${JDK_HOME}/bin/java
+   update-alternatives --remove javac ${JDK_HOME}/bin/javac
+   update-alternatives --remove javah ${JDK_HOME}/bin/javah
 }
diff --git a/recipes-devtools/oracle-java/oracle-jse.inc 
b/recipes-devtools/oracle-java/oracle-jse.inc
index c812cf7..ce8280c 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -41,9 +41,9 @@ PROVIDES += "virtual/java"
 inherit update-alternatives
 
 pkg_postinst_${PN} () {
-   update-alternatives --install ${bindir}/java java 
${JDK_HOME}/jre/bin/java 75
+   update-alternatives --install ${bindir}/java java ${JDK_HOME}/bin/java 
75
 }
 
 pkg_prerm_${PN} () {
-   update-alternatives --remove java ${JDK_HOME}/jre/bin/java
+   update-alternatives --remove java ${JDK_HOME}/bin/java
 }
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto