Compare commits

..
2 Commits
Author SHA1 Message Date
Dimitri John Ledkov 078e9987d5 clr-debug-info: Use well known install paths.
systemd pkgconfig module is already required, which will have system
paths defined as pkg-config variables. This simplifies autofoo, and
installs tmpfile.d into a system location under /usr, rather than
admin location under /etc.
2015-02-02 10:30:49 +00:00
Arjan van de Ven 97431314b5 use the non-staging URL 2015-01-31 13:48:44 -05:00
4 changed files with 12 additions and 15 deletions
+2 -5
View File
@@ -14,9 +14,6 @@ clr_debug_fuse_LDADD = ${fuse_LIBS} $(glib_LIBS)
clr_debug_daemon_LDADD = $(glib_LIBS) ${curl_LIBS}
clr_debug_prepare_LDADD = $(glib_LIBS)
systemdsystemunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
systemdunitdir = @SYSTEMD_UNITDIR@
systemdunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
tmpwatchdir = /etc/tmpfiles.d
tmpwatch_DATA = debuginfo.conf
tmpfiles_DATA = debuginfo.conf
+6 -9
View File
@@ -3,7 +3,7 @@
AC_PREREQ([2.66])
AC_INIT(clr-debug-info, 11, arjan@linux.intel.com)
AM_INIT_AUTOMAKE([foreign -Wall -W])
AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
AM_SILENT_RULES([yes])
AC_PROG_CC
AC_LANG(C)
@@ -13,14 +13,11 @@ PKG_CHECK_MODULES([curl], [libcurl])
PKG_CHECK_MODULES([fuse], [fuse])
PKG_CHECK_MODULES([SYSTEMD], [systemd])
AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
[path to systemd service directory]), [path_systemdunit=${withval}],
[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
if (test -n "${path_systemdunit}"); then
SYSTEMD_UNITDIR="${path_systemdunit}"
AC_SUBST(SYSTEMD_UNITDIR)
AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
fi
tmpfilesdir=`pkg-config --variable tmpfilesdir systemd`
AC_SUBST(tmpfilesdir)
systemdsystemunitdir=`pkg-config --variable systemdsystemunitdir systemd`
AC_SUBST(systemdsystemunitdir)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
+3
View File
@@ -610,6 +610,9 @@ int main(int argc, char *argv[])
char *dir = "/usr/src/debug";
char *shadowdir = "/var/cache/debuginfo/src";
umask(0);
/* give the system some time to boot before we go active; this is a background task */
sleep(1);
if (access("/sys/module/fuse/", F_OK))
system("modprobe fuse");
+1 -1
View File
@@ -196,7 +196,7 @@ static void *server_thread(void *arg)
return NULL;
}
url = NULL;
if (asprintf(&url, "http://localhost/debuginfo/%s%s.tar", prefix, path) < 0) {
if (asprintf(&url, "http://debuginfo.clearlinux.org/debuginfo/%s%s.tar", prefix, path) < 0) {
close(fd);
return NULL;
}