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 | |
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')
3 files changed, 17 insertions, 5 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 a5e554736..312f44f8e 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 b96865d73..83e1f8b7a 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> |
2 | d squid squid 0755 /var/run/squid none | 2 | d squid squid 0755 /var/run/squid none |
3 | d squid squid 0750 /var/log/squid none | ||
diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb index fe1b0277a..1341d92fc 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.20.bb | |||
@@ -48,7 +48,8 @@ BASIC_AUTH = "DB SASL LDAP NIS" | |||
48 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 48 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
49 | BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" | 49 | BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" |
50 | 50 | ||
51 | EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" | 51 | EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' --sysconfdir=${sysconfdir}/${BPN} --with-logdir=${localstatedir}/log/${BPN}" |
52 | |||
52 | export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" | 53 | export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" |
53 | 54 | ||
54 | TESTDIR = "test-suite" | 55 | TESTDIR = "test-suite" |
@@ -75,10 +76,20 @@ do_install_ptest() { | |||
75 | } | 76 | } |
76 | 77 | ||
77 | do_install_append() { | 78 | do_install_append() { |
79 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
80 | install -d ${D}${sysconfdir}/tmpfiles.d | ||
81 | echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf | ||
82 | echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf | ||
83 | fi | ||
84 | |||
78 | install -d ${D}${sysconfdir}/default/volatiles | 85 | install -d ${D}${sysconfdir}/default/volatiles |
79 | install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/volatiles.03_squid | 86 | install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid |
87 | |||
80 | rmdir "${D}${localstatedir}/run/${BPN}" | 88 | rmdir "${D}${localstatedir}/run/${BPN}" |
81 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" | 89 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" |
90 | |||
91 | rmdir "${D}${localstatedir}/log/${BPN}" | ||
92 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" | ||
82 | } | 93 | } |
83 | 94 | ||
84 | FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" | 95 | FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" |