From 62ec4adb0dd43b9770b98f9720e58990084d3ce3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Tue, 16 Feb 2021 09:12:22 -0300 Subject: [PATCH] recipes: daemons/dbus*: Reconfigured MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- archive/dbus/rc.main | 13 ++++--------- recipes/daemons/dbus-x11/post-install | 2 +- recipes/daemons/dbus-x11/recipe | 23 ++++++++++++----------- recipes/daemons/dbus/post-install | 2 +- recipes/daemons/dbus/recipe | 22 ++++++++++++---------- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/archive/dbus/rc.main b/archive/dbus/rc.main index b7232e66..a0cda82f 100644 --- a/archive/dbus/rc.main +++ b/archive/dbus/rc.main @@ -15,15 +15,10 @@ start() { echo "*** ${SVNAME}: Starting dbus ..." - mkdir -p /var/lib/dbus /run/dbus - chown messagebus /var/lib/dbus - rm -f /run/dbus/pid - - # Validate or generate unique ID file (/var/lib/dbus/machine-id) - /usr/bin/dbus-uuidgen --ensure && { - chmod 600 /var/lib/dbus/machine-id - ln -sf /var/lib/dbus/machine-id /etc/machine-id - } + test -d /var/run/dbus || mkdir -p /var/run/dbus + + # Validate or generate unique ID file + /usr/bin/dbus-uuidgen --ensure=/etc/machine-id exec /usr/bin/dbus-daemon --nofork --system --nopidfile } diff --git a/recipes/daemons/dbus-x11/post-install b/recipes/daemons/dbus-x11/post-install index 7da507bf..b34871ec 100644 --- a/recipes/daemons/dbus-x11/post-install +++ b/recipes/daemons/dbus-x11/post-install @@ -1,4 +1,4 @@ # To validate UUIDs (Universally Unique IDs) -chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure 2> /dev/null +chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure=/etc/machine-id 2> /dev/null diff --git a/recipes/daemons/dbus-x11/recipe b/recipes/daemons/dbus-x11/recipe index dd3b2b2c..f33a684c 100644 --- a/recipes/daemons/dbus-x11/recipe +++ b/recipes/daemons/dbus-x11/recipe @@ -20,7 +20,7 @@ set -e program=dbus version=1.12.20 -release=2 +release=3 pkgname=dbus-x11 @@ -63,28 +63,28 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure \ - CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" CXXFLAGS="$QICXXFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" CXXFLAGS="$QICXXFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ - --runstatedir=/run \ --enable-static=no \ --enable-shared=yes \ --enable-debug=no \ --enable-inotify \ --enable-x11-autolaunch \ - --disable-systemd \ + --enable-user-session \ --disable-selinux \ --disable-doxygen-docs \ + --with-systemduserunitdir=no \ + --with-systemdsystemunitdir=no \ --with-xml=expat \ --with-dbus-user=messagebus \ - --with-console-auth-dir=/run/console \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ + --with-system-socket=/var/run/system_bus_socket \ + --with-system-pid-file=/var/run/dbus/dbus.pid \ --build="$(gcc -dumpmachine)" - + make -j${jobs} V=1 make -j${jobs} DESTDIR="$destdir" install-strip @@ -94,6 +94,8 @@ build() mkdir -p "${destdir}/var/lib/dbus" chown messagebus "${destdir}/var/lib/dbus" + mkdir -p "${destdir}/etc/dbus-1/system.d" + # Compress and link man pages (if needed) if test -d "${destdir}/$mandir" then @@ -110,12 +112,11 @@ build() # Copy documentation mkdir -p "${destdir}${docsdir}" - cp -p $docs "${destdir}${docsdir}/" + cp -p $docs "${destdir}${docsdir}" # Install perp service for dbus mkdir -p "${destdir}/etc/perp/dbus" - cp -p "${worktree}/archive/dbus/rc.log" \ "${worktree}/archive/dbus/rc.main" \ "${destdir}/etc/perp/dbus/" diff --git a/recipes/daemons/dbus/post-install b/recipes/daemons/dbus/post-install index 7da507bf..b34871ec 100644 --- a/recipes/daemons/dbus/post-install +++ b/recipes/daemons/dbus/post-install @@ -1,4 +1,4 @@ # To validate UUIDs (Universally Unique IDs) -chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure 2> /dev/null +chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure=/etc/machine-id 2> /dev/null diff --git a/recipes/daemons/dbus/recipe b/recipes/daemons/dbus/recipe index a89d79db..bc50e32e 100644 --- a/recipes/daemons/dbus/recipe +++ b/recipes/daemons/dbus/recipe @@ -1,4 +1,4 @@ -# Build recipe for dbus (Use 'dbus_x11' instead for X11 support). +# Build recipe for dbus (Use 'dbus-x11' instead for the X11 support). # # Copyright (C) 2018, MMPG # Copyright (c) 2018-2021 Matias Fonzo, . @@ -20,7 +20,7 @@ set -e program=dbus version=1.12.20 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=daemons @@ -58,26 +58,27 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure \ - CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" CXXFLAGS="$QICXXFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" CXXFLAGS="$QICXXFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ - --runstatedir=/run \ --enable-static=no \ --enable-shared=yes \ --enable-debug=no \ --enable-inotify \ + --enable-user-session \ --disable-x11-autolaunch \ --disable-systemd \ --disable-selinux \ --disable-doxygen-docs \ + --with-systemduserunitdir=no \ + --with-systemdsystemunitdir=no \ --with-xml=expat \ --with-dbus-user=messagebus \ - --with-console-auth-dir=/run/console \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ + --with-system-socket=/var/run/system_bus_socket \ + --with-system-pid-file=/var/run/dbus/dbus.pid \ --without-x \ --build="$(gcc -dumpmachine)" @@ -90,6 +91,8 @@ build() mkdir -p "${destdir}/var/lib/dbus" chown messagebus "${destdir}/var/lib/dbus" + mkdir -p "${destdir}/etc/dbus-1/system.d" + # Compress and link man pages (if needed) if test -d "${destdir}/$mandir" then @@ -106,12 +109,11 @@ build() # Copy documentation mkdir -p "${destdir}${docsdir}" - cp -p $docs "${destdir}${docsdir}/" + cp -p $docs "${destdir}${docsdir}" # Install perp service for dbus mkdir -p "${destdir}/etc/perp/dbus" - cp -p "${worktree}/archive/dbus/rc.log" \ "${worktree}/archive/dbus/rc.main" \ "${destdir}/etc/perp/dbus/" -- 2.11.4.GIT