-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Khem Raj schreef op 04-12-13 08:36: > From: "stephen.arnold42" <[email protected]> > > Signed-off-by: stephen.arnold42 <[email protected]> > Signed-off-by: Khem Raj <[email protected]>
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb > b/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb new file mode 100644 > index 0000000..20e9ab5 --- /dev/null +++ > b/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb @@ -0,0 +1,113 @@ > +SUMMARY = "HTTP and reverse proxy server" + +DESCRIPTION = "Nginx is a > web server and a reverse proxy server for \ +HTTP, SMTP, POP3 and IMAP > protocols, with a strong focus on high \ +concurrency, performance and > low memory usage." + +HOMEPAGE = "http://nginx.org/"; +LICENSE = > "BSD-2-Clause" +LIC_FILES_CHKSUM = > "file://LICENSE;md5=917bfdf005ffb6fd025550414ff05a9f" +SECTION = "net" + > +DEPENDS = "libpcre gzip openssl" + +SRC_URI = " \ + > http://nginx.org/download/nginx-${PV}.tar.gz \ + file://nginx-cross.patch > \ + file://nginx.conf \ + file://nginx.init \ The conf and init file both have hardcoded references that break when ${prefix} is not /usr and ${localstatedir} is not /var. There was an nginx recipe submitted earlier this week that did update those reference in do_install, but that one lacked the USERADD, systemd and CONFFILES touches in this patch. Can you have a look at combining all the good features into one patch? regards, Koen > +do_install () { + oe_runmake 'DESTDIR=${D}' install + rm -fr > ${D}${localstatedir}/run ${D}/run + install -d > ${D}${sysconfdir}/default/volatiles + echo "d root root 0755 > ${localstatedir}/run/${BPN} none" \ + > > ${D}${sysconfdir}/default/volatiles/99_${BPN} + if > ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; > then + install -d ${D}${sysconfdir}/tmpfiles.d + > echo "d /run/${BPN} - > - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + > fi + > install -d ${D}${sysconfdir}/${BPN} + ln -snf ${localstatedir}/run/${BPN} > ${D}${sysconfdir}/${BPN}/run + install -d > ${D}${localstatedir}/www/localhost + mv ${D}/usr/html > ${D}${localstatedir}/www/localhost/ + chown www:www-data -R > ${D}${localstatedir} + + install -d ${D}${sysconfdir}/init.d + install > -d > ${D}${sysconfdir}/nginx + install -m 0755 ${WORKDIR}/nginx.init > ${D}${sysconfdir}/init.d/nginx + install -m 0644 ${WORKDIR}/nginx.conf > ${D}${sysconfdir}/nginx/ + + install -d > ${D}${sysconfdir}/default/volatiles + echo "d www www-data 0755 > ${localstatedir}/run/nginx none" \ + > > ${D}${sysconfdir}/default/volatiles/99_nginx +} -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFSnubHMkyGM64RGpERAuyiAKCWF6kexMwtL4jWoj+zpGKQXWvCRQCgjueb Ix+WbciF6sUSj2NBdDL4pb0= =iYwy -----END PGP SIGNATURE----- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
