From 9566a0e737362afa6a966eec699ca7f7cc8854fc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 5 Nov 2014 09:40:32 +0100 Subject: [PATCH] Re-add support for system virtualpkg.d (XBPS_SYS_VPKG_PATH). This is still useful to set distro defaults for virtual packages, with the option to override them via /etc/xbps/virtualpkg.d. --- NEWS | 7 +++---- include/xbps.h.in | 6 ++++++ lib/initend.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 16033ee9..0843c459 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,8 @@ xbps-0.42 (???): - * Get rid of system virtualpkg.d configuration files stored at - /share/xbps/virtualpkg.d) and collect all virtual packages - directly from pkgdb. Virtual package overrides can still be defined - at /xbps/virtualpkg.d. + * Virtual packages are now collected directly from pkgdb, that means + that installed packages do not need to have a virtualpkg configuration + file in the system virtualpkg.d directory. * xbps-{install,remove}: implemented a column/wide output mode as requested in #63 (https://github.com/voidlinux/xbps/issues/63). diff --git a/include/xbps.h.in b/include/xbps.h.in index d4ecd907..0708f5c0 100644 --- a/include/xbps.h.in +++ b/include/xbps.h.in @@ -94,6 +94,12 @@ */ #define XBPS_VPKG_PATH XBPS_SYSCONF_PATH "/virtualpkg.d" +/** + * @def XBPS_SYS_VPKG_PATH + * System virtualpkg PATH to store virtualpkg configuration files. + */ +#define XBPS_SYS_VPKG_PATH XBPS_SYSDEFCONF_PATH "/virtualpkg.d" + /** * @def XBPS_REPOD_PATH * Configuration directory to store repository configuration files. diff --git a/lib/initend.c b/lib/initend.c index 23e0a895..f9b9bbc5 100644 --- a/lib/initend.c +++ b/lib/initend.c @@ -448,7 +448,7 @@ xbps_init(struct xbps_handle *xhp) free(buf); } /* process virtualpkg.d dirs */ - if ((rv = parse_dir(xhp, cwd, NULL, XBPS_VPKG_PATH, true)) != 0) + if ((rv = parse_dir(xhp, cwd, XBPS_SYS_VPKG_PATH, XBPS_VPKG_PATH, true)) != 0) return rv; /* process repo.d dirs */