This reverts commit 0fb5d3ed2cb31a0a6076d36fb7a668cfe5328c92. root@finn:/# /etc/init.d/dbus start dbus[2537]: Failed to start message bus: Failed to open "/dbus-1/system.conf": No such file or directory
I guess simple run testing still is too much to expect when doing arbitrary changes packaging? Just commit the broken package and let someone else clean up the mess. Is that your idea of contributing? FWIW, the version update was fine. So if the commit hadn't been such a squashed mess, then both changes didn't have to be reverted. But I'm not going clean that up. I am not your mother. The repeated lack of run testing major changes really makes me wonder what it takes to get commit rights around here. Not much, from the looks of it. Cc: Rosen Penev <[email protected]> Signed-off-by: Bjørn Mork <[email protected]> --- utils/dbus/Makefile | 55 ++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 94bfa2e94f1c..0ebeb7a3be80 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -8,25 +8,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus -PKG_VERSION:=1.13.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.13.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus -PKG_HASH:=8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e +PKG_HASH:=7588649b56dd257c6a5f85a8c45aa2dfdf9e99f4de3983710f452081ca43eca6 PKG_MAINTAINER:= PKG_LICENSE:=AFL-2.1 PKG_CPE_ID:=cpe:/a:freedesktop:dbus +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk define Package/dbus/Default SECTION:=utils CATEGORY:=Utilities TITLE:=Simple interprocess messaging system - URL:=https://dbus.freedesktop.org/ + URL:=http://dbus.freedesktop.org/ endef define Package/dbus/Default/description @@ -71,19 +73,32 @@ $(call Package/dbus/Default/description) This package contains D-Bus utilities. endef -CMAKE_OPTIONS += \ - -DDBUS_BUILD_TESTS=OFF \ - -DDBUS_LINUX=ON \ - -DDBUS_DISABLE_ASSERT=ON \ - -DBUS_ENABLE_STATS=OFF \ - -DDBUS_ENABLE_CONTAINERS=OFF \ - -DENABLE_SYSTEMD=OFF \ - -DDBUS_BUS_ENABLE_SYSTEMD=OFF \ - -DHAVE_SYSTEMD=OFF \ - -DDBUS_WITH_GLIB=OFF \ - -DDBUS_ENABLE_VERBOSE_MODE=OFF \ - -DDBUS_DISABLE_CHECKS=ON \ - -DDBUS_BUILD_X11=OFF \ +CONFIGURE_ARGS += \ + --disable-maintainer-mode \ + --disable-developer \ + --enable-debug=no \ + --enable-shared \ + --disable-static \ + --disable-verbose-mode \ + --disable-asserts \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --disable-ducktype-docs \ + --disable-selinux \ + --disable-apparmor \ + --disable-libaudit \ + --enable-inotify \ + --disable-kqueue \ + --disable-console-owner-file \ + --disable-systemd \ + --disable-tests \ + --disable-code-coverage \ + --disable-x11-autolaunch \ + --with-session-socket-dir=/tmp \ + --with-system-socket=/var/run/dbus/system_bus_socket \ + --with-system-pid-file=/var/run/dbus.pid \ + --with-dbus-user=root \ + --without-x define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -93,7 +108,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \ $(1)/usr/lib/dbus-1.0/include/dbus/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so* \ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{so*,la} \ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -114,7 +129,7 @@ define Package/dbus/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen $(1)/usr/bin/ $(INSTALL_BIN) ./files/dbus-launch $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/dbus-daemon-launch-helper $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dbus-daemon-launch-helper $(1)/usr/lib/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/dbus $(INSTALL_DIR) $(1)/usr/share/dbus-1 -- 2.20.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
