mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

squid: specify sysconfdir and logdir

Browse Source 
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>
This commit is contained in:
Yi Zhao
2016-09-23 16:30:28 +08:00
committed by Joe MacDonald
parent 307d1c993d
commit 6f54f29b70
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
+3 -3
View File
@@ -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; \
meta-networking/recipes-daemons/squid/files/volatiles.03_squid
+1
View File
@@ -1,2 +1,3 @@
# <type> <owner> <group> <mode> <path> <linksource>
d squid squid 0755 /var/run/squid none
d squid squid 0750 /var/log/squid none
meta-networking/recipes-daemons/squid/squid_3.5.20.bb
+13 -2
View File
@@ -48,7 +48,8 @@ BASIC_AUTH = "DB SASL LDAP NIS"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'"
EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' --sysconfdir=${sysconfdir}/${BPN} --with-logdir=${localstatedir}/log/${BPN}"
export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
TESTDIR = "test-suite"
@@ -75,10 +76,20 @@ do_install_ptest() {
}
do_install_append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
fi
install -d ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/volatiles.03_squid
install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid
rmdir "${D}${localstatedir}/run/${BPN}"
rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run"
rmdir "${D}${localstatedir}/log/${BPN}"
rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log"
}
FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons"