diff options
Diffstat (limited to 'meta-openembedded/meta-webserver/recipes-httpd')
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb | 8 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb (renamed from meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb) | 10 | ||||
-rw-r--r-- | meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 8 |
3 files changed, 12 insertions, 14 deletions
diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index c44efb6cd..3cbab22c3 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -25,9 +25,9 @@ EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl \ LIBTOOL=${STAGING_DIR_TARGET}${bindir_crossscripts}/${HOST_SYS}-libtool" do_install() { - install -d ${D}${libdir}/apache2/modules - install -m 755 ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules + install -d ${D}${libexecdir}/apache2/modules + install -m 755 ${B}/.libs/mod_websocket.so ${D}${libexecdir}/apache2/modules } -FILES_${PN} += " ${libdir}/apache2/modules/* " -FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* " +FILES_${PN} += " ${libexecdir}/apache2/modules/* " +FILES_${PN}-dbg += " ${libexecdir}/apache2/modules/.debug/* " diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb index da96086e4..a34734c20 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb @@ -25,8 +25,8 @@ SRC_URI_append_class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd" -SRC_URI[md5sum] = "930e217ba2d71e708a3f1521ecae7ec0" -SRC_URI[sha256sum] = "b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2" +SRC_URI[md5sum] = "dfc674f8f454e3bc2d4ccd73ad3b5f1e" +SRC_URI[sha256sum] = "133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40" S = "${WORKDIR}/httpd-${PV}" @@ -53,7 +53,7 @@ EXTRA_OECONF_class-target = "\ --sysconfdir=${sysconfdir}/${BPN} \ --datadir=${datadir}/${BPN} \ --libdir=${libdir} \ - --libexecdir=${libdir}/${BPN}/modules \ + --libexecdir=${libexecdir}/${BPN}/modules \ --localstatedir=${localstatedir} \ --enable-ssl \ --with-dbm=sdbm \ @@ -78,7 +78,7 @@ EXTRA_OECONF_class-native = "\ " do_configure_prepend() { - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout + sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout } do_install_append_class-target() { @@ -139,7 +139,7 @@ do_install_append_class-target() { install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi - rm -rf ${D}${localstatedir} + rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} } diff --git a/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 8632b97f4..560dd9b6e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dc DEPENDS += "base-passwd virtual/crypt" -SRC_URI = "https://github.com/blueness/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ +SRCREV = "2845bf5bff2b820d2336c8c8061cbfc5f271e720" +SRC_URI = "git://github.com/blueness/${BPN} \ file://thttpd.service \ file://thttpd.conf \ file://init" -SRC_URI[md5sum] = "3cda1b6c8c8542b1510eadb8e540d8b6" -SRC_URI[sha256sum] = "a1ee2806432eaf5b5dd267a0523701f9f1fa00fefd499d5bec42165a41e05846" - UPSTREAM_CHECK_URI = "https://github.com/blueness/sthttpd/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+).tar.gz" -S = "${WORKDIR}/sthttpd-${PV}" +S = "${WORKDIR}/git" inherit autotools update-rc.d systemd update-alternatives |