summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-04-08 15:56:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-10 09:10:36 +0100
commit1ed050ae47d681d5892fb58f00e07767f8a06233 (patch)
treee1103d887988020a39be2bf25a8036dc4ed81192 /meta/recipes-devtools
parent003e90886584f0b92bdebf23fc1661443b6d50f2 (diff)
downloadpoky-1ed050ae47d681d5892fb58f00e07767f8a06233.tar.gz
rpm: build without dbus for rpm-native
Add option for dbus in configure.ac, and explicitly build without dbus for rpm-native. Previously, the rpm recipe tries to prevent rpm-native from attempting to inhibit shutdown via session dbus by appending '--disable-plugins' to EXTRA_OECONF in case of native. However, some layer may need some functionality via plugin support. And when it enables it, we would meet the following warning at rootfs time. Unable to get systemd shutdown inhibition lock: Socket name too long As plugins/systemd_inhibit.c is the only place that's related to this dependency, we can be sure that dbus is really not needed for rpm-native. (From OE-Core rev: 815ccef2d5bef1e46c51916e694d0974aee394a9) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch42
-rw-r--r--meta/recipes-devtools/rpm/rpm_4.14.1.bb6
2 files changed, 46 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
new file mode 100644
index 0000000000..dc71d9b18b
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
@@ -0,0 +1,42 @@
1From dfb422c744fdc1838afc40b8e1f161bb46093d92 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Sun, 8 Apr 2018 12:06:42 +0800
4Subject: [PATCH] configure.ac: add option for dbus
5
6Add option for dbus so that users could choose to build with dbus
7or with no dbus.
8
9Upstream-Status: Pending
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 configure.ac | 11 +++++++----
14 1 file changed, 7 insertions(+), 4 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 4db15c7909..493f393d31 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -976,12 +976,15 @@ AS_IF([test "$enable_plugins" = yes],[
21 ])
22 AM_CONDITIONAL(ENABLE_PLUGINS,[test "$enable_plugins" = yes])
23
24-with_dbus=no
25-AS_IF([test "$enable_plugins" != no],[
26+AC_ARG_WITH([dbus], [AS_HELP_STRING([--with-dbus], [build with dbus support])],
27+ [],
28+ [with_dbus=yes])
29+
30+AS_IF([test "$with_dbus" != no],[
31 PKG_CHECK_MODULES([DBUS],
32 [dbus-1 >= 1.3],
33- [AC_DEFINE(DBUS, 1, [Build with dbus support?]) with_dbus=yes],
34- [with_dbus=no])
35+ [AC_DEFINE(DBUS, 1, [Build with dbus support?])],
36+ [AC_MSG_ERROR([dbus not present (--without-dbus to disable)])])
37 AC_SUBST(DBUS_CFLAGS)
38 AC_SUBST(DBUS_LIBS)
39 ])
40--
412.11.0
42
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index 7b8ea46a75..818d3ef9e3 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -40,6 +40,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
40 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \ 40 file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
41 file://0001-perl-disable-auto-reqs.patch \ 41 file://0001-perl-disable-auto-reqs.patch \
42 file://0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch \ 42 file://0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch \
43 file://0001-configure.ac-add-option-for-dbus.patch \
43 " 44 "
44 45
45PE = "1" 46PE = "1"
@@ -63,8 +64,9 @@ EXTRA_OECONF_append_libc-musl = " --disable-nls"
63# 64#
64# --localstatedir prevents rpm from writing its database to native sysroot when building images 65# --localstatedir prevents rpm from writing its database to native sysroot when building images
65# 66#
66# Also disable plugins, so that rpm doesn't attempt to inhibit shutdown via session dbus 67# Disable dbus for native, so that rpm doesn't attempt to inhibit shutdown via session dbus even when plugins support is enabled.
67EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" 68# Also disable plugins by default for native.
69EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --without-dbus --disable-plugins"
68 70
69BBCLASSEXTEND = "native nativesdk" 71BBCLASSEXTEND = "native nativesdk"
70 72