From e613923b68e2708c5af0a536b425b8f3600b0145 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 17 Aug 2005 13:40:41 +0000 Subject: Add apache 2.0.54. This package only compiles nativly, and is only tested on openslug-native. Since this is not for cross I'm leaving the apache files in nonworking for the time beeing. --- packages/apache/apache_2.0.54.bb | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 packages/apache/apache_2.0.54.bb (limited to 'packages/apache/apache_2.0.54.bb') diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb new file mode 100644 index 0000000000..53b27e9f7b --- /dev/null +++ b/packages/apache/apache_2.0.54.bb @@ -0,0 +1,80 @@ +MAINTAINER="David Karlstrom " +SECTION = "net" +DEPENDS = "openssl" + +PR = "r1" + +# ------------------------------------------ +# NOTE: This package is currently only meant +# to be built nativly on the target device +# ------------------------------------------ + +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz" + +S = "${WORKDIR}/httpd-${PV}" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "httpd" +INITSCRIPT_PARAMS = "defaults 91 20" + +CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \ + ${sysconfdir}/apache/ssl.conf \ + ${sysconfdir}/apache/magic \ + ${sysconfdir}/apache/mime.types \ + ${datadir}/apache/htdocs/index.html \ + ${datadir}/apache/htdocs/apache_pb.gif \ + " + +PACKAGES = "libaprutil libapr apache-dev apache-doc apache" +FILES_libapr = "${libdir}/libapr*.so.0* ${libdir}/apr.exp" +FILES_libaprutil = "${libdir}/libaprutil*.so.0* ${libdir}/aprutil.exp" + +FILES_apache-dev_prepend = "${datadir}/apache/build ${bindir}/apr-config ${bindir}/apu-config " +FILES_apache-doc_prepend = "${datadir}/apache/manual " + +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ + ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ + ${datadir}/apache" + +CFLAGS_append = " -DPATH_MAX=4096" +CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " +EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \ + --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no --localstatedir=${localstatedir}/log/apache \ + --with-gdbm=no --with-ndbm=no --datadir=${datadir}/apache --sysconfdir=${sysconfdir}/apache" + +do_configure () { + # Looks like rebuilding configure doesn't work, so we are skipping + # that and are just using the shipped one + oe_runconf +} + +do_install_append () { + set -x + rm ${D}/${datadir}/apache/htdocs/index* + rm ${D}/${datadir}/apache/htdocs/apache_pb2.* + rm ${D}/${datadir}/apache/htdocs/apache_pb.png + install -m 0644 ${FILESDIR}/index.html ${D}/${datadir}/apache/htdocs/ + + install -d ${D}/${sysconfdir}/init.d + cat ${FILESDIR}/init | \ + sed -e 's,/usr/sbin/,${sbindir}/,g' \ + -e 's,/usr/bin/,${bindir}/,g' \ + -e 's,/usr/lib,${libdir}/,g' \ + -e 's,/etc/,${sysconfdir}/,g' \ + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd + chmod 755 ${D}/${sysconfdir}/init.d/httpd + + install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf + + rm ${D}/${libdir}/libexpat.* +} + +python () { + # Don't build apache unless we are building nativly + target = bb.data.getVar("TARGET_ARCH", d, 1) + build = bb.data.getVar("BUILD_ARCH", d, 1) + if target != build: + raise bb.parse.SkipPackage("Apache will only build nativly (TARGET_ARCH == BUILD_ARCH)") +} + -- cgit v1.2.3 From 781ae9369c6a7a5555be6ed86e351958c7d252c6 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sun, 21 Aug 2005 21:27:15 +0000 Subject: Fix apache to use openssl from staging. Fix depends on pcre and expat. NOTE: still just for native building. --- packages/apache/apache_2.0.54.bb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'packages/apache/apache_2.0.54.bb') diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 53b27e9f7b..882b7f2c71 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -1,15 +1,16 @@ MAINTAINER="David Karlstrom " SECTION = "net" -DEPENDS = "openssl" +DEPENDS = "openssl expat pcre" -PR = "r1" +PR = "r2" # ------------------------------------------ # NOTE: This package is currently only meant # to be built nativly on the target device # ------------------------------------------ -SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz" +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz \ + " S = "${WORKDIR}/httpd-${PV}" @@ -39,9 +40,20 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ CFLAGS_append = " -DPATH_MAX=4096" CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl " -EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \ - --enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no --localstatedir=${localstatedir}/log/apache \ - --with-gdbm=no --with-ndbm=no --datadir=${datadir}/apache --sysconfdir=${sysconfdir}/apache" +EXTRA_OECONF = "--enable-ssl \ + --with-ssl=${STAGING_LIBDIR}/.. \ + --enable-dav \ + --enable-dav-fs \ + --with-dbm=sdbm \ + --with-berkeley-db=no \ + --localstatedir=${localstatedir}/log/apache \ + --with-gdbm=no \ + --with-ndbm=no \ + --datadir=${datadir}/apache \ + --sysconfdir=${sysconfdir}/apache \ + " + +export LD_LIBRARY_PATH=${STAGING_LIBDIR} do_configure () { # Looks like rebuilding configure doesn't work, so we are skipping -- cgit v1.2.3 From 84cdf4fa2923a81afa14144fad3fbcb63f52bb26 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 20 Aug 2005 05:10:28 +0000 Subject: Fixed the equality test in the apache init script. --- packages/apache/apache_2.0.54.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/apache/apache_2.0.54.bb') diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 882b7f2c71..37138bb87c 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom " SECTION = "net" DEPENDS = "openssl expat pcre" -PR = "r2" +PR = "r3" # ------------------------------------------ # NOTE: This package is currently only meant -- cgit v1.2.3 From d8ed0a13ec0521bb309ae3489c41f7e83c099e0d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 20 Aug 2005 05:28:51 +0000 Subject: Changed the init script name from httpd to apache. --- packages/apache/apache_2.0.54.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/apache/apache_2.0.54.bb') diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 37138bb87c..3ab58c590f 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom " SECTION = "net" DEPENDS = "openssl expat pcre" -PR = "r3" +PR = "r4" # ------------------------------------------ # NOTE: This package is currently only meant @@ -16,7 +16,7 @@ S = "${WORKDIR}/httpd-${PV}" inherit autotools update-rc.d -INITSCRIPT_NAME = "httpd" +INITSCRIPT_NAME = "apache" INITSCRIPT_PARAMS = "defaults 91 20" CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \ @@ -74,8 +74,8 @@ do_install_append () { -e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/lib,${libdir}/,g' \ -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd - chmod 755 ${D}/${sysconfdir}/init.d/httpd + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache + chmod 755 ${D}/${sysconfdir}/init.d/apache install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf -- cgit v1.2.3