[oe-commits] org.oe.dev merge of '036e2e71bb09d2efdeab9165b6946b947e4316b2'
crofton commit
openembedded-commits at lists.openembedded.org
Thu Aug 9 02:15:17 UTC 2007
merge of '036e2e71bb09d2efdeab9165b6946b947e4316b2'
and '73523d2b53ed38a63f46fcb966b7de6091c0c9d5'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 852e79e4fd49c31ea2c4db69de85247ea872bc5c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=852e79e4fd49c31ea2c4db69de85247ea872bc5c
Files:
1
packages/cacao
packages/cacao/files
packages/midpath
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/cacao/files/arm_mmap.patch
packages/cacao/files/classpath_var.patch
packages/cacao/files/libmath.patch
packages/cacao/files/midpath.patch
packages/cacao/files/offset.h_arm.patch
packages/cacao/files/offsets_make.patch
packages/midpath/midpath-alsa_svn.bb
packages/midpath/midpath-cldc-x11_svn.bb
packages/midpath/midpath-gtk_svn.bb
packages/midpath/midpath-native_svn.bb
packages/midpath/midpath-qt3x11_svn.bb
packages/midpath/midpath-qte_svn.bb
packages/midpath/midpath_svn.bb
classes/base.bbclass
classes/gtk-icon-cache.bbclass
conf/bitbake.conf
packages/autoconf/autoconf-native_2.61.bb
packages/autoconf/autoconf_2.61.bb
packages/exmap-console/exmap-console_0.4.bb
packages/exmap-console/exmap-console_0.4.1.bb
packages/exmap-console/exmap-console.inc
packages/exmap-console/exmap-console_svn.bb
Diffs:
#
# mt diff -r036e2e71bb09d2efdeab9165b6946b947e4316b2 -r852e79e4fd49c31ea2c4db69de85247ea872bc5c
#
#
#
# add_dir "packages/cacao"
#
# add_dir "packages/cacao/files"
#
# add_dir "packages/midpath"
#
# add_file "packages/cacao/cacao-cldc_0.98.bb"
# content [638b504328b4b00e7847c72728b8fd48190cd126]
#
# add_file "packages/cacao/cacao.inc"
# content [850a3631e55de6c25da31b955be07c7b8c2a42e3]
#
# add_file "packages/cacao/cacaoh-cldc-native_0.98.bb"
# content [80dbefd60462f32de95373690a2c248477fe9183]
#
# add_file "packages/cacao/files/arm_mmap.patch"
# content [45dbc46941b95102aa800f44e7356566d102196c]
#
# add_file "packages/cacao/files/classpath_var.patch"
# content [c04e83ae51270d3ebec918b295178a033c94e4be]
#
# add_file "packages/cacao/files/libmath.patch"
# content [1d4cb756e5ac08cb73324e178057ad65823a9f0b]
#
# add_file "packages/cacao/files/midpath.patch"
# content [39901dc0bb8c438d3b35d8dd264a4a45f4f5e75e]
#
# add_file "packages/cacao/files/offset.h_arm.patch"
# content [c08ba4ebdc4862d862425c5621819991c19fcd8e]
#
# add_file "packages/cacao/files/offsets_make.patch"
# content [ef9ca31e88c88aae677d9160a0019830f3aa4b19]
#
# add_file "packages/midpath/midpath-alsa_svn.bb"
# content [fb00f08dd7e21b0915d61bc4f5da08d449c042dd]
#
# add_file "packages/midpath/midpath-cldc-x11_svn.bb"
# content [4508d47ae521121138c38ca1c627bbe1b03a38b0]
#
# add_file "packages/midpath/midpath-gtk_svn.bb"
# content [8b8dbd9444e83c2f45d5646af02cfd5654a87113]
#
# add_file "packages/midpath/midpath-native_svn.bb"
# content [d5f1cdf7fe2c541f753f4b5bd7a09e6524916905]
#
# add_file "packages/midpath/midpath-qt3x11_svn.bb"
# content [ae69b147de0f7b04618b3b2d35131bc7ce9c9adc]
#
# add_file "packages/midpath/midpath-qte_svn.bb"
# content [3712d85d8c5ae1385fb2ed8a6b0631a4fbac2839]
#
# add_file "packages/midpath/midpath_svn.bb"
# content [746724449d034c259adac0c1deb3a12a0c152ea9]
#
# patch "classes/base.bbclass"
# from [814ca4a03b3d5ea4596ae040b150a92ea3076a42]
# to [1fa503b3ccef56a6f8b086ebe3645e7d155c31d3]
#
# patch "classes/gtk-icon-cache.bbclass"
# from [2c00130ba17205e8f5cc856de7067a2448120604]
# to [75b805566ae03614fdfdd691b5b9542ed54bf96c]
#
# patch "conf/bitbake.conf"
# from [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
# to [b185da507a3c374b9fdc2dda0edafa17db3c8fcd]
#
# patch "packages/autoconf/autoconf-native_2.61.bb"
# from [d2d5ff88d7322226f5bcfa5b3c4f3044d6b4b993]
# to [5b5e460d1ae2d2c23c9ee23969e82124c681c4c0]
#
# patch "packages/autoconf/autoconf_2.61.bb"
# from [2649340a39fc22ba02826daeab7d0a79afaad42e]
# to [c54a5aee52046432870f167d5f80009f6bf44115]
#
============================================================
--- packages/cacao/cacao-cldc_0.98.bb 638b504328b4b00e7847c72728b8fd48190cd126
+++ packages/cacao/cacao-cldc_0.98.bb 638b504328b4b00e7847c72728b8fd48190cd126
@@ -0,0 +1,35 @@
+
+require cacao.inc
+
+SRC_URI +="file://midpath.patch;patch=1 \
+ file://offsets_make.patch;patch=1 \
+ file://classpath_var.patch;patch=1 \
+ file://libmath.patch;patch=1 \
+ file://arm_mmap.patch;patch=1 \
+ "
+SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1"
+
+DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool zlib"
+RDEPENDS = "virtual/cldc-api-1.1"
+RPROVIDES = "virtual/java"
+
+EXTRA_OECONF += "--with-classpath-libdir=${STAGING_LIBDIR}/classpath-minimal \
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \
+ --enable-jni \
+ --enable-java=cldc1.1 \
+ --with-classpath=cldc1.1 \
+ --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \
+ --with-target-classpath-classes=${libdir}/java/cldc1.1.jar \
+ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh \
+ --disable-libjvm \
+ "
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
+
+FILES_${PN} = "${bindir}/cacao"
+FILES_${PN}-doc = "${datadir}/man"
+FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+
+ALTERNATIVE_NAME = "java"
+ALTERNATIVE_PATH = "${bindir}/cacao"
+ALTERNATIVE_PRIORITY = "10"
============================================================
--- packages/cacao/cacao.inc 850a3631e55de6c25da31b955be07c7b8c2a42e3
+++ packages/cacao/cacao.inc 850a3631e55de6c25da31b955be07c7b8c2a42e3
@@ -0,0 +1,15 @@
+DESCRIPTION = "cacao is a Java Virtual Machine, which uses GNU Classpath as default Java core library"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "interpreters"
+
+inherit autotools
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+EXTRA_OECONF = "--disable-debug \
+ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+ "
============================================================
--- packages/cacao/cacaoh-cldc-native_0.98.bb 80dbefd60462f32de95373690a2c248477fe9183
+++ packages/cacao/cacaoh-cldc-native_0.98.bb 80dbefd60462f32de95373690a2c248477fe9183
@@ -0,0 +1,16 @@
+
+require cacao.inc
+
+DEPENDS = "ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool-native zlib-native"
+
+inherit native
+
+EXTRA_OECONF += "--with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \
+ --enable-jni \
+ --enable-java=cldc1.1 \
+ --with-classpath=cldc1.1 \
+ --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \
+ "
+do_stage() {
+ install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/
+}
============================================================
--- packages/cacao/files/arm_mmap.patch 45dbc46941b95102aa800f44e7356566d102196c
+++ packages/cacao/files/arm_mmap.patch 45dbc46941b95102aa800f44e7356566d102196c
@@ -0,0 +1,21 @@
+--- cacao-0.98/src/vm/exceptions.c 2007/06/27 09:04:17 8146
++++ cacao-0.98/src/vm/exceptions.c 2007/07/02 14:07:24 8175
+@@ -92,6 +92,10 @@
+
+ bool exceptions_init(void)
+ {
++#if !(defined(__ARM__) && defined(__LINUX__))
++ /* On arm-linux the first memory page can't be mmap'ed, as it
++ contains the exception vectors. */
++
+ int pagesize;
+
+ /* mmap a memory page at address 0x0, so our hardware-exceptions
+@@ -100,6 +104,7 @@
+ pagesize = getpagesize();
+
+ (void) memory_mmap_anon(NULL, pagesize, PROT_NONE, MAP_PRIVATE | MAP_FIXED);
++#endif
+
+ /* check if we get into trouble with our hardware-exceptions */
+
============================================================
--- packages/cacao/files/classpath_var.patch c04e83ae51270d3ebec918b295178a033c94e4be
+++ packages/cacao/files/classpath_var.patch c04e83ae51270d3ebec918b295178a033c94e4be
@@ -0,0 +1,66 @@
+Index: cacao-0.98/configure.ac
+===================================================================
+--- cacao-0.98.orig/configure.ac 2007-06-06 11:24:23.000000000 +0200
++++ cacao-0.98/configure.ac 2007-07-18 23:26:43.000000000 +0200
+@@ -842,6 +842,7 @@
+ AC_CHECK_WITH_CLASSPATH
+ AC_CHECK_WITH_CLASSPATH_PREFIX
+ AC_CHECK_WITH_CLASSPATH_CLASSES
++AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES
+ AC_CHECK_WITH_CLASSPATH_LIBDIR
+ AC_CHECK_WITH_CLASSPATH_INCLUDEDIR
+
+Index: cacao-0.98/src/vm/vm.c
+===================================================================
+--- cacao-0.98.orig/src/vm/vm.c 2007-06-05 09:44:38.000000000 +0200
++++ cacao-0.98/src/vm/vm.c 2007-07-18 23:26:43.000000000 +0200
+@@ -621,7 +621,7 @@
+ #if defined(WITH_CLASSPATH_GNU)
+ puts(" java.boot.class.path : "CACAO_VM_ZIP":"CLASSPATH_CLASSES"");
+ #else
+- puts(" java.boot.class.path : "CLASSPATH_CLASSES"");
++ puts(" java.boot.class.path : "TARGET_CLASSPATH_CLASSES"");
+ #endif
+ puts(" gnu.classpath.boot.library.path: "CLASSPATH_LIBDIR"/classpath\n");
+
+@@ -873,7 +873,7 @@
+ strlen(CACAO_VM_ZIP) +
+ strlen(":") +
+ # endif
+- strlen(CLASSPATH_CLASSES) +
++ strlen(TARGET_CLASSPATH_CLASSES) +
+ strlen("0");
+
+ _Jv_bootclasspath = MNEW(char, len);
+@@ -881,7 +881,7 @@
+ strcat(_Jv_bootclasspath, CACAO_VM_ZIP);
+ strcat(_Jv_bootclasspath, ":");
+ # endif
+- strcat(_Jv_bootclasspath, CLASSPATH_CLASSES);
++ strcat(_Jv_bootclasspath, TARGET_CLASSPATH_CLASSES);
+ #endif
+ }
+
+Index: cacao-0.98/m4/classpath.m4
+===================================================================
+--- cacao-0.98.orig/m4/classpath.m4 2007-04-23 22:06:07.000000000 +0200
++++ cacao-0.98/m4/classpath.m4 2007-07-18 23:38:06.000000000 +0200
+@@ -82,6 +82,18 @@
+ AC_SUBST(CLASSPATH_CLASSES)
+ ])
+
++dnl where are Java core library classes installed on the target
++
++AC_DEFUN([AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are installed on the target)
++AC_ARG_WITH([target-classpath-classes],
++ [AS_HELP_STRING(--with-target-classpath-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
++ [TARGET_CLASSPATH_CLASSES=${withval}],
++ [TARGET_CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${TARGET_CLASSPATH_CLASSES})
++AC_DEFINE_UNQUOTED([TARGET_CLASSPATH_CLASSES], "${TARGET_CLASSPATH_CLASSES}", [Java core library classes on the target])
++AC_SUBST(TARGET_CLASSPATH_CLASSES)
++])
+
+ dnl where are Java core library native libraries installed
+
============================================================
--- packages/cacao/files/libmath.patch 1d4cb756e5ac08cb73324e178057ad65823a9f0b
+++ packages/cacao/files/libmath.patch 1d4cb756e5ac08cb73324e178057ad65823a9f0b
@@ -0,0 +1,53 @@
+Index: cacao-0.98/configure.ac
+===================================================================
+--- cacao-0.98.orig/configure.ac 2007-07-21 12:11:47.000000000 +0200
++++ cacao-0.98/configure.ac 2007-07-21 13:36:40.000000000 +0200
+@@ -234,6 +234,48 @@
+ AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+ AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+
++dnl The idea of this solutions comes from bochs-project configure.in
++dnl
++dnl Add the -lm library if math functions cannot be used without it.
++dnl This check is important on cygwin because of the bizarre way that they
++dnl have organized functions into libraries. On cygwin, both libc.a and
++dnl libm.a are symbolic links to a single lib libcygwin.a. This means that
++dnl 1) linking with -lm is not necessary, and
++dnl 2) linking with -lm is dangerous if the order of libraries is wrong
++dnl In particular, if you compile any program with -mno-cygwin and link with
++dnl -lm, it will crash instantly when it is run. This happens because the
++dnl linker incorrectly links the Cygwin libm.a (==libcygwin.a), which replaces
++dnl the ___main function instead of allowing it to be defined by
++dnl /usr/lib/mingw/libmingw32.a as it should be.
++dnl
++dnl On MacOS X, this test will find that -lm is unnecessary and leave it out.
++dnl
++dnl With uClibc and without libjvm cacao needs to be linked with -lm because of
++dnl the function scalbn
++dnl
++dnl Just check this math functions. If it is found without
++dnl -lm, then we must not need -lm.
++have_scalbn=0
++AC_CHECK_FUNCS(scalbn, have_scalbn=1)
++AC_MSG_CHECKING(if math functions link without -lm)
++if test "$have_scalbn" = 1; then
++ AC_MSG_RESULT(yes)
++else
++ AC_MSG_RESULT(no)
++ LIBS="$LIBS -lm"
++ # use different functions to bypass configure caching
++ have_scalbl=0
++ AC_CHECK_FUNCS(scalbl, have_scalbl=1)
++ AC_MSG_CHECKING(if math functions link with -lm)
++ if test "$have_scalbl" = 1; then
++ AC_MSG_RESULT(yes)
++ else
++ AC_MSG_RESULT(no)
++ # not sure we should warn the user, crash, etc.
++ # expect link failure
++ fi
++fi
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
============================================================
--- packages/cacao/files/midpath.patch 39901dc0bb8c438d3b35d8dd264a4a45f4f5e75e
+++ packages/cacao/files/midpath.patch 39901dc0bb8c438d3b35d8dd264a4a45f4f5e75e
@@ -0,0 +1,372 @@
+Index: cacao-0.98/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c
+===================================================================
+--- cacao-0.98.orig/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c 2007-05-16 10:06:15.000000000 +0200
++++ cacao-0.98/src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c 2007-07-22 00:15:55.000000000 +0200
+@@ -26,25 +26,53 @@
+
+ */
+
++#include <sys/stat.h>
++#include <stdlib.h>
+
+ #include "config.h"
+-#include "vm/types.h"
++
++#include "arch.h"
++#include "mm/memory.h"
+
+ #include "native/jni.h"
+ #include "native/native.h"
+
+ #include "native/include/java_lang_Object.h"
+ #include "native/include/java_lang_String.h"
+-
++#include "native/include/java_lang_Integer.h"
+ #include "native/include/com_sun_cldc_io_ResourceInputStream.h"
++#include "native/include/com_sun_cldchi_jvm_FileDescriptor.h"
+
++#include "vm/types.h"
++#include "vm/builtin.h"
+ #include "vm/vm.h" /* REMOVE ME: temporarily */
++#include "vm/exceptions.h"
++#include "vm/initialize.h"
++#include "vm/stringlocal.h"
++#include "vm/properties.h"
++
++#include "vmcore/class.h"
++#include "vmcore/classcache.h"
++#include "vmcore/linker.h"
++#include "vmcore/loader.h"
++#include "vmcore/options.h"
++#include "vmcore/statistics.h"
++#include "vmcore/suck.h"
++#include "vmcore/zip.h"
++
++#include "toolbox/list.h"
++#include "toolbox/logging.h"
++#include "toolbox/util.h"
+
+
+ /* native methods implemented by this file ************************************/
+
+ static JNINativeMethod methods[] = {
+ { "open", "(Ljava/lang/String;)Ljava/lang/Object;", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_open },
++ { "bytesRemain", "(Ljava/lang/Object;)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_bytesRemain },
++ { "readByte", "(Ljava/lang/Object;)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_readByte },
++ { "readBytes", "(Ljava/lang/Object;[BII)I", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_readBytes },
++ { "clone", "(Ljava/lang/Object;)Ljava/lang/Object;", (void *) (ptrint) &Java_com_sun_cldc_io_ResourceInputStream_clone },
+ };
+
+ /* _Jv_com_sun_cldc_io_ResourceInputStream_init ********************************
+@@ -68,13 +96,209 @@
+ * Method: open
+ * Signature: (Ljava/lang/String;)Ljava/lang/Object;
+ */
+-JNIEXPORT java_lang_Object* JNICALL Java_com_sun_cldc_io_ResourceInputStream_open(JNIEnv *env, jclass clazz, java_lang_String *name)
++JNIEXPORT struct java_lang_Object* JNICALL Java_com_sun_cldc_io_ResourceInputStream_open(JNIEnv *env, jclass clazz, java_lang_String *name)
+ {
+- vm_abort("Java_com_sun_cldc_io_ResourceInputStream_open: IMPLEMENT ME!");
++
++ list_classpath_entry *lce;
++ char *filename;
++ s4 filenamelen;
++ char *path;
++ FILE *classfile;
++ /*struct stat statBuffer;
++ int bufferSize = -1;*/
++ utf *uname;
++ /*java_lang_Integer *fhandler;*/
++ com_sun_cldchi_jvm_FileDescriptor *fileDescriptor;
++ classinfo *ci;
++
++
++ /* get the classname as char string (do it here for the warning at
++ the end of the function) */
++
++ uname = javastring_toutf((java_objectheader *)name, false);
++ filenamelen = utf_bytes(uname) + strlen("0");
++ filename = MNEW(char, filenamelen);
++ utf_copy(filename, uname);
++ classfile = NULL;
++
++
++ /* walk through all classpath entries */
++
++ for (lce = list_first(list_classpath_entries); lce != NULL;
++ lce = list_next(list_classpath_entries, lce)) {
++
++ path = MNEW(char, lce->pathlen + filenamelen);
++ strcpy(path, lce->path);
++ strcat(path, filename);
++
++ classfile = fopen(path, "r");
++
++ MFREE(path, char, lce->pathlen + filenamelen);
++
++ if (classfile) { /* file exists */
++ break;
++ }
++ }
++
++ MFREE(filename, char, filenamelen);
++
++ if (classfile) {
++ ci = load_class_bootstrap(utf_new_char("com/sun/cldchi/jvm/FileDescriptor"));
++ fileDescriptor = (com_sun_cldchi_jvm_FileDescriptor *) native_new_and_init(ci);
++ fileDescriptor->handle = (int) classfile;
++ fileDescriptor->valid = (int) 0;
++ return (java_la%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r73523d2b53ed38a63f46fcb966b7de6091c0c9d5 -r852e79e4fd49c31ea2c4db69de85247ea872bc5c
#
#
#
# delete "packages/exmap-console/exmap-console_0.4.bb"
#
# add_file "packages/exmap-console/exmap-console_0.4.1.bb"
# content [fcf738744d19e6d33be29ce3ffffb13dcd080b4a]
#
# patch "packages/exmap-console/exmap-console.inc"
# from [a823d75578539d9482a2b8059eeffb92c9ad576a]
# to [63d7774ca1ed640b50ead734368313117dad3a6c]
#
# patch "packages/exmap-console/exmap-console_svn.bb"
# from [692eef7c990b82df32abcf1541536e75d0e09f8a]
# to [9e500fd9df5191ba71310c281219b5b3dd9ab532]
#
============================================================
--- packages/exmap-console/exmap-console_0.4.1.bb fcf738744d19e6d33be29ce3ffffb13dcd080b4a
+++ packages/exmap-console/exmap-console_0.4.1.bb fcf738744d19e6d33be29ce3ffffb13dcd080b4a
@@ -0,0 +1,3 @@
+require exmap-console.inc
+
+PR = "r4"
============================================================
--- packages/exmap-console/exmap-console.inc a823d75578539d9482a2b8059eeffb92c9ad576a
+++ packages/exmap-console/exmap-console.inc 63d7774ca1ed640b50ead734368313117dad3a6c
@@ -1,61 +1,61 @@ LICENSE = "GPL"
DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
HOMEPAGE = "http://projects.o-hand.com/exmap-console"
SECTION = "devel"
LICENSE = "GPL"
-DEPENDS = "virtual/kernel"
+DEPENDS = "virtual/kernel readline"
SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
+TEMPPACKAGE_ARCH := "${PACKAGE_ARCH}"
+
inherit module-base
inherit autotools
MYPV := "${PV}"
+PACKAGE_ARCH = "${TEMPPACKAGE_ARCH}"
-PACKAGES += "exmap-server kernel-module-exmap"
+PACKAGES =+ "exmap-server kernel-module-exmap"
FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd"
-PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
RDEPENDS_exmap-console += "kernel-module-exmap"
FILES_exmap-server = "${bindir}/exmapserver"
-PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
RDEPENDS_exmap-server += "kernel-module-exmap"
FILES_kernel-module-exmap = "${base_libdir}"
PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
-RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
+RDEPENDS_kernel-module-exmap += "update-modules kernel-image-${KERNEL_VERSION}"
S = "${WORKDIR}/exmap-console-${PV}"
export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
do_compile() {
- cd ${S}/src
- make
+ cd ${S}/src
+ make
- cd ${S}/kernel
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
- KERNEL_SRC=${STAGING_KERNEL_DIR} \
- KERNEL_VERSION=${KERNEL_VERSION} \
- CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
- ${MAKE_TARGETS}
+ cd ${S}/kernel
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+ ${MAKE_TARGETS}
}
do_install() {
- oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
+ oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
}
pkg_postinst_append_kernel-module-exmap () {
- if [ -n "$D" ]; then
- exit 1
- fi
- depmod -a
- update-modules || true
+ if [ -n "$D" ]; then
+ exit 1
+ fi
+ depmod -a
+ update-modules || true
}
pkg_postrm_append_kernel-module-exmap () {
- update-modules || true
+ update-modules || true
}
-
============================================================
--- packages/exmap-console/exmap-console_svn.bb 692eef7c990b82df32abcf1541536e75d0e09f8a
+++ packages/exmap-console/exmap-console_svn.bb 9e500fd9df5191ba71310c281219b5b3dd9ab532
@@ -1,5 +1,7 @@
-PR = "r10"
+require exmap-console.inc
+
PV = "0.4+svn${SRCDATE}"
+PR = "r14"
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
@@ -7,4 +9,3 @@ PV_kernel-module-exmap = "${MYPV}-${KERN
MYPV := "${PV}"
PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
-
More information about the Openembedded-commits
mailing list