diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-08-21 15:44:29 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-08-21 15:44:29 +0000 |
| commit | 1a29e9f0e4f2b31e0c668b7a4daa6ca436119a10 (patch) | |
| tree | 2ac29c58a1d67ac30fe3aa3786f14d62d177d9ed /packages | |
| parent | dd5d2d7643d4dab3b88d2fdf85df726c37af0982 (diff) | |
| parent | e295c6669417f74e0127fcce8a80627a1c042ef3 (diff) | |
merge of '7ba62c1bc5f5f44c638e1e5f4805429a188ca3a6'
and 'a211067fbce0623d7710d98f40f12ce3a2247ecf'
Diffstat (limited to 'packages')
102 files changed, 3087 insertions, 1051 deletions
diff --git a/packages/busybox/busybox-1.9.2/topmem.patch b/packages/busybox/busybox-1.9.2/topmem.patch new file mode 100644 index 0000000000..d49bf58103 --- /dev/null +++ b/packages/busybox/busybox-1.9.2/topmem.patch @@ -0,0 +1,28 @@ +Index: busybox-1.9.2/procps/top.c +=================================================================== +--- busybox-1.9.2.orig/procps/top.c 2008-08-21 16:19:31.004137057 +0200 ++++ busybox-1.9.2/procps/top.c 2008-08-21 16:21:46.066805448 +0200 +@@ -909,17 +909,22 @@ + #else + qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); + #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ +- } else { /* TOPMEM */ ++ } ++#if ENABLE_FEATURE_TOPMEM ++ else { /* TOPMEM */ + qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); + } ++#endif + count = lines; + if (OPT_BATCH_MODE || count > ntop) { + count = ntop; + } + if (scan_mask == TOP_MASK) + display_process_list(count, col); ++#if ENABLE_FEATURE_TOPMEM + else + display_topmem_process_list(count, col); ++#endif + clearmems(); + if (iterations >= 0 && !--iterations) + break; diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index 37cd2a86be..e5c0f2473c 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \ + file://topmem.patch;patch=1 \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \ diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb index e2c92cc328..eac95b8ace 100644 --- a/packages/cacao/cacaoh-cldc-native_0.98.bb +++ b/packages/cacao/cacaoh-cldc-native_0.98.bb @@ -1,19 +1,9 @@ require cacaoh-native.inc -DEPENDS += "midpath-cldc-native" - SRC_URI = "\ http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \ " -EXTRA_OECONF += "\ - --with-classpath-includedir=${STAGING_INCDIR}/classpath \ - --enable-jni \ - --enable-java=cldc1.1 \ - --with-classpath=cldc1.1 \ - --with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \ -" - do_stage() { install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV} } diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb index 756dd9ffe9..8ed5c44d94 100644 --- a/packages/dbus-java/dbus-java_2.3.bb +++ b/packages/dbus-java/dbus-java_2.3.bb @@ -20,10 +20,15 @@ RSUGGESTS_libdbus-java = "libunixsocket-java dbus" RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + do_compile () { # run target .binclasses first to fix a brokenness in the Makefile oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ JAVAC="javac" \ JARPREFIX="${STAGING_DATADIR_JAVA}" \ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ @@ -32,7 +37,7 @@ do_compile () { .binclasses oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFL |