From 0fe95e93e6485a819cefa0d6d5f5a4d9ac800309 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 9 Mar 2005 22:02:59 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/03/09 17:02:43-05:00 handhelds.org!kergoth Kill off some old appweb versions, and fix the appweb build to pass 'linux' into its configure script rather than 'linux-uclibc' when targeting uclibc. BKrev: 422f7293K2OlGz2oeNO6eboXgubDVQ --- packages/appweb/appweb-1.0.0/charsignedness.patch | 0 packages/appweb/appweb-1.0.0/makerules.patch | 0 packages/appweb/appweb-1.0.1/charsignedness.patch | 0 packages/appweb/appweb-1.0.1/makerules.patch | 0 packages/appweb/appweb-1.0.2/charsignedness.patch | 0 packages/appweb/appweb-1.0.2/makerules.patch | 0 packages/appweb/appweb-1.2.0/makerules.patch | 34 +++++++++ packages/appweb/appweb-1.2.0/nonrootinstall.patch | 57 +++++++++++++++ packages/appweb/appweb_1.0.0.bb | 86 ---------------------- packages/appweb/appweb_1.0.1.bb | 86 ---------------------- packages/appweb/appweb_1.0.2.bb | 87 ----------------------- packages/appweb/appweb_1.2.0.bb | 8 ++- 12 files changed, 98 insertions(+), 260 deletions(-) delete mode 100644 packages/appweb/appweb-1.0.0/charsignedness.patch delete mode 100644 packages/appweb/appweb-1.0.0/makerules.patch delete mode 100644 packages/appweb/appweb-1.0.1/charsignedness.patch delete mode 100644 packages/appweb/appweb-1.0.1/makerules.patch delete mode 100644 packages/appweb/appweb-1.0.2/charsignedness.patch delete mode 100644 packages/appweb/appweb-1.0.2/makerules.patch delete mode 100644 packages/appweb/appweb_1.0.0.bb delete mode 100644 packages/appweb/appweb_1.0.1.bb delete mode 100644 packages/appweb/appweb_1.0.2.bb (limited to 'packages/appweb') diff --git a/packages/appweb/appweb-1.0.0/charsignedness.patch b/packages/appweb/appweb-1.0.0/charsignedness.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.0.0/makerules.patch b/packages/appweb/appweb-1.0.0/makerules.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.0.1/charsignedness.patch b/packages/appweb/appweb-1.0.1/charsignedness.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.0.1/makerules.patch b/packages/appweb/appweb-1.0.1/makerules.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.0.2/charsignedness.patch b/packages/appweb/appweb-1.0.2/charsignedness.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.0.2/makerules.patch b/packages/appweb/appweb-1.0.2/makerules.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/appweb/appweb-1.2.0/makerules.patch b/packages/appweb/appweb-1.2.0/makerules.patch index e69de29bb2..55d3dd22d9 100644 --- a/packages/appweb/appweb-1.2.0/makerules.patch +++ b/packages/appweb/appweb-1.2.0/makerules.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- appWeb-1.2.0/make.rules~makerules 2004-06-28 14:50:23.000000000 -0500 ++++ appWeb-1.2.0/make.rules 2004-07-15 13:27:35.000000000 -0500 +@@ -61,24 +61,19 @@ + for i in $$D "" ; \ + do [ -z "$$i" ] && continue ;\ + [ -d "$$i" ] || continue ;\ +- home=`pwd` ; \ +- cd "$$i" >/dev/null ; \ +- if [ -f Makefile ] ; then \ ++ if [ -f $$i/Makefile ] ; then \ + echo ; \ +- echo " cd $$i" ; \ + set +e ; \ + unset COMPILE_SHARED EXPORT_OBJECTS _LDPATH ; \ + set -e ; \ + echo " \# $(MAKE) $$T" ; \ +- $(MAKE) --no-print-directory -S $$T ; \ ++ $(MAKE) -C $$i --no-print-directory -S $$T ; \ + code=$$? ; \ + if [ $$code != 0 ] ; then \ + echo "\#WARNING: Makefile error in `pwd`" ; \ + exit 255 ; \ + fi ; \ +- echo " cd $$home" ; \ + fi ; \ +- cd $$home >/dev/null ;\ + done + + DO_RECURSE=[ -z "$$D" ] || $(RECURSE) diff --git a/packages/appweb/appweb-1.2.0/nonrootinstall.patch b/packages/appweb/appweb-1.2.0/nonrootinstall.patch index e69de29bb2..4227b76591 100644 --- a/packages/appweb/appweb-1.2.0/nonrootinstall.patch +++ b/packages/appweb/appweb-1.2.0/nonrootinstall.patch @@ -0,0 +1,57 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- appWeb-1.2.0/Makefile~nonrootinstall 2004-07-06 15:09:21.000000000 -0500 ++++ appWeb-1.2.0/Makefile 2004-07-15 13:45:32.000000000 -0500 +@@ -127,40 +127,33 @@ + # + # Installation targets + # +-install: install-rootCheck install-binary +- +-install-rootCheck: +- @if [ $(BLD_OS) != WIN -a `id -u` -ne 0 ] ; \ +- then \ +- echo "Must be root to install" ; \ +- exit 255 ; \ +- fi ++install: install-binary + +-install-release: install-rootCheck ++install-release: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall release + +-install-binary: install-rootCheck ++install-binary: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall binary + @echo -e " #\n # To start ${BLD_NAME}, run as root:\n #" + @echo -e " service ${BLD_PRODUCT} start\n" + +-install-dev: install-rootCheck ++install-dev: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall dev + +-install-doc: install-rootCheck ++install-doc: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall doc + +-install-samples: install-rootCheck ++install-samples: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall samples + +-install-source: install-rootCheck ++install-source: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall source + +-install-all: install-rootCheck ++install-all: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeInstall \ + "release binary dev doc samples source" + +-uninstall: install-rootCheck ++uninstall: + @$(BLD_PRODUCT)/package/$(BLD_OS)/makeUninstall + + # diff --git a/packages/appweb/appweb_1.0.0.bb b/packages/appweb/appweb_1.0.0.bb deleted file mode 100644 index e962675509..0000000000 --- a/packages/appweb/appweb_1.0.0.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." -SECTION = "console/network" -LICENSE="GPL" -SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" -SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \ - file://charsignedness.patch;patch=1 \ - file://makerules.patch;patch=1' -S = "${WORKDIR}/appWeb-${PV}" - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_unpack', d) - bb.data.setVar('SRC_URI', src_uri, d) - bb.build.exec_func('do_unpack_cleanup', d) -} - -do_unpack_cleanup () { - ( - set -e - cd ${WORKDIR} - rm -f README.HTML install remove - ) -} - -python do_patch () { - bb.build.exec_func('base_do_patch', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_patch', d) - bb.data.setVar('SRC_URI', src_uri, d) -} -# --enable-access-log -# --enable-admin -# --enable-all-static -# --enable-assert -# --enable-c-api -# --enable-dll -# --enable-fast-malloc -# --enable-goahead-compat -# --enable-if-modified -# --enable-log -# --enable-rom-fs -# --enable-run-as-service -# --enable-safe-strings -# --enable-squeeze -# --enable-ssl -# --enable-session - -APPWEB_TARGET = "${TARGET_ARCH}" -APPWEB_OS = "${TARGET_OS}" -APPWEB_OS_linux = "LINUX" -EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \ - --enable-keep-alive \ - --enable-multi-thread \ - --enable-cgi \ - --enable-cookie \ - --enable-config \ - --enable-digest-auth \ - --disable-ssl" -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'" - -LD_LIBRARY_PATH_prepend = "${S}/lib:" -LD_LIBRARY_PATH[export] = "1" -do_configure () { - ./configure ${EXTRA_OECONF} -} - -do_compile () { - oe_runmake build - oe_runmake compile -} - -do_stage () { - : -} - -do_install () { - install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \ - ${D}${libexecdir}/appWeb ${D}${libdir} - install -m 0755 appWeb/appWeb ${D}${sbindir}/ - install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/ - install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/ - install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/ -} diff --git a/packages/appweb/appweb_1.0.1.bb b/packages/appweb/appweb_1.0.1.bb deleted file mode 100644 index 8595e0e691..0000000000 --- a/packages/appweb/appweb_1.0.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." -SECTION = "console/network" -LICENSE="GPL" -SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" -SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \ - file://charsignedness.patch;patch=1 \ - file://makerules.patch;patch=1' -S = "${WORKDIR}/appWeb-${PV}" - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_unpack', d) - bb.data.setVar('SRC_URI', src_uri, d) - bb.build.exec_func('do_unpack_cleanup', d) -} - -do_unpack_cleanup () { - ( - set -e - cd ${WORKDIR} - rm -f README.HTML install remove - ) -} - -python do_patch () { - bb.build.exec_func('base_do_patch', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_patch', d) - bb.data.setVar('SRC_URI', src_uri, d) -} -# --enable-access-log -# --enable-admin -# --enable-all-static -# --enable-assert -# --enable-c-api -# --enable-dll -# --enable-fast-malloc -# --enable-goahead-compat -# --enable-if-modified -# --enable-log -# --enable-rom-fs -# --enable-run-as-service -# --enable-safe-strings -# --enable-squeeze -# --enable-ssl -# --enable-session - -APPWEB_TARGET = "${TARGET_ARCH}" -APPWEB_OS = "${TARGET_OS}" -APPWEB_OS_linux = "LINUX" -EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \ - --enable-keep-alive \ - --enable-multi-thread \ - --enable-cgi \ - --enable-cookie \ - --enable-config \ - --enable-digest-auth \ - --disable-ssl" -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'" - -LD_LIBRARY_PATH_prepend = "${S}/lib:" -LD_LIBRARY_PATH[export] = "1" -do_configure () { - ./configure ${EXTRA_OECONF} -} - -do_compile () { - oe_runmake build - oe_runmake compile -} - -do_stage () { - : -} - -do_install () { - install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \ - ${D}${libexecdir}/appWeb ${D}${libdir} - install -m 0755 appWeb/appWeb ${D}${sbindir}/ - install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/ - install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/ - install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/ -} diff --git a/packages/appweb/appweb_1.0.2.bb b/packages/appweb/appweb_1.0.2.bb deleted file mode 100644 index 7702078135..0000000000 --- a/packages/appweb/appweb_1.0.2.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind." -SECTION = "console/network" -LICENSE="GPL" - -SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" -SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-12.tar.gz \ - file://charsignedness.patch;patch=1 \ - file://makerules.patch;patch=1' -S = "${WORKDIR}/appWeb-${PV}" - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_unpack', d) - bb.data.setVar('SRC_URI', src_uri, d) - bb.build.exec_func('do_unpack_cleanup', d) -} - -do_unpack_cleanup () { - ( - set -e - cd ${WORKDIR} - rm -f README.HTML install remove - ) -} - -python do_patch () { - bb.build.exec_func('base_do_patch', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d) - bb.build.exec_func('base_do_patch', d) - bb.data.setVar('SRC_URI', src_uri, d) -} -# --enable-access-log -# --enable-admin -# --enable-all-static -# --enable-assert -# --enable-c-api -# --enable-dll -# --enable-fast-malloc -# --enable-goahead-compat -# --enable-if-modified -# --enable-log -# --enable-rom-fs -# --enable-run-as-service -# --enable-safe-strings -# --enable-squeeze -# --enable-ssl -# --enable-session - -APPWEB_TARGET = "${TARGET_ARCH}" -APPWEB_OS = "${TARGET_OS}" -APPWEB_OS_linux = "LINUX" -EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \ - --enable-keep-alive \ - --enable-multi-thread \ - --enable-cgi \ - --enable-cookie \ - --enable-config \ - --enable-digest-auth \ - --disable-ssl" -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'" - -LD_LIBRARY_PATH_prepend = "${S}/lib:" -LD_LIBRARY_PATH[export] = "1" -do_configure () { - ./configure ${EXTRA_OECONF} -} - -do_compile () { - oe_runmake build - oe_runmake compile -} - -do_stage () { - : -} - -do_install () { - install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \ - ${D}${libexecdir}/appWeb ${D}${libdir} - install -m 0755 appWeb/appWeb ${D}${sbindir}/ - install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/ - install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/ - install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/ -} diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb index dc0ac7d0dd..8cf506af2c 100644 --- a/packages/appweb/appweb_1.2.0.bb +++ b/packages/appweb/appweb_1.2.0.bb @@ -6,8 +6,14 @@ SRC_URI = "http://www.mbedthis.com/software/appWeb-src-1.2.0-1.tar.gz \ file://nonrootinstall.patch;patch=1" S = "${WORKDIR}/appWeb-1.2.0" -APPWEB_HOST = "${HOST_SYS}" +APPWEB_HOST = "${@get_appweb_host(d, bb)}" APPWEB_BUILD = "${BUILD_SYS}" + +def get_appweb_host(d, bb): + host = bb.data.getVar('HOST_SYS', d, 1) + return host.replace('-linux-uclibc', '-linux') + + # --buildNumber=NUMBER Set the build number part of the version (1.0.0.X). # --name=NAME Set the full product name (BLD_NAME define). # --port=PORT Set the default HTTP port to use for the product. -- cgit v1.2.3