from:"Andrew Shadura"

[OE-core] [PATCH] cups: explicitly configure with systemd when needed

2015-10-21 Thread Andrew Shadura

Add PACKAGECONFIG for systemd, enable it when systemd is enabled
in DISTRO_FEATURES. Pass the correct path to systemd units,
ensure they're installed into the package.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
I hope this patch will be merged before jethro is released :)

 meta/recipes-extended/cups/cups.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-extended/cups/cups.inc 
b/meta/recipes-extended/cups/cups.inc
index 2c34da9..ad980fc 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -24,10 +24,12 @@ GROUPADD_PARAM_${PN} = "--system lpadmin"
 SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', 
d)}"
 PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
 PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
+PACKAGECONFIG[systemd] = 
"--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
 PACKAGECONFIG[xinetd] = 
"--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"
 
 EXTRA_OECONF = " \
@@ -100,6 +102,7 @@ FILES_${PN} += "${libdir}/cups/backend \
${libdir}/cups/monitor \
${libdir}/cups/notifier \
${libdir}/cups/daemon \
+   ${systemd_system_unitdir} \
   "
 
 FILES_${PN}-lib = "${libdir}/libcups.so.*"
-- 
2.1.4

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

Re: [OE-core] [PATCH] cups: explicitly configure with systemd when needed

2015-10-22 Thread Andrew Shadura

On 22 October 2015 12:59:13 CEST, "Burton, Ross" <ross.bur...@intel.com> wrote:
>On 21 October 2015 at 18:41, Andrew Shadura
><andrew.shad...@collabora.co.uk>
>wrote:
>
>> +   ${systemd_system_unitdir} \
>>
>
>This isn't needed as systemd.bbclass handles it for you.


Well, that's what I thought too, but no, in fact it doesn't. 

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

[OE-core] [PATCH v2] cups: update systemd support

2015-10-22 Thread Andrew Shadura

Add PACKAGECONFIG for systemd, enable it when systemd is enabled
in DISTRO_FEATURES. Pass the correct path to systemd units,
ensure they're installed into the package.

Drop custom systemd unit files, use those shipped by the upstream
instead.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-extended/cups/cups.inc  | 14 +++---
 meta/recipes-extended/cups/cups/cups.path|  8 
 meta/recipes-extended/cups/cups/cups.service | 10 --
 meta/recipes-extended/cups/cups/cups.socket  |  8 
 4 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/cups/cups/cups.path
 delete mode 100644 meta/recipes-extended/cups/cups/cups.service
 delete mode 100644 meta/recipes-extended/cups/cups/cups.socket

diff --git a/meta/recipes-extended/cups/cups.inc 
b/meta/recipes-extended/cups/cups.inc
index 2c34da9..ac2abf5 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -7,9 +7,6 @@ SRC_URI = 
"http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
file://use_echo_only_in_init.patch \
file://0001-don-t-try-to-run-generated-binaries.patch \
file://cups_serverbin.patch \
-   file://cups.socket \
-   file://cups.path \
-   file://cups.service \
  "
 
 LEAD_SONAME = "libcupsdriver.so"
@@ -21,13 +18,15 @@ inherit autotools-brokensep binconfig useradd systemd
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "--system lpadmin"
 
-SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service"
+SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path 
org.cups.cupsd.service org.cups.cups-lpd.socket org.cups.cups-lpd@.service"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 
'avahi', '', d)} \
+   ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', 
d)}"
 PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
 PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
+PACKAGECONFIG[systemd] = 
"--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
 PACKAGECONFIG[xinetd] = 
"--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"
 
 EXTRA_OECONF = " \
@@ -75,13 +74,6 @@ do_install () {
rm -rf ${D}${sysconfdir}/init.d/
rm -rf ${D}${sysconfdir}/rc*
fi
-
-   # Install systemd unit files
-   install -d ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/cups.socket ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/cups.path ${D}${systemd_unitdir}/system
-   install -m 0644 ${WORKDIR}/cups.service ${D}${systemd_unitdir}/system
-   sed -i -e 's,@SBINDIR@,${sbindir},g' 
${D}${systemd_unitdir}/system/cups.service
 }
 
 python do_package_append() {
diff --git a/meta/recipes-extended/cups/cups/cups.path 
b/meta/recipes-extended/cups/cups/cups.path
deleted file mode 100644
index de8cc57..000
--- a/meta/recipes-extended/cups/cups/cups.path
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Printer Service Spool
-
-[Path]
-PathExistsGlob=/var/spool/cups/d*
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta/recipes-extended/cups/cups/cups.service 
b/meta/recipes-extended/cups/cups/cups.service
deleted file mode 100644
index 7d3e839..000
--- a/meta/recipes-extended/cups/cups/cups.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=CUPS Printing Service
-
-[Service]
-ExecStart=@SBINDIR@/cupsd -f
-PrivateTmp=true
-
-[Install]
-Also=cups.socket cups.path
-WantedBy=printer.target
diff --git a/meta/recipes-extended/cups/cups/cups.socket 
b/meta/recipes-extended/cups/cups/cups.socket
deleted file mode 100644
index 3314870..000
--- a/meta/recipes-extended/cups/cups/cups.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CUPS Printing Service Sockets
-
-[Socket]
-ListenStream=/var/run/cups/cups.sock
-
-[Install]
-WantedBy=sockets.target
-- 
2.1.4

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

Re: [OE-core] [PATCH v2] cups: update systemd support

2015-11-02 Thread Andrew Shadura

On 22/10/15 16:00, Andrew Shadura wrote:
> Add PACKAGECONFIG for systemd, enable it when systemd is enabled
> in DISTRO_FEATURES. Pass the correct path to systemd units,
> ensure they're installed into the package.
> 
> Drop custom systemd unit files, use those shipped by the upstream
> instead.
> 
> Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>

Anything about this patch?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH 1/2] ifupdown: import recipe

2015-10-09 Thread Andrew Shadura

Hi,

I just wanted to comment on this patch pulled with the recipe:

> +From 74152ac74a3e1ea0f3be292aa1eeca5ad1fe69c0 Mon Sep 17 00:00:00 2001
> +From: Paul Gortmaker 
> +Date: Wed, 6 Aug 2014 15:12:11 -0400
> +Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback

I have already commented on this patch when I still was an upstream
developer for ifupdown, see . The issue
led to this patch was caused by Ubuntu maintainer trying to remove one
of the features he deemed as not yet ready for Ubuntu release, but he
didn't do it properly on the first attempt, thus leading to broken
loopback (which didn't really matter for Ubuntu, as the loopback
interface was configured by upstart there back then).

The correct fix for the issue would be rebasing to the Debian version of
the package which, by the way, has a new active developer, Guus Sliepen.
Then the patch could be dropped.

-- 
Cheers,
  Andrew





signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] dbus: merge .bb and .inc

2015-08-28 Thread Andrew Shadura

On 28/08/15 05:53, Khem Raj wrote:
 On Thu, Aug 27, 2015 at 2:12 AM, Andrew Shadura
 andrew.shad...@collabora.co.uk wrote:
  The split is no longer necessary, and only makes it more complicated to
  do changes in external layers.
 
  Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
  ---
   meta/recipes-core/dbus/dbus.inc   | 170 
  -
   meta/recipes-core/dbus/dbus_1.8.20.bb | 171 
  +-
   2 files changed, 170 insertions(+), 171 deletions(-)
   delete mode 100644 meta/recipes-core/dbus/dbus.inc
 can you send patch generated with -M 1

Gives me exact same patch, hmm.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] dbus: merge .bb and .inc

2015-08-28 Thread Andrew Shadura

Hello again,

By the way, Khem, what's new about your systemd update patches? I have
more patches for dbus recipe, but they depend on a newer systemd, so I
don't send them in yet.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/3] dbus: merge .bb and .inc

2015-08-28 Thread Andrew Shadura

On 28/08/15 16:23, Khem Raj wrote:
 On Fri, Aug 28, 2015 at 5:22 AM, Andrew Shadura
 andrew.shad...@collabora.co.uk wrote:
  can you send patch generated with -M 1
 
  Gives me exact same patch, hmm.
 try -C

No changes.

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

Re: [OE-core] [PATCH 2/3] dbus: update the recipes to 1.10.0

2015-08-27 Thread Andrew Shadura

On 27/08/15 13:22, Jussi Kukkonen wrote:
 Could you please configure your git so that it tries harder to find
 renames: it's hard to see the changes otherwise. Something like this
 would work in git config (the other option is renames=copies):

Right, thanks for the suggestion. Resubmitting that patch.

-- 
Cheers,
  Andrew
From 863fb3ce148485e3838b68fc5bb1531465ac37bb Mon Sep 17 00:00:00 2001
From: Andrew Shadura andrew.shad...@collabora.co.uk
Date: Wed, 29 Jul 2015 16:00:37 +0100
Subject: [PATCH 2/3] dbus: update the recipes to 1.10.0

Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
---
 .../dbus/{dbus-test_1.8.20.bb = dbus-test_1.10.0.bb}  |  6 +++---
 meta/recipes-core/dbus/dbus/python-config.patch| 13 +++--
 meta/recipes-core/dbus/{dbus_1.8.20.bb = dbus_1.10.0.bb}  | 14 +-
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb = dbus-test_1.10.0.bb} (91%)
 rename meta/recipes-core/dbus/{dbus_1.8.20.bb = dbus_1.10.0.bb} (93%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
similarity index 91%
rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb
rename to meta/recipes-core/dbus/dbus-test_1.10.0.bb
index 704070b..7dec16e 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
@@ -5,7 +5,7 @@ LICENSE = AFL-2 | GPLv2+
 LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c
 
-DEPENDS = python-pygobject dbus dbus-glib
+DEPENDS = python-pygobject dbus
 
 RDEPENDS_${PN} += make
 RDEPENDS_${PN}-dev = 
@@ -18,8 +18,8 @@ SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \

 
-SRC_URI[md5sum] = b49890bbabedab3a1c3f4f73c7ff8b2b
-SRC_URI[sha256sum] = 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
+SRC_URI[md5sum] = 5af6297348107a906c8449817a728b3b
+SRC_URI[sha256sum] = 1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b
 
 S=${WORKDIR}/dbus-${PV}
 FILESEXTRAPATHS =. ${FILE_DIRNAME}/dbus:
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch
index 2944002..fbb4ede 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
@@ -6,19 +6,20 @@ Disable the python module check for cross compiling.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Mark Hatle mark.ha...@windriver.com
+Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
 
 dbus-1.6.8/configure.ac.orig	2013-07-11 14:15:58.834554799 -0500
-+++ dbus-1.6.8/configure.ac	2013-07-11 14:14:40.969554848 -0500
-@@ -257,13 +257,6 @@
+--- a/configure.ac
 b/configure.ac
+@@ -267,13 +267,6 @@
# full test coverage is required, Python is a hard dependency
-   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject])
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi])
AM_PATH_PYTHON([2.6])
 -  AC_MSG_CHECKING([for Python modules for full test coverage])
--  if $PYTHON -c import dbus, gobject, dbus.mainloop.glib; then
+-  if $PYTHON -c import dbus, gi.repository.GObject, dbus.mainloop.glib; then
 -AC_MSG_RESULT([yes])
 -  else
 -AC_MSG_RESULT([no])
--AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules])
+-AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules])
 -  fi
  else
# --enable-tests not given: do not abort if Python is missing
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.10.0.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus_1.8.20.bb
rename to meta/recipes-core/dbus/dbus_1.10.0.bb
index 207a018..cbfdf05 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -19,8 +19,8 @@ SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
 
 
-SRC_URI[md5sum] = b49890bbabedab3a1c3f4f73c7ff8b2b
-SRC_URI[sha256sum] = 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
+SRC_URI[md5sum] = 5af6297348107a906c8449817a728b3b
+SRC_URI[sha256sum] = 1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b
 
 inherit useradd autotools pkgconfig gettext update-rc.d
 
@@ -58,15 +58,20 @@ FILES_${PN} = ${bindir}/dbus-daemon* \
${bindir}/dbus-monitor \
${bindir}/dbus-launch \
${bindir}/dbus-run-session \
+   ${bindir}/dbus-update-activation-environment \
${libexecdir}/dbus* \
${sysconfdir} \
${localstatedir

[OE-core] [PATCH 1/3] dbus: merge .bb and .inc

2015-08-27 Thread Andrew Shadura

The split is no longer necessary, and only makes it more complicated to
do changes in external layers.

Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
---
 meta/recipes-core/dbus/dbus.inc   | 170 -
 meta/recipes-core/dbus/dbus_1.8.20.bb | 171 +-
 2 files changed, 170 insertions(+), 171 deletions(-)
 delete mode 100644 meta/recipes-core/dbus/dbus.inc

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
deleted file mode 100644
index 3971081..000
--- a/meta/recipes-core/dbus/dbus.inc
+++ /dev/null
@@ -1,170 +0,0 @@
-SUMMARY = D-Bus message bus
-DESCRIPTION = D-Bus is a message bus system, a simple way for applications to 
talk to one another. In addition to interprocess communication, D-Bus helps 
coordinate process lifecycle; it makes it simple and reliable to code a 
\single instance\ application or daemon, and to launch applications and 
daemons on demand when their services are needed.
-HOMEPAGE = http://dbus.freedesktop.org;
-SECTION = base
-LICENSE = AFL-2 | GPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c
-DEPENDS = expat virtual/libintl
-RDEPENDS_dbus_class-native = 
-RDEPENDS_dbus_class-nativesdk = 
-PACKAGES += ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', 
'', d)}
-ALLOW_EMPTY_dbus-ptest = 1
-RDEPENDS_dbus-ptest_class-target = dbus-test-ptest
-
-SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-   file://tmpdir.patch \
-   file://dbus-1.init \
-   file://os-test.patch \
-   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-
-
-inherit useradd autotools pkgconfig gettext update-rc.d
-
-INITSCRIPT_NAME = dbus-1
-INITSCRIPT_PARAMS = start 02 5 3 2 . stop 20 0 1 6 .
-
-python __anonymous() {
-if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-d.setVar(INHIBIT_UPDATERCD_BBCLASS, 1)
-}
-
-USERADD_PACKAGES = ${PN}
-GROUPADD_PARAM_${PN} = -r netdev
-USERADD_PARAM_${PN} = --system --home ${localstatedir}/lib/dbus \
-   --no-create-home --shell /bin/false \
-   --user-group messagebus
-
-CONFFILES_${PN} = ${sysconfdir}/dbus-1/system.conf 
${sysconfdir}/dbus-1/session.conf
-
-DEBIANNAME_${PN} = dbus-1
-
-PACKAGES =+ ${PN}-lib
-
-OLDPKGNAME = dbus-x11
-OLDPKGNAME_class-nativesdk = 
-
-# for compatibility
-RPROVIDES_${PN} = ${OLDPKGNAME}
-RREPLACES_${PN} += ${OLDPKGNAME}
-
-FILES_${PN} = ${bindir}/dbus-daemon* \
-   ${bindir}/dbus-uuidgen \
-   ${bindir}/dbus-cleanup-sockets \
-   ${bindir}/dbus-send \
-   ${bindir}/dbus-monitor \
-   ${bindir}/dbus-launch \
-   ${bindir}/dbus-run-session \
-   ${libexecdir}/dbus* \
-   ${sysconfdir} \
-   ${localstatedir} \
-   ${datadir}/dbus-1/services \
-   ${datadir}/dbus-1/system-services \
-   ${systemd_unitdir}/system/
-FILES_${PN}-lib = ${libdir}/lib*.so.*
-RRECOMMENDS_${PN}-lib = ${PN}
-FILES_${PN}-dev += ${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool
-
-pkg_postinst_dbus() {
-   # If both systemd and sysvinit are enabled, mask the dbus-1 init script
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd 
sysvinit','true','false',d)}; then
-   if [ -n $D ]; then
-   OPTS=--root=$D
-   fi
-   systemctl $OPTS mask dbus-1.service
-   fi
-
-   if [ -z $D ]  [ -e /etc/init.d/populate-volatile.sh ] ; then
-   /etc/init.d/populate-volatile.sh update
-   fi
-}
-
-EXTRA_OECONF = --disable-tests \
---disable-xml-docs \
---disable-doxygen-docs \
---disable-libaudit \
---disable-systemd \
---without-dbus-glib
-
-EXTRA_OECONF_append_class-native =  --disable-selinux
-
-PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)}
-PACKAGECONFIG_class-native = 
-PACKAGECONFIG_class-nativesdk = 
-
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd-dbus
-PACKAGECONFIG[systemd] = 
--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir
-PACKAGECONFIG[x11] = --with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm
-
-do_install() {
-   autotools_do_install
-
-   if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', 
d)}; then
-   install -d ${D}${sysconfdir}/init.d
-   sed 's:@bindir@:${bindir}:'  ${WORKDIR}/dbus-1.init 
${WORKDIR}/dbus-1.init.sh
-   install -m 0755 ${WORKDIR}/dbus-1.init.sh 
${D

[OE-core] [PATCH 2/3] dbus: update the recipes to 1.10.0

2015-08-27 Thread Andrew Shadura

Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
---
 meta/recipes-core/dbus/dbus-test_1.10.0.bb  |  61 
 meta/recipes-core/dbus/dbus-test_1.8.20.bb  |  61 
 meta/recipes-core/dbus/dbus/python-config.patch |  13 +-
 meta/recipes-core/dbus/dbus_1.10.0.bb   | 177 
 meta/recipes-core/dbus/dbus_1.8.20.bb   | 173 ---
 5 files changed, 245 insertions(+), 240 deletions(-)
 create mode 100644 meta/recipes-core/dbus/dbus-test_1.10.0.bb
 delete mode 100644 meta/recipes-core/dbus/dbus-test_1.8.20.bb
 create mode 100644 meta/recipes-core/dbus/dbus_1.10.0.bb
 delete mode 100644 meta/recipes-core/dbus/dbus_1.8.20.bb

diff --git a/meta/recipes-core/dbus/dbus-test_1.10.0.bb 
b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
new file mode 100644
index 000..7dec16e
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
@@ -0,0 +1,61 @@
+SUMMARY = D-Bus test package (for D-bus functionality testing only)
+HOMEPAGE = http://dbus.freedesktop.org;
+SECTION = base
+LICENSE = AFL-2 | GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
+
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c
+
+DEPENDS = python-pygobject dbus
+
+RDEPENDS_${PN} += make
+RDEPENDS_${PN}-dev = 
+
+SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+   file://tmpdir.patch \
+   file://dbus-1.init  \
+   file://run-ptest \
+   file://python-config.patch \
+   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
+   
+
+SRC_URI[md5sum] = 5af6297348107a906c8449817a728b3b
+SRC_URI[sha256sum] = 
1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b
+
+S=${WORKDIR}/dbus-${PV}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/dbus:
+
+inherit autotools pkgconfig gettext ptest
+
+EXTRA_OECONF_X = ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', 
'--without-x', d)}
+EXTRA_OECONF_X_class-native = --without-x
+
+EXTRA_OECONF = --enable-tests \
+--enable-modular-tests \
+--enable-installed-tests \
+--enable-checks \
+--enable-asserts \
+--enable-verbose-mode \
+--disable-xml-docs \
+--disable-doxygen-docs \
+--disable-libaudit \
+--disable-systemd \
+--without-systemdsystemunitdir \
+--with-dbus-test-dir=${PTEST_PATH} \
+${EXTRA_OECONF_X}
+
+do_install() {
+:
+}
+
+do_install_ptest() {
+   install -d ${D}${PTEST_PATH}/test
+   case1=shell printf refs syslog
+   for i in ${case1}; do install ${B}/test/test-$i ${D}${PTEST_PATH}/test; 
done
+   case2=marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop 
loopback relay
+   for i in ${case2}; do install ${B}/test/.libs/test-$i 
${D}${PTEST_PATH}/test; done
+   case3=bus bus-system bus-launch-helper
+   for i in ${case3}; do install ${B}/bus/test-$i ${D}${PTEST_PATH}/test; 
done
+   install ${B}/dbus/test-dbus ${D}${PTEST_PATH}/test
+   cp -r ${B}/test/data ${D}${PTEST_PATH}/test
+}
+RDEPENDS_${PN}-ptest += bash
diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb 
b/meta/recipes-core/dbus/dbus-test_1.8.20.bb
deleted file mode 100644
index 704070b..000
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = D-Bus test package (for D-bus functionality testing only)
-HOMEPAGE = http://dbus.freedesktop.org;
-SECTION = base
-LICENSE = AFL-2 | GPLv2+
-LIC_FILES_CHKSUM = file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c
-
-DEPENDS = python-pygobject dbus dbus-glib
-
-RDEPENDS_${PN} += make
-RDEPENDS_${PN}-dev = 
-
-SRC_URI = http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-   file://tmpdir.patch \
-   file://dbus-1.init  \
-   file://run-ptest \
-   file://python-config.patch \
-   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-   
-
-SRC_URI[md5sum] = b49890bbabedab3a1c3f4f73c7ff8b2b
-SRC_URI[sha256sum] = 
5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
-
-S=${WORKDIR}/dbus-${PV}
-FILESEXTRAPATHS =. ${FILE_DIRNAME}/dbus:
-
-inherit autotools pkgconfig gettext ptest
-
-EXTRA_OECONF_X = ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', 
'--without-x', d)}
-EXTRA_OECONF_X_class-native = --without-x
-
-EXTRA_OECONF = --enable-tests \
---enable-modular-tests \
---enable-installed-tests \
---enable-checks \
---enable-asserts \
---enable-verbose-mode \
---disable-xml-docs \
---disable-doxygen-docs \
---disable-libaudit \
---disable-systemd

[OE-core] [PATCH 3/3] dbus: add apparmor support

2015-08-27 Thread Andrew Shadura

Signed-off-by: Andrew Shadura andrew.shad...@collabora.co.uk
---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index cbfdf05..31cbef0 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -104,6 +104,7 @@ PACKAGECONFIG_class-nativesdk = 
 # systemd-dbus
 PACKAGECONFIG[systemd] = 
--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir
 PACKAGECONFIG[x11] = --with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm
+PACKAGECONFIG[apparmor] = --enable-apparmor,--disable-apparmor,libapparmor
 
 do_install() {
autotools_do_install
-- 
2.1.4

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

[OE-core] [PATCH v3 1/2] dbus: add user sessions support

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index 31cbef0..e099f4b 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_unitdir}/system/"
+   ${systemd_system_unitdir} \
+   ${systemd_user_unitdir} \
+"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool 
${bindir}/dbus-test-tool"
@@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = ""
 PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
+PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session"
 
 do_install() {
autotools_do_install
-- 
2.1.4

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

[OE-core] [PATCH v3 2/2] dbus: build with systemd support

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index e099f4b..a2bb493 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -92,8 +92,7 @@ pkg_postinst_dbus() {
 EXTRA_OECONF = "--disable-tests \
 --disable-xml-docs \
 --disable-doxygen-docs \
---disable-libaudit \
---disable-systemd"
+--disable-libaudit"
 
 EXTRA_OECONF_append_class-native = " --disable-selinux"
 
@@ -102,9 +101,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'systemd', 'systemd',
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd<->dbus
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd 
--without-systemdsystemunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
 PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session"
-- 
2.1.4

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

Re: [OE-core] [PATCH v3 1/2] dbus: add user sessions support

2015-09-15 Thread Andrew Shadura

On 15/09/15 13:36, Tanu Kaskinen wrote:
> I think user-session should be enabled by default when systemd is in
> DISTRO_FEATURES. Some services, e.g. PulseAudio, can fully enable their
> systemd integration only if dbus is compiled with --enable-user
> -session.

I think so too, but I think it's worth a separate patch, right?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2 1/7] dbus: merge .bb and .inc

2015-09-14 Thread Andrew Shadura

The split is no longer necessary, and only makes it more complicated to
do changes in external layers.
---
 meta/recipes-core/dbus/dbus.inc   | 170 -
 meta/recipes-core/dbus/dbus_1.8.20.bb | 171 +-
 2 files changed, 170 insertions(+), 171 deletions(-)
 delete mode 100644 meta/recipes-core/dbus/dbus.inc

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
deleted file mode 100644
index 3971081..000
--- a/meta/recipes-core/dbus/dbus.inc
+++ /dev/null
@@ -1,170 +0,0 @@
-SUMMARY = "D-Bus message bus"
-DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to 
talk to one another. In addition to interprocess communication, D-Bus helps 
coordinate process lifecycle; it makes it simple and reliable to code a 
\"single instance\" application or daemon, and to launch applications and 
daemons on demand when their services are needed."
-HOMEPAGE = "http://dbus.freedesktop.org;
-SECTION = "base"
-LICENSE = "AFL-2 | GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
-DEPENDS = "expat virtual/libintl"
-RDEPENDS_dbus_class-native = ""
-RDEPENDS_dbus_class-nativesdk = ""
-PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', 
'', d)}"
-ALLOW_EMPTY_dbus-ptest = "1"
-RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-   file://tmpdir.patch \
-   file://dbus-1.init \
-   file://os-test.patch \
-   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-"
-
-inherit useradd autotools pkgconfig gettext update-rc.d
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
-
-python __anonymous() {
-if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "-r netdev"
-USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
-   --no-create-home --shell /bin/false \
-   --user-group messagebus"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf 
${sysconfdir}/dbus-1/session.conf"
-
-DEBIANNAME_${PN} = "dbus-1"
-
-PACKAGES =+ "${PN}-lib"
-
-OLDPKGNAME = "dbus-x11"
-OLDPKGNAME_class-nativesdk = ""
-
-# for compatibility
-RPROVIDES_${PN} = "${OLDPKGNAME}"
-RREPLACES_${PN} += "${OLDPKGNAME}"
-
-FILES_${PN} = "${bindir}/dbus-daemon* \
-   ${bindir}/dbus-uuidgen \
-   ${bindir}/dbus-cleanup-sockets \
-   ${bindir}/dbus-send \
-   ${bindir}/dbus-monitor \
-   ${bindir}/dbus-launch \
-   ${bindir}/dbus-run-session \
-   ${libexecdir}/dbus* \
-   ${sysconfdir} \
-   ${localstatedir} \
-   ${datadir}/dbus-1/services \
-   ${datadir}/dbus-1/system-services \
-   ${systemd_unitdir}/system/"
-FILES_${PN}-lib = "${libdir}/lib*.so.*"
-RRECOMMENDS_${PN}-lib = "${PN}"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-pkg_postinst_dbus() {
-   # If both systemd and sysvinit are enabled, mask the dbus-1 init script
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd 
sysvinit','true','false',d)}; then
-   if [ -n "$D" ]; then
-   OPTS="--root=$D"
-   fi
-   systemctl $OPTS mask dbus-1.service
-   fi
-
-   if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
-   /etc/init.d/populate-volatile.sh update
-   fi
-}
-
-EXTRA_OECONF = "--disable-tests \
---disable-xml-docs \
---disable-doxygen-docs \
---disable-libaudit \
---disable-systemd \
---without-dbus-glib"
-
-EXTRA_OECONF_append_class-native = " --disable-selinux"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)}"
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG_class-nativesdk = ""
-
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd<->dbus
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
-PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
-
-do_install() {
-   autotools_do_install
-
-   if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', 
d)}; then
-   install -d ${D}${sysconfdir}/init.d
-   sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init 
>${WORKDIR}/dbus-1.init.sh
-   install -m 0755

[OE-core] [PATCH v2 4/7] systemd: don't build against dbus unless required

2015-09-14 Thread Andrew Shadura

Modern systemd doesn't need dbus libraries normally, as it
ships with its own dbus library. This is required to proceed
with systemd support in dbus, as otherwise dependency loops
occur.
---
 meta/recipes-core/systemd/systemd_225.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_225.bb 
b/meta/recipes-core/systemd/systemd_225.bb
index 6ac99cd..5751bea 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -18,7 +18,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl 
readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl 
readline libcap libcgroup glib-2.0 qemu-native util-linux"
 
 SECTION = "base/shell"
 
@@ -87,6 +87,7 @@ PACKAGECONFIG[iptc] = 
"--enable-libiptc,--disable-libiptc,iptables"
 PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,,"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
 PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes 
ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no 
ac_cv_header_valgrind_valgrind_h=no ,valgrind"
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
 CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"
-- 
2.1.4

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

[OE-core] [PATCH v2 5/7] systemd: add gnuefi package configuration option, switched off by default

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/systemd/systemd_225.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd_225.bb 
b/meta/recipes-core/systemd/systemd_225.bb
index 5751bea..942f6ce 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_225.bb
@@ -88,6 +88,7 @@ PACKAGECONFIG[ldconfig] = 
"--enable-ldconfig,--disable-ldconfig,,"
 PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
 PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes 
ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no 
ac_cv_header_valgrind_valgrind_h=no ,valgrind"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
+PACKAGECONFIG[efi] = "--enable-gnuefi,--disable-gnuefi,gnu-efi"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill"
 CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod"
-- 
2.1.4

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

[OE-core] [PATCH v2 2/7] dbus: update the recipes to 1.10.0

2015-09-14 Thread Andrew Shadura

---
 .../dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.0.bb}  |  6 +++---
 meta/recipes-core/dbus/dbus/python-config.patch| 13 +++--
 meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.0.bb}  | 14 +-
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.0.bb} 
(91%)
 rename meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.0.bb} (93%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb 
b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
similarity index 91%
rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb
rename to meta/recipes-core/dbus/dbus-test_1.10.0.bb
index 704070b..7dec16e 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.10.0.bb
@@ -5,7 +5,7 @@ LICENSE = "AFL-2 | GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
 
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
 
-DEPENDS = "python-pygobject dbus dbus-glib"
+DEPENDS = "python-pygobject dbus"
 
 RDEPENDS_${PN} += "make"
 RDEPENDS_${PN}-dev = ""
@@ -18,8 +18,8 @@ SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] = 
"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
+SRC_URI[md5sum] = "5af6297348107a906c8449817a728b3b"
+SRC_URI[sha256sum] = 
"1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch 
b/meta/recipes-core/dbus/dbus/python-config.patch
index 2944002..fbb4ede 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
@@ -6,19 +6,20 @@ Disable the python module check for cross compiling.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
+Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
 
 dbus-1.6.8/configure.ac.orig   2013-07-11 14:15:58.834554799 -0500
-+++ dbus-1.6.8/configure.ac2013-07-11 14:14:40.969554848 -0500
-@@ -257,13 +257,6 @@
+--- a/configure.ac
 b/configure.ac
+@@ -267,13 +267,6 @@
# full test coverage is required, Python is a hard dependency
-   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, 
dbus-python, pygobject])
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, 
dbus-python, pygi])
AM_PATH_PYTHON([2.6])
 -  AC_MSG_CHECKING([for Python modules for full test coverage])
--  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
+-  if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; 
then
 -AC_MSG_RESULT([yes])
 -  else
 -AC_MSG_RESULT([no])
--AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python 
modules])
+-AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, 
dbus.mainloop.glib Python modules])
 -  fi
  else
# --enable-tests not given: do not abort if Python is missing
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus_1.8.20.bb
rename to meta/recipes-core/dbus/dbus_1.10.0.bb
index 207a018..cbfdf05 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -19,8 +19,8 @@ SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
 "
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] = 
"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
+SRC_URI[md5sum] = "5af6297348107a906c8449817a728b3b"
+SRC_URI[sha256sum] = 
"1dfb9745fb992f1ccd43c920490de8caddf6726a6222e8b803be6098293f924b"
 
 inherit useradd autotools pkgconfig gettext update-rc.d
 
@@ -58,15 +58,20 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-monitor \
${bindir}/dbus-launch \
${bindir}/dbus-run-session \
+   ${bindir}/dbus-update-activation-environment \
${libexecdir}/dbus* \
${sysconfdir} \
${localstatedir} \
${datadir}/dbus-1/services \
${datadir}/dbus-1/system-services \
+   ${datadir}/dbus-1/session.d \
+   ${datadir}/dbus-1/session.conf \
+   ${datadir}/dbus-1/system.d \
+   ${datadir}/dbus-1/system.conf \

[OE-core] [PATCH v2 7/7] dbus: build with systemd support

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index 58210f4..d2bea13 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -92,8 +92,7 @@ pkg_postinst_dbus() {
 EXTRA_OECONF = "--disable-tests \
 --disable-xml-docs \
 --disable-doxygen-docs \
---disable-libaudit \
---disable-systemd"
+--disable-libaudit"
 
 EXTRA_OECONF_append_class-native = " --disable-selinux"
 
@@ -102,9 +101,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'systemd', 'systemd',
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd<->dbus
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd 
--without-systemdsystemunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
 PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session"
-- 
2.1.4

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

[OE-core] [PATCH v2 3/7] dbus: add apparmor support

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index cbfdf05..31cbef0 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -104,6 +104,7 @@ PACKAGECONFIG_class-nativesdk = ""
 # systemd<->dbus
 PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
+PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
 
 do_install() {
autotools_do_install
-- 
2.1.4

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

[OE-core] [PATCH v2 6/7] dbus: add user sessions support

2015-09-14 Thread Andrew Shadura

---
 meta/recipes-core/dbus/dbus_1.10.0.bb | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.0.bb 
b/meta/recipes-core/dbus/dbus_1.10.0.bb
index 31cbef0..58210f4 100644
--- a/meta/recipes-core/dbus/dbus_1.10.0.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.0.bb
@@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_unitdir}/system/"
+   ${systemd_unitdir}/system/ \
+   ${libdir}/systemd/user/* \
+"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool 
${bindir}/dbus-test-tool"
@@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = ""
 PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
+PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session"
 
 do_install() {
autotools_do_install
-- 
2.1.4

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

Re: [OE-core] [PATCH v2 1/7] dbus: merge .bb and .inc

2015-09-29 Thread Andrew Shadura

Hi all,

There hasn't been anything on this for two weeks already, has anyone
considered merging these patches?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/7] dbus: merge .bb and .inc

2015-09-29 Thread Andrew Shadura

On 29/09/15 16:41, Burton, Ross wrote:
> On 29 September 2015 at 13:39, Andrew Shadura
> <andrew.shad...@collabora.co.uk <mailto:andrew.shad...@collabora.co.uk>>
> wrote:
> 
>>There hasn't been anything on this for two weeks already, has anyone
>>considered merging these patches?

> Sorry but they didn't quite make the M3 deadline (well, the patches did,
> but reviewing didn't as we were heads down trying to fix the build).  If
> you can rebase and resend when master re-opens (when 2.0 is released)
> that would be much appreciated.

Cool thanks, at least I won't feel being ignored anymore :)

So, what is the planned date for the release?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2 1/7] dbus: merge .bb and .inc

2015-09-29 Thread Andrew Shadura

On 29/09/15 16:50, Richard Purdie wrote:
> On Tue, 2015-09-29 at 15:41 +0100, Burton, Ross wrote:
>> > On 29 September 2015 at 13:39, Andrew Shadura
>> > <andrew.shad...@collabora.co.uk> wrote:
>> >>There hasn't been anything on this for two weeks already, has
>> >>anyone
>> >> considered merging these patches?
>> >
>> > Sorry but they didn't quite make the M3 deadline (well, the patches
>> > did, but reviewing didn't as we were heads down trying to fix the
>> > build).  If you can rebase and resend when master re-opens (when 2.0
>> > is released) that would be much appreciated.
> Just to add that what would help is a little bit more explanation about
> what happened in the patches. It looks like dbus-glib isn't needed for
> example but the commit message doesn't mention why?

Thanks. I will update the patches when I submit them next time.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] dbus: build with systemd support

2015-12-07 Thread Andrew Shadura

On 07/12/15 20:02, Patrick Ohly wrote:
> On Fri, 2015-11-20 at 15:38 +0100, Andrew Shadura wrote:
>> > It's good to have the extra functionality, such as seat support
>> > provided with systemd support. Not least of all to support
>> > systemd user-sessions.
> Your patch is against D-Bus 1.10.2, which is not yet in OE-core master.
> I adapted the patch to the current D-Bus 1.8.20, but there the
> advantages turned out to be (IMHO) fairly minor: it only adds logging
> via journald.
> 
> socket activation via systemd already works even without
> --enable-systemd, because the recipe explicitly installs the systemd
> unit files and the code itself supports it also without
> --enable-systemd.
> 
> But I like your patches, so perhaps including D-Bus 1.10.x (1.10.6 is
> the latest stable release) can be considered for the next OE-core
> release?

This patch is supposed to be applied after other series of mine adding
1.10.2, see <http://patchwork.openembedded.org/patch/108237/>.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] cups: update systemd support

2015-12-30 Thread Andrew Shadura

On 11/12/15 22:39, Burton, Ross wrote:
> Sorry for the delay in looking at this.  buildhistory-diff reports this:
> 
> packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
> "/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
> /etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups
> /etc/rc3.d/S81cups /etc/rc3.d/K36cups /lib/systemd/system/cups.socket
> /lib/systemd/system/cups.path /etc/init.d/cups" added
> "/lib/systemd/system/org.cups.cupsd.socket
> /lib/systemd/system/org.cups.cupsd.service
> /lib/systemd/system/org.cups.cups-lpd@.service
> /lib/systemd/system/org.cups.cupsd.path
> /lib/systemd/system/org.cups.cups-lpd.socket"
> 
> Looks like if systemd is enabled it removes the sysvinit files, but we
> still need those installed if sysvinit is in DISTRO_FEATURES.

I just had a look at the recipe, and it seems it removes those files on
its own even without my patch. I guess fixing that makes sense in a
separate patch then?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v3 3/3] dbus: add apparmor support

2015-11-20 Thread Andrew Shadura

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus_1.10.2.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/dbus/dbus_1.10.2.bb 
b/meta/recipes-core/dbus/dbus_1.10.2.bb
index 9e24090..1abe067 100644
--- a/meta/recipes-core/dbus/dbus_1.10.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.2.bb
@@ -104,6 +104,7 @@ PACKAGECONFIG_class-nativesdk = ""
 # systemd<->dbus
 PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
+PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
 
 do_install() {
autotools_do_install
-- 
2.5.0

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

[OE-core] [PATCH v3 2/3] dbus: update the recipes to 1.10.2

2015-11-20 Thread Andrew Shadura

dbus 1.10.2 doesn't depend on dbus-glib anymore, so drop the
dependency.

Refresh python-config.patch.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
 .../dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.2.bb}  |  4 ++--
 meta/recipes-core/dbus/dbus/python-config.patch| 13 +++--
 meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.2.bb}  | 14 +-
 3 files changed, 18 insertions(+), 13 deletions(-)
 rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.2.bb} 
(93%)
 rename meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.2.bb} (93%)

diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb 
b/meta/recipes-core/dbus/dbus-test_1.10.2.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb
rename to meta/recipes-core/dbus/dbus-test_1.10.2.bb
index 704070b..8317548 100644
--- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.10.2.bb
@@ -18,8 +18,8 @@ SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
"
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] = 
"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
+SRC_URI[md5sum] = "9190f5c0e41e8d220352c058faf5463522378e35"
+SRC_URI[sha256sum] = 
"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch 
b/meta/recipes-core/dbus/dbus/python-config.patch
index 2944002..fbb4ede 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
@@ -6,19 +6,20 @@ Disable the python module check for cross compiling.
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
+Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
 
 dbus-1.6.8/configure.ac.orig   2013-07-11 14:15:58.834554799 -0500
-+++ dbus-1.6.8/configure.ac2013-07-11 14:14:40.969554848 -0500
-@@ -257,13 +257,6 @@
+--- a/configure.ac
 b/configure.ac
+@@ -267,13 +267,6 @@
# full test coverage is required, Python is a hard dependency
-   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, 
dbus-python, pygobject])
+   AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, 
dbus-python, pygi])
AM_PATH_PYTHON([2.6])
 -  AC_MSG_CHECKING([for Python modules for full test coverage])
--  if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then
+-  if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; 
then
 -AC_MSG_RESULT([yes])
 -  else
 -AC_MSG_RESULT([no])
--AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python 
modules])
+-AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, 
dbus.mainloop.glib Python modules])
 -  fi
  else
# --enable-tests not given: do not abort if Python is missing
diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb 
b/meta/recipes-core/dbus/dbus_1.10.2.bb
similarity index 93%
rename from meta/recipes-core/dbus/dbus_1.8.20.bb
rename to meta/recipes-core/dbus/dbus_1.10.2.bb
index 207a018..9e24090 100644
--- a/meta/recipes-core/dbus/dbus_1.8.20.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.2.bb
@@ -19,8 +19,8 @@ SRC_URI = 
"http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
 "
 
-SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b"
-SRC_URI[sha256sum] = 
"5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a"
+SRC_URI[md5sum] = "2428919cc77b8d0028d65ee4d5dbef31"
+SRC_URI[sha256sum] = 
"aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e"
 
 inherit useradd autotools pkgconfig gettext update-rc.d
 
@@ -58,15 +58,20 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-monitor \
${bindir}/dbus-launch \
${bindir}/dbus-run-session \
+   ${bindir}/dbus-update-activation-environment \
${libexecdir}/dbus* \
${sysconfdir} \
${localstatedir} \
${datadir}/dbus-1/services \
${datadir}/dbus-1/system-services \
+   ${datadir}/dbus-1/session.d \
+   ${datadir}/dbus-1/session.conf \
+   ${datadir}/dbus-1/system.d \
+   ${datadir}/dbus-1/system.conf \
${systemd_unitdir}/system/"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
-FILES_${PN}-dev += "${l

[OE-core] [PATCH v3 1/3] dbus: merge .bb and .inc

2015-11-20 Thread Andrew Shadura

The split is no longer necessary, and only makes it more complicated to
do changes in external layers.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus.inc   | 170 -
 meta/recipes-core/dbus/dbus_1.8.20.bb | 171 +-
 2 files changed, 170 insertions(+), 171 deletions(-)
 delete mode 100644 meta/recipes-core/dbus/dbus.inc

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
deleted file mode 100644
index 3971081..000
--- a/meta/recipes-core/dbus/dbus.inc
+++ /dev/null
@@ -1,170 +0,0 @@
-SUMMARY = "D-Bus message bus"
-DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to 
talk to one another. In addition to interprocess communication, D-Bus helps 
coordinate process lifecycle; it makes it simple and reliable to code a 
\"single instance\" application or daemon, and to launch applications and 
daemons on demand when their services are needed."
-HOMEPAGE = "http://dbus.freedesktop.org;
-SECTION = "base"
-LICENSE = "AFL-2 | GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
-
file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
-DEPENDS = "expat virtual/libintl"
-RDEPENDS_dbus_class-native = ""
-RDEPENDS_dbus_class-nativesdk = ""
-PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', 
'', d)}"
-ALLOW_EMPTY_dbus-ptest = "1"
-RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-   file://tmpdir.patch \
-   file://dbus-1.init \
-   file://os-test.patch \
-   file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-"
-
-inherit useradd autotools pkgconfig gettext update-rc.d
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
-
-python __anonymous() {
-if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "-r netdev"
-USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
-   --no-create-home --shell /bin/false \
-   --user-group messagebus"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf 
${sysconfdir}/dbus-1/session.conf"
-
-DEBIANNAME_${PN} = "dbus-1"
-
-PACKAGES =+ "${PN}-lib"
-
-OLDPKGNAME = "dbus-x11"
-OLDPKGNAME_class-nativesdk = ""
-
-# for compatibility
-RPROVIDES_${PN} = "${OLDPKGNAME}"
-RREPLACES_${PN} += "${OLDPKGNAME}"
-
-FILES_${PN} = "${bindir}/dbus-daemon* \
-   ${bindir}/dbus-uuidgen \
-   ${bindir}/dbus-cleanup-sockets \
-   ${bindir}/dbus-send \
-   ${bindir}/dbus-monitor \
-   ${bindir}/dbus-launch \
-   ${bindir}/dbus-run-session \
-   ${libexecdir}/dbus* \
-   ${sysconfdir} \
-   ${localstatedir} \
-   ${datadir}/dbus-1/services \
-   ${datadir}/dbus-1/system-services \
-   ${systemd_unitdir}/system/"
-FILES_${PN}-lib = "${libdir}/lib*.so.*"
-RRECOMMENDS_${PN}-lib = "${PN}"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-
-pkg_postinst_dbus() {
-   # If both systemd and sysvinit are enabled, mask the dbus-1 init script
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd 
sysvinit','true','false',d)}; then
-   if [ -n "$D" ]; then
-   OPTS="--root=$D"
-   fi
-   systemctl $OPTS mask dbus-1.service
-   fi
-
-   if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
-   /etc/init.d/populate-volatile.sh update
-   fi
-}
-
-EXTRA_OECONF = "--disable-tests \
---disable-xml-docs \
---disable-doxygen-docs \
---disable-libaudit \
---disable-systemd \
---without-dbus-glib"
-
-EXTRA_OECONF_append_class-native = " --disable-selinux"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 
'systemd', '', d)} \
-   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', 
d)}"
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG_class-nativesdk = ""
-
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd<->dbus
-P

Re: [OE-core] [PATCH v2] cups: update systemd support

2015-11-20 Thread Andrew Shadura

On 26/10/15 23:33, Andrew Shadura wrote:
> On 22/10/15 16:00, Andrew Shadura wrote:
>> Add PACKAGECONFIG for systemd, enable it when systemd is enabled
>> in DISTRO_FEATURES. Pass the correct path to systemd units,
>> ensure they're installed into the package.
> 
> Ross, could you please review an updated version of the patch?

Any news on this patch since then? Comments, critique, anything?

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] dbus: build with systemd support

2015-11-20 Thread Andrew Shadura

It's good to have the extra functionality, such as seat support
provided with systemd support. Not least of all to support
systemd user-sessions.

This commit also changes references to the system unit path
from ${systemd_unitdir}/system to ${systemd_system_unitdir},
a new variable provided by bitbake.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus_1.10.2.bb | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.2.bb 
b/meta/recipes-core/dbus/dbus_1.10.2.bb
index 1abe067..f7ab39b 100644
--- a/meta/recipes-core/dbus/dbus_1.10.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.2.bb
@@ -68,7 +68,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_unitdir}/system/"
+   ${systemd_system_unitdir}"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool 
${bindir}/dbus-test-tool"
@@ -90,8 +90,7 @@ pkg_postinst_dbus() {
 EXTRA_OECONF = "--disable-tests \
 --disable-xml-docs \
 --disable-doxygen-docs \
---disable-libaudit \
---disable-systemd"
+--disable-libaudit"
 
 EXTRA_OECONF_append_class-native = " --disable-selinux"
 
@@ -100,9 +99,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'systemd', 'systemd',
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-# Would like to --enable-systemd but that's a circular build-dependency between
-# systemd<->dbus
-PACKAGECONFIG[systemd] = 
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd 
--without-systemdsystemunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
 
@@ -117,12 +114,12 @@ do_install() {
 
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', 
d)}; then
for i in dbus.target.wants sockets.target.wants 
multi-user.target.wants; do \
-   install -d ${D}${systemd_unitdir}/system/$i; done
-   install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket 
${D}${systemd_unitdir}/system/
+   install -d ${D}${systemd_system_unitdir}/$i; done
+   install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket 
${D}${systemd_system_unitdir}/
cd ${D}${systemd_unitdir}/system/dbus.target.wants/
-   ln -fs ../dbus.socket 
${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket
-   ln -fs ../dbus.socket 
${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket
-   ln -fs ../dbus.service 
${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service
+   ln -fs ../dbus.socket 
${D}${systemd_system_unitdir}/dbus.target.wants/dbus.socket
+   ln -fs ../dbus.socket 
${D}${systemd_system_unitdir}/sockets.target.wants/dbus.socket
+   ln -fs ../dbus.service 
${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service
fi
 
install -d ${D}${sysconfdir}/default/volatiles
-- 
2.5.0

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

[OE-core] [PATCH 2/2] dbus: add user sessions support

2015-11-20 Thread Andrew Shadura

Enable the user-sessions support with a PACKAGECONFIG flag.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus_1.10.2.bb | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.2.bb 
b/meta/recipes-core/dbus/dbus_1.10.2.bb
index f7ab39b..445f7ef 100644
--- a/meta/recipes-core/dbus/dbus_1.10.2.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.2.bb
@@ -68,7 +68,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_system_unitdir}"
+   ${systemd_system_unitdir} \
+   ${systemd_user_unitdir} \
+"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool 
${bindir}/dbus-test-tool"
@@ -99,9 +101,10 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'systemd', 'systemd',
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd 
--without-systemdsystemunitdir,systemd"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir} 
--with-systemduserunitdir=${systemd_user_unitdir},--disable-systemd 
--without-systemdsystemunitdir --without-systemduserunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[apparmor] = "--enable-apparmor,--disable-apparmor,libapparmor"
+PACKAGECONFIG[user-session] = "--enable-user-session,--disable-user-session"
 
 do_install() {
autotools_do_install
-- 
2.5.0

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

Re: [OE-core] [PATCH 1/2] dbus: build with systemd support

2015-11-20 Thread Andrew Shadura

On 20/11/15 17:09, Jussi Kukkonen wrote:
>>  PACKAGECONFIG_class-native = ""
>>  PACKAGECONFIG_class-nativesdk = ""
>>
>> -# Would like to --enable-systemd but that's a circular
> build-dependency between
>> -# systemd<->dbus
> 
> Has this issue been somehow resolved since the comment was added?

Yes, systemd doesn't depend on dbus any longer unless explicitly
enabled, as it uses its own dbus library.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 2/2] dbus: add user sessions support

2015-11-24 Thread Andrew Shadura

On 24/11/15 15:03, Burton, Ross wrote:
> On 20 November 2015 at 14:38, Andrew Shadura
> <andrew.shad...@collabora.co.uk> wrote:
> 
>>Enable the user-sessions support with a PACKAGECONFIG flag.
> 
> What is the impact on this if someone is using systemd but doesn't want
> user sessions?  Should we enable it if the DISTRO_FEATURES contains
> systemd by default?

It is okay to use systemd and not use user sessions. Possibly, we want
to enable it by default in the future, but it should be okay to have it
disabled for now unless it's switched on from elsewhere.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] u-boot: Update to 2016.05 release

2016-06-07 Thread Andrew Shadura

On 27/05/16 16:00, Otavio Salvador wrote:
> On Fri, May 27, 2016 at 10:58 AM, Andrew Shadura
> <andrew.shad...@collabora.co.uk> wrote:
>> > Upgrade U-Boot to the latest upstream version.
>> > Add a patch to unbreak build on some toolchains.
>> >
>> > Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
>> > ---
> Acked-by: Otavio Salvador <ota...@ossystems.com.br>

Any news on this? It still hasn't been merged, even though the other
patch has been.

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

Re: [OE-core] [PATCH v2] u-boot: Update to 2016.05 release

2016-06-10 Thread Andrew Shadura

On 10/06/16 17:33, Burton, Ross wrote:
> 
> On 7 June 2016 at 09:21, Andrew Shadura <andrew.shad...@collabora.co.uk
> <mailto:andrew.shad...@collabora.co.uk>> wrote:
> 
> Any news on this? It still hasn't been merged, even though the other
> patch has been.
> 
> 
> It's broken on hosts where the library loader doesn't  match where the
> OE distro puts it:
> 
> | cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \
> | tools/bin2header license_gzip > ./include/license.h
> | /bin/sh: 2: tools/bin2header: not found
> 
> $ ./bin2header
> -bash: ./bin2header: No such file or directory
> 
> Classic symptom of target compiler flags being used in a build using
> CC_FOR_BUILD.

Is it something new in this version or is that something that's also
been broken for a while now?

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

Re: [OE-core] [PATCH v2] u-boot: Update to 2016.05 release

2016-06-14 Thread Andrew Shadura

On 13/06/16 14:33, Burton, Ross wrote:
> 
> On 10 June 2016 at 22:35, Andrew Shadura <andrew.shad...@collabora.co.uk
> <mailto:andrew.shad...@collabora.co.uk>> wrote:
> 
>> Is it something new in this version or is that something that's also
>> been broken for a while now?
> 
> It worked previously so it must be in the new version.

Okay, I'll have a look.

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] u-boot: replace old-style shell syntax with the modern one

2016-05-26 Thread Andrew Shadura

Use "-n" operation instead of comparing with an "x"-ed empty string,
use $(...) notation instead of the deprecated backticks.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-bsp/u-boot/u-boot.inc | 60 +++---
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
b/meta/recipes-bsp/u-boot/u-boot.inc
index 037f35c..1071d1f 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -79,13 +79,13 @@ do_compile () {
echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
fi
-
-if [ "x${UBOOT_CONFIG}" != "x" ]
+
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type  in ${UBOOT_CONFIG}; do
-j=`expr $j + 1`;
+j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
 oe_runmake O=${config} ${config}
@@ -104,12 +104,12 @@ do_compile () {
 }
 
 do_install () {
-if [ "x${UBOOT_CONFIG}" != "x" ]
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type in ${UBOOT_CONFIG}; do
-j=`expr $j + 1`;
+j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
 install -d ${D}/boot
@@ -127,14 +127,14 @@ do_install () {
 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 fi
 
-if [ "x${UBOOT_ELF}" != "x" ]
+if [ -n "${UBOOT_ELF}" ]
 then
-if [ "x${UBOOT_CONFIG}" != "x" ]
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type in ${UBOOT_CONFIG}; do
-j=`expr $j + 1`;
+j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
 install ${S}/${config}/${UBOOT_ELF} 
${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}
@@ -156,14 +156,14 @@ do_install () {
 install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 fi
 
-if [ "x${SPL_BINARY}" != "x" ]
+if [ -n "${SPL_BINARY}" ]
 then
-if [ "x${UBOOT_CONFIG}" != "x" ]   
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type in ${UBOOT_CONFIG}; do
-j=`expr $j + 1`;
+j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
  install ${S}/${config}/${SPL_BINARY} 
${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR}
@@ -180,7 +180,7 @@ do_install () {
 fi
 fi
 
-if [ "x${UBOOT_ENV}" != "x" ]
+if [ -n "${UBOOT_ENV}" ]
 then
 install ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE}
 ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY}
@@ -190,12 +190,12 @@ do_install () {
 FILES_${PN} = "/boot ${sysconfdir}"
 
 do_deploy () {
-if [ "x${UBOOT_CONFIG}" != "x" ]
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type in ${UBOOT_CONFIG}; do
-j=`expr $j + 1`;
+j=$(expr $j + 1);
 if [ $j -eq $i ]
 then
 install -d ${DEPLOYDIR}
@@ -205,8 +205,8 @@ do_deploy () {
 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_SYMLINK}
 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}-${type}
 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}
-fi 
-done 
+fi
+done
 unset  j
 done
 unset  i
@@ -219,14 +219,14 @@ do_deploy () {
 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
fi
 
-if [ "x${UBOOT_ELF}" != "x" ]
+if [ -n "${UBOOT_ELF}" ]
 then
-if [ "x${UBOOT_CONFIG}" != "x" ]
+if [ -n "${UBOOT_CONFIG}" ]
 then
 for config in ${UBOOT_MACHINE}; do
-i=`expr $i + 1`;
+i=$(expr $i + 1);
 for type in ${UBOOT_CONFIG}; do
-

[OE-core] [PATCH v2] u-boot: Update to 2016.05 release

2016-05-27 Thread Andrew Shadura

Upgrade U-Boot to the latest upstream version.
Add a patch to unbreak build on some toolchains.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
Changes since v1:

 * Fixes Upstream-Status of the patch.
---
 ...utils_2016.03.bb => u-boot-fw-utils_2016.05.bb} |  4 +-
 ...kimage_2016.03.bb => u-boot-mkimage_2016.05.bb} |  4 +-
 .../-video-ipu_common-fix-build-error.patch| 48 ++
 .../{u-boot_2016.03.bb => u-boot_2016.05.bb}   | 10 +++--
 4 files changed, 59 insertions(+), 7 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2016.03.bb => 
u-boot-fw-utils_2016.05.bb} (94%)
 rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2016.03.bb => 
u-boot-mkimage_2016.05.bb} (90%)
 create mode 100644 
meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
 rename meta/recipes-bsp/u-boot/{u-boot_2016.03.bb => u-boot_2016.05.bb} (38%)

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
similarity index 94%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
index 79f1548..94d9c13 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
@@ -7,9 +7,9 @@ DEPENDS = "mtd-utils"
 # This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
 
-PV = "v2016.03+git${SRCPV}"
+PV = "v2016.05+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
similarity index 90%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
index d5921a0..bdfcaf4 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
@@ -8,9 +8,9 @@ DEPENDS = "openssl"
 # This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
 
-PV = "v2016.03+git${SRCPV}"
+PV = "v2016.05+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git 
a/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch 
b/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
new file mode 100644
index 000..822c30b
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
@@ -0,0 +1,48 @@
+From c510f2e436008e55a50b063f2180cb1e63984224 Mon Sep 17 00:00:00 2001
+From: Peng Fan <van.free...@gmail.com>
+Date: Thu, 28 Apr 2016 10:07:53 +0800
+Subject: [PATCH] video: ipu_common: fix build error
+
+Some toolchains fail to build
+"clk->rate = (u64)(clk->parent->rate * 16) / div;"
+And the cast usage is wrong.
+
+Use the following code to fix the issue,
+"
+  do_div(parent_rate, div);
+  clk->rate = parent_rate;
+"
+
+Upstream-Status: Backport
+
+Reported-by: Peter Robinson <pbrobin...@gmail.com>
+Signed-off-by: Peng Fan <van.free...@gmail.com>
+Cc: Stefano Babic <sba...@denx.de>
+Cc: Fabio Estevam <fabio.este...@nxp.com>
+Cc: Tom Rini <tr...@konsulko.com>
+Cc: Anatolij Gustschin <ag...@denx.de>
+Cc: Peter Robinson <pbrobin...@gmail.com>
+Reviewed-by: Tom Rini <tr...@konsulko.com>
+Tested-by: Peter Robinson <pbrobin...@gmail.com>
+---
+ drivers/video/ipu_common.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
+index 36d4b23..5676a0f 100644
+--- a/drivers/video/ipu_common.c
 b/drivers/video/ipu_common.c
+@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, 
unsigned long rate)
+*/
+   __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id));
+ 
+-  clk->rate = (u64)(clk->parent->rate * 16) / div;
++  do_div(parent_rate, div);
++
++  clk->rate = parent_rate;
+ 
+   return 0;
+ }
+-- 
+2.7.4
+
diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot_2016.05.bb
similarity index 38%
rename from meta/recipes-bsp/u-boot/u-boot_2016.03.bb
rename to meta/recipes-bsp/u-boot/u-boot_2016.05.bb
index 836b0ce..57408e7 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2016.05.bb
@@ -2,9 +2,13 @@ require u-boot.inc
 
 D

Re: [OE-core] [PATCH] u-boot: Update to 2016.05 release

2016-05-27 Thread Andrew Shadura

On 27/05/16 15:53, Otavio Salvador wrote:
>> +Upstream-Status: Inappropriate [comes from upstream's branch]
> Is this a backport? If such, please fix the value.

Oh, I didn't know that value exists. How about the yesterday's patch by
the way?

http://patchwork.openembedded.org/patch/123585/

-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] u-boot: Update to 2016.05 release

2016-05-27 Thread Andrew Shadura

Upgrade U-Boot to the latest upstream version.
Add a patch to unbreak build on some toolchains.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 ...utils_2016.03.bb => u-boot-fw-utils_2016.05.bb} |  4 +-
 ...kimage_2016.03.bb => u-boot-mkimage_2016.05.bb} |  4 +-
 .../-video-ipu_common-fix-build-error.patch| 48 ++
 meta/recipes-bsp/u-boot/u-boot_2016.03.bb  | 10 -
 meta/recipes-bsp/u-boot/u-boot_2016.05.bb  | 14 +++
 5 files changed, 66 insertions(+), 14 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2016.03.bb => 
u-boot-fw-utils_2016.05.bb} (94%)
 rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2016.03.bb => 
u-boot-mkimage_2016.05.bb} (90%)
 create mode 100644 
meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
 delete mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.03.bb
 create mode 100644 meta/recipes-bsp/u-boot/u-boot_2016.05.bb

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
similarity index 94%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
index 79f1548..94d9c13 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2016.05.bb
@@ -7,9 +7,9 @@ DEPENDS = "mtd-utils"
 # This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
 
-PV = "v2016.03+git${SRCPV}"
+PV = "v2016.05+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
similarity index 90%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
index d5921a0..bdfcaf4 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.05.bb
@@ -8,9 +8,9 @@ DEPENDS = "openssl"
 # This revision corresponds to the tag "v2016.03"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
+SRCREV = "aeaec0e682f45b9e0c62c522fafea353931f73ed"
 
-PV = "v2016.03+git${SRCPV}"
+PV = "v2016.05+git${SRCPV}"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
 
diff --git 
a/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch 
b/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
new file mode 100644
index 000..452672d
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot/-video-ipu_common-fix-build-error.patch
@@ -0,0 +1,48 @@
+From c510f2e436008e55a50b063f2180cb1e63984224 Mon Sep 17 00:00:00 2001
+From: Peng Fan <van.free...@gmail.com>
+Date: Thu, 28 Apr 2016 10:07:53 +0800
+Subject: [PATCH] video: ipu_common: fix build error
+
+Some toolchains fail to build
+"clk->rate = (u64)(clk->parent->rate * 16) / div;"
+And the cast usage is wrong.
+
+Use the following code to fix the issue,
+"
+  do_div(parent_rate, div);
+  clk->rate = parent_rate;
+"
+
+Upstream-Status: Inappropriate [comes from upstream's branch]
+
+Reported-by: Peter Robinson <pbrobin...@gmail.com>
+Signed-off-by: Peng Fan <van.free...@gmail.com>
+Cc: Stefano Babic <sba...@denx.de>
+Cc: Fabio Estevam <fabio.este...@nxp.com>
+Cc: Tom Rini <tr...@konsulko.com>
+Cc: Anatolij Gustschin <ag...@denx.de>
+Cc: Peter Robinson <pbrobin...@gmail.com>
+Reviewed-by: Tom Rini <tr...@konsulko.com>
+Tested-by: Peter Robinson <pbrobin...@gmail.com>
+---
+ drivers/video/ipu_common.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c
+index 36d4b23..5676a0f 100644
+--- a/drivers/video/ipu_common.c
 b/drivers/video/ipu_common.c
+@@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, 
unsigned long rate)
+*/
+   __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id));
+ 
+-  clk->rate = (u64)(clk->parent->rate * 16) / div;
++  do_div(parent_rate, div);
++
++  clk->rate = parent_rate;
+ 
+   return 0;
+ }
+-- 
+2.7.4
+
diff --git a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb 
b/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
deleted file mode 100644
index 836b0ce..000
--- a/meta/recipes-bsp/u-boot/u-boot_2016.03.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require u-boot.inc
-
-DEPENDS += "dtc-native"
-
-# This revision corresponds to the tag "v2016.03&qu

Re: [OE-core] [PATCH v2] cups: update systemd support

2016-01-08 Thread Andrew Shadura

On 08/01/16 16:34, Martin Jansa wrote:
> On Wed, Dec 30, 2015 at 11:53:04AM +0100, Andrew Shadura wrote:
>> > On 11/12/15 22:39, Burton, Ross wrote:
>>> > > Sorry for the delay in looking at this.  buildhistory-diff reports this:
>>> > > 
>>> > > packages/corei7-64-poky-linux/cups/cups: FILELIST: removed
>>> > > "/etc/rc2.d/S81cups /lib/systemd/system/cups.service /etc/rc5.d/S81cups
>>> > > /etc/rc5.d/K36cups /etc/rc0.d/K36cups /etc/rc2.d/K36cups
>>> > > /etc/rc3.d/S81cups /etc/rc3.d/K36cups /lib/systemd/system/cups.socket
>>> > > /lib/systemd/system/cups.path /etc/init.d/cups" added
>>> > > "/lib/systemd/system/org.cups.cupsd.socket
>>> > > /lib/systemd/system/org.cups.cupsd.service
>>> > > /lib/systemd/system/org.cups.cups-lpd@.service
>>> > > /lib/systemd/system/org.cups.cupsd.path
>>> > > /lib/systemd/system/org.cups.cups-lpd.socket"
>>> > > 
>>> > > Looks like if systemd is enabled it removes the sysvinit files, but we
>>> > > still need those installed if sysvinit is in DISTRO_FEATURES.
>> > 
>> > I just had a look at the recipe, and it seems it removes those files on
>> > its own even without my patch. I guess fixing that makes sense in a
>> > separate patch then?
> My latest bitbake world build shows new QA issue:
> 
> cups-2.0.4: cups: Files/directories were installed but not shipped in
> any package:
>   /lib/systemd/system/org.cups.cupsd.path
>   /lib/systemd/system/org.cups.cupsd.service
>   /lib/systemd/system/org.cups.cupsd.socket
>   /lib/systemd/system/org.cups.cups-lpd@.service
>   /lib/systemd/system/org.cups.cups-lpd.socket
> Please set FILES such that these items are packaged. Alternatively if
> they are unneeded, avoid installing them or delete them within
> do_install.
> 
> I'm not sure if it's caused by this change, but it would be good to fix
> it.

Hmm, the whole point of my change is precisely fixing this issue, are
you sure you have applied my patch?


-- 
Cheers,
  Andrew



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] dbus: use ${systemd_system_unitdir}

2016-02-02 Thread Andrew Shadura

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus_1.10.6.bb | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.6.bb 
b/meta/recipes-core/dbus/dbus_1.10.6.bb
index 5ba3f21..fec68a4 100644
--- a/meta/recipes-core/dbus/dbus_1.10.6.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.6.bb
@@ -69,7 +69,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_unitdir}/system/"
+   ${systemd_system_unitdir}"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool"
@@ -102,7 +102,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 
'systemd', 'systemd',
 PACKAGECONFIG_class-native = ""
 PACKAGECONFIG_class-nativesdk = ""
 
-PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd 
--without-systemdsystemunitdir,systemd"
+PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd 
--without-systemdsystemunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
 
@@ -117,12 +117,12 @@ do_install() {
 
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', 
d)}; then
for i in dbus.target.wants sockets.target.wants 
multi-user.target.wants; do \
-   install -d ${D}${systemd_unitdir}/system/$i; done
-   install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket 
${D}${systemd_unitdir}/system/
-   cd ${D}${systemd_unitdir}/system/dbus.target.wants/
-   ln -fs ../dbus.socket 
${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket
-   ln -fs ../dbus.socket 
${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket
-   ln -fs ../dbus.service 
${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service
+   install -d ${D}${systemd_system_unitdir}/$i; done
+   install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket 
${D}${systemd_system_unitdir}/
+   cd ${D}${systemd_system_unitdir}/dbus.target.wants/
+   ln -fs ../dbus.socket 
${D}${systemd_system_unitdir}/dbus.target.wants/dbus.socket
+   ln -fs ../dbus.socket 
${D}${systemd_system_unitdir}/sockets.target.wants/dbus.socket
+   ln -fs ../dbus.service 
${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service
fi
 
install -d ${D}${sysconfdir}/default/volatiles
-- 
2.5.0

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

[OE-core] [PATCH 2/2] dbus: add user sessions support

2016-02-02 Thread Andrew Shadura

Enable the user-sessions support with a PACKAGECONFIG flag.

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
 meta/recipes-core/dbus/dbus_1.10.6.bb | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/dbus/dbus_1.10.6.bb 
b/meta/recipes-core/dbus/dbus_1.10.6.bb
index fec68a4..245798a 100644
--- a/meta/recipes-core/dbus/dbus_1.10.6.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.6.bb
@@ -69,7 +69,9 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
${datadir}/dbus-1/session.conf \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/system.conf \
-   ${systemd_system_unitdir}"
+   ${systemd_system_unitdir} \
+   ${systemd_user_unitdir} \
+"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool"
@@ -105,6 +107,7 @@ PACKAGECONFIG_class-nativesdk = ""
 PACKAGECONFIG[systemd] = "--enable-systemd 
--with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd 
--without-systemdsystemunitdir,systemd"
 PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x 
--disable-x11-autolaunch, virtual/libx11 libsm"
 PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
+PACKAGECONFIG[user-session] = "--enable-user-session 
--with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session"
 
 do_install() {
autotools_do_install
-- 
2.5.0

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

[OE-core] [PATCH v3 2/2] ghostscript: build and install libgs

2017-03-09 Thread Andrew Shadura

From: Joshua Lock <joshua.l...@collabora.co.uk>

Build and install libgs library, which is a build dependency
of a few other libraries, such as libspectre.

We don't want to ship the executable binaries, only the library and its
headers, hence oe_runmake install-so + rm -rf, not e.g. oe_libinstall.

Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-extended/ghostscript/ghostscript_9.20.bb | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb 
b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
index 210e9a7..3c95ed9 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
@@ -70,15 +70,17 @@ do_configure_prepend () {
mkdir -p soobj
if [ -e ${WORKDIR}/objarch.h ]; then
cp ${WORKDIR}/objarch.h obj/arch.h
+   cp ${WORKDIR}/objarch.h soobj/arch.h
fi
 }
 
 do_configure_append () {
# copy tools from the native ghostscript build
if [ "${PN}" != "ghostscript-native" ]; then
-   mkdir -p obj/aux soobj
+   mkdir -p obj/aux soobj/aux
for i in genarch genconf mkromfs echogs gendev genht; do
cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
obj/aux/$i
+   cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
soobj/aux/$i
done
fi
 }
@@ -96,6 +98,10 @@ do_compile_class-native () {
 done
 }
 
+do_compile_class-target_append () {
+oe_runmake so
+}
+
 do_install_class-native () {
 install -d ${D}${bindir}/ghostscript-${PV}
 for i in genarch genconf mkromfs echogs gendev genht; do
@@ -103,4 +109,13 @@ do_install_class-native () {
 done
 }
 
+do_install_class-target_append () {
+oe_runmake install-so DESTDIR=${D}
+rm -rf ${D}${bindir}
+}
+
+PACKAGES =+ "${PN}-lib"
+
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+
 BBCLASSEXTEND = "native"
-- 
1.8.3.1

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

[OE-core] [PATCH v3 1/2] security_flags: disable -pie for ghostscript

2017-03-09 Thread Andrew Shadura

Otherwise ghostscript fails to build the libraries:

relocation R_X86_64_PC32 against symbol `st_ttfInterpreter'
can not be used when making a shared object; recompile
with -fPIC

Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/conf/distro/include/security_flags.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/distro/include/security_flags.inc 
b/meta/conf/distro/include/security_flags.inc
index 5a1cbb1..cb8b696 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -33,6 +33,7 @@ SECURITY_CFLAGS_pn-coreutils = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-ghostscript = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-glibc = ""
 SECURITY_CFLAGS_pn-glibc-initial = ""
 SECURITY_CFLAGS_pn-elfutils = "${SECURITY_NO_PIE_CFLAGS}"
-- 
1.8.3.1

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

Re: [OE-core] [PATCH v3 2/2] ghostscript: build and install libgs

2017-03-10 Thread Andrew Shadura

On 09/03/17 17:36, Burton, Ross wrote:
> On 9 March 2017 at 14:31, Andrew Shadura <andrew.shad...@collabora.co.uk>
> wrote:
> 
>> Build and install libgs library, which is a build dependency
>> of a few other libraries, such as libspectre.
>>
>> We don't want to ship the executable binaries, only the library and its
>> headers, hence oe_runmake install-so + rm -rf, not e.g. oe_libinstall.
>>
> 
> This does *way* more:
> 
> packages/corei7-64-poky-linux/ghostscript/ghostscript-dev: PKGSIZE changed
> from 0 to 38856 (+100%)
>   * FILELIST: added "/usr/include/ghostscript/gdevdsp.h
> /usr/include/ghostscript/iapi.h /usr/lib/libgs.so
> /usr/include/ghostscript/gserrors.h /usr/include/ghostscript/ierrors.h"
> packages/corei7-64-poky-linux/ghostscript/ghostscript-dev: RDEPENDS: added
> "ghostscript-lib"
> packages/corei7-64-poky-linux/ghostscript/ghostscript-dev: FILELIST: added
> "/usr/include/ghostscript/gdevdsp.h /usr/include/ghostscript/iapi.h
> /usr/lib/libgs.so /usr/include/ghostscript/gserrors.h
> /usr/include/ghostscript/ierrors.h"
> packages/corei7-64-poky-linux/ghostscript/ghostscript-dev: RRECOMMENDS:
> added "ghostscript-lib-dev"
> 
> That's all good.
> 
> packages/corei7-64-poky-linux/ghostscript/ghostscript-doc: PKGSIZE changed
> from 45465 to 0 (-100%)
>   * FILELIST: removed all items "/usr/share/man/de/man1/ps2pdf.1 ...
> /usr/share/man/man1/pdf2ps.1"
> 
> All the man pages disappeared
> 
> packages/corei7-64-poky-linux/ghostscript/ghostscript: PKGSIZE changed from
> 61037876 to 16376087 (-73%)
>   * FILELIST: removed "/usr/share/ghostscript/9.20/doc/index.html
> /usr/share/ghostscript/9.20/doc/gs.css
> /usr/share/ghostscript/9.20/lib/bjc610a0.upp ...
> /usr/share/ghostscript/9.20/doc/Make.htm /usr/share/ghostscript/9.20/lib/
> wrfont.ps"
> 
> Pretty much all of ghostscript disappeared.

Right. I'm probably removing way too much.

> packages/corei7-64-poky-linux/ghostscript/ghostscript: RDEPENDS: removed
> all items "cups-libimage (['>= 2.2.2']) glibc (['>= 2.25']) cups-lib (['>=
> 2.2.2']) libpng (['>= 1.6.28']) tiff (['>= 4.0.7']) fontconfig (['>=
> 2.12.1'])"
> 
> Was that the intention?  Having libgs sounds sensible but surely both
> should be packaged.

The intention was what I said, probably I misunderstood what the
original packages had, so I haven't noticed things disappearing.

Will investigate and resubmit.

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

[OE-core] [PATCH] ghostscript: build and install libgs

2017-03-05 Thread Andrew Shadura

From: Joshua Lock <joshua.l...@collabora.co.uk>

Build and install libgs library, which is a build dependency
of a few other libraries, such as libspectre.

We don't want to ship the executable binaries, only the library and its
headers, hence oe_runmake install-so + rm -rf, not e.g. oe_libinstall.

Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-extended/ghostscript/ghostscript_9.19.bb | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb 
b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
index fe2016b..4329f31 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
@@ -70,15 +70,17 @@ do_configure_prepend () {
mkdir -p soobj
if [ -e ${WORKDIR}/objarch.h ]; then
cp ${WORKDIR}/objarch.h obj/arch.h
+   cp ${WORKDIR}/objarch.h soobj/arch.h
fi
 }
 
 do_configure_append () {
# copy tools from the native ghostscript build
if [ "${PN}" != "ghostscript-native" ]; then
-   mkdir -p obj/aux soobj
+   mkdir -p obj/aux soobj/aux
for i in genarch genconf mkromfs echogs gendev genht; do
cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
obj/aux/$i
+   cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
soobj/aux/$i
done
fi
 }
@@ -96,6 +98,10 @@ do_compile_class-native () {
 done
 }
 
+do_compile_class-target_append () {
+oe_runmake so
+}
+
 do_install_class-native () {
 install -d ${D}${bindir}/ghostscript-${PV}
 for i in genarch genconf mkromfs echogs gendev genht; do
@@ -103,4 +109,13 @@ do_install_class-native () {
 done
 }
 
+do_install_class-target_append () {
+oe_runmake install-so DESTDIR=${D}
+rm -rf ${D}${bindir}
+}
+
+PACKAGES =+ "${PN}-lib"
+
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+
 BBCLASSEXTEND = "native"
-- 
1.8.3.1

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

[OE-core] [PATCH v2] ghostscript: build and install libgs

2017-03-06 Thread Andrew Shadura

From: Joshua Lock <joshua.l...@collabora.co.uk>

Build and install libgs library, which is a build dependency
of a few other libraries, such as libspectre.

We don't want to ship the executable binaries, only the library and its
headers, hence oe_runmake install-so + rm -rf, not e.g. oe_libinstall.

Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
Signed-off-by: Andrew Shadura <andrew.shad...@collabora.co.uk>
---
 meta/recipes-extended/ghostscript/ghostscript_9.20.bb | 17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb 
b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
index 210e9a7..3c95ed9 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
@@ -70,15 +70,17 @@ do_configure_prepend () {
mkdir -p soobj
if [ -e ${WORKDIR}/objarch.h ]; then
cp ${WORKDIR}/objarch.h obj/arch.h
+   cp ${WORKDIR}/objarch.h soobj/arch.h
fi
 }
 
 do_configure_append () {
# copy tools from the native ghostscript build
if [ "${PN}" != "ghostscript-native" ]; then
-   mkdir -p obj/aux soobj
+   mkdir -p obj/aux soobj/aux
for i in genarch genconf mkromfs echogs gendev genht; do
cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
obj/aux/$i
+   cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i 
soobj/aux/$i
done
fi
 }
@@ -96,6 +98,10 @@ do_compile_class-native () {
 done
 }
 
+do_compile_class-target_append () {
+oe_runmake so
+}
+
 do_install_class-native () {
 install -d ${D}${bindir}/ghostscript-${PV}
 for i in genarch genconf mkromfs echogs gendev genht; do
@@ -103,4 +109,13 @@ do_install_class-native () {
 done
 }
 
+do_install_class-target_append () {
+oe_runmake install-so DESTDIR=${D}
+rm -rf ${D}${bindir}
+}
+
+PACKAGES =+ "${PN}-lib"
+
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+
 BBCLASSEXTEND = "native"
-- 
1.8.3.1

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

[OE-core] pseudo FTBFS with recent glibc

2021-12-31 Thread Andrew Shadura


Hi,

pseudo started failing to build from the source apparently after a glibc 
update [1] we had in Debian:



In file included from pseudo_wrappers.c:46:
ports/unix/guts/symlinkat.c: In function ‘wrap_symlinkat’:
pseudo_client.h:14:65: error: ‘_STAT_VER’ undeclared (first use in this 
function)
   14 | #define base_fstatat(dirfd, path, buf, flags) 
real___fxstatat64(_STAT_VER, dirfd, path, buf, flags)
  | 
^
ports/unix/guts/symlinkat.c:37:14: note: in expansion of macro ‘base_fstatat’
   37 | rc = base_fstatat(dirfd, newpath, , AT_SYMLINK_NOFOLLOW);
  |  ^~~~


A similar issue has been reported against fakeroot [2]. I guess, 
something similar is required for pseudo as well.


[0]: https://bugs.debian.org/1002136
[1]: https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=8ed005daf0
[2]: https://salsa.debian.org/clint/fakeroot/-/merge_requests/10/diffs

--
Cheers,
  Andrej

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

51 matches

Mail list logo