gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-01-10 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)

Browse Source 
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.

STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.

Also fixes a typo in the dbus Makefile ("STAGIND_DIR").

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer
2017-01-10 15:02:50 +01:00
parent 876d139c98
commit 4a984a8d60
36 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/dbus/Makefile
View File

@@ -122,11 +122,11 @@ HOST_CONFIGURE_ARGS+= \
--disable-verbose-mode \
--disable-xml-docs \
--with-dbus-user=root \
--with-dbus-daemondir="$(STAGIND_DIR)/host/bin" \
--with-system-socket="$(STAGING_DIR)/host/var/run/dbus/system_bus_socket" \
--with-system-pid-file="$(STAGING_DIR)/host/var/run/dbus.pid" \
--with-dbus-daemondir="$(STAGING_DIR_HOSTPKG)/bin" \
--with-system-socket="$(STAGING_DIR_HOSTPKG)/var/run/dbus/system_bus_socket" \
--with-system-pid-file="$(STAGING_DIR_HOSTPKG)/var/run/dbus.pid" \
--without-x \
--libexecdir="$(STAGING_DIR)/host/lib/dbus-1"
--libexecdir="$(STAGING_DIR_HOSTPKG)/lib/dbus-1"
HOST_CONFIGURE_VARS+= \
ac_cv_have_abstract_sockets="yes" \