summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/classpath/classpath-native_0.97.2.bb3
-rw-r--r--packages/jamvm/jamvm-native.inc1
-rw-r--r--packages/linux/linux-rp.inc18
-rw-r--r--packages/u-boot/u-boot_git.bb4
4 files changed, 23 insertions, 3 deletions
diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb
index e744b3378e..c25b1849ca 100644
--- a/packages/classpath/classpath-native_0.97.2.bb
+++ b/packages/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
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 \
"
diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc
index 07eecb52b3..fc9023a62c 100644
--- a/packages/jamvm/jamvm-native.inc
+++ b/packages/jamvm/jamvm-native.inc
@@ -1,6 +1,7 @@
require jamvm.inc
DEPENDS = "zlib-native classpath-native virtual/javac-native"
+RDEPENDS = ""
PROVIDES_jamvm = "virtual/java-native"
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index e6dee572f6..5d32113848 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -65,6 +65,24 @@ module_autoload_collie-ts_collie = "collie-ts"
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
diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb
index 6ccc6f2614..54c5f81b45 100644
--- a/packages/u-boot/u-boot_git.bb
+++ b/packages/u-boot/u-boot_git.bb
@@ -1,8 +1,8 @@
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"