cherokee.inc: add DEPENDS to mysql5
PATCH 1/6 cherokee.inc: add DEPENDS to mysql5
error in do_configure.log was:
checking for mysql_config... /usr/bin/mysql_config checking for MySQL libraries... yes
checking for mysql.h (using mysql_config --cflags)... no checking if MySQL version is >= 5.0.0... yes
...
ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '/home/andreas/tmp/oe-core-eglibc/work/armv7a-angstrom-linux-gnueabi/cherokee-1.2.98-r0.0/cherokee-1.2.98'
ERROR: Function failed: do_qa_configure
--- meta-oe/recipes-connectivity/cherokee/cherokee.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-connectivity/cherokee/cherokee.inc +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" INC_PR = "r0" -DEPENDS = "libpcre openssl ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://www.cherokee-project.com/download/1.2/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init \
Signature · 1 line
1.7.6.4
PATCH 2/6 cherokee: no need for cherokee.inc since it is used only once
--- meta-oe/recipes-connectivity/cherokee/cherokee.inc | 50 -------------------- .../cherokee/cherokee_1.2.98.bb | 49 ++++++++++++++++++- 2 files changed, 47 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/cherokee/cherokee.inc
meta-oe/recipes-connectivity/cherokee/cherokee.inc deleted +0 -50
@@ -1,50 +0,0 @@ -DESCRIPTION = "Cherokee Web Server fast and secure" -DESCRIPTION_cget = "Small downloader based in the Cherokee client library" -HOMEPAGE = "http://www.cherokee-project.com/" -SECTION = "network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -INC_PR = "r0" - -DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "http://www.cherokee-project.com/download/1.2/${PV}/cherokee-${PV}.tar.gz \ - file://cherokee.init \ - file://cherokee.service" - - -inherit autotools pkgconfig binconfig update-rc.d - -EXTRA_OECONF = "--disable-static \ - --disable-nls \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ - " - -do_install_append () { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee - - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system/ - - # clean up .la files for plugins - rm -f ${D}${libdir}/cherokee/*.la -} - -# Put -dev near the front so we can move the .la files into it with a wildcard -PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" - -FILES_${PN} += "${base_libdir}/systemd" -FILES_cget = "${bindir}/cget" -FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" -FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" -FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" - -CONFFILES_${PN} = " \ - ${sysconfdir}/cherokee/cherokee.conf \ - ${sysconfdir}/init.d/cherokee \ - " - -INITSCRIPT_NAME = "cherokee" -INITSCRIPT_PARAMS = "defaults 91 91"
meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +47 -2
53 lines not on this page · raw message
Signature · 1 line
1.7.6.4
PATCH 3/6 cherokee: complete systemd native support
In reply to Andreas Müller--- .../cherokee/cherokee_1.2.98.bb | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +5 -6
@@ -5,7 +5,7 @@ SECTION = "network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r1" +PR = "r3" DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -15,7 +15,7 @@ SRC_URI = "http://www.cherokee-project.com/download/1.2/${PV}/cherokee-${PV}.tar SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb" SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d" -inherit autotools pkgconfig binconfig update-rc.d +inherit autotools pkgconfig binconfig update-rc.d systemd EXTRA_OECONF = "--disable-static \ --disable-nls \
@@ -26,9 +26,6 @@ do_install_append () { install -m 0755 -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system/ - # clean up .la files for plugins rm -f ${D}${libdir}/cherokee/*.la }
@@ -36,7 +33,6 @@ do_install_append () { # Put -dev near the front so we can move the .la files into it with a wildcard PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" -FILES_${PN} += "${base_libdir}/systemd" FILES_cget = "${bindir}/cget" FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}"
@@ -49,3 +45,6 @@ CONFFILES_${PN} = " \ INITSCRIPT_NAME = "cherokee" INITSCRIPT_PARAMS = "defaults 91 91" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "cherokee.service"
Signature · 1 line
1.7.6.4
PATCH 4/6 gdm: inherit systemd / remove unneeded systemd code
In reply to Andreas Müller--- meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 29 +++------------------------ 1 files changed, 4 insertions(+), 25 deletions(-)
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +4 -25
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" -PR = "r6" +PR = "r7" -inherit gnome update-rc.d +inherit gnome update-rc.d systemd SRC_URI += " \ file://cross-xdetection.diff \
@@ -46,31 +46,10 @@ do_install_append() { install -d ${D}/${sysconfdir}/gdm/Init install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/gdm.service ${D}${base_libdir}/systemd/system/ } -PACKAGES =+ "gdm-systemd" -FILES_gdm-systemd = "${base_libdir}/systemd" -RDEPENDS_gdm-systemd = "gdm" - -pkg_postinst_gdm-systemd() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - systemctl enable gdm.service -} - -pkg_postrm_gdm-systemd() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - systemctl disable gdm.service -} +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "gdm.service" FILES_${PN} += "${datadir}/icon* \ ${datadir}/xsession* \
Signature · 1 line
1.7.6.4
PATCH 5/6 cloud9: remove unneded systemd code
In reply to Andreas Müller--- meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
meta-oe/recipes-devtools/cloud9/cloud9_0.5.1.bb +1 -5
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018" DEPENDS = "libxml2 nodejs-native" -PR = "r14" +PR = "r15" SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \ git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
@@ -98,9 +98,6 @@ do_install () { install -m 0644 ${WORKDIR}/o3/modules/o3.js ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.js install -m 0755 ${WORKDIR}/o3/o3.node ${D}${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/o3.node - install -m 0755 -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system/ - install -m 0755 -d ${D}${sysconfdir}/avahi/services/ install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/ }
@@ -109,7 +106,6 @@ FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o ${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/.debug \ " -FILES_${PN} += "${systemd_unitdir}/system" RDEPENDS_${PN} = "nodejs gzip" inherit systemd
Signature · 1 line
1.7.6.4
PATCH 6/6 lighttpd: inherit systemd / remove unneded systemd code
In reply to Andreas Müller--- .../lighttpd/lighttpd_1.4.30.bbappend | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
meta-oe/recipes-extended/lighttpd/lighttpd_1.4.30.bbappend +5 -11
@@ -1,16 +1,10 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}" -PRINC = "1" +PRINC = "2" -SRC_URI += "file://lighttpd.service" - -do_install_append() { - install -d ${D}${base_libdir}/systemd/systemd/ - install -m 0644 ${WORKDIR}/lighttpd.service ${D}${base_libdir}/systemd/systemd/ +inherit systemd - install -d ${D}${base_libdir}/systemd/systemd/multi-user.target.wants - ln -sf ../lighttpd.service ${D}${base_libdir}/systemd/systemd/multi-user.target.wants -} - -FILES_${PN} += "${base_libdir}/systemd" +SRC_URI += "file://lighttpd.service" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "lighttpd.service"
Signature · 1 line
1.7.6.4