Radu Moisan : dbus: include dbus-launch in the main dbus package

oe-commits Martin Jansa 2 participants 4 messages Jul 31, 2012 – Aug 1, 2012 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20120731110242.D424910219@opal

Martin Jansa

author

2012-07-31 13:34 UTC #1 lore raw

Quoted 12 lines · On Tue, Jul 31, 2012 at 11:02:42AM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: c02364f36e228835ea5d7fd4e1d347fd451f8544
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c02364f36e228835ea5d7fd4e1d347fd451f8544

Author: Radu Moisan <[email protected]>
Date:   Tue Jul 31 09:23:23 2012 +0300

dbus: include dbus-launch in the main dbus package

Followed suggestions from Bugz 2261:

Quoted 7 lines

2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs.
4) make dbus provide dbus-x11, for compatibility.

5) create new warning:
NOTE: multiple providers are available for runtime dbus-x11 (dbus, dbus-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match dbus-x11

Cheers,

Quoted 53 lines

Fixes [Yocto #2261]

Signed-off-by Radu Moisan <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

---

 meta/recipes-core/dbus/dbus.inc |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

meta/recipes-core/dbus/dbus.inc +6 -4

index a75583d..164c4d3 100644
@@ -31,10 +31,11 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
 DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+# for compatibility
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
 
 FILES_${PN}-systemd = "${systemd_unitdir}/system/"

@@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-cleanup-sockets \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                ${libexecdir}/dbus* \
                ${sysconfdir} \
                ${localstatedir} \

@@ -59,7 +61,7 @@ pkg_postinst_dbus() {
 }
 
 EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
 EXTRA_OECONF = "--disable-tests \
                 --disable-checks \

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Radu Moisan

2012-08-01 08:27 UTC #2 lore raw

Could not get rid of PREFERRED_PROVIDER warning. Tried different variations but the warning remains there every time. Can you give me some hint about PREFERRED_PROVIDER usage?

Thanks,
Radu

Quoted 84 lines · Martin Jansa

Quoted 12 lines · On Tue, Jul 31, 2012 at 11:02:42AM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: c02364f36e228835ea5d7fd4e1d347fd451f8544
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c02364f36e228835ea5d7fd4e1d347fd451f8544
Author: Radu Moisan <[email protected]>
Date:   Tue Jul 31 09:23:23 2012 +0300
dbus: include dbus-launch in the main dbus package
Followed suggestions from Bugz 2261:
Quoted 7 lines
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs.
4) make dbus provide dbus-x11, for compatibility.
5) create new warning:
NOTE: multiple providers are available for runtime dbus-x11 (dbus, dbus-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match dbus-x11
Cheers,
Quoted 48 lines
Fixes [Yocto #2261]
Signed-off-by Radu Moisan <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
  meta/recipes-core/dbus/dbus.inc |   10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/dbus/dbus.inc +6 -4
index a75583d..164c4d3 100644
@@ -31,10 +31,11 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
  DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+# for compatibility
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
 
  FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                 ${bindir}/dbus-cleanup-sockets \
                 ${bindir}/dbus-send \
                 ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                 ${libexecdir}/dbus* \
                 ${sysconfdir} \
                 ${localstatedir} \
@@ -59,7 +61,7 @@ pkg_postinst_dbus() {
  }
 
  EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
  EXTRA_OECONF = "--disable-tests \
                  --disable-checks \
Quoted 4 lines
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Martin Jansa

author

2012-08-01 08:39 UTC #3 lore raw

Quoted 3 lines · Radu Moisan

Could not get rid of PREFERRED_PROVIDER warning. Tried different variations but the warning remains there every time. Can you give me some hint about PREFERRED_PROVIDER usage?

It's not problem in configuration, it's bug in dbus metadata

Quoted 2 lines

Review
Quoted 2 lines
(quoted diff) +2 -0
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"

should be:
1) if we don't have anything depending on e.g. dbus-x11-nativesdk then you can fix that by something like:
RPROVIDES_${PN} = "${PN}-x11"
RREPLACES_${PN} += "${PN}-x11"
which will cause dbus-nativesdk to provide dbus-nativesdk-x11 (which nobody is interested in).

2) but if some package with nativesdk BBCLASSEXTEND have RDEPENDS_${PN} = "dbus-x11" then you have to append PKGSUFFIX after dbus-x11 not between dbus and x11. Something like:
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
RPROVIDES_${PN} = "dbus-x11${PKGSUFFIX}"
RREPLACES_${PN} += dbus-x11${PKGSUFFIX}"

Cheers,

Quoted 95 lines

Thanks,
Radu
Quoted 74 lines · Martin Jansa
Quoted 12 lines · On Tue, Jul 31, 2012 at 11:02:42AM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: c02364f36e228835ea5d7fd4e1d347fd451f8544
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c02364f36e228835ea5d7fd4e1d347fd451f8544
Author: Radu Moisan <[email protected]>
Date:   Tue Jul 31 09:23:23 2012 +0300
dbus: include dbus-launch in the main dbus package
Followed suggestions from Bugz 2261:
Quoted 7 lines
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs.
4) make dbus provide dbus-x11, for compatibility.
5) create new warning:
NOTE: multiple providers are available for runtime dbus-x11 (dbus, dbus-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match dbus-x11
Cheers,
Quoted 48 lines
Fixes [Yocto #2261]
Signed-off-by Radu Moisan <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
  meta/recipes-core/dbus/dbus.inc |   10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/dbus/dbus.inc +6 -4
index a75583d..164c4d3 100644
@@ -31,10 +31,11 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
  DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+# for compatibility
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
 
  FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                 ${bindir}/dbus-cleanup-sockets \
                 ${bindir}/dbus-send \
                 ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                 ${libexecdir}/dbus* \
                 ${sysconfdir} \
                 ${localstatedir} \
@@ -59,7 +61,7 @@ pkg_postinst_dbus() {
  }
 
  EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
  EXTRA_OECONF = "--disable-tests \
                  --disable-checks \
Quoted 10 lines
Quoted 4 lines
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Radu Moisan

2012-08-01 08:44 UTC #4 lore raw

ok, thanks Martin, I'll give it a shot later today.

Radu

Quoted 124 lines · Martin Jansa

Quoted 3 lines · Radu Moisan
Could not get rid of PREFERRED_PROVIDER warning. Tried different variations but the warning remains there every time. Can you give me some hint about PREFERRED_PROVIDER usage?
It's not problem in configuration, it's bug in dbus metadata
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2 -0
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
should be:
1) if we don't have anything depending on e.g. dbus-x11-nativesdk then you can fix that by something like:
RPROVIDES_${PN} = "${PN}-x11"
RREPLACES_${PN} += "${PN}-x11"
which will cause dbus-nativesdk to provide dbus-nativesdk-x11 (which nobody is interested in).
2) but if some package with nativesdk BBCLASSEXTEND have RDEPENDS_${PN} = "dbus-x11" then you have to append PKGSUFFIX after dbus-x11 not between dbus and x11. Something like:
PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
RPROVIDES_${PN} = "dbus-x11${PKGSUFFIX}"
RREPLACES_${PN} += dbus-x11${PKGSUFFIX}"
Cheers,
Quoted 87 lines
Thanks,
Radu
Quoted 74 lines · Martin Jansa
Quoted 12 lines · On Tue, Jul 31, 2012 at 11:02:42AM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: c02364f36e228835ea5d7fd4e1d347fd451f8544
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c02364f36e228835ea5d7fd4e1d347fd451f8544
Author: Radu Moisan <[email protected]>
Date:   Tue Jul 31 09:23:23 2012 +0300
dbus: include dbus-launch in the main dbus package
Followed suggestions from Bugz 2261:
Quoted 7 lines
2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature. This makes the build dependencies reflect the feature list.
3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency is now back in dbus where is belongs.
4) make dbus provide dbus-x11, for compatibility.
5) create new warning:
NOTE: multiple providers are available for runtime dbus-x11 (dbus, dbus-nativesdk)
NOTE: consider defining a PREFERRED_PROVIDER entry to match dbus-x11
Cheers,
Quoted 48 lines
Fixes [Yocto #2261]
Signed-off-by Radu Moisan <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
   meta/recipes-core/dbus/dbus.inc |   10 ++++++----
   1 files changed, 6 insertions(+), 4 deletions(-)
meta/recipes-core/dbus/dbus.inc +6 -4
index a75583d..164c4d3 100644
@@ -31,10 +31,11 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
 
   DEBIANNAME_${PN} = "dbus-1"
 
-PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
+PACKAGES =+ "${PN}-lib ${PN}-systemd"
 
-FILES_${PN}-x11 = "${bindir}/dbus-launch"
-RDEPENDS_${PN}-x11 = "${PN}"
+# for compatibility
+RPROVIDES_${PN} = "dbus-x11"
+RREPLACES_${PN} += "dbus-x11"
 
   FILES_${PN}-systemd = "${systemd_unitdir}/system/"
 
@@ -43,6 +44,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
                  ${bindir}/dbus-cleanup-sockets \
                  ${bindir}/dbus-send \
                  ${bindir}/dbus-monitor \
+               ${bindir}/dbus-launch \
                  ${libexecdir}/dbus* \
                  ${sysconfdir} \
                  ${localstatedir} \
@@ -59,7 +61,7 @@ pkg_postinst_dbus() {
   }
 
   EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x"
+EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
 
   EXTRA_OECONF = "--disable-tests \
                   --disable-checks \
Quoted 9 lines
Quoted 4 lines
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core