diff --git a/base/linux/config-700.in b/base/linux/config-700.in index d9abbb51c..65175a7ba 100644 --- a/base/linux/config-700.in +++ b/base/linux/config-700.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../linux/config-700.in -# Copyright (C) 2006 - 2010 The OpenSDE Project +# Copyright (C) 2006 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -25,6 +25,7 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options' comment ' ' text 'Custom settings file' SDECFG_PKG_LINUX_CONFIG_FILE "config/$config/linux.cfg" + text 'Embedded initramfs file' SDECFG_PKG_LINUX_EARLY_FILE "" if pkgcheck uml_utilities X ; then comment ' ' diff --git a/base/linux/linux-conf.in b/base/linux/linux-conf.in index 1105126b3..e68377eb5 100644 --- a/base/linux/linux-conf.in +++ b/base/linux/linux-conf.in @@ -106,6 +106,15 @@ auto_config() { echo > .config.$arch fi + # inject CONFIG_INITRAMFS_SOURCE if set + if [ -n "$SDECFG_PKG_LINUX_EARLY_FILE" ]; then + x="$SDECFG_PKG_LINUX_EARLY_FILE" + expr "$x" : '/*' > /dev/null || x="$base/$x" + + sed -i '/CONFIG_INITRAMFS_SOURCE/d;' .config.$arch + echo "CONFIG_INITRAMFS_SOURCE=\"$x\"" >> .config.$arch + fi + if [ -s .config.$arch ]; then # apply $arch specific rules #