linux-rp: remove packaging of kernel-cmdline

This is now done by kexecboot-cfg.

diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index cb2e85e49abc499ebf6673f253e48d9b0dd16a25..e2af859069e43b5d17c8a25a83bf129eab1d5071 100644 (file)
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -68,24 +68,6 @@ 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
 
@@ -165,10 +147,6 @@ do_configure() {
 
        yes '' | oe_runmake oldconfig
 }
-#collie dosn't need to deploy kernel. The kernel is in the rootfs and
-# linux-kexecboot kernel is flashed
-do_deploy_collie() {
-}
 
 # wlan-ng stuff need compiled kernel sources
 do_rm_work() {

diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index ebc969f1bf3ca91026913ab991bedac4cdaa0661..2293eea80e95048f04f5b5f368945e51536770ae 100644 (file)
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r34"
+PR = "r35"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046

diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index 3f9eac86a5cc258f329090c05aad401b78f13330..1ce1e01c785488ce30b588ebb5d8d5035140e661 100644 (file)
--- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r5"
+PR = "r6"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "1"

diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 524405cfd9ac52b6e38e87ec32f44c7713ab4844..406d95d2d0e3ce19d0bec625ba330eb43e5d072d 100644 (file)
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r7"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"