summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/squid/files
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2016-09-23 16:30:28 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2016-10-20 11:16:49 -0400
commit6f54f29b7061f45dd76249cbae80893bcb007814 (patch)
treebd582da27812ee7d83fa5b78eaf1b41b08c9a44e /meta-networking/recipes-daemons/squid/files
parent307d1c993d244567a34cd98d2a413ee57f486520 (diff)
downloadmeta-openembedded-6f54f29b7061f45dd76249cbae80893bcb007814.tar.gz
squid: specify sysconfdir and logdir
The default sysconfdir is /etc and logdir is /var/logs. Set sysconfdir and logdir when configure, replace them with /etc/squid and /var/log/squid. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files')
-rw-r--r--meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch6
-rw-r--r--meta-networking/recipes-daemons/squid/files/volatiles.03_squid1
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
index a5e554736a..312f44f8eb 100644
--- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
+++ b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
@@ -37,7 +37,7 @@ index d5468be..77fc480 100644
37 ## $(AR_R) $(TARGLIB) $(LIBOBJS) 37 ## $(AR_R) $(TARGLIB) $(LIBOBJS)
38 38
39-squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* 39-squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/*
40+squid-conf-tests: /etc/squid.conf.default squidconf/* 40+squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/*
41 @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ 41 @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \
42 for cfg in $$cfglist ; do \ 42 for cfg in $$cfglist ; do \
43- $(top_builddir)/src/squid -k parse -f $$cfg || \ 43- $(top_builddir)/src/squid -k parse -f $$cfg || \
@@ -45,7 +45,7 @@ index d5468be..77fc480 100644
45 { echo "FAIL: squid.conf test: $$cfg" | \ 45 { echo "FAIL: squid.conf test: $$cfg" | \
46- sed s%$(top_builddir)/src/%% | \ 46- sed s%$(top_builddir)/src/%% | \
47- sed s%$(srcdir)/squidconf/%% ; \ 47- sed s%$(srcdir)/squidconf/%% ; \
48+ sed s%/etc/%% | \ 48+ sed s%$(sysconfdir)/%% | \
49+ sed s%squidconf/%% ; \ 49+ sed s%squidconf/%% ; \
50 failed=1; break; \ 50 failed=1; break; \
51 }; \ 51 }; \
@@ -53,7 +53,7 @@ index d5468be..77fc480 100644
53 echo "PASS: squid.conf test: $$cfg" | \ 53 echo "PASS: squid.conf test: $$cfg" | \
54- sed s%$(top_builddir)/src/%% | \ 54- sed s%$(top_builddir)/src/%% | \
55- sed s%$(srcdir)/squidconf/%% ; \ 55- sed s%$(srcdir)/squidconf/%% ; \
56+ sed s%/etc/%% | \ 56+ sed s%$(sysconfdir)/%% | \
57+ sed s%squidconf/%% ; \ 57+ sed s%squidconf/%% ; \
58 else break; fi; \ 58 else break; fi; \
59 done; \ 59 done; \
diff --git a/meta-networking/recipes-daemons/squid/files/volatiles.03_squid b/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
index b96865d731..83e1f8b7a5 100644
--- a/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
+++ b/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
@@ -1,2 +1,3 @@
1# <type> <owner> <group> <mode> <path> <linksource> 1# <type> <owner> <group> <mode> <path> <linksource>
2d squid squid 0755 /var/run/squid none 2d squid squid 0755 /var/run/squid none
3d squid squid 0750 /var/log/squid none