From 9ee75d90a3f1216efbd55603f7dd44ab5aa41617 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Fri, 22 Jan 2010 12:43:21 -0700 Subject: [PATCH] kernel: Use the debian infrastructure to construct kernel config files This is the first step towards abandonding make-kpkg. The next step is to remove the kernel config files under $(KERNEL_DIR)/files/Config, thereby requiring the use of config files in $(KERNEL_DIR)/files/debian.chrome/config Signed-off-by: Tim Gardner Review URL: http://codereview.chromium.org/549135 --- build_kernel.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/build_kernel.sh b/build_kernel.sh index 4efa4667b1..0c451ed832 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -19,12 +19,12 @@ SRC_ROOT=$(dirname $(readlink -f $(dirname "$0"))) . "${SRC_ROOT}/third_party/shflags/files/src/shflags" KERNEL_DIR="$SRC_ROOT/third_party/kernel" -DEFAULT_KCONFIG="${KERNEL_DIR}/files/chromeos/config/chromeos-intel-menlow" +DEFAULT_KFLAVOUR="chromeos-intel-menlow" # Flags DEFAULT_BUILD_ROOT=${BUILD_ROOT:-"${SRC_ROOT}/build"} -DEFINE_string config "${DEFAULT_KCONFIG}" \ - "The kernel configuration file to use." +DEFINE_string flavour "${DEFAULT_KFLAVOUR}" \ + "The kernel flavour to use." DEFINE_integer revision 002 \ "The package revision to use" DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/x86/local_packages" \ @@ -49,12 +49,19 @@ mkdir -p "$FLAGS_output_root" # to /tmp/kernel-pkg.conf when setting up the chroot env? sudo cp "$KERNEL_DIR"/package/kernel-pkg.conf /etc/kernel-pkg.conf +# +# Generate the flavour config file. +# +flavour=$FLAGS_flavour +(cd ${KERNEL_DIR}/files; debian/rules prepare-${flavour}) + # Parse kernel config file for target architecture information. This is needed # to determine the full package name and also to setup the environment for # kernel build scripts which use "uname -m" to autodetect architecture. -KCONFIG="$FLAGS_config" +KCONFIG="${KERNEL_DIR}/files/debian/build/build-${flavour}/.config" if [ ! -f "$KCONFIG" ]; then - KCONFIG="$KERNEL_DIR"/files/chromeos/config/"$KCONFIG" + echo Major bummer. Could not find kernel config. + exit 1 fi if [ -n $(grep 'CONFIG_X86=y' "$KCONFIG") ] then