diff options
| -rw-r--r-- | packages/images/fso-image.bb | 19 | ||||
| -rw-r--r-- | packages/jamvm/files/jamvm_1.4.5-initial.patch | 73 | ||||
| -rw-r--r-- | packages/jamvm/jamvm-initial_1.4.5.bb | 38 |
3 files changed, 130 insertions, 0 deletions
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 8c9d56adbc..f1b9104b87 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -64,6 +64,13 @@ AUDIO_INSTALL = "\ fso-sounds \ " +GTK_INSTALL = "\ + openmoko-calculator2 \ + openmoko-terminal2 \ + gpe-scap \ + tangogps \ +" + # FIXME these should rather be part of alsa-state, # once Om stabilizes them... AUDIO_INSTALL_append_om-gta01 = "\ @@ -90,6 +97,7 @@ ZHONE_INSTALL = "\ IMAGE_INSTALL = "\ ${BASE_INSTALL} \ ${X_INSTALL} \ + ${GTK_INSTALL} \ ${AUDIO_INSTALL} \ ${TOOLS_INSTALL} \ ${PYTHON_INSTALL} \ @@ -102,14 +110,25 @@ inherit image fso_rootfs_postprocess() { curdir=$PWD cd ${IMAGE_ROOTFS} + # date/time date "+%m%d%H%M%Y" >./etc/timestamp + # alias foo echo "alias pico=nano" >>./etc/profile echo "alias fso='cd /local/pkg/fso'" >>./etc/profile echo "alias ipkg='opkg'" >>./etc/profile + # nfs mkdir -p ./local/pkg echo >>./etc/fstab echo "# NFS Host" >>./etc/fstab echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab + # fix .desktop files for illume + desktop=`find ./usr/share/applications -name "*.desktop"` + for file in $desktop; do + echo "Categories=Office;" >>$file + done + # minimal gtk theme foo + mkdir -p ./etc/gtk-2.0/ + echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc cd $curdir } diff --git a/packages/jamvm/files/jamvm_1.4.5-initial.patch b/packages/jamvm/files/jamvm_1.4.5-initial.patch new file mode 100644 index 0000000000..3c68818955 --- /dev/null +++ b/packages/jamvm/files/jamvm_1.4.5-initial.patch @@ -0,0 +1,73 @@ +Index: jamvm-1.4.5/configure.ac +=================================================================== +--- jamvm-1.4.5.orig/configure.ac ++++ jamvm-1.4.5/configure.ac +@@ -1,6 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/jam.c) +-AM_INIT_AUTOMAKE(jamvm, 1.4.5) ++AM_INIT_AUTOMAKE(jamvm-initial, 1.4.5) + AC_CONFIG_HEADERS([src/config.h]) + AC_PREFIX_DEFAULT(/usr/local/jamvm) + +Index: jamvm-1.4.5/java-initial +=================================================================== +--- /dev/null ++++ jamvm-1.4.5/java-initial +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# ++# Wrapper script inspired by the one provided by cacao. ++ ++exec jamvm-initial ${1+"$@"} +Index: jamvm-1.4.5/lib/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/lib/Makefile.am ++++ jamvm-1.4.5/lib/Makefile.am +@@ -1,4 +1,4 @@ +-@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip ++@use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath-initial/glibj.zip + @use_zip_no@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/ + + SUBDIRS = jamvm java gnu sun +Index: jamvm-1.4.5/src/dll.c +=================================================================== +--- jamvm-1.4.5.orig/src/dll.c ++++ jamvm-1.4.5/src/dll.c +@@ -294,7 +294,7 @@ char *getDllPath() { + } + + char *getBootDllPath() { +- return CLASSPATH_INSTALL_DIR"/lib/classpath"; ++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial"; + } + + char *getDllName(char *name) { +Index: jamvm-1.4.5/src/Makefile.am +=================================================================== +--- jamvm-1.4.5.orig/src/Makefile.am ++++ jamvm-1.4.5/src/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = os + DIST_SUBDIRS = os arch + + bin_PROGRAMS = jamvm +-include_HEADERS = jni.h ++noinst_HEADERS = jni.h + + lib_LTLIBRARIES = libjvm.la + noinst_LTLIBRARIES = libcore.la +Index: jamvm-1.4.5/src/class.c +=================================================================== +--- jamvm-1.4.5.orig/src/class.c ++++ jamvm-1.4.5/src/class.c +@@ -1653,8 +1653,8 @@ void scanDirsForJars(char *directories) + } + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" +-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" ++#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm-initial/classes.zip" ++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip" + #else + #define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" diff --git a/packages/jamvm/jamvm-initial_1.4.5.bb b/packages/jamvm/jamvm-initial_1.4.5.bb new file mode 100644 index 0000000000..c71811dd4e --- /dev/null +++ b/packages/jamvm/jamvm-initial_1.4.5.bb @@ -0,0 +1,38 @@ +SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" + +DEPENDS = "zlib-native classpath-initial jikes-initial" + +PR = "r0" + +PROVIDES = "virtual/java-initial" + +S = "${WORKDIR}/jamvm-${PV}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ + file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \ + " + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit native autotools + +EXTRA_OECONF = "\ + --with-classpath-install-dir=${prefix} \ + --program-suffix=-initial \ + " + +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +do_compile() { + oe_runmake \ + JAVAC=jikes-initial \ + GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip +} + +do_stage_append() { + install -d ${STAGING_BINDIR} + install -m 0755 java-initial ${STAGING_BINDIR} +} |