From 145db3c5de32dfe260d8bc9be13ee85571f16b48 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 6 Feb 2009 15:49:39 +0100 Subject: [PATCH] Made ./make.sh shell run some more commands and added kernel config option. Run: ./make.sh config kernel --- src/scripts/edit-kernel-config | 11 +++++++++++ tools/make-include | 4 +++- tools/make-interactive | 16 +++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/scripts/edit-kernel-config diff --git a/src/scripts/edit-kernel-config b/src/scripts/edit-kernel-config new file mode 100644 index 000000000..9e20f3238 --- /dev/null +++ b/src/scripts/edit-kernel-config @@ -0,0 +1,11 @@ +#!/bin/bash + +cd /usr/src/linux* + +cp -f /usr/src/config/kernel/kernel.config .config + +make menuconfig + +if [ "$?" -eq "0" ]; then + cp -f .config /usr/src/config/kernel/kernel.config +fi diff --git a/tools/make-include b/tools/make-include index 6d28c8df3..0122a90a6 100644 --- a/tools/make-include +++ b/tools/make-include @@ -113,6 +113,8 @@ entershell() { if [ ! -e $LFS/usr/src/lfs/ ]; then exiterror "No such file or directory: $LFS/usr/src/lfs/" fi + + COMMAND=${@-bash} # Run command, given as parameters. echo -ne "Entering ${BOLD}$MACHINE${NORMAL} LFS chroot, type exit to return to host environment\n" @@ -144,7 +146,7 @@ entershell() { STAGE=$STAGE \ STAGE_ORDER=$STAGE_ORDER \ LOGFILE=$(echo $LOGFILE | sed "s,$BASEDIR,/usr/src,g") \ - bash + $COMMAND if [ $? -ne 0 ]; then exiterror "chroot error" diff --git a/tools/make-interactive b/tools/make-interactive index 55470574f..6e920096c 100644 --- a/tools/make-interactive +++ b/tools/make-interactive @@ -37,10 +37,11 @@ build) ;; shell) + shift # enter a shell inside LFS chroot # may be used to change kernel settings prepareenv - entershell + entershell $@ ;; batch) @@ -73,6 +74,19 @@ ccache) esac ;; +config) + # config options + case "$2" in + kernel) + prepareenv + entershell /usr/local/bin/edit-kernel-config + ;; + *) + usage + ;; + esac + ;; + distcc|distccd) # distcc(d) commands case "$2" in -- 2.39.2