diff options
55 files changed, 973 insertions, 287 deletions
diff --git a/classes/autotools_stage.bbclass b/classes/autotools_stage.bbclass new file mode 100644 index 0000000000..3007eef969 --- /dev/null +++ b/classes/autotools_stage.bbclass @@ -0,0 +1,6 @@ +inherit autotools + +do_stage () { + autotools_stage_all +} + diff --git a/conf/checksums.ini b/conf/checksums.ini index 3a129b7924..bb29499183 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -258,6 +258,10 @@ sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff md5=7030996497f3cf012bc9e99b4ca3e920 sha256=be21e3d5fa2edd1f5ff5952f67e6574dae15a027b26415910dfe813902fd5985 +[http://downloads.sourceforge.net/freeimage/FreeImage3110.zip] +md5=ad1db36414391417654ba7bf1c0277d3 +sha256=84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c + [http://www.urban.ne.jp/home/kanemori/zaurus/FreeNote_1.12.0.tar.gz] md5=06b5aeb6cc97107090438a364f0ce89b sha256=e6a0a5b674c4803bfd1ffda9660c29f4399294623ed095b0d1c554367c7db73c @@ -1434,6 +1438,10 @@ sha256=7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f md5=c3702668a640be1695956115857ec22e sha256=8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3 +[http://www.apache.org/dist/apr/apr-util-1.3.4.tar.gz] +md5=a10e2ca150ff07f484c724c36142211f +sha256=3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e + [ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz] md5=26b37525371cdaaec552237e0667305d sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10 @@ -2754,6 +2762,10 @@ sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03 md5=d113f2777e4f508faa8b674ece87a37b sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f +[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch] +md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4 +sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5 + [http://www.busybox.net/downloads/busybox-1.13.2.tar.gz] md5=aeb526108f13b91c02b115c8d86f9659 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83 @@ -10138,6 +10150,10 @@ sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f md5=03a0f63b997ce7b83a1eeaa6b80f4388 sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f +[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz] +md5=9c0ae9880e9b6e081f1a238fe6a28bd5 +sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d + [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz] md5=a891a699010452258d77e59842ebe4a0 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e @@ -11382,6 +11398,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb md5=15de3830b751818a54a42899bd3ae72c sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb +[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz] +md5=fa4a620efa1a1c1036b6701b7d4dafe1 +sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c + +[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-gtk-0.2.8.tar.gz] +md5=c3e62c1912c0dba013c8f3df28fc809d +sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef + [http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz] md5=866fd13611a8de946428db1df9be8468 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7 @@ -15870,6 +15894,10 @@ sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1 md5=b374415d7f5d485993fa697ab9a678b4 sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1 +[http://downloads.sourceforge.net/ogre/ogre-v1-6-1.tar.bz2] +md5=6fbd72e81dd4c135a2cc4f78d596aeb4 +sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb + [http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2] md5=9807d4451e65cb4ec385155eef7bf3cf sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3 @@ -21906,6 +21934,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345 md5=c990186db06cf188cb267d12bc21e2da sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345 +[http://downloads.sourceforge.net/witty/wt-2.2.3.tar.gz] +md5=2f4c34f1e092451d3c4d2e7f8c250015 +sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3 + [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz] md5=b6319d5e75611fe2210453b5feb82c0c sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4 @@ -25142,6 +25174,10 @@ sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8 md5=4943ab7aa141af2c339266cd66b05c74 sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867 +[http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2] +md5=5f7b88ebb2bcd7e8044328482d079661 +sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af + [http://heanet.dl.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2] md5=5f7b88ebb2bcd7e8044328482d079661 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 711c0f74d6..c51684d0e6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -22,6 +22,9 @@ SRCREV_pn-bootchart-lite ?= "4" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" +SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" +SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" SRCREV_pn-clutter ?= "3240" SRCREV_pn-comic-reader ?= "54" SRCREV_pn-connman ?= "103706c4f4da0c89f8b6f33cccdc3149f4ecc09a" @@ -54,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d" SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" -SRCREV_pn-fso-abyss ?= "b8430f9e8898dae390191fb114904f13583043f5" +SRCREV_pn-fso-abyss ?= "4afeacb21c3d4193289e2b7db549a91751d75195" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 92651f60f1..b26df9dfea 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,18 +3,29 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" - -MACHINE_KERNEL_VERSION ?= "2.6" -require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc require conf/machine/include/tune-strongarm.inc -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +MACHINE_KERNEL_VERSION = "2.6" +KERNEL_IMAGE_MAXSIZE = "1048576" +KERNEL_IMAGETYPE = "zImage" +SERIAL_CONSOLE = "115200 ttySA0" + +ROOT_FLASH_SIZE = "14" +# actually 14680064, see EXTRA_IMAGECMD + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +XSERVER ?= "xserver-kdrive-fbdev" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" + IMAGE_LINGUAS ?= "" IMAGE_FSTYPES ?= "jffs2 tar.gz" -ROOT_FLASH_SIZE = "14" -# actually 14680064, see EXTRA_IMAGECMD above +PCMCIA_MANAGER ?= "pcmciautils" -XSERVER ?= "xserver-kdrive-fbdev" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" + +require conf/machine/include/kexecboot.inc diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc index 0a9f209fe2..c8656bb117 100644 --- a/conf/machine/include/kexecboot.inc +++ b/conf/machine/include/kexecboot.inc @@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image" # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels DONT_CHECK_KERNELSIZE ?= "1" +MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 8fb36f78be..aeba16b67c 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -2,7 +2,6 @@ # Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" @@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -ZAURUS-UPDATER_collie = "" ZAURUS-UPDATER = "zaurus-updater" EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" SERIAL_CONSOLE = "115200 ttyS0" -SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" @@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-px MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \ - kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \ - kernel-module-power" GUI_MACHINE_CLASS = "bigscreen" -GUI_MACHINE_CLASS_collie = "smallscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGE_MAXSIZE_collie = "1048576" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" @@ -69,10 +60,8 @@ zaurus_make_installkit () { [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin fi - # All zaurus machines except collie need updater.sh - if [ "${MACHINE}" != "collie" ]; then - cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh - fi + cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh + tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 diff --git a/packages/apr/apr-util/configfix.patch b/packages/apr/apr-util/configfix.patch new file mode 100644 index 0000000000..a8953e5244 --- /dev/null +++ b/packages/apr/apr-util/configfix.patch @@ -0,0 +1,49 @@ +Index: apr-util-1.3.4/apu-config.in +=================================================================== +--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000 ++++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000 +@@ -134,14 +134,7 @@ + exit 0 + ;; + --includes) +- if test "$location" = "installed"; then + flags="$flags -I$includedir $INCLUDES" +- elif test "$location" = "source"; then +- flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES" +- else +- # this is for VPATH builds +- flags="$flags -I$APU_BUILD_DIR/include -I$APU_SOURCE_DIR/include $INCLUDES" +- fi + ;; + --ldflags) + flags="$flags $LDFLAGS" +@@ -155,28 +148,10 @@ + exit 0 + ;; + --link-ld) +- if test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib + flags="$flags -L$libdir -l$APRUTIL_LIBNAME" +- else +- flags="$flags -L$APU_BUILD_DIR -l$APRUTIL_LIBNAME" +- fi + ;; + --link-libtool) +- # If the LA_FILE exists where we think it should be, use it. If we're +- # installed and the LA_FILE does not exist, assume to use -L/-l +- # (the LA_FILE may not have been installed). If we're building ourselves, +- # we'll assume that at some point the .la file be created. +- if test -f "$LA_FILE"; then +- flags="$flags $LA_FILE" +- elif test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib +- # Since the user is specifying they are linking with libtool, we +- # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l$APRUTIL_LIBNAME" +- else +- flags="$flags $LA_FILE" +- fi ++ flags="$flags -l$APRUTIL_LIBNAME" + ;; + --apu-la-file) + if test -f "$LA_FILE"; then diff --git a/packages/apr/apr-util/configure_fixes.patch b/packages/apr/apr-util/configure_fixes.patch index 7c6fa6a4d2..0b2a0903e1 100644 --- a/packages/apr/apr-util/configure_fixes.patch +++ b/packages/apr/apr-util/configure_fixes.patch @@ -1,6 +1,8 @@ ---- /tmp/configure.in 2009-02-06 16:34:14.000000000 +0100 -+++ apr-util-1.2.12/configure.in 2009-02-06 16:34:38.000000000 +0100 -@@ -8,13 +8,13 @@ +Index: apr-util-1.3.4/configure.in +=================================================================== +--- apr-util-1.3.4.orig/configure.in ++++ apr-util-1.3.4/configure.in +@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in) AC_CONFIG_HEADER(include/private/apu_config.h) AC_CONFIG_AUX_DIR(build) @@ -11,6 +13,7 @@ -sinclude(build/find_apr.m4) -sinclude(build/dbm.m4) -sinclude(build/dbd.m4) +-sinclude(build/dso.m4) +#sinclude(build/apu-conf.m4) +#sinclude(build/apu-iconv.m4) +#sinclude(build/apu-hints.m4) @@ -18,20 +21,7 @@ +#sinclude(build/find_apr.m4) +#sinclude(build/dbm.m4) +#sinclude(build/dbd.m4) ++#sinclude(build/dso.m4) dnl Generate ./config.nice for reproducing runs of configure dnl -@@ -45,10 +45,10 @@ - # against installed versions of libapr instead of those just - # built. - case $host in --*-apple-darwin*) LT_NO_INSTALL="" ;; --*) LT_NO_INSTALL="-no-install" ;; -+*-apple-darwin*) LV_NO_INSTALL="" ;; -+*) LV_NO_INSTALL="-no-install" ;; - esac --AC_SUBST(LT_NO_INSTALL) -+AC_SUBST(LV_NO_INSTALL) - - dnl - dnl compute the top directory of the build diff --git a/packages/apr/apr-util/configure_fixes.patch.old b/packages/apr/apr-util/configure_fixes.patch.old new file mode 100644 index 0000000000..16f88b3bba --- /dev/null +++ b/packages/apr/apr-util/configure_fixes.patch.old @@ -0,0 +1,25 @@ +Index: apr-util-1.2.12/configure.in +=================================================================== +--- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000 ++++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000 +@@ -8,13 +8,13 @@ + AC_CONFIG_HEADER(include/private/apu_config.h) + AC_CONFIG_AUX_DIR(build) + +-sinclude(build/apu-conf.m4) +-sinclude(build/apu-iconv.m4) +-sinclude(build/apu-hints.m4) +-sinclude(build/apr_common.m4) +-sinclude(build/find_apr.m4) +-sinclude(build/dbm.m4) +-sinclude(build/dbd.m4) ++#sinclude(build/apu-conf.m4) ++#sinclude(build/apu-iconv.m4) ++#sinclude(build/apu-hints.m4) ++#sinclude(build/apr_common.m4) ++#sinclude(build/find_apr.m4) ++#sinclude(build/dbm.m4) ++#sinclude(build/dbd.m4) + + dnl Generate ./config.nice for reproducing runs of configure + dnl diff --git a/packages/apr/apr-util_1.3.4.bb b/packages/apr/apr-util_1.3.4.bb new file mode 100644 index 0000000000..6b2e9cc903 --- /dev/null +++ b/packages/apr/apr-util_1.3.4.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Apache Portable Runtime (APR) companion library" +SECTION = "libs" +DEPENDS = "apr expat gdbm" +LICENSE = "Apache License, Version 2.0" + +PR = "r5" + +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \ + file://configfix.patch;patch=1 \ + file://configure_fixes.patch;patch=1" + +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ + --with-dbm=gdbm \ + --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \ + --without-sqlite2 \ + --without-sqlite3 \ + --with-expat=${STAGING_DIR_HOST}${layout_prefix}" + + +inherit autotools_stage lib_package binconfig + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk + echo "AC_PROG_LIBTOOL" >> ${S}/configure.in +} + +do_configure_append() { + sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk + sed -i /^LIBTOOL/d ${S}/build/rules.mk + echo LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool --tag=CC" >> ${S}/build/rules.mk +} + diff --git a/packages/apr/apr/cleanup.patch b/packages/apr/apr/cleanup.patch new file mode 100644 index 0000000000..fd74826480 --- /dev/null +++ b/packages/apr/apr/cleanup.patch @@ -0,0 +1,42 @@ +Index: apr-1.3.3/build/buildcheck.sh +=================================================================== +--- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000 ++++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000 +@@ -32,35 +32,4 @@ + echo "buildconf: autoconf version $ac_version (ok)" + fi + +-# Sample libtool --version outputs: +-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) +-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a +-# output is multiline from 1.5 onwards +- +-# Require libtool 1.4 or newer +-libtool=`build/PrintPath glibtool libtool libtool15 libtool14` +-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` +-if test -z "$lt_pversion"; then +-echo "buildconf: libtool not found." +-echo " You need libtool version 1.4 or newer installed" +-echo " to build APR from SVN." +-exit 1 +-fi +-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` +-IFS=.; set $lt_version; IFS=' ' +-lt_status="good" +-if test "$1" = "1"; then +- if test "$2" -lt "4"; then +- lt_status="bad" +- fi +-fi +-if test $lt_status = "good"; then +- echo "buildconf: libtool version $lt_pversion (ok)" +- exit 0 +-fi +- +-echo "buildconf: libtool version $lt_pversion found." +-echo " You need libtool version 1.4 or newer installed" +-echo " to build APR from SVN." +- +-exit 1 ++exit 0 +\ No newline at end of file diff --git a/packages/apr/apr/configfix.patch b/packages/apr/apr/configfix.patch new file mode 100644 index 0000000000..995555e8ba --- /dev/null +++ b/packages/apr/apr/configfix.patch @@ -0,0 +1,51 @@ +Index: apr-1.3.3/apr-config.in +=================================================================== +--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000 ++++ apr-1.3.3/apr-config.in 2009-01-12 15:19:25.000000000 +0000 +@@ -152,14 +152,7 @@ + flags="$flags $LDFLAGS" + ;; + --includes) +- if test "$location" = "installed"; then + flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "source"; then +- flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" +- else +- # this is for VPATH builds +- flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" +- fi + ;; + --srcdir) + echo $APR_SOURCE_DIR +@@ -181,29 +167,14 @@ + exit 0 + ;; + --link-ld) +- if test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l${APR_LIBNAME}" +- else +- ### this surely can't work since the library is in .libs? +- flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" +- fi ++ flags="$flags -l${APR_LIBNAME}" + ;; + --link-libtool) + # If the LA_FILE exists where we think it should be, use it. If we're + # installed and the LA_FILE does not exist, assume to use -L/-l + # (the LA_FILE may not have been installed). If we're building ourselves, + # we'll assume that at some point the .la file be created. +- if test -f "$LA_FILE"; then +- flags="$flags $LA_FILE" +- elif test "$location" = "installed"; then +- ### avoid using -L if libdir is a "standard" location like /usr/lib +- # Since the user is specifying they are linking with libtool, we +- # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" +- else +- flags="$flags $LA_FILE" +- fi ++ flags="$flags -l${APR_LIBNAME}" + ;; + --shlib-path-var) + echo "$SHLIBPATH_VAR" diff --git a/packages/apr/apr/configure_fixes.patch b/packages/apr/apr/configure_fixes.patch index 88e1e2163a..86ceb8cf08 100644 --- a/packages/apr/apr/configure_fixes.patch +++ b/packages/apr/apr/configure_fixes.patch @@ -1,54 +1,66 @@ ---- /tmp/configure.in 2009-02-02 17:50:51.000000000 +0100 -+++ apr-1.2.12/configure.in 2009-02-02 17:54:55.000000000 +0100 -@@ -13,12 +13,11 @@ - dnl - dnl Include our own M4 macros along with those for libtool - dnl --sinclude(build/apr_common.m4) --sinclude(build/apr_network.m4) --sinclude(build/apr_threads.m4) --sinclude(build/apr_hints.m4) --sinclude(build/libtool.m4) --sinclude(build/ltsugar.m4) -+#sinclude(build/apr_common.m4) -+#sinclude(build/apr_network.m4) -+#sinclude(build/apr_threads.m4) -+#sinclude(build/apr_hints.m4) -+#sinclude(build/libtool.m4) +Index: apr-1.3.3/configure.in +=================================================================== +--- apr-1.3.3.orig/configure.in ++++ apr-1.3.3/configure.in +@@ -794,39 +794,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm + create_area]) - dnl Hard-coded inclusion at the tail end of apr_private.h: - AH_BOTTOM([ -@@ -197,8 +196,8 @@ + APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) +-AC_CHECK_FILE(/dev/zero) +- +-# Not all systems can mmap /dev/zero (such as HP-UX). Check for that. +-if test "$ac_cv_func_mmap" = "yes" && +- test "$ac_cv_file__dev_zero" = "yes"; then +- AC_MSG_CHECKING(for mmap that can map /dev/zero) +- AC_TRY_RUN([ +-#include <sys/types.h> +-#include <sys/stat.h> +-#include <fcntl.h> +-#ifdef HAVE_SYS_MMAN_H +-#include <sys/mman.h> +-#endif +- int main() +- { +- int fd; +- void *m; +- fd = open("/dev/zero", O_RDWR); +- if (fd < 0) { +- return 1; +- } +- m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); +- if (m == (void *)-1) { /* aka MAP_FAILED */ +- return 2; +- } +- if (munmap(m, sizeof(void*)) < 0) { +- return 3; +- } +- return 0; +- }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no]) +- +- AC_MSG_RESULT($ac_cv_file__dev_zero) +-fi - if test "x$use_libtool" = "xyes"; then - lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' -- LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" -- link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" -+ LV_VERSION="-version-info `$get_version libtool $version_hdr APR`" -+ link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LV_LDFLAGS) \$(COMPILE) ${LV_VERSION} \$(ALL_LDFLAGS) -o \$@" - so_ext='lo' - lib_target='-rpath $(libdir) $(OBJECTS)' - export_lib_target='-rpath \$(libdir) \$(OBJECTS)' -@@ -225,7 +224,7 @@ - AC_SUBST(export_lib_target) - AC_SUBST(shlibpath_var) - AC_SUBST(LTFLAGS) --AC_SUBST(LT_LDFLAGS) -+AC_SUBST(LV_LDFLAGS) + # Now we determine which one is our anonymous shmem preference. + haveshmgetanon="0" +@@ -1518,13 +1485,14 @@ else + bigendian=0 + fi - dnl ----------------------------- Checks for compiler flags - nl=' -@@ -2132,10 +2131,10 @@ - # against installed versions of libapr instead of those just - # built. - case $host in --*-apple-darwin*) LT_NO_INSTALL="" ;; --*) LT_NO_INSTALL="-no-install" ;; -+*-apple-darwin*) LV_NO_INSTALL="" ;; -+*) LV_NO_INSTALL="-no-install" ;; - esac --AC_SUBST(LT_NO_INSTALL) -+AC_SUBST(LV_NO_INSTALL) +-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> +-#include <sys/uio.h>],struct iovec,0) +-if test "$ac_cv_sizeof_struct_iovec" = "0"; then +- have_iovec=0 +-else +- have_iovec=1 +-fi ++#APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h> ++##include <sys/uio.h>],struct iovec,0) ++#if test "$ac_cv_sizeof_struct_iovec" = "0"; then ++# have_iovec=0 ++#else ++# have_iovec=1 ++#fi ++have_iovec=1 - # - # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles + AC_SUBST(voidp_size) + AC_SUBST(short_value) diff --git a/packages/apr/apr_1.3.3.bb b/packages/apr/apr_1.3.3.bb new file mode 100644 index 0000000000..0d0fd667c0 --- /dev/null +++ b/packages/apr/apr_1.3.3.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Apache Portable Runtime (APR) library" +SECTION = "libs" +LICENSE = "Apache License, Version 2.0" + +PR = "r4" + +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \ + file://configure_fixes.patch;patch=1 \ + file://cleanup.patch;patch=1 \ + file://configfix.patch;patch=1" + +inherit autotools lib_package binconfig + +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + +do_configure_prepend() { + cd ${S} + ./buildconf +} + +do_stage() { + autotools_stage_all + install -d ${STAGING_DATADIR}/apr + cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/ + sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk + sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk + sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${TARGET_PREFIX}libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk + sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk + cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/ + cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/ + cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/ +} diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 0ad71ca9d6..5ab187d89d 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r1" +PR = "r2" BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" @@ -70,6 +70,9 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" PACKAGES += "${PN}" RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" +# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works +TARGET_CC_ARCH += " ${LDFLAGS}" + # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this # stuff is documented... diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index 77d99e4fda..76c8322fb9 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -1,8 +1,6 @@ include boost-36.inc -DEFAULT_PREFERENCE = "-1" - -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ diff --git a/packages/busybox/busybox-1.13.2/angstrom/defconfig b/packages/busybox/busybox-1.13.2/angstrom/defconfig index 203acfd20b..0db650fcf1 100644 --- a/packages/busybox/busybox-1.13.2/angstrom/defconfig +++ b/packages/busybox/busybox-1.13.2/angstrom/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.13.2 -# Fri Jan 23 17:02:44 2009 +# Sun Feb 8 17:22:39 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -19,7 +19,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set CONFIG_LOCALE_SUPPORT=y @@ -82,7 +82,7 @@ CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_HISTORY=64 CONFIG_FEATURE_EDITING_SAVEHISTORY=y CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_USERNAME_COMPLETION=y @@ -124,7 +124,7 @@ CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_UNAME_GNAME=y # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set @@ -152,7 +152,7 @@ CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -169,7 +169,7 @@ CONFIG_EXPR=y CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set @@ -192,8 +192,8 @@ CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y CONFIG_NOHUP=y CONFIG_OD=y # CONFIG_PRINTENV is not set @@ -204,7 +204,7 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y @@ -223,7 +223,7 @@ CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -341,7 +341,7 @@ CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y @@ -350,7 +350,7 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -361,8 +361,8 @@ CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities @@ -430,7 +430,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" CONFIG_INSMOD=y CONFIG_RMMOD=y CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODPROBE=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y # CONFIG_DEPMOD is not set @@ -468,7 +468,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y CONFIG_FEATURE_OSF_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y # CONFIG_FINDFS is not set -# CONFIG_FREERAMDISK is not set +CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y CONFIG_MKFS_MINIX=y @@ -515,7 +515,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_MOUNT=y # CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_VERBOSE=y CONFIG_FEATURE_MOUNT_HELPERS=y CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y @@ -526,7 +526,7 @@ CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y CONFIG_RDEV=y CONFIG_READPROFILE=y -# CONFIG_RTCWAKE is not set +CONFIG_RTCWAKE=y # CONFIG_SCRIPT is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y @@ -569,10 +569,10 @@ CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVMEM is not set # CONFIG_EJECT is not set # CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set +CONFIG_FBSPLASH=y # CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y # CONFIG_FEATURE_LAST_FANCY is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -594,7 +594,7 @@ CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set -# CONFIG_MICROCOM is not set +CONFIG_MICROCOM=y # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set @@ -627,26 +627,26 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" @@ -686,8 +686,8 @@ CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_PING6=y @@ -708,10 +708,10 @@ CONFIG_FEATURE_TFTP_PUT=y # CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DHCPRELAY=y CONFIG_APP_DUMPLEASES=y # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" @@ -831,12 +831,12 @@ CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_RANDOM_SUPPORT is not set CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set diff --git a/packages/busybox/busybox-1.13.2/defconfig b/packages/busybox/busybox-1.13.2/defconfig index 33fc2da6f4..0db650fcf1 100644 --- a/packages/busybox/busybox-1.13.2/defconfig +++ b/packages/busybox/busybox-1.13.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.13.2 -# Fri Jan 23 16:57:40 2009 +# Sun Feb 8 17:22:39 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -19,7 +19,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set CONFIG_LOCALE_SUPPORT=y @@ -82,7 +82,7 @@ CONFIG_FEATURE_FAST_TOP=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_HISTORY=64 CONFIG_FEATURE_EDITING_SAVEHISTORY=y CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_USERNAME_COMPLETION=y @@ -121,10 +121,10 @@ CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_AUTODETECT=y CONFIG_FEATURE_TAR_FROM=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +CONFIG_FEATURE_TAR_LONG_OPTIONS=y CONFIG_FEATURE_TAR_UNAME_GNAME=y # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set @@ -147,12 +147,12 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set +CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -169,7 +169,7 @@ CONFIG_EXPR=y CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set @@ -192,8 +192,8 @@ CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y CONFIG_NOHUP=y CONFIG_OD=y # CONFIG_PRINTENV is not set @@ -204,7 +204,7 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y @@ -223,7 +223,7 @@ CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -295,7 +295,7 @@ CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set CONFIG_RUN_PARTS=y CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_FEATURE_RUN_PARTS_FANCY=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y @@ -310,7 +310,7 @@ CONFIG_CMP=y CONFIG_DIFF=y CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_FEATURE_DIFF_MINIMAL=y # CONFIG_ED is not set CONFIG_PATCH=y CONFIG_SED=y @@ -321,10 +321,10 @@ CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set +CONFIG_FEATURE_VI_DOT_CMD=y # CONFIG_FEATURE_VI_READONLY is not set # CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y @@ -341,7 +341,7 @@ CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y @@ -350,7 +350,7 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -360,57 +360,57 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set # CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set +CONFIG_FEATURE_INITRD=y +CONFIG_HALT=y # CONFIG_MESG is not set # # Login/Password Management Utilities # -# CONFIG_FEATURE_SHADOWPASSWDS is not set +CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_DELUSER=y +CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y # CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y # # Linux Ext2 FS Progs @@ -430,7 +430,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" CONFIG_INSMOD=y CONFIG_RMMOD=y CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODPROBE=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y # CONFIG_DEPMOD is not set @@ -465,10 +465,10 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y # CONFIG_FINDFS is not set -# CONFIG_FREERAMDISK is not set +CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y CONFIG_MKFS_MINIX=y @@ -476,7 +476,7 @@ CONFIG_MKFS_MINIX=y # Minix filesystem support # CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set +CONFIG_GETOPT=y CONFIG_HEXDUMP=y # CONFIG_FEATURE_HEXDUMP_REVERSE is not set # CONFIG_HD is not set @@ -486,12 +486,12 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y # CONFIG_IPCRM is not set # CONFIG_IPCS is not set CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_V0 is not set CONFIG_MORE=y @@ -515,7 +515,7 @@ CONFIG_VOLUMEID=y # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_MOUNT=y # CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set +CONFIG_FEATURE_MOUNT_VERBOSE=y CONFIG_FEATURE_MOUNT_HELPERS=y CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y @@ -525,15 +525,15 @@ CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y CONFIG_RDEV=y -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y # CONFIG_SCRIPT is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set +CONFIG_FEATURE_UMOUNT_ALL=y # # Common options for mount/umount @@ -569,10 +569,10 @@ CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVMEM is not set # CONFIG_EJECT is not set # CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set +CONFIG_FBSPLASH=y # CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y # CONFIG_FEATURE_LAST_FANCY is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -590,15 +590,15 @@ CONFIG_FEATURE_LESS_FLAGS=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set +CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set -# CONFIG_MICROCOM is not set +CONFIG_MICROCOM=y # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set +CONFIG_READAHEAD=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -627,26 +627,26 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" @@ -686,8 +686,8 @@ CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_PING6=y @@ -707,11 +707,11 @@ CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set # CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DHCPRELAY=y CONFIG_APP_DUMPLEASES=y # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" @@ -762,8 +762,8 @@ CONFIG_KILLALL=y # CONFIG_NMETER is not set # CONFIG_PGREP is not set CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y @@ -831,12 +831,12 @@ CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_RANDOM_SUPPORT is not set CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index 56f47b37a2..5ae76b900d 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,14 +1,17 @@ require busybox.inc - -PR = "r10" +PR = "r12" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch;patch=1 \ + http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-init.patch;patch=1 \ + http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-mdev.patch;patch=1 \ + http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch;patch=1 \ + http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch;patch=1 \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ file://B921600.patch;patch=1 \ - file://r24785.patch;patch=1;status=merged \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ diff --git a/packages/clutter/clutter-gtk-0.6_git.bb b/packages/clutter/clutter-gtk-0.6_git.bb new file mode 100644 index 0000000000..89f2592bfc --- /dev/null +++ b/packages/clutter/clutter-gtk-0.6_git.bb @@ -0,0 +1,9 @@ +require clutter-gtk.inc + +PV = "0.6.0+git${SRCREV}" + +DEPENDS += "clutter-0.6" + +SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-6" + +S = "${WORKDIR}/git" diff --git a/packages/clutter/clutter-gtk-0.8_git.bb b/packages/clutter/clutter-gtk-0.8_git.bb new file mode 100644 index 0000000000..3fb0cff8aa --- /dev/null +++ b/packages/clutter/clutter-gtk-0.8_git.bb @@ -0,0 +1,9 @@ +require clutter-gtk.inc + +PV = "0.8.0+git${SRCREV}" + +DEPENDS += "clutter" + +SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0-8" + +S = "${WORKDIR}/git" diff --git a/packages/clutter/clutter-gtk.inc b/packages/clutter/clutter-gtk.inc new file mode 100644 index 0000000000..bbecee548c --- /dev/null +++ b/packages/clutter/clutter-gtk.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Clutter GTK+" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "gtk+" + +FILESPATH = "${FILE_DIRNAME}/clutter-gtk" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" + +inherit autotools_stage pkgconfig gtk-doc + diff --git a/packages/clutter/clutter-gtk_git.bb b/packages/clutter/clutter-gtk_git.bb new file mode 100644 index 0000000000..a3e3767f90 --- /dev/null +++ b/packages/clutter/clutter-gtk_git.bb @@ -0,0 +1,10 @@ +require clutter-gst.inc + +PV = "0.9.0+git${SRCREV}" +PR = "r0" + +SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git" + +S = "${WORKDIR}/git" + +DEPENDS = "clutter" diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc index e91ddaa40e..97a45ac8dc 100644 --- a/packages/eglibc/eglibc.inc +++ b/packages/eglibc/eglibc.inc @@ -18,4 +18,6 @@ LEAD_SONAME = "libc.so" GLIBC_EXTRA_OECONF ?= "" INHIBIT_DEFAULT_DEPS = "1" +ARM_INSTRUCTION_SET = "arm" + PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/eglibc/eglibc_2.9.bb b/packages/eglibc/eglibc_2.9.bb index 7643bb3f6b..7a71fcd646 100644 --- a/packages/eglibc/eglibc_2.9.bb +++ b/packages/eglibc/eglibc_2.9.bb @@ -4,7 +4,7 @@ DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "r2" +PR = "r3" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb index 7038d5e0f9..471f404fc1 100644 --- a/packages/freesmartphone/fso-abyss_git.bb +++ b/packages/freesmartphone/fso-abyss_git.bb @@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib libgee" LICENSE = "GPL" -PV = "0.1.0+gitr${SRCREV}" +PV = "0.2.0+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master" diff --git a/packages/gnome/libchamplain-gtk_0.2.8.bb b/packages/gnome/libchamplain-gtk_0.2.8.bb new file mode 100644 index 0000000000..b72685a786 --- /dev/null +++ b/packages/gnome/libchamplain-gtk_0.2.8.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Libchamplain is a C library aimed to provide a Gtk+ widget to display rasterized maps. " +LICENSE = "LGPL" +DEPENDS = "libchamplain clutter-gtk-0.8" + +inherit gnome autotools_stage + +SRC_URI = "http://libchamplain.pierlux.com/release/${PV}/libchamplain-gtk-${PV}.tar.gz" + + diff --git a/packages/gnome/libchamplain_0.2.8.bb b/packages/gnome/libchamplain_0.2.8.bb new file mode 100644 index 0000000000..9418a4d3e0 --- /dev/null +++ b/packages/gnome/libchamplain_0.2.8.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Libchamplain is a C library aimed to provide a Gtk+ widget to display rasterized maps. " +LICENSE = "LGPL" +DEPENDS = "clutter-cairo libsoup-2.4 clutter gtk+" + +inherit gnome autotools_stage + +SRC_URI = "http://libchamplain.pierlux.com/release/${PV}/libchamplain-${PV}.tar.gz" + +FILES_${PN} += "${datadir}/champlain/error.svg" + diff --git a/packages/jack/jack_0.116.2.bb b/packages/jack/jack_0.116.2.bb new file mode 100644 index 0000000000..f0a2e7525e --- /dev/null +++ b/packages/jack/jack_0.116.2.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "JACK is a low-latency audio server. It can \ +connect a number of different applications to an audio \ +device, as well as allowing them to share audio between \ +themselves." +SECTION = "libs/multimedia" +PRIORITY = "optional" +LICENSE = "GPL LGPL" +PR = "r0" + +DEPENDS = "alsa-lib" + +SRC_URI = "http://jackaudio.org/downloads/jack-audio-connection-kit-${PV}.tar.gz" +S = "${WORKDIR}/jack-audio-connection-kit-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \ + --disable-portaudio --disable-coreaudio --enable-oss --enable-alsa" + +EXTRA_OEMAKE = 'transform="s,^,,"' +LDFLAGS_append = " -ldl -L${STAGING_LIBDIR}" + +PACKAGES =+ "libjack jack-server jack-examples" + +FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" +FILES_jack-server = "${bindir}/jackd" +FILES_jack-examples = "${bindir}/*" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/kexecboot/kexecboot-cfg_0.1.bb b/packages/kexecboot/kexecboot-cfg_0.1.bb new file mode 100644 index 0000000000..394e531760 --- /dev/null +++ b/packages/kexecboot/kexecboot-cfg_0.1.bb @@ -0,0 +1,25 @@ +LICENSE = "GPL" +SECTION = "base" +DESCRIPTION = "Configuration file for kexecboot" + +PR = "r1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" +CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd" +CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd" + +CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' + +CMDLINE_MEM_collie = "mem=${mem}M" + +CMDLINE_ROTATE_spitz = "fbcon=rotate:1" +CMDLINE_ROTATE_akita = "fbcon=rotate:1" +CMDLINE_ROTATE_collie = "fbcon=rotate:1" +CMDLINE_ROTATE_poodle = "fbcon=rotate:1" +FILES_${PN} += "/boot/*" + +do_install () { + install -d ${D}/boot + echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> ${D}/boot/kernel-cmdline +} diff --git a/packages/kexecboot/kexecboot_0.5.bb b/packages/kexecboot/kexecboot_0.5.bb new file mode 100644 index 0000000000..b901903a2a --- /dev/null +++ b/packages/kexecboot/kexecboot_0.5.bb @@ -0,0 +1,4 @@ +SRC_URI = "http://projects.linuxtogo.org/frs/download.php/226/kexecboot-${PV}.tar.gz \ + " + +require kexecboot.inc diff --git a/packages/kexecboot/linux-kexecboot.inc b/packages/kexecboot/linux-kexecboot.inc index 86c4ebbbbe..2056758796 100644 --- a/packages/kexecboot/linux-kexecboot.inc +++ b/packages/kexecboot/linux-kexecboot.inc @@ -1,3 +1,6 @@ +# We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels: +PR = "r12" + SRC_URI = "file://defconfig" LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}' diff --git a/packages/kexecboot/linux-kexecboot_2.6.21-hh20.bb b/packages/kexecboot/linux-kexecboot_2.6.21-hh20.bb index 002ed7b200..7667037037 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.21-hh20.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.21-hh20.bb @@ -4,8 +4,6 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_hx4700 = "1" DEFAULT_PREFERENCE_h2200 = "1" -PR = "r2" - SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://linux-2.6.git-9d20fdd58e74d4d26dc5216efaaa0f800c23dd3a.patch;patch=1 \ http://www.rpsys.net/openzaurus/patches/archive/export_atags-r0a.patch;patch=1 \ diff --git a/packages/kexecboot/linux-kexecboot_2.6.24.bb b/packages/kexecboot/linux-kexecboot_2.6.24.bb index 2c97cf6d35..f728c7adc1 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.24.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.24.bb @@ -1,7 +1,5 @@ require linux-kexecboot.inc -PR = "r7" - DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "-1" DEFAULT_PREFERENCE_poodle = "1" diff --git a/packages/kexecboot/linux-kexecboot_2.6.26.bb b/packages/kexecboot/linux-kexecboot_2.6.26.bb index 6c97db2341..bf1dbb62bf 100644 --- a/packages/kexecboot/linux-kexecboot_2.6.26.bb +++ b/packages/kexecboot/linux-kexecboot_2.6.26.bb @@ -1,6 +1,5 @@ require linux-kexecboot.inc -PR = "r11" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" diff --git a/packages/libpcap/libpcap.inc b/packages/libpcap/libpcap.inc index f2e5d3072b..4468a4b89e 100644 --- a/packages/libpcap/libpcap.inc +++ b/packages/libpcap/libpcap.inc @@ -2,7 +2,9 @@ DESCRIPTION = "Network Packet Capture Library" HOMEPAGE = "http://www.tcpdump.org/" SECTION = "libs/network" LICENSE = "BSD" -DEPENDS = "flex-native bison-native" +DEPENDS = "bluez-libs flex-native bison-native" + +PR = "r1" # Don't forget to edit shared.patch to have the correct version number inside SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \ diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa index a7b8a8229e..b39c9f0914 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24 -# Wed Feb 4 10:30:32 2009 +# Sun Feb 8 12:31:04 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -760,14 +760,22 @@ CONFIG_NETDEV_10000=y # CONFIG_WLAN_PRE80211 is not set CONFIG_WLAN_80211=y # CONFIG_PCMCIA_RAYCS is not set -# CONFIG_LIBERTAS is not set -# CONFIG_HERMES is not set -# CONFIG_ATMEL is not set -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_USB_ZD1201 is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_ATMEL=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_USB_ZD1201=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m # diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index cb2e85e49a..e2af859069 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -68,24 +68,6 @@ module_autoload_collie-ts_collie = "collie-ts" module_autoload_leds-locomo_collie = "leds-locomo" module_autoload_power_collie = "power" - -#package kernel cmdline -PACKAGES_append += "kernel-cmdline" -FILES_kernel-cmdline = "/boot/kernel-cmdline*" -PKG_kernel-cmdline = "kernel-cmdline-${KERNEL_VERSION}" -RRECOMMENDS_kernel-base += "kernel-cmdline" - -pkg_postinst_kernel-cmdline () { - cd /boot; update-alternatives --install /boot/kernel-cmdline kernel-cmdline kernel-cmdline-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -} - -pkg_postrm_kernel-cmdline () { - cd /boot; update-alternatives --remove kernel-cmdline kernel-cmdline-${KERNEL_VERSION} || true -} -do_install_append () { - echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> "${D}/boot/kernel-cmdline-${KERNEL_VERSION}" -} - do_configure() { rm -f ${S}/.config @@ -165,10 +147,6 @@ do_configure() { yes '' | oe_runmake oldconfig } -#collie dosn't need to deploy kernel. The kernel is in the rootfs and -# linux-kexecboot kernel is flashed -do_deploy_collie() { -} # wlan-ng stuff need compiled kernel sources do_rm_work() { diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index ebc969f1bf..2293eea80e 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r34" +PR = "r35" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 8c7a22d00f..7b06916e1c 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r21" +PR = "r22" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb index 3f9eac86a5..1ce1e01c78 100644 --- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb +++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "1" diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb index 524405cfd9..406d95d2d0 100644 --- a/packages/linux/linux-rp_2.6.26.bb +++ b/packages/linux/linux-rp_2.6.26.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r7" +PR = "r8" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_qemuarm = "-1" diff --git a/packages/ogre/files/ogre-egl-update.diff b/packages/ogre/files/ogre-egl-update.diff new file mode 100644 index 0000000000..9173715ee3 --- /dev/null +++ b/packages/ogre/files/ogre-egl-update.diff @@ -0,0 +1,165 @@ +Index: RenderSystems/GLES/include/OgreGLESSupport.h +=================================================================== +--- RenderSystems/GLES/include/OgreGLESSupport.h (revision 8310) ++++ RenderSystems/GLES/include/OgreGLESSupport.h (working copy) +@@ -80,6 +80,11 @@ + virtual void initialiseExtensions(); + virtual bool checkExtension(const String& ext) const; + ++ virtual unsigned int getDisplayMonitorCount() const ++ { ++ return 1; ++ } ++ + virtual void start() = 0; + virtual void stop() = 0; + +Index: RenderSystems/GLES/include/OgreGLESRenderSystem.h +=================================================================== +--- RenderSystems/GLES/include/OgreGLESRenderSystem.h (revision 8310) ++++ RenderSystems/GLES/include/OgreGLESRenderSystem.h (working copy) +@@ -139,9 +139,11 @@ + void _setTextureBorderColour(size_t stage, const ColourValue& colour); + void _setTextureMipmapBias(size_t unit, float bias); + void _setTextureMatrix(size_t stage, const Matrix4& xform); +- void _setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor); +- void _setSeparateSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha); +- void _setAlphaRejectSettings(CompareFunction func, unsigned char value); ++ void _setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendOperation op ); ++ void _setSeparateSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha, SceneBlendOperation op, SceneBlendOperation alphaOp ); ++ void _setSceneBlendingOperation(SceneBlendOperation op); ++ void _setSeparateSceneBlendingOperation(SceneBlendOperation op, SceneBlendOperation alphaOp); ++ void _setAlphaRejectSettings(CompareFunction func, unsigned char value, bool alphaToCoverage); + void _setViewport(Viewport *vp); + void _beginFrame(void); + void _endFrame(void); +@@ -195,6 +197,7 @@ + + GLESContext* _getMainContext() { return mMainContext; } + void _unregisterContext(GLESContext *context); ++ unsigned int getDisplayMonitorCount() const; + void _switchContext(GLESContext *context); + void _oneTimeContextInitialization(); + void initialiseContext(RenderWindow* primary); +Index: RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h +=================================================================== +--- RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h (revision 8310) ++++ RenderSystems/GLES/include/OgreGLESDefaultHardwareBufferManager.h (working copy) +@@ -110,6 +110,8 @@ + HardwareIndexBufferSharedPtr + createIndexBuffer(HardwareIndexBuffer::IndexType itype, size_t numIndexes, + HardwareBuffer::Usage usage, bool useShadowBuffer = false); ++ // Create a render to vertex buffer ++ RenderToVertexBufferSharedPtr createRenderToVertexBuffer(); + }; + } + +Index: RenderSystems/GLES/src/OgreGLESRenderSystem.cpp +=================================================================== +--- RenderSystems/GLES/src/OgreGLESRenderSystem.cpp (revision 8310) ++++ RenderSystems/GLES/src/OgreGLESRenderSystem.cpp (working copy) +@@ -1182,7 +1182,8 @@ + return GL_ONE; + } + +- void GLESRenderSystem::_setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor) ++ ++ void GLESRenderSystem::_setSceneBlending(SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, SceneBlendOperation op ) + { + GLint sourceBlend = getBlendMode(sourceFactor); + GLint destBlend = getBlendMode(destFactor); +@@ -1199,17 +1200,19 @@ + GL_CHECK_ERROR; + } + } +- +- void GLESRenderSystem::_setSeparateSceneBlending(SceneBlendFactor sourceFactor, +- SceneBlendFactor destFactor, +- SceneBlendFactor sourceFactorAlpha, +- SceneBlendFactor destFactorAlpha) ++ ++ void GLESRenderSystem::_setSeparateSceneBlending( ++ SceneBlendFactor sourceFactor, SceneBlendFactor destFactor, ++ SceneBlendFactor sourceFactorAlpha, SceneBlendFactor destFactorAlpha, ++ SceneBlendOperation op, SceneBlendOperation alphaOp ) + { + // Not supported + } + +- void GLESRenderSystem::_setAlphaRejectSettings(CompareFunction func, unsigned char value) ++ void GLESRenderSystem::_setAlphaRejectSettings(CompareFunction func, unsigned char value, bool alphaToCoverage) + { ++ bool a2c = false; ++ static bool lasta2c = false; + if (func == CMPF_ALWAYS_PASS) + { + glDisable(GL_ALPHA_TEST); +@@ -1222,6 +1225,15 @@ + glAlphaFunc(convertCompareFunction(func), value / 255.0f); + GL_CHECK_ERROR; + } ++ if (a2c != lasta2c && getCapabilities()->hasCapability(RSC_ALPHA_TO_COVERAGE)) ++ { ++ if (a2c) ++ glEnable(GL_SAMPLE_ALPHA_TO_COVERAGE); ++ else ++ glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); ++ ++ lasta2c = a2c; ++ } + } + + void GLESRenderSystem::_setViewport(Viewport *vp) +@@ -2084,7 +2096,12 @@ + { + // Not implemented + } +- ++ ++ unsigned int GLESRenderSystem::getDisplayMonitorCount() const ++ { ++ return mGLSupport->getDisplayMonitorCount(); ++ } ++ + void GLESRenderSystem::setClipPlanesImpl(const Ogre::PlaneList& clipPlanes) + { + // A note on GL user clipping: +Index: RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp +=================================================================== +--- RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp (revision 8310) ++++ RenderSystems/GLES/src/OgreGLESDefaultHardwareBufferManager.cpp (working copy) +@@ -164,4 +164,12 @@ + return HardwareIndexBufferSharedPtr( + new GLESDefaultHardwareIndexBuffer(itype, numIndexes, usage)); + } ++ ++ RenderToVertexBufferSharedPtr ++ GLESDefaultHardwareBufferManager::createRenderToVertexBuffer() ++ { ++ OGRE_EXCEPT(Exception::ERR_RENDERINGAPI_ERROR, ++ "Cannot create RenderToVertexBuffer in GLESDefaultHardwareBufferManager", ++ "GLESDefaultHardwareBufferManager::createRenderToVertexBuffer"); ++ } + } +Index: RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp +=================================================================== +--- RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp (revision 8310) ++++ RenderSystems/GLES/src/EGL/OgreEGLWindow.cpp (working copy) +@@ -182,7 +182,7 @@ + + if ((opt = miscParams->find("parentWindowHandle")) != end) + { +- std::vector<String> tokens = StringUtil::split(opt->second, " :"); ++ StringVector tokens = StringUtil::split(opt->second, " :"); + + if (tokens.size() == 3) + { +@@ -197,7 +197,7 @@ + } + else if ((opt = miscParams->find("externalWindowHandle")) != end) + { +- std::vector<String> tokens = StringUtil::split(opt->second, " :"); ++ StringVector tokens = StringUtil::split(opt->second, " :"); + + LogManager::getSingleton().logMessage( + "EGLWindow::create: The externalWindowHandle parameter is deprecated.\n" diff --git a/packages/ogre/freeimage_3.11.0.bb b/packages/ogre/freeimage_3.11.0.bb new file mode 100644 index 0000000000..8281aaf371 --- /dev/null +++ b/packages/ogre/freeimage_3.11.0.bb @@ -0,0 +1,29 @@ +LICENSE = "MIT" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freeimage/FreeImage3110.zip" + +S = "${WORKDIR}/FreeImage/" + +do_configure() { + sed -i -e /^CC/d \ + -e /^CXX\ /d \ + -e /^AR/d \ + -e /^INCDIR\ /d \ + -e /^INSTALLDIR\ /d \ + -e s:'-o root -g root'::g \ + -e /ldconfig/d \ + ${S}/Makefile.gnu +} + +do_install() { + install -d ${D}${libdir} + install -d ${D}${includedir} + oe_runmake INSTALLDIR="${D}${libdir}" INCDIR="${D}${includedir}" install +} + +do_stage() { + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} + oe_runmake INSTALLDIR="${STAGING_LIBDIR}" INCDIR="${STAGING_INCDIR}" install +} + diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb new file mode 100644 index 0000000000..8cecf56a7d --- /dev/null +++ b/packages/ogre/ogre-egl_svn.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D engine " +LICENSE = "LGPL" +DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl" + +SRCREV = "8310" +PV = "1.6.1+svnr${SRCREV}" + +SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https \ + file://ogre-egl-update.diff;patch=1;pnum=0 \ + " + +inherit autotools_stage + +# This is the EGL version +EXTRA_OECONF = " --with-allocator=std --enable-threading=no --disable-cg --enable-gles " + +S = "${WORKDIR}/trunk" + + +EXTRA_OEMAKE = " ZZIPLIB_CFLAGS=\"${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DOGRE_CONFIG_LITTLE_ENDIAN', '-DOGRE_CONFIG_BIG_ENDIAN', d)}\" " + +do_configure_prepend() { + sed -i -e /OGRE_DETECT_ENDIAN/d ${S}/configure.in +} + +FILES_${PN}-dbg += "${libdir}/OGRE/.debug" +FILES_${PN}-dev += "${libdir}/OGRE/*.la" +FILES_${PN} += "${libdir}/OGRE/*.so" + diff --git a/packages/powervr-drivers/libgles-omap3.inc b/packages/powervr-drivers/libgles-omap3.inc index 2789ac8bc5..36c2b6e9dd 100644 --- a/packages/powervr-drivers/libgles-omap3.inc +++ b/packages/powervr-drivers/libgles-omap3.inc @@ -1,6 +1,8 @@ DESCRIPTION = "libGLES for the omap3" LICENCE = "proprietary-binary" +PROVIDES += "virtual/egl" + # Put "OMAP35x_Graphics_SDK_setuplinux_3_00_00_05.bin" in the same directory as this recipe SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \ file://rc.pvr \ @@ -60,9 +62,16 @@ do_install () { install -d ${D}${includedir} cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ install -d ${D}${sysconfdir}/init.d/ cp -pP ${WORKDIR}/rc.pvr ${D}${sysconfdir}/init.d/pvr-init + + install -d ${D}${sysconfdir} + echo "[default]" > ${D}${sysconfdir}/powervr.ini + echo "WindowSystem=libpvrPVR2D_FRONTWSEGL.so" >> ${D}${sysconfdir}/powervr.ini } do_stage () { @@ -72,6 +81,9 @@ do_stage () { install -d ${STAGING_INCDIR} cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${STAGING_INCDIR}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/ } pkg_postinst() { diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf index 3059a466da..8d59d5d6f3 100644 --- a/packages/slugos-init/files/sysconf +++ b/packages/slugos-init/files/sysconf @@ -381,7 +381,7 @@ sysconf_restore_conffiles(){ else echo "sysconf_restore_conffiles: $file: timestamp copy failed (ignored)" >&2 fi - elif test -h "$saved/file" -o -h "$ffsdir/$file" + elif test -h "$saved/$file" -o -h "$ffsdir/$file" then # new or old symbolic link if test -h "$saved/$file" -a -h "$ffsdir/$file" && @@ -396,7 +396,7 @@ sysconf_restore_conffiles(){ echo "$file" echo "$file" >&3;; diff) # need user input - if sysconf_verify_link "$file" <>/dev/tty >&0 2>&0 + if sysconf_verify_link "$file" </dev/tty >/dev/tty 2>&1 then echo "$file" echo "$file" >&3 @@ -420,7 +420,7 @@ sysconf_restore_conffiles(){ echo "$file" echo "$file" >&3;; diff) # the files are different, get user input - if sysconf_verify "$file" <>/dev/tty >&0 2>&0 + if sysconf_verify "$file" </dev/tty >/dev/tty 2>&1 then echo "$file" echo "$file" >&3 @@ -456,7 +456,7 @@ sysconf_test_restore(){ elif test "$file" = "etc/.configured" then : # special handling - elif test -h "$saved/file" -o -h "$ffsdir/$file" + elif test -h "$saved/$file" -o -h "$ffsdir/$file" then # new or old symbolic link if test -h "$saved/$file" -a -h "$ffsdir/$file" && diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index e7a45a94aa..7d4769d6e9 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r8" +PR = "r9" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/wt/wt_2.2.3.bb b/packages/wt/wt_2.2.3.bb new file mode 100644 index 0000000000..ec0f3cc302 --- /dev/null +++ b/packages/wt/wt_2.2.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "A C++ Web Toolkit" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "boost zlib openssl" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ + file://cmakelist.patch;patch=1" + +FILES_${PN} += "${datadir}/Wt" +FILES_${PN}-dev += "${datadir}/cmake-2.*" + +inherit cmake + +STAGE_TEMP = "${WORKDIR}/temp-staging" + +do_configure_append() { + ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C +} + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR} + rm -rf ${STAGE_TEMP} +} + diff --git a/packages/xqt2/files/fix_seqfault_qtscreen.patch b/packages/xqt2/files/fix_seqfault_qtscreen.patch new file mode 100644 index 0000000000..43b97f4bdb --- /dev/null +++ b/packages/xqt2/files/fix_seqfault_qtscreen.patch @@ -0,0 +1,13 @@ +--- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100 ++++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100 +@@ -406,7 +406,9 @@ + // + void qtScreen::keyPressEvent(QKeyEvent *ev) + { +- static QTextCodec *codec = QTextCodec::codecForName("eucJP"); ++ //static QTextCodec *codec = QTextCodec::codecForName("eucJP"); ++ //Better to choose the locale - even better provide a command line switch! ++ static QTextCodec *codec = QTextCodec::codecForLocale(); + + #ifdef QWS + QCString euc; diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index 731385adb4..7b56c37f37 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r3" +PR = "r4" inherit palmtop @@ -22,7 +22,8 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pse file://fephack.patch;patch=1 \ file://xchar2b.patch;patch=1 \ file://xqt-make.patch;patch=1 \ - file://fix_qtscreen_HACK.patch;patch=1 " + file://fix_qtscreen_HACK.patch;patch=1 \ + file://fix_seqfault_qtscreen.patch;patch=1 " S = "${WORKDIR}/xc" QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' diff --git a/packages/xqtlauncher/xqtlauncher.bb b/packages/xqtlauncher/xqtlauncher.bb index 043ee566e3..5fc80b1e51 100644 --- a/packages/xqtlauncher/xqtlauncher.bb +++ b/packages/xqtlauncher/xqtlauncher.bb @@ -1,7 +1,7 @@ DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" HOMEPAGE = "http://angstrom-distribution.org/" LICENSE = "GPL" -PR = "r1" +PR = "r2" RDEPENDS = "xqt2 xorg-minimal-fonts" diff --git a/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh b/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh index 0356d332ff..59efad3be3 100755 --- a/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh +++ b/packages/xqtlauncher/xqtlauncher/xqtlauncher-convert.sh @@ -5,7 +5,7 @@ for i in `find /usr/share/applications -name *.desktop`; do newfile=/usr/lib/opie/apps/XQt2/$name.desktop if [ ! -f $newfile ] ; then #cat $i | awk 'BEGIN {FS="="} {if ($1 == "Exec") {print "Exec=run"ENVIRON["name"]" " $2} else if ($1 == "Icon") {print "Icon=/usr/share/pixmaps/"$2} else {print $0} }' > $newfile - cat $i | awk 'BEGIN {FS="="} {if ($1 == "Exec") {print "Exec=run"ENVIRON["name"]" " $2} else {print $0} }' > $newfile + cat $i | awk 'BEGIN {FS="="} {if ($1 == "Exec") {print "Exec=/usr/lib/opie/bin/run"ENVIRON["name"]" " $2} else {print $0} }' > $newfile icon=$(cat $i | awk 'BEGIN {FS="="} {if ($1 == "Icon") {print $2} }') ln -sf /usr/bin/xqtlauncher /usr/lib/opie/bin/run$name #We need to make symlinks for the pics because opie can not handle pics with paths :( diff --git a/packages/zziplib/zziplib.inc b/packages/zziplib/zziplib.inc index 602eae6315..e0ef3f2e58 100644 --- a/packages/zziplib/zziplib.inc +++ b/packages/zziplib/zziplib.inc @@ -14,7 +14,17 @@ do_configure_append() { sed -i \ -e "s|tail -1|tail -n 1|" \ -e "s|dist dist-all dist-all:|dist dist-all:|" \ - Makefile + -e "s|docs||g" \ + Makefile mkdir ${S}/build } + + +do_compile_append() { +for i in ${S}/*/*.pc ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i +done +} diff --git a/packages/zziplib/zziplib_0.13.49.bb b/packages/zziplib/zziplib_0.13.49.bb index 3a6c148dc5..f90e41f5a9 100644 --- a/packages/zziplib/zziplib_0.13.49.bb +++ b/packages/zziplib/zziplib_0.13.49.bb @@ -1,5 +1,7 @@ require zziplib.inc +PR = "r1" + SRC_URI += "\ file://zip_c.patch;patch=1 \ file://zziplib-autoconf.patch;patch=1 \ |