diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-04 15:26:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-07 14:03:38 +0000 |
| commit | 0809f98e995d3a2ce24ad25bade3dcd5154061fd (patch) | |
| tree | 606d3499aed6ad39d9c92972ae9b7738fa9f41a1 | |
| parent | da1759308bd2d8ca3bf4dc077c164aadb5ce3916 (diff) | |
| download | openembedded-core-0809f98e995d3a2ce24ad25bade3dcd5154061fd.tar.gz openembedded-core-0809f98e995d3a2ce24ad25bade3dcd5154061fd.tar.bz2 openembedded-core-0809f98e995d3a2ce24ad25bade3dcd5154061fd.zip | |
lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR
As Martin Jansa pointed out before, bitbake will silently peek in DL_DIR before FILESPATH and use files from there if found.
The failure mode for lighttpd involves a 404 redirect placing index.html into DL_DIR, which will end up in the lighttpd packages. In my specific case iproute2 hit the linuxfoundation 404 redirect so lighttpd.ipk now serves the linuxfoundation frontpage :)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta/recipes-extended/lighttpd/files/index.html.lighttpd (renamed from meta/recipes-extended/lighttpd/files/index.html) | 0 | ||||
| -rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/lighttpd/files/index.html b/meta/recipes-extended/lighttpd/files/index.html.lighttpd index cd25bf17b3..cd25bf17b3 100644 --- a/meta/recipes-extended/lighttpd/files/index.html +++ b/meta/recipes-extended/lighttpd/files/index.html.lighttpd diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb index c1d5f81f62..9fdb5f6926 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.29.bb @@ -16,10 +16,10 @@ RDEPENDS_${PN} += " \ lighttpd-module-staticfile \ " -PR = "r0" +PR = "r1" SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ - file://index.html \ + file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ " @@ -48,7 +48,7 @@ do_install_append() { install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/index.html ${D}/www/pages/ + install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html } FILES_${PN} += "${sysconfdir} /www" |