[oe-commits] org.oe.dev merge of 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'

[mickeyl commit]

merge of 'b99a6dc2eb39390c552fe0329acbb5ed94fa5fcf'
     and 'ef63b228877ae1c3c905d3921b256693b1914dea'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cd657545dfa92db8fbeea03c9a06a85a5486912d
ViewMTN: http://monotone.openembedded.org/revision/info/cd657545dfa92db8fbeea03c9a06a85a5486912d
Files:
1
packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb
packages/classpath/classpath-native_0.97.2.bb
packages/jamvm/jamvm-native.inc
packages/linux/linux-rp.inc
packages/u-boot/u-boot_git.bb
Diffs:

#
# mt diff -rb99a6dc2eb39390c552fe0329acbb5ed94fa5fcf -rcd657545dfa92db8fbeea03c9a06a85a5486912d
#
#
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb"
#  from [2f754f1f6ca748cfafed2035c77ebef63a683538]
#    to [06cec5096d5b9fa55fde816334c8be8a06f584d9]
#
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	2f754f1f6ca748cfafed2035c77ebef63a683538
+++ packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb	06cec5096d5b9fa55fde816334c8be8a06f584d9
@@ -1,6 +1,6 @@ DESCRIPTION = "Shows the battery/AC stat
 DESCRIPTION = "Shows the battery/AC status in the Openmoko panel"
-DEPENDS = "apmd"
-PV = "0.1.0+svn${SVNREV}"
+DEPENDS = "apmd libnotify"
+PV = "0.1.1+svn${SVNREV}"
 
 inherit openmoko-panel-plugin
 


#
# mt diff -ref63b228877ae1c3c905d3921b256693b1914dea -rcd657545dfa92db8fbeea03c9a06a85a5486912d
#
#
#
# patch "packages/classpath/classpath-native_0.97.2.bb"
#  from [00c39f7324532c966c52166a21c322312b678fb2]
#    to [84d70815005e590915c97516174edfb0a1f8afd9]
# 
# patch "packages/jamvm/jamvm-native.inc"
#  from [6860472b71586e2ce8530c2f408cdc435b89d12e]
#    to [f712a428d0019c7d5914a56508e55e6cc4b22d71]
# 
# patch "packages/linux/linux-rp.inc"
#  from [2c46a07cacd6773da1465135b93706ce46d94b79]
#    to [d5e693d8ce0306dd5f561a01017f7f042f4cf537]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [20da764e37d8eda3e5848758576cfe8a9671a2a6]
#    to [77d3411a0511c6640be31d9e6a41b663ef6533c3]
#
============================================================
--- packages/classpath/classpath-native_0.97.2.bb	00c39f7324532c966c52166a21c322312b678fb2
+++ packages/classpath/classpath-native_0.97.2.bb	84d70815005e590915c97516174edfb0a1f8afd9
@@ -1,6 +1,6 @@ require classpath-native.inc
 require classpath-native.inc
 
-PR = "r0"
+PR = "r1"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
@@ -9,5 +9,6 @@ SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
   file://javanet-local.patch;patch=1;pnum=0 \
+  file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \
   "
 
============================================================
--- packages/jamvm/jamvm-native.inc	6860472b71586e2ce8530c2f408cdc435b89d12e
+++ packages/jamvm/jamvm-native.inc	f712a428d0019c7d5914a56508e55e6cc4b22d71
@@ -1,6 +1,7 @@ DEPENDS = "zlib-native classpath-native 
 require jamvm.inc 
 
 DEPENDS = "zlib-native classpath-native virtual/javac-native"
+RDEPENDS = ""
 
 PROVIDES_jamvm = "virtual/java-native"
 
============================================================
--- packages/linux/linux-rp.inc	2c46a07cacd6773da1465135b93706ce46d94b79
+++ packages/linux/linux-rp.inc	d5e693d8ce0306dd5f561a01017f7f042f4cf537
@@ -65,6 +65,24 @@ module_autoload_power_collie = "power"
 module_autoload_leds-locomo_collie = "leds-locomo"
 module_autoload_power_collie = "power"
 
+
+#package kernel cmdline
+PACKAGES_append += "kernel-cmdline"
+FILES_kernel-cmdline = "/boot/kernel-cmdline*"
+PKG_kernel-cmdline = "kernel-cmdline-${KERNEL_VERSION}"
+RRECOMMENDS_kernel-base += "kernel-cmdline"
+
+pkg_postinst_kernel-cmdline () {
+	cd /boot; update-alternatives --install /boot/kernel-cmdline kernel-cmdline kernel-cmdline-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
+}
+
+pkg_postrm_kernel-cmdline () {
+	cd /boot; update-alternatives --remove kernel-cmdline kernel-cmdline-${KERNEL_VERSION} || true
+}
+do_install_append () {
+	echo "${CMDLINE_CON} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"> "${D}/boot/kernel-cmdline-${KERNEL_VERSION}"
+}
+
 do_configure() {
 	rm -f ${S}/.config
 
============================================================
--- packages/u-boot/u-boot_git.bb	20da764e37d8eda3e5848758576cfe8a9671a2a6
+++ packages/u-boot/u-boot_git.bb	77d3411a0511c6640be31d9e6a41b663ef6533c3
@@ -1,8 +1,8 @@ PR="r11"
 require u-boot.inc
 PR="r11"
 
-SRCREV_davinci-sffsdr = "699f05125509249072a0b865c8d35520d97cd501"
-SRCREV_davinci-dvevm = "699f05125509249072a0b865c8d35520d97cd501"
+SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
+SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa"
 SRCREV_beagleboard = "bde63587622c4b830a27d1ddf7265843de9e994f"
 SRCREV_neuros-osd2 = "70ee511d37ca99afee00edc27be36d0af2832bbc"