[OE-core] [PATCH v3] ldconfig-native: Add usrmerge support

2023-12-19 Thread Johannes Pointner via lists.openembedded.org 
From: Johannes Pointner 

If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR.
ldconfig-native uses hardcoded paths for SLIBDIR and LIBDIR that are fine for
the not usrmerge case. But if usrmerge is enabled ldconfig-native generates a
ld.so.cache for the target, which is done in rootfs.py, that looks like this:
236 libs found in cache `/etc/ld.so.cache'
   libzstd.so.1 (libc6) => /lib/libzstd.so.1
   libz.so.1 (libc6) => /lib/libz.so.1
   libxtables.so.12 (libc6) => /lib/libxtables.so.12
   libxslt.so.1 (libc6) => /lib/libxslt.so.1
   libxml2.so.2 (libc6) => /lib/libxml2.so.2

But it should look like this, which it does in case of not usrmerge:
236 libs found in cache `/etc/ld.so.cache'
libzstd.so.1 (libc6) => /usr/lib/libzstd.so.1
libz.so.1 (libc6) => /usr/lib/libz.so.1
libxtables.so.12 (libc6) => /usr/lib/libxtables.so.12
libxslt.so.1 (libc6) => /usr/lib/libxslt.so.1
libxml2.so.2 (libc6) => /usr/lib/libxml2.so.2

As this is part of the generated image(target) this breaks for example the
Qt QLibraryInfo paths if Qt is configured 'relocatable' and leads to the issue
that the QtWebEngine can find the QtWebEngineProcess,
Qt WebEngine resources,...
In the case of Qt this issue appears because Qt tries to determine the library
locations using dladdr and uses this as base to access QtWebEngineProcess or
Qt Webengine resources.

Therefore don't let ldconfig-native parse SLIBDIR if it is a symlink.

Signed-off-by: Johannes Pointner 
---
v3: enhanced explanation

v2: fixed sendemail.from and enhanced explanation

 .../ldconfig-add-usrmerge-support.patch   | 37 +++
 .../glibc/ldconfig-native_2.12.1.bb   |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 
meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch

diff --git 
a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
new file mode 100644
index 00..3041d433fd
--- /dev/null
+++ 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
@@ -0,0 +1,37 @@
+From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
+From: Johannes Pointner 
+Date: Fri, 1 Dec 2023 11:02:39 +0100
+Subject: [PATCH] ldconfig: add usrmerge support
+
+Check whether SLIBDIR is a symlink, which is the case if usrmerge
+is enabled, and if so, ignore it.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Johannes Pointner 
+---
+ ldconfig.c | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ldconfig.c b/ldconfig.c
+index e826410..72ac67b 100644
+--- a/ldconfig.c
 b/ldconfig.c
+@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
+ 
+   if (!opt_only_cline)
+ {
++  struct stat buf;
++  int ret;
+   parse_conf (config_file, true);
+ 
+   /* Always add the standard search paths.  */
+-  add_system_dir (SLIBDIR);
++  /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
++   is enabled, and if so, ignore it. */
++  ret = lstat(SLIBDIR ,);
++  if(ret == -1 || !S_ISLNK(buf.st_mode))
++add_system_dir (SLIBDIR);
+   if (strcmp (SLIBDIR, LIBDIR))
+   add_system_dir (LIBDIR);
+   add_system_dir (SLIBDIR32);
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 4db67c3ad4..85fc87257d 100644
--- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
@@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://add-64-bit-flag-for-ELF64-entries.patch \
file://no-aux-cache.patch \
file://add-riscv-support.patch \
+   file://ldconfig-add-usrmerge-support.patch \
 "
 
 
-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192723): 
https://lists.openembedded.org/g/openembedded-core/message/192723
Mute This Topic: https://lists.openembedded.org/mt/103260432/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v2] ldconfig-native: Add usrmerge support

2023-12-15 Thread Johannes Pointner 
On Wed, Dec 13, 2023 at 12:01 PM Ross Burton  wrote:
>
> On 6 Dec 2023, at 07:40, Johannes Pointner via lists.openembedded.org 
>  wrote:
> >
> > From: Johannes Pointner 
> >
> > If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR.
> > ldconfig-native uses hardcoded paths for SLIBDIR and LIBDIR that are fine 
> > for
> > the not usrmerge case. But if usrmerge is enabled ldconfig-native generates 
> > a
> > ld.so.cache, which is done in rootfs.py, that looks like this:
> > 236 libs found in cache `/etc/ld.so.cache'
> >   libzstd.so.1 (libc6) => /lib/libzstd.so.1
> >   libz.so.1 (libc6) => /lib/libz.so.1
> >   libxtables.so.12 (libc6) => /lib/libxtables.so.12
> >   libxslt.so.1 (libc6) => /lib/libxslt.so.1
> >   libxml2.so.2 (libc6) => /lib/libxml2.so.2
> >
> > This breaks for example the Qt QLibraryInfo paths if Qt is configured
> > 'relocatable' and leads to the issue that the QtWebEngine can find the
> > QtWebEngineProcess, Qt WebEngine resources,...
> >
> > Therefore don't let ldconfig-native parse SLIBDIR if it is a symlink.
>
> This still doesn’t explain *why* ldconfig is broken, why the workaround is a 
> yocto-specific fix in ldconfig and not a general fix that other distros have, 
> and why this isn’t a problem with Qt.
As I wrote above ldconfig-native is broken for the usrmerge case
because it uses hardcoded paths which are correct for the "not
usrmerge case" but not for the "usrmerge case".
Other distros as also the yocto ldconfig for the target system is
configured at build time with the correct paths and works fine.
This is an issue for Qt because it tries to determine the library
locations using dladdr and this leads to incorrect paths that in my
case broke QtWebEngine.
>
> Ross
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192429): 
https://lists.openembedded.org/g/openembedded-core/message/192429
Mute This Topic: https://lists.openembedded.org/mt/103009101/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH v2] ldconfig-native: Add usrmerge support

2023-12-05 Thread Johannes Pointner via lists.openembedded.org 
From: Johannes Pointner 

If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR.
ldconfig-native uses hardcoded paths for SLIBDIR and LIBDIR that are fine for
the not usrmerge case. But if usrmerge is enabled ldconfig-native generates a
ld.so.cache, which is done in rootfs.py, that looks like this:
236 libs found in cache `/etc/ld.so.cache'
   libzstd.so.1 (libc6) => /lib/libzstd.so.1
   libz.so.1 (libc6) => /lib/libz.so.1
   libxtables.so.12 (libc6) => /lib/libxtables.so.12
   libxslt.so.1 (libc6) => /lib/libxslt.so.1
   libxml2.so.2 (libc6) => /lib/libxml2.so.2

This breaks for example the Qt QLibraryInfo paths if Qt is configured
'relocatable' and leads to the issue that the QtWebEngine can find the
QtWebEngineProcess, Qt WebEngine resources,...

Therefore don't let ldconfig-native parse SLIBDIR if it is a symlink.

Signed-off-by: Johannes Pointner 
---
v2: fixed sendemail.from and enhanced explanation

 .../ldconfig-add-usrmerge-support.patch   | 37 +++
 .../glibc/ldconfig-native_2.12.1.bb   |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 
meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch

diff --git 
a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
new file mode 100644
index 00..3041d433fd
--- /dev/null
+++ 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
@@ -0,0 +1,37 @@
+From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
+From: Johannes Pointner 
+Date: Fri, 1 Dec 2023 11:02:39 +0100
+Subject: [PATCH] ldconfig: add usrmerge support
+
+Check whether SLIBDIR is a symlink, which is the case if usrmerge
+is enabled, and if so, ignore it.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Johannes Pointner 
+---
+ ldconfig.c | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ldconfig.c b/ldconfig.c
+index e826410..72ac67b 100644
+--- a/ldconfig.c
 b/ldconfig.c
+@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
+ 
+   if (!opt_only_cline)
+ {
++  struct stat buf;
++  int ret;
+   parse_conf (config_file, true);
+ 
+   /* Always add the standard search paths.  */
+-  add_system_dir (SLIBDIR);
++  /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
++   is enabled, and if so, ignore it. */
++  ret = lstat(SLIBDIR ,);
++  if(ret == -1 || !S_ISLNK(buf.st_mode))
++add_system_dir (SLIBDIR);
+   if (strcmp (SLIBDIR, LIBDIR))
+   add_system_dir (LIBDIR);
+   add_system_dir (SLIBDIR32);
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 4db67c3ad4..85fc87257d 100644
--- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
@@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://add-64-bit-flag-for-ELF64-entries.patch \
file://no-aux-cache.patch \
file://add-riscv-support.patch \
+   file://ldconfig-add-usrmerge-support.patch \
 "
 
 
-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191870): 
https://lists.openembedded.org/g/openembedded-core/message/191870
Mute This Topic: https://lists.openembedded.org/mt/103009101/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] ldconfig-native: Add usrmerge support

2023-12-05 Thread Johannes Pointner 
On Mon, Dec 4, 2023 at 11:00 AM Alexander Kanavin
 wrote:
>
> Generally if you mark something as inappropriate, it's best to write
> an extended description of why in the patch. The barrier to adding
> patches that we can never upstream is high.
>
Thanks, I understand that, but ldconfig-native seemed very special to me, so
I tried to take an example from the existing patches.

So the next step would be a v2 with a better explanation and obviously a
fixed sendemail.from?
Or are there any other things I should change?

Hannes
> Alex
>
> On Mon, 4 Dec 2023 at 07:53, Johannes Pointner  wrote:
> >
> > Hello,
> >
> > On Sat, Dec 2, 2023 at 4:13 PM Alexandre Belloni via
> > lists.openembedded.org
> >  wrote:
> > >
> > > On 01/12/2023 11:53:59+0100, Johannes Pointner via lists.openembedded.org 
> > > wrote:
> > > > If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to 
> > > > LIBDIR,
> > > > therefore don't add SLIBDIR for parsing in this case.
> > > >
> > > > Signed-off-by: Johannes Pointner 
> > > > ---
> > > >  .../ldconfig-add-usrmerge-support.patch   | 37 +++
> > > >  .../glibc/ldconfig-native_2.12.1.bb   |  1 +
> > > >  2 files changed, 38 insertions(+)
> > > >  create mode 100644 
> > > > meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > >
> > > > diff --git 
> > > > a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > >  
> > > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > > new file mode 100644
> > > > index 00..3041d433fd
> > > > --- /dev/null
> > > > +++ 
> > > > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > > > @@ -0,0 +1,37 @@
> > > > +From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
> > > > +From: Johannes Pointner 
> > > > +Date: Fri, 1 Dec 2023 11:02:39 +0100
> > > > +Subject: [PATCH] ldconfig: add usrmerge support
> > > > +
> > > > +Check whether SLIBDIR is a symlink, which is the case if usrmerge
> > > > +is enabled, and if so, ignore it.
> > > > +
> > > > +Upstream-Status: Inappropriate [embedded specific]
> > >
> > > I'm not sure how this is embedded specific, why doesn't it affect desktop
> > > distribution that have usrmerge (e.g. Fedora) ?
> > Because this is just a workaround for the standalone ldconfig-native.
> > https://lists.openembedded.org/g/openembedded-core/message/191566
> > I also looked at the reason for the patches that are already used by
> > ldconfig-native.
> > But I am open to suggestions, what would you prefer?
> > >
> > > > +
> > > > +Signed-off-by: Johannes Pointner 
> > > > +---
> > > > + ldconfig.c | 8 +++-
> > > > + 1 file changed, 7 insertions(+), 1 deletion(-)
> > > > +
> > > > +diff --git a/ldconfig.c b/ldconfig.c
> > > > +index e826410..72ac67b 100644
> > > > +--- a/ldconfig.c
> > > >  b/ldconfig.c
> > > > +@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
> > > > +
> > > > +   if (!opt_only_cline)
> > > > + {
> > > > ++  struct stat buf;
> > > > ++  int ret;
> > > > +   parse_conf (config_file, true);
> > > > +
> > > > +   /* Always add the standard search paths.  */
> > > > +-  add_system_dir (SLIBDIR);
> > > > ++  /* Check whether SLIBDIR is a symlink, which is the case if 
> > > > usrmerge
> > > > ++   is enabled, and if so, ignore it. */
> > > > ++  ret = lstat(SLIBDIR ,);
> > > > ++  if(ret == -1 || !S_ISLNK(buf.st_mode))
> > > > ++add_system_dir (SLIBDIR);
> > > > +   if (strcmp (SLIBDIR, LIBDIR))
> > > > + add_system_dir (LIBDIR);
> > > > +   add_system_dir (SLIBDIR32);
> > > > diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
> > > > b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > index 4db67c3ad4..85fc87257d 100644
> > > > --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > > > @@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
> > > > file://add-64-bit-flag-for-ELF64-entries.patch \
> > > > file://no-aux-cache.patch \
> > > > file://add-riscv-support.patch \
> > > > +   file://ldconfig-add-usrmerge-support.patch \
> > > >  "
> > > >
> > > >
> > > > --
> > > > 2.43.0
> > > >
> > > >
> > >
> > > >
> > > >
> > > >
> > >
> > >
> > > --
> > > Alexandre Belloni, co-owner and COO, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
> > >
> > >
> > >
> >
> > 
> >

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191811): 
https://lists.openembedded.org/g/openembedded-core/message/191811
Mute This Topic: https://lists.openembedded.org/mt/102912756/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] ldconfig-native: Add usrmerge support

2023-12-03 Thread Johannes Pointner 
Hello,

On Sat, Dec 2, 2023 at 4:13 PM Alexandre Belloni via
lists.openembedded.org
 wrote:
>
> On 01/12/2023 11:53:59+0100, Johannes Pointner via lists.openembedded.org 
> wrote:
> > If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR,
> > therefore don't add SLIBDIR for parsing in this case.
> >
> > Signed-off-by: Johannes Pointner 
> > ---
> >  .../ldconfig-add-usrmerge-support.patch   | 37 +++
> >  .../glibc/ldconfig-native_2.12.1.bb   |  1 +
> >  2 files changed, 38 insertions(+)
> >  create mode 100644 
> > meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> >
> > diff --git 
> > a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> >  
> > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > new file mode 100644
> > index 00..3041d433fd
> > --- /dev/null
> > +++ 
> > b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
> > @@ -0,0 +1,37 @@
> > +From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
> > +From: Johannes Pointner 
> > +Date: Fri, 1 Dec 2023 11:02:39 +0100
> > +Subject: [PATCH] ldconfig: add usrmerge support
> > +
> > +Check whether SLIBDIR is a symlink, which is the case if usrmerge
> > +is enabled, and if so, ignore it.
> > +
> > +Upstream-Status: Inappropriate [embedded specific]
>
> I'm not sure how this is embedded specific, why doesn't it affect desktop
> distribution that have usrmerge (e.g. Fedora) ?
Because this is just a workaround for the standalone ldconfig-native.
https://lists.openembedded.org/g/openembedded-core/message/191566
I also looked at the reason for the patches that are already used by
ldconfig-native.
But I am open to suggestions, what would you prefer?
>
> > +
> > +Signed-off-by: Johannes Pointner 
> > +---
> > + ldconfig.c | 8 +++-
> > + 1 file changed, 7 insertions(+), 1 deletion(-)
> > +
> > +diff --git a/ldconfig.c b/ldconfig.c
> > +index e826410..72ac67b 100644
> > +--- a/ldconfig.c
> >  b/ldconfig.c
> > +@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
> > +
> > +   if (!opt_only_cline)
> > + {
> > ++  struct stat buf;
> > ++  int ret;
> > +   parse_conf (config_file, true);
> > +
> > +   /* Always add the standard search paths.  */
> > +-  add_system_dir (SLIBDIR);
> > ++  /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
> > ++   is enabled, and if so, ignore it. */
> > ++  ret = lstat(SLIBDIR ,);
> > ++  if(ret == -1 || !S_ISLNK(buf.st_mode))
> > ++add_system_dir (SLIBDIR);
> > +   if (strcmp (SLIBDIR, LIBDIR))
> > + add_system_dir (LIBDIR);
> > +   add_system_dir (SLIBDIR32);
> > diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
> > b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > index 4db67c3ad4..85fc87257d 100644
> > --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
> > @@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
> > file://add-64-bit-flag-for-ELF64-entries.patch \
> > file://no-aux-cache.patch \
> > file://add-riscv-support.patch \
> > +   file://ldconfig-add-usrmerge-support.patch \
> >  "
> >
> >
> > --
> > 2.43.0
> >
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191722): 
https://lists.openembedded.org/g/openembedded-core/message/191722
Mute This Topic: https://lists.openembedded.org/mt/102912756/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] ldconfig-native: Add usrmerge support

2023-12-01 Thread Johannes Pointner via lists.openembedded.org 
If DISTRO_FEATURE usrmerge is enabled, SLIBDIR is just a symlink to LIBDIR,
therefore don't add SLIBDIR for parsing in this case.

Signed-off-by: Johannes Pointner 
---
 .../ldconfig-add-usrmerge-support.patch   | 37 +++
 .../glibc/ldconfig-native_2.12.1.bb   |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 
meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch

diff --git 
a/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
new file mode 100644
index 00..3041d433fd
--- /dev/null
+++ 
b/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-add-usrmerge-support.patch
@@ -0,0 +1,37 @@
+From 6e543f39f6bec6eb2e02eea02029c7f4ec533b66 Mon Sep 17 00:00:00 2001
+From: Johannes Pointner 
+Date: Fri, 1 Dec 2023 11:02:39 +0100
+Subject: [PATCH] ldconfig: add usrmerge support
+
+Check whether SLIBDIR is a symlink, which is the case if usrmerge
+is enabled, and if so, ignore it.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Johannes Pointner 
+---
+ ldconfig.c | 8 +++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ldconfig.c b/ldconfig.c
+index e826410..72ac67b 100644
+--- a/ldconfig.c
 b/ldconfig.c
+@@ -1371,10 +1371,16 @@ main (int argc, char **argv)
+ 
+   if (!opt_only_cline)
+ {
++  struct stat buf;
++  int ret;
+   parse_conf (config_file, true);
+ 
+   /* Always add the standard search paths.  */
+-  add_system_dir (SLIBDIR);
++  /* Check whether SLIBDIR is a symlink, which is the case if usrmerge
++   is enabled, and if so, ignore it. */
++  ret = lstat(SLIBDIR ,);
++  if(ret == -1 || !S_ISLNK(buf.st_mode))
++add_system_dir (SLIBDIR);
+   if (strcmp (SLIBDIR, LIBDIR))
+   add_system_dir (LIBDIR);
+   add_system_dir (SLIBDIR32);
diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb 
b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
index 4db67c3ad4..85fc87257d 100644
--- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
@@ -16,6 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://add-64-bit-flag-for-ELF64-entries.patch \
file://no-aux-cache.patch \
file://add-riscv-support.patch \
+   file://ldconfig-add-usrmerge-support.patch \
 "
 
 
-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191566): 
https://lists.openembedded.org/g/openembedded-core/message/191566
Mute This Topic: https://lists.openembedded.org/mt/102912756/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] rootfs.py generates wrong ld.so.cache in case of usrmerge distro feature

2023-11-30 Thread Johannes Pointner 
On Thu, Nov 30, 2023 at 10:45 AM Johannes Pointner
 wrote:
>
> On Fri, Nov 24, 2023 at 6:03 PM Khem Raj  wrote:
> >
> >
> >
> > On Fri, Nov 24, 2023 at 2:34 AM Johannes Pointner  
> > wrote:
> >>
> >> Hello,
> >>
> >> I did recently my first Nanbield build which required the distro
> >> feature usrmerge because of using systemd and as a result QtWebEngine
> >> didn't work anymore.
> >> I reported this to Qt(https://bugreports.qt.io/browse/QTBUG-119140),
> >> but looking deeper into this it turned out to be an issue related to
> >> the generated ld.so.cache in the rootfs.py.
> >> At the moment in the ldconfig-native which is used to generate this,
> >> are the paths to LIBDIR("/usr/lib") and SLIBDIR("/lib") hardcoded, but
> >> that isn't correct if usrmerge is enabled, at least I think so.
> >> The resulting ld.so.cache looks like this:
> >> 236 libs found in cache `/etc/ld.so.cache'
> >>libzstd.so.1 (libc6) => /lib/libzstd.so.1
> >>libz.so.1 (libc6) => /lib/libz.so.1
> >>libxtables.so.12 (libc6) => /lib/libxtables.so.12
> >>libxslt.so.1 (libc6) => /lib/libxslt.so.1
> >>libxml2.so.2 (libc6) => /lib/libxml2.so.2
> >> ...
> >>
> >> Would it be OK to configure the paths LIBDIR SLIBDIR using base_libdir
> >> and libdir?
> >
> >
> > I think it should check for usrmerge feature and generate the correct 
> > values during build
> This is already done in bitbake.conf:
> root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
> '${exec_prefix}', '${base_prefix}', d)}"
> Do you really think we should check again in ldconfig-native for
> usrmerge, can't we just do something like that:
>  Add in ldconfig.c:
> +#ifndef LIBDIR
> #define LIBDIR "/usr/lib"
> +#endif
> +#ifndef SLIBDIR
> #define SLIBDIR "/lib"
> +#endif
> and build it like this:
> do_compile () {
> $CC ldconfig.c -std=gnu99 -DLIBDIR=\"${nonarch_libdir}\"
> -DSLIBDIR=\"${nonarch_base_libdir}\" chroot_canon.c xmalloc.c
> xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
> }
OK, after testing this I have seen that the paths are adjusted by the
native class so this won't work.
But another approach using something like this
LDCONFIG_SLIBIDR=${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'/usr/lib', '/lib', d)}
$CC ldconfig.c -std=gnu99 -DSLIBDIR=\"${LDCONFIG_SLIBIDR}\"
chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c
-o ldconfig
doesn't work either because usrmerge isn't in the DISTRO_FEATURES in
case of native, at least it seems so.
DISTRO_FEATURES_NATIVE:append = " usrmerge" fixes this but I have no
idea if this is the right approach.
> >
> >>
> >>
> >> Thanks,
> >> Hannes

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191505): 
https://lists.openembedded.org/g/openembedded-core/message/191505
Mute This Topic: https://lists.openembedded.org/mt/102778802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] rootfs.py generates wrong ld.so.cache in case of usrmerge distro feature

2023-11-30 Thread Johannes Pointner 
On Fri, Nov 24, 2023 at 6:03 PM Khem Raj  wrote:
>
>
>
> On Fri, Nov 24, 2023 at 2:34 AM Johannes Pointner  
> wrote:
>>
>> Hello,
>>
>> I did recently my first Nanbield build which required the distro
>> feature usrmerge because of using systemd and as a result QtWebEngine
>> didn't work anymore.
>> I reported this to Qt(https://bugreports.qt.io/browse/QTBUG-119140),
>> but looking deeper into this it turned out to be an issue related to
>> the generated ld.so.cache in the rootfs.py.
>> At the moment in the ldconfig-native which is used to generate this,
>> are the paths to LIBDIR("/usr/lib") and SLIBDIR("/lib") hardcoded, but
>> that isn't correct if usrmerge is enabled, at least I think so.
>> The resulting ld.so.cache looks like this:
>> 236 libs found in cache `/etc/ld.so.cache'
>>libzstd.so.1 (libc6) => /lib/libzstd.so.1
>>libz.so.1 (libc6) => /lib/libz.so.1
>>libxtables.so.12 (libc6) => /lib/libxtables.so.12
>>libxslt.so.1 (libc6) => /lib/libxslt.so.1
>>libxml2.so.2 (libc6) => /lib/libxml2.so.2
>> ...
>>
>> Would it be OK to configure the paths LIBDIR SLIBDIR using base_libdir
>> and libdir?
>
>
> I think it should check for usrmerge feature and generate the correct values 
> during build
This is already done in bitbake.conf:
root_prefix = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge',
'${exec_prefix}', '${base_prefix}', d)}"
Do you really think we should check again in ldconfig-native for
usrmerge, can't we just do something like that:
 Add in ldconfig.c:
+#ifndef LIBDIR
#define LIBDIR "/usr/lib"
+#endif
+#ifndef SLIBDIR
#define SLIBDIR "/lib"
+#endif
and build it like this:
do_compile () {
$CC ldconfig.c -std=gnu99 -DLIBDIR=\"${nonarch_libdir}\"
-DSLIBDIR=\"${nonarch_base_libdir}\" chroot_canon.c xmalloc.c
xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
}
>
>>
>>
>> Thanks,
>> Hannes

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191489): 
https://lists.openembedded.org/g/openembedded-core/message/191489
Mute This Topic: https://lists.openembedded.org/mt/102778802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] rootfs.py generates wrong ld.so.cache in case of usrmerge distro feature

2023-11-24 Thread Johannes Pointner 
Hello,

I did recently my first Nanbield build which required the distro
feature usrmerge because of using systemd and as a result QtWebEngine
didn't work anymore.
I reported this to Qt(https://bugreports.qt.io/browse/QTBUG-119140),
but looking deeper into this it turned out to be an issue related to
the generated ld.so.cache in the rootfs.py.
At the moment in the ldconfig-native which is used to generate this,
are the paths to LIBDIR("/usr/lib") and SLIBDIR("/lib") hardcoded, but
that isn't correct if usrmerge is enabled, at least I think so.
The resulting ld.so.cache looks like this:
236 libs found in cache `/etc/ld.so.cache'
   libzstd.so.1 (libc6) => /lib/libzstd.so.1
   libz.so.1 (libc6) => /lib/libz.so.1
   libxtables.so.12 (libc6) => /lib/libxtables.so.12
   libxslt.so.1 (libc6) => /lib/libxslt.so.1
   libxml2.so.2 (libc6) => /lib/libxml2.so.2
...

Would it be OK to configure the paths LIBDIR SLIBDIR using base_libdir
and libdir?

Thanks,
Hannes

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191179): 
https://lists.openembedded.org/g/openembedded-core/message/191179
Mute This Topic: https://lists.openembedded.org/mt/102778802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] glibc 2.26 memory leak

2017-11-14 Thread Johannes Pointner 
Hi,

I started to switch to rocko and noticed that processes like automount
are steadily increasing their memory usage over time until the kernel
kills them with out of memory.
After a bit research I came to the conclusion that glibc could be the
guilty one.
I updated glibc 2.26 to the commit which is used by archlinux:
https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/glibc
After a rebuild everythings seems normal.

I found a commit in glibc 2.26 which could be the fix for my problem

commit 6e1ea21501eac981204c3cc8212d45998f74983c
Author: Carlos O'Donell 
Date:   Thu Sep 28 11:05:18 2017 -0600

   malloc: Fix tcache leak after thread destruction [BZ #22111]


Have somebody noticed something similar?

Thanks,
Hannes
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv2 0/1] Do not use command in profile

2017-04-21 Thread Johannes Pointner 
Will this patch get merge?
Or do we have to include 'command' from now on? As this commit
"busybox: In defconfig enable ASH_CMDCMD for built-in 'command'"
suggests?

Thanks,
Hannes

2017-04-13 14:30 GMT+02:00 Peter Kjellerstedt :
> Since we apparently cannot rely on the command utility to always
> exist, it is better to avoid using it in the profile script. Rather
> than using command to detect if tty and resize exist (which obviously
> will not work if command itself does not exist), just call them
> directly while piping any output for stderr to /dev/null. This should
> actually be a little bit more efficient in the case that they do
> exist, and the same in the case that they do not exist.
>
> I leave to you to decide whether you want to revert commit e41c90b852
> that enabled the command utility in busybox or not.
>
> PATCHv2: Correct a typo in the commit message
>
> //Peter
>
> The following changes since commit fe47bff64b17562593c620d2daf748735bb5c3d6:
>
>   linux-yocto: Update genericx86* SRCREVs for linux-yocto 4.10 (2017-04-13 
> 10:54:37 +0100)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib pkj/profile_without_command
>   
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/profile_without_command
>
> Peter Kjellerstedt (1):
>   base-files: profile: Avoid using "command" to determine if programs
> exist
>
>  meta/recipes-core/base-files/base-files/profile | 14 ++
>  1 file changed, 6 insertions(+), 8 deletions(-)
>
> --
> 2.12.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core PATCH] wayland: upgrade from 1.11.0 to 1.11.1

2016-10-31 Thread Johannes Pointner 
Wouldn't it make more sense to update to 1.12?
Since 1.11.1 is backporting fixes from 1.12 as stated in the annouce
mail of the release.

2016-10-29 16:57 GMT+02:00 Fathi Boudra :
> Update release tarball md5sum/sha256sum
>
> Signed-off-by: Fathi Boudra 
> ---
>  .../wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch   | 2 +-
>  .../recipes-graphics/wayland/{wayland_1.11.0.bb => wayland_1.11.1.bb} | 4 
> ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>  rename meta/recipes-graphics/wayland/{wayland_1.11.0.bb => 
> wayland_1.11.1.bb} (92%)
>
> diff --git 
> a/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
>  
> b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
> index dece95c..ef41b79 100644
> --- 
> a/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
> +++ 
> b/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch
> @@ -16,7 +16,7 @@ diff --git a/src/scanner.c b/src/scanner.c
>  index 5f06e8e..10a4023 100644
>  --- a/src/scanner.c
>  +++ b/src/scanner.c
> -@@ -808,7 +808,7 @@ find_enumeration(struct protocol *protocol,
> +@@ -812,7 +812,7 @@ find_enumeration(struct protocol *protocol,
> struct interface *i;
> struct enumeration *e;
> char *enum_name;
> diff --git a/meta/recipes-graphics/wayland/wayland_1.11.0.bb 
> b/meta/recipes-graphics/wayland/wayland_1.11.1.bb
> similarity index 92%
> rename from meta/recipes-graphics/wayland/wayland_1.11.0.bb
> rename to meta/recipes-graphics/wayland/wayland_1.11.1.bb
> index 3413406..fa674f6 100644
> --- a/meta/recipes-graphics/wayland/wayland_1.11.0.bb
> +++ b/meta/recipes-graphics/wayland/wayland_1.11.1.bb
> @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = 
> "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
>  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
> file://0001-scanner-Use-unit32_t-instead-of-uint.patch \
> "
> -SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9"
> -SRC_URI[sha256sum] = 
> "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0"
> +SRC_URI[md5sum] = "82f227c65faec3df0335847626811303"
> +SRC_URI[sha256sum] = 
> "4c8a99d030282740e898dead98c92d92023be9c3536c7f50d215a7e39195"
>
>  EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries"
>
> --
> 2.10.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch v2][jethro] xf86-video-modesetting: Require sufficiently new libdrm

2016-03-07 Thread Johannes Pointner 
v2: Fixed file mode of patch file.

This fixes the check of the libdrm version in the configure script.

Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../0002-modesetting_libdrm_requirements.patch | 29 ++
 .../xorg-xserver/xserver-xorg_1.17.2.bb|  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch

diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
new file mode 100644
index 000..22b7e6f
--- /dev/null
+++ 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
@@ -0,0 +1,29 @@
+From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Wed, 27 Jan 2016 11:50:13 -0500
+Subject: modesetting: Require sufficiently new libdrm
+
+Bugzilla: https://bugs.freedesktop.org/93883
+Signed-off-by: Adam Jackson <a...@redhat.com>
+Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+Reviewed-by: Julien Cristau <jcris...@debian.org>
+
+Upstream-Status: Backport
+
+diff --git a/configure.ac b/configure.ac
+index ac3bb64..312fc69 100644
+--- a/configure.ac
 b/configure.ac
+@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
+ 
+   if test "x$DRM" = xyes; then
+   dnl 2.4.46 is required for cursor hotspot support.
+-  PKG_CHECK_EXISTS(libdrm >= 2.4.46)
+-  XORG_DRIVER_MODESETTING=yes
++  PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, 
XORG_DRIVER_MODESETTING=no)
+   fi
+ 
+   AC_SUBST([XORG_LIBS])
+-- 
+cgit v0.10.2
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
index 3039d30..f087ecb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
@@ -1,6 +1,7 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
+   file://0002-modesetting_libdrm_requirements.patch \
"
 SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
 SRC_URI[sha256sum] = 
"f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch] xf86-video-modesetting: Require sufficiently new libdrm

2016-03-07 Thread Johannes Pointner 
This fixes the check of the libdrm version in the configure script.

Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../modesetting_libdrm_requirements.patch  | 29 ++
 .../xorg-xserver/xserver-xorg_1.18.0.bb|  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 
meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch

diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
new file mode 100644
index 000..22b7e6f
--- /dev/null
+++ 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch
@@ -0,0 +1,29 @@
+From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Wed, 27 Jan 2016 11:50:13 -0500
+Subject: modesetting: Require sufficiently new libdrm
+
+Bugzilla: https://bugs.freedesktop.org/93883
+Signed-off-by: Adam Jackson <a...@redhat.com>
+Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+Reviewed-by: Julien Cristau <jcris...@debian.org>
+
+Upstream-Status: Backport
+
+diff --git a/configure.ac b/configure.ac
+index ac3bb64..312fc69 100644
+--- a/configure.ac
 b/configure.ac
+@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
+ 
+   if test "x$DRM" = xyes; then
+   dnl 2.4.46 is required for cursor hotspot support.
+-  PKG_CHECK_EXISTS(libdrm >= 2.4.46)
+-  XORG_DRIVER_MODESETTING=yes
++  PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, 
XORG_DRIVER_MODESETTING=no)
+   fi
+ 
+   AC_SUBST([XORG_LIBS])
+-- 
+cgit v0.10.2
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
index e606dac..eb79b40 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
@@ -2,6 +2,7 @@ require xserver-xorg.inc
 
 SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \
 file://musl-arm-inb-outb.patch \
+file://modesetting_libdrm_requirements.patch \
"
 SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
 SRC_URI[sha256sum] = 
"195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][Patch][jethro] xf86-video-modesetting: Require sufficiently new libdrm

2016-03-07 Thread Johannes Pointner 
Sure, I'll send a patch for master.
Furthermore, I'll send a second version of this one, because I just
saw that I messed up the file mode of the patch file.

2016-03-07 17:00 GMT+01:00 Burton, Ross <ross.bur...@intel.com>:
>
> On 7 March 2016 at 14:50, Johannes Pointner <h4nn35.w...@gmail.com> wrote:
>>
>> The reason I thought this patch wouldn't be needed for master is that
>> it was included in xserver 1.18.1 and master is already on xserver
>> 1.18.0.
>> Do you know if it is planned to switch to the newer 1.18.1 version?
>
>
> No, we're upstream version frozen now, so this is appropriate for master
> too.  Patches for stable branches should be applied to master first, so can
> you also prepare a patch for the master branch too?
>
> Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][Patch][jethro] xf86-video-modesetting: Require sufficiently new libdrm

2016-03-07 Thread Johannes Pointner 
The reason I thought this patch wouldn't be needed for master is that
it was included in xserver 1.18.1 and master is already on xserver
1.18.0.
Do you know if it is planned to switch to the newer 1.18.1 version?

2016-03-07 15:02 GMT+01:00 Burton, Ross <ross.bur...@intel.com>:
>
> On 1 March 2016 at 20:12, Johannes Pointner <h4nn35.w...@gmail.com> wrote:
>>
>> This fixes the check of the libdrm version in the configure script.
>
>
> For patches to stable branches please explain why this isn't also required
> to be applied to master.
>
> Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch v2 1/2] xcursor-transparent-theme: Add new recipe for git repo

2016-03-03 Thread Johannes Pointner 
Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../xcursor-transparent-theme_git.bb | 20 
 1 file changed, 20 insertions(+)
 create mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb

diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
new file mode 100644
index 000..580967a
--- /dev/null
+++ 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Transparent X11 cursor theme for touchscreens"
+HOMEPAGE = "http://www.matchbox-project.org/;
+BUGTRACKER = "http://bugzilla.yoctoproject.org/;
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SECTION = "x11/base"
+
+SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06"
+PV = "0.1.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
+
+S = "${WORKDIR}/git"
+
+inherit autotools allarch
+
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch v2 2/2] xcursor-transparent-theme: Remove old recipe and related patches

2016-03-03 Thread Johannes Pointner 
Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../fix_watch_cursor.patch | 17 ---
 .../use-relative-symlinks.patch| 25 --
 .../xcursor-transparent-theme_0.1.1.bb | 19 
 3 files changed, 61 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb

diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
deleted file mode 100644
index cfac55c..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix typo in Makefile
-
-Upstream-Status: Pending
-
-Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
-===
 xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am   2013-03-07 
22:25:04.001435305 +
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am2013-03-07 
22:25:04.061435302 +
-@@ -79,7 +79,7 @@
-   ul_angle \
-   ur_angle \
-   v_double_arrow \
--  watcha \
-+  watch \
-   xterm  
- 
- CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
deleted file mode 100644
index 5028fd6..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use relative symlink for link rather than absolute path which 
-doesn't work well in DESTDIR setting.
-
-Also fix out of tree builds to use correct srcdir.
-
-Upstream-Status: Pending
-
-RP 2013/3/8
-
-Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
-===
 xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am   2013-03-07 
22:25:03.933435307 +
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am2013-03-07 
22:25:27.293434755 +
-@@ -88,9 +88,9 @@
- 
- install-data-local:
-   $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); 
--  $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
-+  $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
-   for CURSOR in $(CURSOR_NAMES); do \
-   echo '-- Installing cursor '$$CURSOR; \
--  ln -s $(DESTDIR)$(CURSOR_DIR)/transp 
$(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
-+  ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
-   done
- 
diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
deleted file mode 100644
index 5e668ab..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Transparent X11 cursor theme for touchscreens"
-HOMEPAGE = "http://www.matchbox-project.org/;
-BUGTRACKER = "http://bugzilla.yoctoproject.org/;
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SECTION = "x11/base"
-PR = "r4"
-
-SRC_URI = 
"http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz
 \
-  file://use-relative-symlinks.patch \
-  file://fix_watch_cursor.patch"
-
-SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
-SRC_URI[sha256sum] = 
"b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
-
-inherit autotools allarch
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch v2 0/2] xcursor-transparent-theme: Convert recipe to git

2016-03-03 Thread Johannes Pointner 
v2: Fixed subject

This patchset converts xcursor-transparent-theme recipe to git

Johannes Pointner (2):
  xcursor-transparent-theme: Add new recipe for git repo
  xcursor-transparent-theme: Remove old recipe and related patches

 .../fix_watch_cursor.patch | 17 ---
 .../use-relative-symlinks.patch| 25 --
 ...e_0.1.1.bb => xcursor-transparent-theme_git.bb} | 15 +++--
 3 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 rename 
meta/recipes-graphics/xcursor-transparent-theme/{xcursor-transparent-theme_0.1.1.bb
 => xcursor-transparent-theme_git.bb} (51%)

-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [yocto][xcursor-transparent-theme][Patch 0/2] Convert recipe to git

2016-03-03 Thread Johannes Pointner 
Sorry I messed up the subject, I'll resend it

2016-03-03 21:31 GMT+01:00 Johannes Pointner <h4nn35.w...@gmail.com>:
> This patchset converts xcursor-transparent-theme recipe to git
>
> Johannes Pointner (2):
>   xcursor-transparent-theme: Add new recipe for git repo
>   xcursor-transparent-theme: Remove old recipe and related patches
>
>  .../fix_watch_cursor.patch | 17 ---
>  .../use-relative-symlinks.patch| 25 
> --
>  ...e_0.1.1.bb => xcursor-transparent-theme_git.bb} | 15 +++--
>  3 files changed, 8 insertions(+), 49 deletions(-)
>  delete mode 100644 
> meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
>  delete mode 100644 
> meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
>  rename 
> meta/recipes-graphics/xcursor-transparent-theme/{xcursor-transparent-theme_0.1.1.bb
>  => xcursor-transparent-theme_git.bb} (51%)
>
> --
> 2.7.2
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [yocto][xcursor-transparent-theme][Patch 2/2] xcursor-transparent-theme: Remove old recipe and related patches

2016-03-03 Thread Johannes Pointner 
Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../fix_watch_cursor.patch | 17 ---
 .../use-relative-symlinks.patch| 25 --
 .../xcursor-transparent-theme_0.1.1.bb | 19 
 3 files changed, 61 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb

diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
deleted file mode 100644
index cfac55c..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix typo in Makefile
-
-Upstream-Status: Pending
-
-Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
-===
 xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am   2013-03-07 
22:25:04.001435305 +
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am2013-03-07 
22:25:04.061435302 +
-@@ -79,7 +79,7 @@
-   ul_angle \
-   ur_angle \
-   v_double_arrow \
--  watcha \
-+  watch \
-   xterm  
- 
- CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
deleted file mode 100644
index 5028fd6..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use relative symlink for link rather than absolute path which 
-doesn't work well in DESTDIR setting.
-
-Also fix out of tree builds to use correct srcdir.
-
-Upstream-Status: Pending
-
-RP 2013/3/8
-
-Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
-===
 xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am   2013-03-07 
22:25:03.933435307 +
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am2013-03-07 
22:25:27.293434755 +
-@@ -88,9 +88,9 @@
- 
- install-data-local:
-   $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); 
--  $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ 
-+  $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
-   for CURSOR in $(CURSOR_NAMES); do \
-   echo '-- Installing cursor '$$CURSOR; \
--  ln -s $(DESTDIR)$(CURSOR_DIR)/transp 
$(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
-+  ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
-   done
- 
diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
deleted file mode 100644
index 5e668ab..000
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Transparent X11 cursor theme for touchscreens"
-HOMEPAGE = "http://www.matchbox-project.org/;
-BUGTRACKER = "http://bugzilla.yoctoproject.org/;
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SECTION = "x11/base"
-PR = "r4"
-
-SRC_URI = 
"http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz
 \
-  file://use-relative-symlinks.patch \
-  file://fix_watch_cursor.patch"
-
-SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
-SRC_URI[sha256sum] = 
"b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
-
-inherit autotools allarch
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [yocto][xcursor-transparent-theme][Patch 0/2] Convert recipe to git

2016-03-03 Thread Johannes Pointner 
This patchset converts xcursor-transparent-theme recipe to git

Johannes Pointner (2):
  xcursor-transparent-theme: Add new recipe for git repo
  xcursor-transparent-theme: Remove old recipe and related patches

 .../fix_watch_cursor.patch | 17 ---
 .../use-relative-symlinks.patch| 25 --
 ...e_0.1.1.bb => xcursor-transparent-theme_git.bb} | 15 +++--
 3 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
 delete mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
 rename 
meta/recipes-graphics/xcursor-transparent-theme/{xcursor-transparent-theme_0.1.1.bb
 => xcursor-transparent-theme_git.bb} (51%)

-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [yocto][xcursor-transparent-theme][Patch 1/2] xcursor-transparent-theme: Add new recipe for git repo

2016-03-03 Thread Johannes Pointner 
Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../xcursor-transparent-theme_git.bb | 20 
 1 file changed, 20 insertions(+)
 create mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb

diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
new file mode 100644
index 000..580967a
--- /dev/null
+++ 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Transparent X11 cursor theme for touchscreens"
+HOMEPAGE = "http://www.matchbox-project.org/;
+BUGTRACKER = "http://bugzilla.yoctoproject.org/;
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SECTION = "x11/base"
+
+SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06"
+PV = "0.1.1+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
+
+S = "${WORKDIR}/git"
+
+inherit autotools allarch
+
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch][jethro][master] xcursor-transparent-theme: insert several cursors

2016-03-01 Thread Johannes Pointner 
This patch inserts several cursors which are used by Qt for example.

Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../insert_several_cursors.patch   | 79 ++
 .../xcursor-transparent-theme_0.1.1.bb |  3 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/insert_several_cursors.patch

diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/insert_several_cursors.patch
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/insert_several_cursors.patch
new file mode 100644
index 000..861899e
--- /dev/null
+++ 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/insert_several_cursors.patch
@@ -0,0 +1,79 @@
+--- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am   2016-03-01 
21:48:25.0 +0100
 xcursor-transparent-theme-0.1.1/cursors/Makefile.am2016-03-01 
22:10:06.473326873 +0100
+@@ -26,10 +26,17 @@
+   bottom_tee \
+   center_ptr \
+   circle \
++  closedhand \
++  color-picker \
++  copy \
+   cross \
+   cross_reverse \
+   crossed_circle \
+   crosshair \
++  dnd-copy \
++  dnd-move \
++  dnd-no-drop \
++  dnd-none \
+   dot \
+   dot_box_mask \
+   dotbox \
+@@ -40,21 +47,27 @@
+   exchange \
+   fd_double_arrow \
+   fleur \
++  forbidden \
+   gumby \
+   h_double_arrow \
+   hand \
+   hand1 \
+   hand2 \
++  ibeam \
+   left_ptr \
+   left_ptr_watch \
+   left_side \
+   left_tee  \
++  link \
+   ll_angle  \
+   lr_angle  \
+   move  \
++  open_hand \
+   pencil\
+   pirate\
+   plus  \
++  pointing_hand \
++  progress \
+   question_arrow \
+   right_ptr  \
+   right_side \
+@@ -67,9 +80,17 @@
+   sb_up_arrow \
+   sb_v_double_arrow \
+   shuttle \
++  size_all \
++  size_bdiag \
++  size_fdiag \
++  size_hor \
++  size_ver \
+   sizing  \
++  split_h \
++  split_v \
+   target  \
+   tcross  \
++  text \
+   top_left_arrow  \
+   top_left_corner \
+   top_right_corner \
+@@ -77,9 +98,12 @@
+   top_tee \
+   trek \
+   ul_angle \
++  up_arrow \
+   ur_angle \
+   v_double_arrow \
++  wait \
+   watch \
++  whats_this \
+   xterm  
+ 
+ CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
index 5e668ab..5a9df62 100644
--- 
a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
+++ 
b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb
@@ -10,7 +10,8 @@ PR = "r4"
 
 SRC_URI = 
"http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz
 \
   file://use-relative-symlinks.patch \
-  file://fix_watch_cursor.patch"
+  file://fix_watch_cursor.patch \
+  file://insert_several_cursors.patch"
 
 SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
 SRC_URI[sha256sum] = 
"b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][Patch][jethro] xf86-video-modesetting: Require sufficiently new libdrm

2016-03-01 Thread Johannes Pointner 
This fixes the check of the libdrm version in the configure script.

Signed-off-by: Johannes Pointner <johannes.point...@gmail.com>
---
 .../0002-modesetting_libdrm_requirements.patch | 29 ++
 .../xorg-xserver/xserver-xorg_1.17.2.bb|  1 +
 2 files changed, 30 insertions(+)
 create mode 100755 
meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch

diff --git 
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
new file mode 100755
index 000..22b7e6f
--- /dev/null
+++ 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-modesetting_libdrm_requirements.patch
@@ -0,0 +1,29 @@
+From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Wed, 27 Jan 2016 11:50:13 -0500
+Subject: modesetting: Require sufficiently new libdrm
+
+Bugzilla: https://bugs.freedesktop.org/93883
+Signed-off-by: Adam Jackson <a...@redhat.com>
+Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
+Reviewed-by: Julien Cristau <jcris...@debian.org>
+
+Upstream-Status: Backport
+
+diff --git a/configure.ac b/configure.ac
+index ac3bb64..312fc69 100644
+--- a/configure.ac
 b/configure.ac
+@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
+ 
+   if test "x$DRM" = xyes; then
+   dnl 2.4.46 is required for cursor hotspot support.
+-  PKG_CHECK_EXISTS(libdrm >= 2.4.46)
+-  XORG_DRIVER_MODESETTING=yes
++  PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, 
XORG_DRIVER_MODESETTING=no)
+   fi
+ 
+   AC_SUBST([XORG_LIBS])
+-- 
+cgit v0.10.2
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
index 3039d30..f087ecb 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
@@ -1,6 +1,7 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
+   file://0002-modesetting_libdrm_requirements.patch \
"
 SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad"
 SRC_URI[sha256sum] = 
"f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
-- 
2.7.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core