|
@ -7,27 +7,22 @@ |
|
|
|
|
|
|
|
|
include $(TOPDIR)/rules.mk |
|
|
include $(TOPDIR)/rules.mk |
|
|
|
|
|
|
|
|
# Make sure to also update the dbus-x package
|
|
|
|
|
|
PKG_NAME:=dbus |
|
|
PKG_NAME:=dbus |
|
|
PKG_VERSION:=1.10.4 |
|
|
|
|
|
|
|
|
PKG_VERSION:=1.12.8 |
|
|
PKG_RELEASE:=1 |
|
|
PKG_RELEASE:=1 |
|
|
|
|
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz |
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz |
|
|
PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ |
|
|
|
|
|
PKG_HASH:=ad7dcad73ad9b0ff55819985d354eacfffe07e2eb8c763e155efc21d6001084b |
|
|
|
|
|
|
|
|
PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus/ |
|
|
|
|
|
PKG_HASH:=e2dc99e7338303393b6663a98320aba6a63421bcdaaf571c8022f815e5896eb3 |
|
|
PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org> |
|
|
PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org> |
|
|
PKG_LICENSE:=AFL-2.1 |
|
|
PKG_LICENSE:=AFL-2.1 |
|
|
|
|
|
|
|
|
PKG_BUILD_PARALLEL:=1 |
|
|
PKG_BUILD_PARALLEL:=1 |
|
|
PKG_FIXUP:=autoreconf |
|
|
|
|
|
PKG_INSTALL:=1 |
|
|
PKG_INSTALL:=1 |
|
|
|
|
|
|
|
|
include $(INCLUDE_DIR)/host-build.mk |
|
|
include $(INCLUDE_DIR)/host-build.mk |
|
|
include $(INCLUDE_DIR)/package.mk |
|
|
include $(INCLUDE_DIR)/package.mk |
|
|
|
|
|
|
|
|
TARGET_LDFLAGS+= \
|
|
|
|
|
|
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
|
|
|
|
|
|
|
|
|
|
|
|
define Package/dbus/Default |
|
|
define Package/dbus/Default |
|
|
SECTION:=utils |
|
|
SECTION:=utils |
|
|
CATEGORY:=Utilities |
|
|
CATEGORY:=Utilities |
|
@ -69,7 +64,7 @@ endef |
|
|
define Package/dbus-utils |
|
|
define Package/dbus-utils |
|
|
$(call Package/dbus/Default) |
|
|
$(call Package/dbus/Default) |
|
|
TITLE+= (utilities) |
|
|
TITLE+= (utilities) |
|
|
DEPENDS:= dbus |
|
|
|
|
|
|
|
|
DEPENDS:= +dbus |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
define Package/dbus-utils/Description |
|
|
define Package/dbus-utils/Description |
|
@ -77,135 +72,98 @@ $(call Package/dbus/Default/description) |
|
|
This package contains D-Bus utilities. |
|
|
This package contains D-Bus utilities. |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
define Build/Prepare |
|
|
|
|
|
$(Build/Prepare/Default) |
|
|
|
|
|
$(SED) 's/-Wl,--gc-sections/--gc-sections/' $(PKG_BUILD_DIR)/configure |
|
|
|
|
|
endef |
|
|
|
|
|
|
|
|
|
|
|
CONFIGURE_ARGS += \
|
|
|
CONFIGURE_ARGS += \
|
|
|
|
|
|
--disable-maintainer-mode \
|
|
|
|
|
|
--disable-developer \
|
|
|
|
|
|
--enable-debug=no \
|
|
|
--enable-shared \
|
|
|
--enable-shared \
|
|
|
--enable-static \
|
|
|
|
|
|
--disable-abstract-sockets \
|
|
|
|
|
|
--disable-ansi \
|
|
|
|
|
|
|
|
|
--disable-static \
|
|
|
|
|
|
--disable-verbose-mode \
|
|
|
--disable-asserts \
|
|
|
--disable-asserts \
|
|
|
--disable-console-owner-file \
|
|
|
|
|
|
|
|
|
--disable-xml-docs \
|
|
|
--disable-doxygen-docs \
|
|
|
--disable-doxygen-docs \
|
|
|
--disable-compiler_coverage \
|
|
|
|
|
|
|
|
|
--disable-ducktype-docs \
|
|
|
--disable-selinux \
|
|
|
--disable-selinux \
|
|
|
|
|
|
--disable-apparmor \
|
|
|
|
|
|
--disable-libaudit \
|
|
|
|
|
|
--enable-inotify \
|
|
|
|
|
|
--disable-kqueue \
|
|
|
|
|
|
--disable-console-owner-file \
|
|
|
|
|
|
--disable-systemd \
|
|
|
--disable-tests \
|
|
|
--disable-tests \
|
|
|
--disable-verbose-mode \
|
|
|
|
|
|
--disable-xml-docs \
|
|
|
|
|
|
--with-xml="expat" \
|
|
|
|
|
|
|
|
|
--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 \
|
|
|
--with-dbus-user=root \
|
|
|
--with-dbus-daemondir="/usr/sbin" \
|
|
|
|
|
|
--with-system-socket="/var/run/dbus/system_bus_socket" \
|
|
|
|
|
|
--with-system-pid-file="/var/run/dbus.pid" \
|
|
|
|
|
|
--without-x \
|
|
|
|
|
|
--libexecdir=/usr/lib/dbus-1 |
|
|
|
|
|
|
|
|
|
|
|
CONFIGURE_VARS+= \
|
|
|
|
|
|
ac_cv_have_abstract_sockets="yes" \
|
|
|
|
|
|
ac_cv_lib_expat_XML_ParserCreate_MM="yes" \
|
|
|
|
|
|
|
|
|
--without-x |
|
|
|
|
|
|
|
|
HOST_CONFIGURE_ARGS+= \
|
|
|
HOST_CONFIGURE_ARGS+= \
|
|
|
|
|
|
--disable-maintainer-mode \
|
|
|
|
|
|
--disable-developer \
|
|
|
|
|
|
--enable-debug=no \
|
|
|
--enable-shared \
|
|
|
--enable-shared \
|
|
|
--enable-static \
|
|
|
|
|
|
--disable-abstract-sockets \
|
|
|
|
|
|
--disable-ansi \
|
|
|
|
|
|
|
|
|
--disable-static \
|
|
|
|
|
|
--disable-verbose-mode \
|
|
|
--disable-asserts \
|
|
|
--disable-asserts \
|
|
|
--disable-console-owner-file \
|
|
|
|
|
|
--disable-docygen-docs \
|
|
|
|
|
|
--disable-compiler_coverage \
|
|
|
|
|
|
|
|
|
--disable-xml-docs \
|
|
|
|
|
|
--disable-doxygen-docs \
|
|
|
|
|
|
--disable-ducktype-docs \
|
|
|
--disable-selinux \
|
|
|
--disable-selinux \
|
|
|
|
|
|
--disable-apparmor \
|
|
|
|
|
|
--disable-libaudit \
|
|
|
|
|
|
--enable-inotify \
|
|
|
|
|
|
--disable-kqueue \
|
|
|
|
|
|
--disable-console-owner-file \
|
|
|
|
|
|
--disable-systemd \
|
|
|
--disable-tests \
|
|
|
--disable-tests \
|
|
|
--disable-verbose-mode \
|
|
|
|
|
|
--disable-xml-docs \
|
|
|
|
|
|
--with-dbus-user=root \
|
|
|
|
|
|
--with-dbus-daemondir="$(STAGING_DIR_HOSTPKG)/bin" \
|
|
|
|
|
|
|
|
|
--disable-code-coverage \
|
|
|
|
|
|
--disable-x11-autolaunch \
|
|
|
--with-system-socket="$(STAGING_DIR_HOSTPKG)/var/run/dbus/system_bus_socket" \
|
|
|
--with-system-socket="$(STAGING_DIR_HOSTPKG)/var/run/dbus/system_bus_socket" \
|
|
|
--with-system-pid-file="$(STAGING_DIR_HOSTPKG)/var/run/dbus.pid" \
|
|
|
--with-system-pid-file="$(STAGING_DIR_HOSTPKG)/var/run/dbus.pid" \
|
|
|
--without-x \
|
|
|
|
|
|
--libexecdir="$(STAGING_DIR_HOSTPKG)/lib/dbus-1" |
|
|
|
|
|
|
|
|
|
|
|
HOST_CONFIGURE_VARS+= \
|
|
|
|
|
|
ac_cv_have_abstract_sockets="yes" \
|
|
|
|
|
|
ac_cv_lib_expat_XML_ParserCreate_MM="yes" \
|
|
|
|
|
|
|
|
|
--with-dbus-daemondir="$(STAGING_DIR_HOSTPKG)/bin" \
|
|
|
|
|
|
--without-x |
|
|
|
|
|
|
|
|
define Build/InstallDev |
|
|
define Build/InstallDev |
|
|
$(INSTALL_DIR) $(1)/usr/include |
|
|
$(INSTALL_DIR) $(1)/usr/include |
|
|
$(CP) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/include/dbus-1.0 \
|
|
|
|
|
|
$(1)/usr/include/ |
|
|
|
|
|
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/dbus-1.0 $(1)/usr/include/ |
|
|
$(INSTALL_DIR) $(1)/usr/lib/dbus-1.0/include/dbus/ |
|
|
$(INSTALL_DIR) $(1)/usr/lib/dbus-1.0/include/dbus/ |
|
|
$(INSTALL_DATA) \
|
|
|
$(INSTALL_DATA) \
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \
|
|
|
$(1)/usr/lib/dbus-1.0/include/dbus/ |
|
|
$(1)/usr/lib/dbus-1.0/include/dbus/ |
|
|
|
|
|
|
|
|
$(INSTALL_DIR) $(1)/usr/lib |
|
|
$(INSTALL_DIR) $(1)/usr/lib |
|
|
$(INSTALL_DATA) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{so*,la,a} \
|
|
|
|
|
|
$(1)/usr/lib/ |
|
|
|
|
|
$(CP) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 \
|
|
|
|
|
|
|
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{so*,la} \
|
|
|
$(1)/usr/lib/ |
|
|
$(1)/usr/lib/ |
|
|
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 $(1)/usr/lib/ |
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig |
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig |
|
|
$(INSTALL_DATA) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
|
|
|
|
|
|
|
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/dbus-1.pc \
|
|
|
$(1)/usr/lib/pkgconfig/ |
|
|
$(1)/usr/lib/pkgconfig/ |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
define Package/dbus/conffiles |
|
|
|
|
|
/etc/dbus-1/session.conf |
|
|
|
|
|
/etc/dbus-1/system.conf |
|
|
|
|
|
endef |
|
|
|
|
|
|
|
|
|
|
|
define Package/libdbus/install |
|
|
define Package/libdbus/install |
|
|
$(INSTALL_DIR) $(1)/usr/lib |
|
|
$(INSTALL_DIR) $(1)/usr/lib |
|
|
$(CP) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so.* \
|
|
|
|
|
|
$(1)/usr/lib/ |
|
|
|
|
|
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so.* $(1)/usr/lib/ |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
define Package/dbus/install |
|
|
define Package/dbus/install |
|
|
$(INSTALL_DIR) $(1)/usr/share |
|
|
|
|
|
$(CP) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/share/dbus-1 \
|
|
|
|
|
|
$(1)/usr/share/ |
|
|
|
|
|
|
|
|
|
|
|
$(INSTALL_DIR) $(1)/usr/lib/dbus-1 |
|
|
|
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/lib/dbus-1/dbus-daemon-launch-helper \
|
|
|
|
|
|
$(1)/usr/lib/dbus-1/ |
|
|
|
|
|
|
|
|
|
|
|
$(INSTALL_DIR) $(1)/usr/sbin |
|
|
|
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/sbin/dbus-daemon \
|
|
|
|
|
|
$(1)/usr/sbin/ |
|
|
|
|
|
|
|
|
|
|
|
$(INSTALL_DIR) $(1)/usr/bin |
|
|
$(INSTALL_DIR) $(1)/usr/bin |
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen \
|
|
|
|
|
|
$(1)/usr/bin/ |
|
|
|
|
|
|
|
|
|
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/bin/dbus-launch \
|
|
|
|
|
|
$(1)/usr/bin/dbus-launch.real |
|
|
|
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
./files/dbus-launch \
|
|
|
|
|
|
$(1)/usr/bin/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-cleanup-sockets $(1)/usr/bin/ |
|
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-daemon $(1)/usr/bin/ |
|
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-launch $(1)/usr/bin/dbus-launch.real |
|
|
|
|
|
$(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_INSTALL_DIR)/usr/lib/dbus-daemon-launch-helper $(1)/usr/lib/ |
|
|
$(INSTALL_DIR) $(1)/etc/init.d |
|
|
$(INSTALL_DIR) $(1)/etc/init.d |
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
./files/dbus.init \
|
|
|
|
|
|
$(1)/etc/init.d/dbus |
|
|
|
|
|
|
|
|
$(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/dbus |
|
|
|
|
|
$(INSTALL_DIR) $(1)/usr/share/dbus-1 |
|
|
|
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/share/dbus-1 $(1)/usr/share/ |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
define Package/dbus-utils/install |
|
|
define Package/dbus-utils/install |
|
|
$(INSTALL_DIR) $(1)/usr/bin |
|
|
$(INSTALL_DIR) $(1)/usr/bin |
|
|
$(INSTALL_BIN) \
|
|
|
|
|
|
$(PKG_INSTALL_DIR)/usr/bin/dbus-{send,monitor,cleanup-sockets} \
|
|
|
|
|
|
$(1)/usr/bin/ |
|
|
|
|
|
|
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-{monitor,send,update-activation-environment} $(1)/usr/bin/ |
|
|
endef |
|
|
endef |
|
|
|
|
|
|
|
|
$(eval $(call HostBuild)) |
|
|
$(eval $(call HostBuild)) |
|
|