mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 20:07:25 +00:00
nginx.inc: use 4 spaces for indentation
* like any other sane recipes do Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
@@ -12,12 +12,12 @@ SECTION = "net"
|
|||||||
DEPENDS = "libpcre gzip openssl"
|
DEPENDS = "libpcre gzip openssl"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
http://nginx.org/download/nginx-${PV}.tar.gz \
|
http://nginx.org/download/nginx-${PV}.tar.gz \
|
||||||
file://nginx-cross.patch \
|
file://nginx-cross.patch \
|
||||||
file://nginx.conf \
|
file://nginx.conf \
|
||||||
file://nginx.init \
|
file://nginx.init \
|
||||||
file://nginx-volatile.conf \
|
file://nginx-volatile.conf \
|
||||||
file://nginx.service \
|
file://nginx.service \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit update-rc.d useradd
|
inherit update-rc.d useradd
|
||||||
@@ -34,104 +34,106 @@ DISABLE_STATIC = ""
|
|||||||
PACKAGECONFIG[http2] = "--with-http_v2_module,,"
|
PACKAGECONFIG[http2] = "--with-http_v2_module,,"
|
||||||
|
|
||||||
do_configure () {
|
do_configure () {
|
||||||
if [ "${SITEINFO_BITS}" = "64" ]; then
|
if [ "${SITEINFO_BITS}" = "64" ]; then
|
||||||
PTRSIZE=8
|
PTRSIZE=8
|
||||||
else
|
else
|
||||||
PTRSIZE=4
|
PTRSIZE=4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo $CFLAGS
|
echo $CFLAGS
|
||||||
echo $LDFLAGS
|
echo $LDFLAGS
|
||||||
|
|
||||||
# Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH
|
# Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH
|
||||||
echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf
|
echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf
|
||||||
|
|
||||||
./configure \
|
./configure \
|
||||||
--crossbuild=Linux:${TUNE_ARCH} \
|
--crossbuild=Linux:${TUNE_ARCH} \
|
||||||
--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
|
--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
|
||||||
--with-int=4 \
|
--with-int=4 \
|
||||||
--with-long=${PTRSIZE} \
|
--with-long=${PTRSIZE} \
|
||||||
--with-long-long=8 \
|
--with-long-long=8 \
|
||||||
--with-ptr-size=${PTRSIZE} \
|
--with-ptr-size=${PTRSIZE} \
|
||||||
--with-sig-atomic-t=${PTRSIZE} \
|
--with-sig-atomic-t=${PTRSIZE} \
|
||||||
--with-size-t=${PTRSIZE} \
|
--with-size-t=${PTRSIZE} \
|
||||||
--with-off-t=${PTRSIZE} \
|
--with-off-t=${PTRSIZE} \
|
||||||
--with-time-t=${PTRSIZE} \
|
--with-time-t=${PTRSIZE} \
|
||||||
--with-sys-nerr=132 \
|
--with-sys-nerr=132 \
|
||||||
--conf-path=${sysconfdir}/nginx/nginx.conf \
|
--conf-path=${sysconfdir}/nginx/nginx.conf \
|
||||||
--http-log-path=${localstatedir}/log/nginx/access.log \
|
--http-log-path=${localstatedir}/log/nginx/access.log \
|
||||||
--error-log-path=${localstatedir}/log/nginx/error.log \
|
--error-log-path=${localstatedir}/log/nginx/error.log \
|
||||||
--pid-path=/run/nginx/nginx.pid \
|
--pid-path=/run/nginx/nginx.pid \
|
||||||
--prefix=${prefix} \
|
--prefix=${prefix} \
|
||||||
--with-http_ssl_module \
|
--with-http_ssl_module \
|
||||||
--with-http_gzip_static_module \
|
--with-http_gzip_static_module \
|
||||||
${EXTRA_OECONF}
|
${EXTRA_OECONF}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
oe_runmake 'DESTDIR=${D}' install
|
oe_runmake 'DESTDIR=${D}' install
|
||||||
rm -fr ${D}${localstatedir}/run ${D}/run
|
rm -fr ${D}${localstatedir}/run ${D}/run
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||||
install -d ${D}${sysconfdir}/tmpfiles.d
|
install -d ${D}${sysconfdir}/tmpfiles.d
|
||||||
echo "d /run/${BPN} - - - -" \
|
echo "d /run/${BPN} - - - -" \
|
||||||
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
|
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
|
||||||
echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
|
echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
|
||||||
>> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
|
>> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
|
||||||
fi
|
fi
|
||||||
install -d ${D}${sysconfdir}/${BPN}
|
install -d ${D}${sysconfdir}/${BPN}
|
||||||
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
|
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
|
||||||
install -d ${D}${NGINX_WWWDIR}
|
install -d ${D}${NGINX_WWWDIR}
|
||||||
mv ${D}/usr/html ${D}${NGINX_WWWDIR}/
|
mv ${D}/usr/html ${D}${NGINX_WWWDIR}/
|
||||||
chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR}
|
chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR}
|
||||||
|
|
||||||
install -d ${D}${sysconfdir}/init.d
|
install -d ${D}${sysconfdir}/init.d
|
||||||
install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx
|
install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx
|
||||||
sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx
|
sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx
|
||||||
sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx
|
sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx
|
||||||
|
|
||||||
install -d ${D}${sysconfdir}/nginx
|
install -d ${D}${sysconfdir}/nginx
|
||||||
install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf
|
install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf
|
||||||
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf
|
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf
|
||||||
sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf
|
sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf
|
||||||
install -d ${D}${sysconfdir}/nginx/sites-enabled
|
install -d ${D}${sysconfdir}/nginx/sites-enabled
|
||||||
|
|
||||||
install -d ${D}${sysconfdir}/default/volatiles
|
install -d ${D}${sysconfdir}/default/volatiles
|
||||||
install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx
|
install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx
|
||||||
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx
|
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx
|
||||||
|
|
||||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
|
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
|
||||||
install -d ${D}${systemd_unitdir}/system
|
install -d ${D}${systemd_unitdir}/system
|
||||||
install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/
|
install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/
|
||||||
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
|
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
|
||||||
-e 's,@LOCALSTATEDIR@,${localstatedir},g' \
|
-e 's,@LOCALSTATEDIR@,${localstatedir},g' \
|
||||||
-e 's,@SBINDIR@,${sbindir},g' \
|
-e 's,@SBINDIR@,${sbindir},g' \
|
||||||
${D}${systemd_unitdir}/system/nginx.service
|
${D}${systemd_unitdir}/system/nginx.service
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_postinst_${PN} () {
|
pkg_postinst_${PN} () {
|
||||||
if [ -z "$D" ]; then
|
if [ -z "$D" ]; then
|
||||||
if type systemd-tmpfiles >/dev/null; then
|
if type systemd-tmpfiles >/dev/null; then
|
||||||
systemd-tmpfiles --create
|
systemd-tmpfiles --create
|
||||||
elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
|
elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
|
||||||
${sysconfdir}/init.d/populate-volatile.sh update
|
${sysconfdir}/init.d/populate-volatile.sh update
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES_${PN} += "${localstatedir}/ \
|
FILES_${PN} += " \
|
||||||
${systemd_unitdir}/system/nginx.service \
|
${localstatedir}/ \
|
||||||
"
|
${systemd_unitdir}/system/nginx.service \
|
||||||
|
"
|
||||||
|
|
||||||
CONFFILES_${PN} = "${sysconfdir}/nginx/nginx.conf \
|
CONFFILES_${PN} = " \
|
||||||
${sysconfdir}/nginx/fastcgi.conf\
|
${sysconfdir}/nginx/nginx.conf \
|
||||||
${sysconfdir}/nginx/fastcgi_params \
|
${sysconfdir}/nginx/fastcgi.conf \
|
||||||
${sysconfdir}/nginx/koi-utf \
|
${sysconfdir}/nginx/fastcgi_params \
|
||||||
${sysconfdir}/nginx/koi-win \
|
${sysconfdir}/nginx/koi-utf \
|
||||||
${sysconfdir}/nginx/mime.types \
|
${sysconfdir}/nginx/koi-win \
|
||||||
${sysconfdir}/nginx/scgi_params \
|
${sysconfdir}/nginx/mime.types \
|
||||||
${sysconfdir}/nginx/uwsgi_params \
|
${sysconfdir}/nginx/scgi_params \
|
||||||
${sysconfdir}/nginx/win-utf \
|
${sysconfdir}/nginx/uwsgi_params \
|
||||||
|
${sysconfdir}/nginx/win-utf \
|
||||||
"
|
"
|
||||||
|
|
||||||
INITSCRIPT_NAME = "nginx"
|
INITSCRIPT_NAME = "nginx"
|
||||||
|
|||||||
Reference in New Issue
Block a user