[oe-commits] org.oe.dev merge of '9dc7779dad5b6a6762c08a60de1c3cba24575356'
mickeyl commit
oe at amethyst.openembedded.net
Sun Jul 27 16:54:44 UTC 2008
merge of '9dc7779dad5b6a6762c08a60de1c3cba24575356'
and 'a08c13e1d6c50600fb85844f3940034870cd26ad'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0dc157d146c11b00a52d985950481dd2a8c370de
ViewMTN: http://monotone.openembedded.org/revision/info/0dc157d146c11b00a52d985950481dd2a8c370de
Files:
1
packages/jamvm/files/jamvm_1.4.5-initial.patch
packages/jamvm/jamvm-initial_1.4.5.bb
packages/classpath/classpath-native.inc
packages/openchrome/openchrome.inc
packages/openchrome/openchrome_svn.bb
packages/openchrome/xf86-video-openchrome_0.2.902.bb
packages/tasks/task-mythfront.bb
packages/images/fso-image.bb
Diffs:
#
# mt diff -r9dc7779dad5b6a6762c08a60de1c3cba24575356 -r0dc157d146c11b00a52d985950481dd2a8c370de
#
#
#
# add_file "packages/jamvm/files/jamvm_1.4.5-initial.patch"
# content [5f7d5417f566f9937a18bddfa1e2ed462babbc22]
#
# add_file "packages/jamvm/jamvm-initial_1.4.5.bb"
# content [c21b003fb1ee97620f078412147c76fa95f9926e]
#
# patch "packages/classpath/classpath-native.inc"
# from [f1053899930127b54417bca6f25818bdf90a200e]
# to [1ac43332aef0a8c639c3aca49bc3319d0ced8273]
#
# patch "packages/openchrome/openchrome.inc"
# from [6b05f1276b7c3b8ed66ecb3b304ef3578d60373f]
# to [9289056713085ea3b218f5a8361f128dfdcbd4b4]
#
# patch "packages/openchrome/openchrome_svn.bb"
# from [09a235effbb87c3702c8b93749812c0d5f51ab2f]
# to [620d7da746e80389843521b8fa4261bccf240ced]
#
# patch "packages/openchrome/xf86-video-openchrome_0.2.902.bb"
# from [af8e84ea948021194f8c0a6a0b2648d7dfde2bac]
# to [aa063269846ae6af14936f70f285fc3e2fa39659]
#
# patch "packages/tasks/task-mythfront.bb"
# from [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
# to [57152c79e113714f749f454369eb70e26b0853d2]
#
============================================================
--- packages/jamvm/files/jamvm_1.4.5-initial.patch 5f7d5417f566f9937a18bddfa1e2ed462babbc22
+++ packages/jamvm/files/jamvm_1.4.5-initial.patch 5f7d5417f566f9937a18bddfa1e2ed462babbc22
@@ -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 @@
+- at use_zip_yes@ GLIBJ_ZIP = ${with_classpath_install_dir}/share/classpath/glibj.zip
++ at 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"
============================================================
--- packages/jamvm/jamvm-initial_1.4.5.bb c21b003fb1ee97620f078412147c76fa95f9926e
+++ packages/jamvm/jamvm-initial_1.4.5.bb c21b003fb1ee97620f078412147c76fa95f9926e
@@ -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}
+}
============================================================
--- packages/classpath/classpath-native.inc f1053899930127b54417bca6f25818bdf90a200e
+++ packages/classpath/classpath-native.inc 1ac43332aef0a8c639c3aca49bc3319d0ced8273
@@ -6,7 +6,7 @@ SRC_URI = "${GNU_MIRROR}/classpath/class
SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-DEPENDS = "ecj-initial fastjar-native zip-native"
+DEPENDS = "ecj-initial fastjar-native zip-nativei gettext-native"
inherit autotools native
@@ -29,7 +29,13 @@ EXTRA_OECONF = "\
--includedir=${STAGING_INCDIR}/classpath \
--with-vm=java \
"
+# hack to get config.rpath in, it comes from gettext
+do_configure_prepend () {
+ ${@['','cp ${STAGING_DATADIR}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']}
+
+}
+
do_stage() {
oe_runmake install
}
============================================================
--- packages/openchrome/openchrome.inc 6b05f1276b7c3b8ed66ecb3b304ef3578d60373f
+++ packages/openchrome/openchrome.inc 9289056713085ea3b218f5a8361f128dfdcbd4b4
@@ -1,5 +1,4 @@ PACKAGES = "libviaXvMC libviaXvMCPro lib
PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
-PACKAGES_DYNAMIC = "xorg-driver-via"
FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
============================================================
--- packages/openchrome/openchrome_svn.bb 09a235effbb87c3702c8b93749812c0d5f51ab2f
+++ packages/openchrome/openchrome_svn.bb 620d7da746e80389843521b8fa4261bccf240ced
@@ -1,4 +1,5 @@ S = "${WORKDIR}/trunk"
SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http"
S = "${WORKDIR}/trunk"
+PACKAGES_DYNAMIC = "xorg-driver-via"
include openchrome.inc
============================================================
--- packages/openchrome/xf86-video-openchrome_0.2.902.bb af8e84ea948021194f8c0a6a0b2648d7dfde2bac
+++ packages/openchrome/xf86-video-openchrome_0.2.902.bb aa063269846ae6af14936f70f285fc3e2fa39659
@@ -1,3 +1,4 @@ SRC_URI = "http://www.openchrome.org/rel
SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+PACKAGES_DYNAMIC = "xorg-driver-openchrome"
include openchrome.inc
============================================================
--- packages/tasks/task-mythfront.bb 9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9
+++ packages/tasks/task-mythfront.bb 57152c79e113714f749f454369eb70e26b0853d2
@@ -1,11 +1,11 @@ DESCRIPTION = "Meta-package for MythTV d
DESCRIPTION = "Meta-package for MythTV diskless frontend"
-PR = "r14"
+PR = "r16"
inherit task
-RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
+RDEPENDS_${PN} = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse"
-RDEPENDS_${PN}_append_epia = " xorg-driver-via mesa-dri-driver-unichrome"
+RDEPENDS_${PN}_append_epia = " xorg-driver-openchrome mesa-dri-driver-unichrome"
PACKAGE_ARCH_epia = "${MACHINE_ARCH}"
#
# mt diff -ra08c13e1d6c50600fb85844f3940034870cd26ad -r0dc157d146c11b00a52d985950481dd2a8c370de
#
#
#
# patch "packages/images/fso-image.bb"
# from [5c8597f6d160a644126f564543e5c4e542223e4b]
# to [0846b765e7589f6a8a71d18695fd72da40666a8f]
#
============================================================
--- packages/images/fso-image.bb 5c8597f6d160a644126f564543e5c4e542223e4b
+++ packages/images/fso-image.bb 0846b765e7589f6a8a71d18695fd72da40666a8f
@@ -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 @@ IMAGE_INSTALL = "\
IMAGE_INSTALL = "\
${BASE_INSTALL} \
${X_INSTALL} \
+ ${GTK_INSTALL} \
${AUDIO_INSTALL} \
${TOOLS_INSTALL} \
${PYTHON_INSTALL} \
@@ -102,14 +110,25 @@ fso_rootfs_postprocess() {
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
}
More information about the Openembedded-commits
mailing list