Add meta-webserver

No modifications in this commit (apart from not copying some unneeded files).

Signed-off-by Paul Eggleton <[email protected]> ---

.../apache2/apache2-2.2.17/server-makefile-patch   |   11 ++ 
.../recipes-httpd/apache2/apache2-native_2.2.17.bb |   44 ++++++++ 
.../recipes-httpd/apache2/apache2_2.2.17.bb        |  119

++++++++++++++++++++ meta-webserver/recipes-httpd/apache2/files/init |
70 ++++++++++++ 4 files changed, 244 insertions(+) create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.2.17/server-makefile-patch

create mode 100644 meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb create mode 100755 meta-webserver/recipes-httpd/apache2/files/init

diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.2.17/server-makefile-patch b/meta-webserver/recipes-httpd/apache2/apache2-2.2.17/server-makefile-patch

index 0000000..f1349cb --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2-2.2.17/server-makefile-patch

+--- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000
-0500 ++++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000
-0500 +@@ -27,7 +27,7 @@ + $(LINK) $(EXTRA_LDFLAGS)
$(gen_test_char_OBJECTS) $(EXTRA_LIBS) + + test_char.h: gen_test_char +-
./gen_test_char > test_char.h ++ gen_test_char > test_char.h + + util.lo:
test_char.h + diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.2.17.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.2.17.bb new file mode 100644 index 0000000..66b326d --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.2.17.bb @@ -0,0 +1,44 @@ +SECTION = "net" +DEPENDS = "expat pcre" + +inherit native + +PR = "r0" +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
+ +S = "${WORKDIR}/httpd-${PV}" + +do_configure () { + ./configure
--with-included-apr --prefix=${prefix} +} + +do_install () { + install -d
${D}${bindir} ${D}${libdir} + cp server/gen_test_char ${D}${bindir} + cp
srclib/apr/apr-1-config ${D}${bindir} + cp srclib/apr-util/apu-1-config
${D}${bindir} + cp support/apxs ${D}${bindir} + chmod 755
${D}${bindir}/apxs + install -d ${D}/usr/build + cp build/*.mk
${D}/usr/build + cp build/instdso.sh ${D}/usr/build + cp .libs/httpd

${D}${bindir} + + (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | +
(cd ${D}${libdir}; tar -xf - ) + (cd srclib/apr-util/.libs; tar -cf -
libaprutil-*.so* ) | + (cd ${D}${libdir}; tar -xf - ) + + install -d
${D}${includedir}/apache2 + cp include/* ${D}${includedir}/apache2 + cp
os/unix/os.h ${D}${includedir}/apache2 + cp os/unix/unixd.h
${D}${includedir}/apache2 + + cp support/envvars-std
${D}${bindir}/envvars + chmod 755 ${D}${bindir}/envvars +} +
+NATIVE_INSTALL_WORKS = "1"

+ +SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e" +SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04" diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb new file mode 100644 index 0000000..13012a7 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb @@ -0,0 +1,119 @@ +SECTION = "net" +DESCRIPTION = "The apache v2 web server" +DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"

+RDEPENDS_${PN} += "openssl"

+ +PR = "r0"

+SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \ + file://apr-sockets-patch;apply=yes \ + file://configure-patch;apply=yes \ +
file://server-makefile-patch;apply=yes \ + file://configure.in.patch
\ + file://apr.h.in.patch \ + file://init"

+ +# +# over-ride needed since apache unpacks into httpd +# +S = "${WORKDIR}/httpd-${PV}" + +# +# implications - autotools defines suitable do_configure, do_install, etc. +# update-rc.d adds hooks for rc-update. +# +# +inherit autotools update-rc.d + +# +# implications - used by update-rc.d scripts +# +INITSCRIPT_NAME = "apache2"

(quoted diff) +2 -0

+INITSCRIPT_PARAMS = "defaults 91 20" +LEAD_SONAME = "libapr-1.so.0" + 
+CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ +

${sysconfdir}/${PN}/magic \ + ${sysconfdir}/${PN}/mime.types \ +
${sysconfdir}/init.d/${PN} " + +PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + +# we override here rather than append so that .so links are +# included in the runtime package rather than here (-dev) +# and to get build, icons, error into the -dev package +FILES_${PN}-dev =
"${datadir}/${PN}/build \ + ${datadir}/${PN}/icons \ +
${datadir}/${PN}/error \ + ${bindir}/apr-config ${bindir}/apu-config \ +
${libdir}/apr*.exp \ + ${includedir}/${PN} \ + ${libdir}/*.la \ +
${libdir}/*.a" + +# manual to manual +FILES_${PN}-doc += "

${datadir}/${PN}/manual" + +# +# override this too - here is the default, less datadir +# +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir}
${libdir}/lib*.so.* ${sysconfdir} \ + ${sharedstatedir} ${localstatedir}
/bin /sbin /lib/*.so* \ + ${libdir}/${PN}" + +# we want htdocs and
cgi-bin to go with the binary +FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin" + +#make sure the lone .so links also get wrapped in the base package +FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"

+CFLAGS_append = " -DPATH_MAX=4096" +CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " +EXTRA_OECONF = "--enable-ssl \ +
--with-ssl=${STAGING_LIBDIR}/.. \ + --with-expat=${STAGING_LIBDIR}/.. \

(quoted diff) +1 -2

+		--with-pcre=${STAGING_LIBDIR}/.. \ +
--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ +
--with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ +		--enable-info

\ + --enable-rewrite \ + --with-dbm=sdbm \ + --with-berkeley-db=no \ +
--localstatedir=/var/${PN} \ + --with-gdbm=no \ + --with-ndbm=no \ +
--includedir=${includedir}/${PN} \ + --datadir=${datadir}/${PN} \ +
--sysconfdir=${sysconfdir}/${PN} \ + ap_cv_void_ptr_lt_long=no \ + " +

(quoted diff) +2 -0

+# +# here we over-ride the autotools provided do_configure. +# + 
+do_configure_prepend() { +	sed -e 's,libtool

libtool15,${HOST_SYS}-libtool libtool115,' -i
${S}/srclib/apr/build/buildcheck.sh +}

+++ b/meta-webserver/recipes-httpd/apache2/files/init

Op 01-10-12 18:14, Paul Eggleton schreef:

Quoted 2 lines

No modifications in this commit (apart from not copying some unneeded files).

Quoted 1 line

+NATIVE_INSTALL_WORKS = "1"

Drop that

Quoted 10 lines

+ +SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e" +SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04" diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb new file mode 100644 index 0000000..13012a7 --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.2.17.bb @@ -0,0 +1,119 @@ +SECTION = "net" +DESCRIPTION = "The apache v2 web server" +DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"

Quoted 1 line

+RDEPENDS_${PN} += "openssl"

That should go below do_install

Quoted 1 line

+ +PR = "r0"

that's the default, drop that

Quoted 5 lines

+SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \ + file://apr-sockets-patch;apply=yes \ + file://configure-patch;apply=yes \ +
file://server-makefile-patch;apply=yes \ + file://configure.in.patch
\ + file://apr.h.in.patch \ + file://init"

whitespace errors

Quoted 11 lines

+ +# +# over-ride needed since apache unpacks into httpd +# +S = "${WORKDIR}/httpd-${PV}" + +# +# implications - autotools defines suitable do_configure, do_install, etc. +# update-rc.d adds hooks for rc-update. +# +# +inherit autotools update-rc.d + +# +# implications - used by update-rc.d scripts +# +INITSCRIPT_NAME = "apache2"

(quoted diff) +2 -0

+INITSCRIPT_PARAMS = "defaults 91 20" +LEAD_SONAME = "libapr-1.so.0" +
+CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ +

${sysconfdir}/${PN}/magic \ + ${sysconfdir}/${PN}/mime.types \ +
${sysconfdir}/init.d/${PN} " + +PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + +# we override here rather than append so that .so links are +# included in the runtime package rather than here (-dev) +# and to get

Quoted 8 lines

build, icons, error into the -dev package +FILES_${PN}-dev =
"${datadir}/${PN}/build \ + ${datadir}/${PN}/icons \ +
${datadir}/${PN}/error \ + ${bindir}/apr-config ${bindir}/apu-config \ +
${libdir}/apr*.exp \ + ${includedir}/${PN} \ + ${libdir}/*.la \ +
${libdir}/*.a" + +# manual to manual +FILES_${PN}-doc += " ${datadir}/${PN}/manual" + +# +# override this too - here is the default, less datadir +# +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir}
${libdir}/lib*.so.* ${sysconfdir} \ + ${sharedstatedir}

Quoted 5 lines

/bin /sbin /lib/*.so* \ + ${libdir}/${PN}" + +# we want htdocs and
cgi-bin to go with the binary +FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin" + +#make sure the lone .so links also get wrapped in the base package +FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"

All that package related stuff goes below do_install

Quoted 3 lines

+CFLAGS_append = " -DPATH_MAX=4096" +CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " +EXTRA_OECONF = "--enable-ssl \ +
--with-ssl=${STAGING_LIBDIR}/.. \ + --with-expat=${STAGING_LIBDIR}/..

Quoted 4 lines

(quoted diff) +1 -2

+		--with-pcre=${STAGING_LIBDIR}/.. \ +
--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ +
--with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ +		--enable-info

\ + --enable-rewrite \ + --with-dbm=sdbm \ + --with-berkeley-

Quoted 3 lines

--localstatedir=/var/${PN} \ + --with-gdbm=no \ + --with-ndbm=no \ +
--includedir=${includedir}/${PN} \ + --datadir=${datadir}/${PN} \ +
--sysconfdir=${sysconfdir}/${PN} \ + ap_cv_void_ptr_lt_long=no \ +

Quoted 4 lines

(quoted diff) +2 -0

+# +# here we over-ride the autotools provided do_configure. +# +
+do_configure_prepend() { +	sed -e 's,libtool

libtool15,${HOST_SYS}-libtool libtool115,' -i
${S}/srclib/apr/build/buildcheck.sh +}

is that 15 -> 115 intended?

This one is missing the needed LSB headers:

Quoted 1 line

+++ b/meta-webserver/recipes-httpd/apache2/files/init

Quoted 4 lines

Quoted 2 lines

+ +PR = "r0"

that's the default, drop that

I'm sorry, but for reasons I've already stated on several occasions, I won't leave this out in any recipe in meta-webserver, nor anywhere else where I'm the maintainer.

Given that you often complain about people forgetting to bump PR, why do you insist that people should remove PR = "r0" when having it there would be at least slightly helpful in that regard?

Op 3 okt. 2012, om 13:28 heeft Paul Eggleton <[email protected]>

Quoted 8 lines

Quoted 3 lines

Quoted 1 line

+ +PR = "r0"

that's the default, drop that

I'm sorry, but for reasons I've already stated on several occasions, I won't leave this out in any recipe in meta-webserver, nor anywhere else where I'm the maintainer.

Quoted 3 lines

Given that you often complain about people forgetting to bump PR, why do you insist that people should remove PR = "r0" when having it there would be at least slightly helpful in that regard?

I haven't seen any evidence that having PR = r0 helps people with that. Have a look at all the patches that were posted with missing PR bumps, they almost all have PR present.

No modifications in this commit (apart from not copying some unneeded files).

Signed-off-by Paul Eggleton <[email protected]> ---

.../recipes-php/modphp/files/70_mod_php5.conf      |   12 ++++ 
.../recipes-php/modphp/files/configure.patch       |   11 ++++ 
meta-webserver/recipes-php/modphp/modphp5.inc      |   66

++++++++++++++++++++ meta-webserver/recipes-php/modphp/modphp_5.1.6.bb | 5 ++ 4 files changed, 94 insertions(+) create mode 100644 meta-webserver/recipes-php/modphp/files/70_mod_php5.conf create mode 100644 meta-webserver/recipes-php/modphp/files/configure.patch create mode 100644 meta-webserver/recipes-php/modphp/modphp5.inc create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.1.6.bb

+++ b/meta-webserver/recipes-php/modphp/modphp5.inc @@ -0,0 +1,66 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module." +LICENSE = "PHP" +RDEPENDS_${PN} = "apache2"

+DEPENDS = "apache2-native apache2 zlib" + +#SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \

+SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2 \ +
file://configure.patch \ + " + +S = "${WORKDIR}/php-${PV}" + +inherit
autotools + +FILES_${PN} = "${libdir}/apache2 /etc"

+FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug"

+ +CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR_NATIVE}/apache2" + +EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \ +
--without-mysql \ + --enable-force-cgi-redirect \ + --disable-cgi \ +
--disable-cli \ + --disable-pdo \ + --without-pear \ + --without-iconv
\ + --disable-ipv6 \ + --disable-xml \ + --disable-xmlreader \ +
--disable-xmlwriter \ + --disable-simplexml \ + --disable-libxml \ +
--disable-dom \ + --with-zlib
--with-zlib-dir=${STAGING_DIR}${layout_exec_prefix}/.. \ + --with-config-file-path=/etc/php/apache2-php5"

+# --with-libxml-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \

+ +# to get postgres support, add it to the DEPENDS above +# and uncomment this line. similar for mysql +#EXTRA_OECONF += " --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix}"

+ +acpaths = "" + +# +# override the autotools do_configure, which runs
autoconf, +# which breaks everything... +# +do_configure() { + export
PHP_LIBXML_DIR=${STAGING_DIR_NATIVE}${layout_exec_prefix} + oe_runconf
+} + +# +do_install () { + install -d ${D}/usr/lib/apache2/modules +
install -d ${D}/etc/apache2/modules.d + install -d
${D}/etc/php/apache2-php5 + install -m 755 libs/libphp5.so
${D}/usr/lib/apache2/modules + install -m 644
${FILESDIR}/70_mod_php5.conf ${D}/etc/apache2/modules.d + cat
${S}/php.ini-dist | \ + sed -e 's,extension_dir = \"\./\",extension_dir
= \"/usr/lib/extensions\",' \ + > ${D}/etc/php/apache2-php5/php.ini +}

(quoted diff) +0 -0

b/meta-webserver/recipes-php/modphp/modphp_5.1.6.bb new file mode 100644 index 0000000..a75a742 --- /dev/null +++ b/meta-webserver/recipes-php/modphp/modphp_5.1.6.bb @@ -0,0 +1,5 @@ +include modphp5.inc +PR ='r3'

Op 01-10-12 18:14, Paul Eggleton schreef:

Quoted 2 lines

No modifications in this commit (apart from not copying some unneeded files).

Quoted 1 line

+RDEPENDS_${PN} = "apache2"

That one goes below do_installed

Quoted 2 lines

+DEPENDS = "apache2-native apache2 zlib" + +#SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \

remove that one

Quoted 3 lines

+SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2 \ +
file://configure.patch \ + " + +S = "${WORKDIR}/php-${PV}" + +inherit
autotools + +FILES_${PN} = "${libdir}/apache2 /etc"

$sysconfdir

Quoted 1 line

+FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug"

and move below do_install

Quoted 4 lines

+ +CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR_NATIVE}/apache2" + +EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \ +
--without-mysql \ + --enable-force-cgi-redirect \ + --disable-cgi

Quoted 1 line

--disable-cli \ + --disable-pdo \ + --without-pear \ + --

Quoted 2 lines

\ + --disable-ipv6 \ + --disable-xml \ + --disable-xmlreader \ +
--disable-xmlwriter \ + --disable-simplexml \ + --disable-libxml

Quoted 3 lines

--disable-dom \ + --with-zlib
--with-zlib-dir=${STAGING_DIR}${layout_exec_prefix}/.. \ + --with-config-file-path=/etc/php/apache2-php5"

whitespace errors

Quoted 1 line

+# --with-libxml-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \

remove

Quoted 3 lines

+ +# to get postgres support, add it to the DEPENDS above +# and uncomment this line. similar for mysql +#EXTRA_OECONF += " --with-pgsql=${STAGING_DIR_HOST}${layout_exec_prefix}"

That is a PACKAGECONFIG change

meta-webserver/recipes-php/modphp/modphp_5.1.6.bb line 2

Quoted 6 lines

(quoted diff) +0 -0

b/meta-webserver/recipes-php/modphp/modphp_5.1.6.bb new file mode 100644 index 0000000..a75a742 --- /dev/null +++ b/meta-webserver/recipes-php/modphp/modphp_5.1.6.bb @@ -0,0 +1,5 @@

meta-webserver/recipes-php/modphp/modphp_5.1.6.bb new file +2 -0

+include modphp5.inc 
+PR ='r3'

Double quotes are preferred, but I'm tempted to just say "drop the PR entirely"

Quoted 1 line

Already fixed in the patch following. (Did you look at those patches?)

Add new recipe for the Xdebug PHP debugger/profiler.

Signed-off-by Paul Eggleton <[email protected]> ---

meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb | 29
+++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb

(quoted diff) +0 -0

b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb new file mode 100644 index 0000000..5bd374c --- /dev/null +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Debugging and profiling extension for PHP"

+LICENSE = "Xdebug" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" + +DEPENDS = "modphp" + +PR = "r0"

Op 01-10-12 18:14, Paul Eggleton schreef:

Quoted 7 lines

Add new recipe for the Xdebug PHP debugger/profiler.

Signed-off-by Paul Eggleton <[email protected]> ---

meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb | 29
+++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb

Quoted 5 lines

(quoted diff) +0 -0

b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb new file mode 100644 index 0000000..5bd374c --- /dev/null +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Debugging and profiling extension for PHP"

Missing DESCRIPTION

Quoted 3 lines

+LICENSE = "Xdebug" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" + +DEPENDS = "modphp" + +PR = "r0"

default....

Review

Quoted 6 lines

+ +SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" + +SRC_URI[md5sum] = "5e5c467e920240c20f165687d7ac3709" +SRC_URI[sha256sum] = "11d340eb7f87909a596bac054cc927df757dc2fc7c90b50a832c30e9bf84c9ad" +

(quoted diff) +2 -1

+inherit autotools + +EXTRA_OECONF += "--enable-xdebug
-with-php-config=${STAGING_BINDIR_CROSS}/php-config" + +do_configure() {
+	${STAGING_BINDIR_CROSS}/phpize +	oe_runconf +}

Why not do autotools_do_configure?

Quoted 8 lines

Op 01-10-12 18:14, Paul Eggleton schreef:

Quoted 7 lines

Add new recipe for the Xdebug PHP debugger/profiler.

Signed-off-by Paul Eggleton <[email protected]> ---

meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb | 29
+++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb

Quoted 7 lines

Quoted 5 lines

(quoted diff) +0 -0

b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb new file mode 100644 index 0000000..5bd374c --- /dev/null +++ b/meta-webserver/recipes-php/xdebug/xdebug_2.2.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Debugging and profiling extension for PHP"

Missing DESCRIPTION

No, this is deliberate - presumably you're aware that the default value of DESCRIPTION is "${SUMMARY}" ? The opposite is not true, which leads to
packages with useless summaries if you set DESCRIPTION and not SUMMARY;
so if it's just one line the single variable to set is SUMMARY. I know we have a lot of recipes that have this issue; we should probably address that on a wider basis.

Quoted 5 lines

Quoted 3 lines

+LICENSE = "Xdebug" +LIC_FILES_CHKSUM = "file://LICENSE;md5=34df3a274aa12b795417c65634c07f16" + +DEPENDS = "modphp" + +PR = "r0"

default....

See reply to patch 2/6.

Quoted 9 lines

Review

Quoted 7 lines

+ +SRC_URI = "http://xdebug.org/files/xdebug-${PV}.tgz" +

(quoted diff) +2 -0

+SRC_URI[md5sum] = "5e5c467e920240c20f165687d7ac3709"
+SRC_URI[sha256sum] =

"11d340eb7f87909a596bac054cc927df757dc2fc7c90b50a832c30e9bf84c9ad" +

(quoted diff) +2 -1

+inherit autotools + +EXTRA_OECONF += "--enable-xdebug 
-with-php-config=${STAGING_BINDIR_CROSS}/php-config" +
+do_configure() { +	${STAGING_BINDIR_CROSS}/phpize +	oe_runconf +}

Why not do autotools_do_configure?

Because AFAICT PHP modules are somewhat unusual when it comes to configure, and totally break if you try to autoreconf. IIRC this was the only way I could get the thing to build.

Quoted 5 lines

Quoted 1 line

Why not do autotools_do_configure?

Because AFAICT PHP modules are somewhat unusual when it comes to configure, and totally break if you try to autoreconf. IIRC this was the only way I could get the thing to build.

Can you add a comment saying that? A lot of recipes in OE classic replace the configure step, but our autotools support has improved a lot, so a comment saying what is going wrong will help people updating the recipe.

So finally I have got this into a working state; apologies for the delay. There were a number of issues affecting cross-compilation as well as some problems with the initial configuration; these should now be addressed. We may wish to look at a more standard directory layout for Apache as the default one doesn't seem to be used by most distributions; we can look at this later - for now let's get the recipes out there so people can try them out.

I know there are a few people waiting to submit additional recipes for this layer and I expect we will also want to look at moving some web-server related recipes from meta-oe into here at some point in the near future.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-10-12 18:14, Paul Eggleton schreef:

Quoted 8 lines

So finally I have got this into a working state; apologies for the delay. There were a number of issues affecting cross-compilation as well as some problems with the initial configuration; these should now be addressed. We may wish to look at a more standard directory layout for Apache as the default one doesn't seem to be used by most distributions; we can look at this later - for now let's get the recipes out there so people can try them out.

Quoted 4 lines

I know there are a few people waiting to submit additional recipes for this layer and I expect we will also want to look at moving some web-server related recipes from meta-oe into here at some point in the near future.

How does this compare to meta-networking?

So finally I have got this into a working state; apologies for the delay. There were a number of issues affecting cross-compilation as well as some problems with the initial configuration; these should now be addressed. We may wish to look at a more standard directory layout for Apache as the default one doesn't seem to be used by most distributions; we can look at this later - for now let's get the recipes out there so people can try them out.

I know there are a few people waiting to submit additional recipes for this layer and I expect we will also want to look at moving some web-server related recipes from meta-oe into here at some point in the near future.

The following changes since commit
7bfff4b1d6b0067ddabf2474320e3e78795b2b4f:

uhd,fuse: Fix misplaced quotations (2012-09-28 22:50:42 +0200)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib
paule/meta-webserver-add
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/meta-webserver-add

Paul Eggleton (6): Add meta-webserver layer apache2: add from
OE-Classic modphp: add from OE-Classic apache2: update to version 2.4.2 and fix modphp: update to 5.3.14 and fix xdebug: add new recipe

Squash those "import" with the "fix" commits, no sense in having a broken recipe in there.

Quoted 2 lines

Squash those "import" with the "fix" commits, no sense in having a broken recipe in there.

I'd rather not - there is sense in being clear about the changes, because there are a large number of them in this case.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Op 3 okt. 2012 om 12:43 heeft Paul Eggleton <[email protected]>

Quoted 6 lines · On Wednesday 03 October 2012 12:24:19 Koen Kooi wrote:

Quoted 2 lines

Squash those "import" with the "fix" commits, no sense in having a broken recipe in there.

I'd rather not - there is sense in being clear about the changes, because there are a large number of them in this case.

The broken recipes are still available in OE classic if people want to compare them. I still don't get why you want to have broken recipes in the tree at multiple points in your series.

Quoted 1 line

Op 3 okt. 2012 om 12:43 heeft Paul Eggleton <[email protected]>

het volgende geschreven:

Quoted 7 lines

Quoted 6 lines · On Wednesday 03 October 2012 12:24:19 Koen Kooi wrote:

Quoted 2 lines

Squash those "import" with the "fix" commits, no sense in having a broken recipe in there.

I'd rather not - there is sense in being clear about the changes, because there are a large number of them in this case.

Quoted 3 lines

The broken recipes are still available in OE classic if people want to compare them. I still don't get why you want to have broken recipes in the tree at multiple points in your series.

Because I want to easily see in "git blame" where particular lines came from - did I add them, or have they been around for ages?

Op 3 okt. 2012, om 13:29 heeft Paul Eggleton <[email protected]>

Quoted 19 lines · On Wednesday 03 October 2012 13:27:41 Koen Kooi wrote:

Quoted 2 lines

Op 3 okt. 2012 om 12:43 heeft Paul Eggleton
<[email protected]>

het volgende geschreven:

Quoted 13 lines

Quoted 8 lines · On Wednesday 03 October 2012 12:24:19 Koen Kooi wrote:

Quoted 3 lines

Squash those "import" with the "fix" commits, no sense in having a broken
recipe in there.

I'd rather not - there is sense in being clear about the changes, because
there are a large number of them in this case.

The broken recipes are still available in OE classic if people want to compare them. I still don't get why you want to have broken recipes in the
tree at multiple points in your series.

Quoted 2 lines

Because I want to easily see in "git blame" where particular lines came from - did I add them, or have they been around for ages?

Does oe-core have the same flow for new recipes?

Quoted 1 line

Op 3 okt. 2012, om 13:29 heeft Paul Eggleton <[email protected]>

het volgende geschreven:

Quoted 19 lines

Quoted 19 lines · On Wednesday 03 October 2012 13:27:41 Koen Kooi wrote:

Quoted 2 lines

Op 3 okt. 2012 om 12:43 heeft Paul Eggleton
<[email protected]>

het volgende geschreven:

Quoted 13 lines

Quoted 8 lines · On Wednesday 03 October 2012 12:24:19 Koen Kooi wrote:

Quoted 3 lines

Squash those "import" with the "fix" commits, no sense in having a broken
recipe in there.

I'd rather not - there is sense in being clear about the changes, because
there are a large number of them in this case.

The broken recipes are still available in OE classic if people want to compare them. I still don't get why you want to have broken recipes in the
tree at multiple points in your series.

Quoted 4 lines

Quoted 2 lines

Because I want to easily see in "git blame" where particular lines came from - did I add them, or have they been around for ages?

Does oe-core have the same flow for new recipes?

You already know the answer to this.

Op 3 okt. 2012, om 14:23 heeft Paul Eggleton <[email protected]>

Quoted 23 lines · On Wednesday 03 October 2012 13:43:30 Koen Kooi wrote:

Quoted 2 lines

Op 3 okt. 2012, om 13:29 heeft Paul Eggleton
<[email protected]>>

het volgende geschreven:

Quoted 19 lines

Quoted 19 lines · On Wednesday 03 October 2012 13:27:41 Koen Kooi wrote:

Quoted 2 lines

Op 3 okt. 2012 om 12:43 heeft Paul Eggleton
<[email protected]>

het volgende geschreven:

Quoted 13 lines

Quoted 8 lines · On Wednesday 03 October 2012 12:24:19 Koen Kooi wrote:

Quoted 3 lines

Squash those "import" with the "fix" commits, no sense in having a broken
recipe in there.

I'd rather not - there is sense in being clear about the changes, because
there are a large number of them in this case.

The broken recipes are still available in OE classic if people want to compare them. I still don't get why you want to have broken recipes in the
tree at multiple points in your series.

Quoted 6 lines

Quoted 4 lines

Quoted 2 lines

Because I want to easily see in "git blame" where particular lines came from - did I add them, or have they been around for ages?

Does oe-core have the same flow for new recipes?

You already know the answer to this.

No I don't, actually.

The answer is no, it doesn't.

I guess on reflection we probably ought to be consistent here though - for better or worse, this is not what has been done when pulling in recipes from OE-Classic for the rest of meta-openembedded. The commit message does already list the changes from the original, and I'll concede that having just one revision doesn't give a huge amount in the way of insight on previous origin; ultimately as you say, OE-Classic is still there as a reference for that.

OK, I've squashed those commits out on the branch. Would it be worth me posting a v2 after all these changes?

On Wed, Oct 3, 2012 at 8:43 AM, Paul Eggleton

Quoted 10 lines · <[email protected]> wrote:

The answer is no, it doesn't.

I guess on reflection we probably ought to be consistent here though - for better or worse, this is not what has been done when pulling in recipes from OE-Classic for the rest of meta-openembedded. The commit message does already list the changes from the original, and I'll concede that having just one revision doesn't give a huge amount in the way of insight on previous origin; ultimately as you say, OE-Classic is still there as a reference for that.

Quoted 2 lines

OK, I've squashed those commits out on the branch. Would it be worth me posting a v2 after all these changes?

Actually, this is one really annoying thing about OE. When people rename the file 'git blame' comes worthless. Is there a way around this?

Quoted 9 lines · Paul Eggleton

The answer is no, it doesn't.

I guess on reflection we probably ought to be consistent here though - for better or worse, this is not what has been done when pulling in recipes from OE-Classic for the rest of meta-openembedded. The commit message does already list the changes from the original, and I'll concede that having just one revision doesn't give a huge amount in the way of insight on previous origin; ultimately as you say, OE-Classic is still there as a reference for that.

Quoted 2 lines

OK, I've squashed those commits out on the branch. Would it be worth me posting a v2 after all these changes?

Actually, this is one really annoying thing about OE. When people rename the file 'git blame' comes worthless. Is there a way around this?

-M

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel