[oe-commits] Andrea Adami : linux-kexecboot.inc: add more mangling to protect our custom CMDLINE.

git version control git at git.openembedded.org
Wed Mar 2 23:32:16 UTC 2011


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5bc56c9595dfae1c2f4281cd344bf87da4c30bc9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5bc56c9595dfae1c2f4281cd344bf87da4c30bc9

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Thu Mar  3 00:28:08 2011 +0100

linux-kexecboot.inc: add more mangling to protect our custom CMDLINE.

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>

---

 recipes/linux/linux-kexecboot.inc |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/recipes/linux/linux-kexecboot.inc b/recipes/linux/linux-kexecboot.inc
index e1b10a0..87ef03d 100644
--- a/recipes/linux/linux-kexecboot.inc
+++ b/recipes/linux/linux-kexecboot.inc
@@ -79,9 +79,19 @@ do_configure_prepend() {
 
         echo "" > ${S}/.config
 
+        #
+        # CONFIG_CMDLINE mangling
+        #
         echo "CONFIG_CMDLINE_BOOL=y" >> ${S}/.config
         echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
+        # mips and x86
+        echo "CONFIG_CMDLINE_OVERRIDE=y" >> ${S}/.config
+
+        # sh only
+        echo "CONFIG_CMDLINE_OVERWRITE=y" >> ${S}/.config
+        echo "# CONFIG_CMDLINE_EXTEND is not set" >> ${S}/.config
+
         #
         # endian support
         #
@@ -105,6 +115,10 @@ do_configure_prepend() {
         fi
 
         sed -e '/CONFIG_CMDLINE=/d' \
+            -e '/CONFIG_CMDLINE_BOOL/d' \
+            -e '/CONFIG_CMDLINE_OVERRIDE/d' \
+            -e '/CONFIG_CMDLINE_OVERWRITE/d' \
+            -e '/CONFIG_CMDLINE_EXTEND/d' \
             -e '/CONFIG_CPU_BIG_ENDIAN/d' \
             -e '/CONFIG_LOGO=/d' \
             -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \





More information about the Openembedded-commits mailing list