rendered paste bodyIndex: com.buglabs.bug.module.vonhippel.bb===================================================================--- com.buglabs.bug.module.vonhippel.bb (wersja 9289)+++ com.buglabs.bug.module.vonhippel.bb (kopia robocza)@@ -1,6 +1,6 @@ require bug-osgi.inc PR = "r9"-DEPENDS += "com.buglabs.common com.buglabs.bug.menu com.buglabs.bug.module com.buglabs.bug.jni.vonhippel com.buglabs.bug.jni.common"+DEPENDS += "com.buglabs.common com.buglabs.bug.menu com.buglabs.bug.module com.buglabs.bug.jni.vonhippel com.buglabs.bug.jni.common com.buglabs.osgi.cm phoneme-advanced-personal" do_compile() { mkdir -p build oe_makeclasspath cp -s ${DEPENDS} ${EXTRA_CP}Index: com.buglabs.bug.program.bb===================================================================--- com.buglabs.bug.program.bb (wersja 9285)+++ com.buglabs.bug.program.bb (kopia robocza)@@ -1,6 +1,6 @@ require bug-osgi.inc-DEPENDS += "com.buglabs.common servlet2.3"+DEPENDS += "com.buglabs.common servlet2.3 com.buglabs.osgi.cm com.buglabs.osgi.http" RDEPENDS += "com.buglabs.osgi.http" EXTRA_CP += "servlet-2.3.1" -PR = "r5"\ No newline at end of file+PR = "r5"Index: com.buglabs.bug.base.bb===================================================================--- com.buglabs.bug.base.bb (wersja 9285)+++ com.buglabs.bug.base.bb (kopia robocza)@@ -1,5 +1,5 @@ require bug-osgi.inc PR = "r4" EXTRA_CP += "servlet-2.3.1"-DEPENDS += "com.buglabs.common com.buglabs.bug.jni.audio com.buglabs.bug.jni.basedisplay com.buglabs.bug.jni.input com.buglabs.bug.jni.bugbeep com.buglabs.bug.menu com.buglabs.bug.jni.common com.buglabs.bug.audio.common servlet2.3"+DEPENDS += "com.buglabs.common com.buglabs.bug.jni.audio com.buglabs.bug.jni.basedisplay com.buglabs.bug.jni.input com.buglabs.bug.jni.bugbeep com.buglabs.bug.menu com.buglabs.bug.jni.common com.buglabs.bug.audio.common servlet2.3 com.buglabs.osgi.http" Index: com.buglabs.bug.module.gps.bb===================================================================--- com.buglabs.bug.module.gps.bb (wersja 9285)+++ com.buglabs.bug.module.gps.bb (kopia robocza)@@ -1,3 +1,3 @@ require bug-osgi.inc PR = "r4"-DEPENDS += "com.buglabs.common com.buglabs.bug.menu com.buglabs.bug.module com.buglabs.bug.jni.gps com.buglabs.nmea com.buglabs.bug.jni.common" \ No newline at end of file+DEPENDS += "com.buglabs.common com.buglabs.bug.menu com.buglabs.bug.module com.buglabs.bug.jni.gps com.buglabs.nmea com.buglabs.bug.jni.common com.buglabs.osgi.cm" Index: bug-osgi.inc===================================================================--- bug-osgi.inc (wersja 9289)+++ bug-osgi.inc (kopia robocza)@@ -12,7 +12,7 @@ SRCREV = "${AUTOREV}" -SRC_URI += "svn://${SVN_SVR}/bug/branches/R1.4/qa;module=${PN};proto=svn \+SRC_URI += "svn://${SVN_SVR}/bug/trunk;module=${PN};proto=svn \ file://files/osgi.jar" FILES_${PN} += "/usr/share/java/${PN}.jar"@@ -20,7 +20,7 @@ PACKAGE_ARCH = "all" PACKAGES = ${PN} S = "${WORKDIR}/${PN}"-DEPENDS = "fastjar-native concierge"+DEPENDS = "fastjar-native concierge service-tracker" EXTRA_OEMAKE += "PHONEME_HOME=${STAGING_DIR}/${HOST_SYS}/phoneme-advanced-personal/cdc/build/linux-arm-generic" @@ -38,3 +38,7 @@ fastjar -m ./META-INF/MANIFEST.MF -C build -c -f ${JARFILENAME} . } +# dummy to keep osgi.jar from being removed by java-library.bbclass+do_removebinaries() {+ :+}Index: com.buglabs.bug.service.bb===================================================================--- com.buglabs.bug.service.bb (wersja 9289)+++ com.buglabs.bug.service.bb (kopia robocza)@@ -1,9 +1,10 @@ require bug-osgi.inc-DEPENDS += "com.buglabs.common"+DEPENDS += "com.buglabs.common com.buglabs.osgi.cm com.buglabs.osgi.http" RDEPENDS += "com.buglabs.osgi.http" DEPENDS += "servlet2.3" EXTRA_CP += "servlet-2.3.1" PR = "r3"+ do_compile() { mkdir -p buildIndex: com.buglabs.common.bb===================================================================--- com.buglabs.common.bb (wersja 9285)+++ com.buglabs.common.bb (kopia robocza)@@ -1,3 +1,3 @@ require bug-osgi.inc-DEPENDS+="service-tracker"-PR = "r8"\ No newline at end of file++PR = "r8"Index: com.buglabs.bug.jni.audio.bb===================================================================--- com.buglabs.bug.jni.audio.bb (wersja 9285)+++ com.buglabs.bug.jni.audio.bb (kopia robocza)@@ -4,4 +4,4 @@ PR = "r6" FILES_${PN} += "${JNI_LIB_DIR}/libMidpathalsa.so" FILES_${PN} += "${JNI_LIB_DIR}/libAudioControl.so"-DEPENDS += "alsa-lib alsa-utils com.buglabs.common com.buglabs.bug.jni.common phoneme-advanced-personal"+DEPENDS += "alsa-lib alsa-utils com.buglabs.common com.buglabs.bug.jni.common phoneme-advanced-personal virtual/kernel"Index: com.buglabs.bug.event.bb===================================================================--- com.buglabs.bug.event.bb (wersja 9285)+++ com.buglabs.bug.event.bb (kopia robocza)@@ -1,6 +1,6 @@ require bug-osgi.inc PR = "r2"-DEPENDS += "com.buglabs.common"+DEPENDS += "com.buglabs.common com.buglabs.osgi.http" RDEPENDS += "com.buglabs.osgi.http" DEPENDS += "servlet2.3" EXTRA_CP += "servlet-2.3.1"