diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2016-09-23 16:30:28 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-10-20 11:16:49 -0400 |
| commit | 6f54f29b7061f45dd76249cbae80893bcb007814 (patch) | |
| tree | bd582da27812ee7d83fa5b78eaf1b41b08c9a44e /meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | |
| parent | 307d1c993d244567a34cd98d2a413ee57f486520 (diff) | |
| download | meta-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/squid-don-t-do-squid-conf-tests-at-build-time.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | 6 |
1 files changed, 3 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 ## $(AR_R) $(TARGLIB) $(LIBOBJS) -squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* -+squid-conf-tests: /etc/squid.conf.default squidconf/* ++squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ for cfg in $$cfglist ; do \ - $(top_builddir)/src/squid -k parse -f $$cfg || \ @@ -45,7 +45,7 @@ index d5468be..77fc480 100644 { echo "FAIL: squid.conf test: $$cfg" | \ - sed s%$(top_builddir)/src/%% | \ - sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%/etc/%% | \ ++ sed s%$(sysconfdir)/%% | \ + sed s%squidconf/%% ; \ failed=1; break; \ }; \ @@ -53,7 +53,7 @@ index d5468be..77fc480 100644 echo "PASS: squid.conf test: $$cfg" | \ - sed s%$(top_builddir)/src/%% | \ - sed s%$(srcdir)/squidconf/%% ; \ -+ sed s%/etc/%% | \ ++ sed s%$(sysconfdir)/%% | \ + sed s%squidconf/%% ; \ else break; fi; \ done; \ |