diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb')
-rw-r--r-- | poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb index cf7f47891..f74016f83 100644 --- a/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb +++ b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb @@ -7,54 +7,52 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" SECTION = "net" -RDEPENDS_${PN} = "lighttpd-module-dirlisting \ +RDEPENDS:${PN} = "lighttpd-module-dirlisting \ lighttpd-module-indexfile \ lighttpd-module-staticfile" -RRECOMMENDS_${PN} = "lighttpd-module-access \ +RRECOMMENDS:${PN} = "lighttpd-module-access \ lighttpd-module-accesslog" SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.xz \ - file://index.html.lighttpd \ - file://lighttpd.conf \ - file://lighttpd \ - file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - " + file://index.html.lighttpd \ + file://lighttpd.conf \ + file://lighttpd \ + file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ + file://0001-meson-add-with_zstd-to-meson_options.txt.patch \ + " SRC_URI[sha256sum] = "fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5" +DEPENDS = "virtual/crypt" + PACKAGECONFIG ??= "openssl pcre zlib \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ " -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" -PACKAGECONFIG[mmap] = "--enable-mmap,--disable-mmap" -PACKAGECONFIG[libev] = "--with-libev,--without-libev,libev" -PACKAGECONFIG[mysql] = "--with-mysql,--without-mysql,mariadb" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5" -PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3" -PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" -PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" -PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" - -EXTRA_OECONF += "--enable-lfs --without-fam" - -inherit autotools pkgconfig update-rc.d gettext systemd +PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev" +PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb" +PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap" +PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" +PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" +PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5" +PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre" +PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib" +PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2" +PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3" +PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux" +PACKAGECONFIG[gdbm] = "-Dwith_gdbm=true,-Dwith_gdbm=false,gdbm" +PACKAGECONFIG[memcache] = "-Dwith_memcached=true,-Dwith_memcached=false,libmemcached" +PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" +PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd" + +inherit meson pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = "lighttpd" INITSCRIPT_PARAMS = "defaults 70" -SYSTEMD_SERVICE_${PN} = "lighttpd.service" +SYSTEMD_SERVICE:${PN} = "lighttpd.service" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd @@ -71,13 +69,15 @@ do_install_append() { ln -sf ${localstatedir}/tmp ${D}/www/var } -FILES_${PN} += "${sysconfdir} /www" +# bitbake.conf sets ${libdir}/${BPN}/* in FILES, which messes up the module split. +# So we re-do the variable. +FILES:${PN} = "${sysconfdir} /www ${sbindir}" -CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" +CONFFILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" PACKAGES_DYNAMIC += "^lighttpd-module-.*" -python populate_packages_prepend () { - lighttpd_libdir = d.expand('${libdir}') +python populate_packages:prepend () { + lighttpd_libdir = d.expand('${prefix}/lib/lighttpd') do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') } |