commit: 9213296399a6eaca67185ca65e309e1e6b6518f3
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Sun Jun 22 02:08:37 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 22 02:08:37 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=92132963
Whitepace.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
---
gen_cmdline.sh | 2 +-
gen_configkernel.sh | 20 ++++++++++----------
gen_determineargs.sh | 2 +-
gen_initramfs.sh | 4 ++--
gen_package.sh | 2 +-
genkernel | 12 ++++++------
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 7bee618..ca6cbcf 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -77,7 +77,7 @@ longusage() {
echo " autodetect."
echo " --makeopts=<makeopts> Make options such as -j2, etc..."
echo " --mountboot Mount BOOTDIR automatically if
mountable"
- echo " --no-mountboot Don't mount BOOTDIR automatically"
+ echo " --no-mountboot Don't mount BOOTDIR automatically"
echo " --bootdir=<dir> Set the location of the boot-directory,
default is /boot"
echo " --modprobedir=<dir> Set the location of the
modprobe.d-directory, default is /etc/modprobe.d"
echo " Initialization"
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a69c713..b935de8 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -118,12 +118,12 @@ config_kernel() {
fi
# Multipath
- if isTrue ${CMD_MULTIPATH}
- then
- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM
is.*/CONFIG_BLK_DEV_DM=m/g'
- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH
is.*/CONFIG_DM_MULTIPATH=m/g'
- sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
- fi
+ if isTrue ${CMD_MULTIPATH}
+ then
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM
is.*/CONFIG_BLK_DEV_DM=m/g'
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH
is.*/CONFIG_DM_MULTIPATH=m/g'
+ sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
+ fi
# Make sure dmraid modules are on if --dmraid
if isTrue ${CMD_DMRAID}
@@ -147,10 +147,10 @@ config_kernel() {
then
sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH
is.*/CONFIG_FB_SPLASH=y/g'
fi
-
+
# VirtIO
- if isTrue ${CMD_VIRTIO}
- then
+ if isTrue ${CMD_VIRTIO}
+ then
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g'
@@ -159,5 +159,5 @@ config_kernel() {
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\?
\?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g'
- fi
+ fi
}
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 615f274..dc6b2c4 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -4,7 +4,7 @@
get_KV() {
if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ]
then
- /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
+ /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
if [ -e ${TEMP}/kerncache.config ]
then
VER=`grep ^VERSION\ \= ${TEMP}/kerncache.config | awk
'{ print $3 };'`
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index d5ee5f6..90a6547 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -15,7 +15,7 @@ CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local"
# CC0 are compatible with the GNU GPL."
# (from https://www.gnu.org/licenses/license-list.html#CC0)
#
-# Written by:
+# Written by:
# - Sebastian Pipping <sebast...@pipping.org> (error checking)
# - Robin H. Johnson <robb...@gentoo.org> (complete rewrite)
# - Richard Yao <r...@cs.stonybrook.edu> (original concept)
@@ -942,7 +942,7 @@ create_initramfs() {
gzip) compress_ext='.gz'
compress_cmd="${cmd_gzip} -f -9" ;;
lzop) compress_ext='.lzo'
compress_cmd="${cmd_lzop} -f -9" ;;
esac
-
+
if [ -n "${compression}" ]; then
print_info 1 " >> Compressing cpio data
(${compress_ext})..."
${compress_cmd} "${CPIO}" || gen_die
"Compression (${compress_cmd}) failed"
diff --git a/gen_package.sh b/gen_package.sh
index fa155b9..95cc469 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -55,7 +55,7 @@ gen_modulespackage() {
then
mkdir -p ${TEMP}/modulespackage/lib/modules
cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}"
"${TEMP}/modulespackage/lib/modules"
- cd "${TEMP}/modulespackage"
+ cd "${TEMP}/modulespackage"
/bin/tar -jcpf ${MODULESPACKAGE} * || gen_die 'Could not compress
the modules package!'
else
print_info 1 "Could not create a modules package
${INSTALL_MOD_PATH}/lib/modules/${KV} was not found"
diff --git a/genkernel b/genkernel
index e6c7520..d1f6d4f 100755
--- a/genkernel
+++ b/genkernel
@@ -156,7 +156,7 @@ then
isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot'
else
[[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory"
-
+
if ! egrep -q "[[:space:]]${BOOTDIR}[[:space:]]" /proc/mounts
then
if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab
@@ -215,7 +215,7 @@ fi
#fi
KERNCACHE_IS_VALID=0
-if [ "${KERNCACHE}" != "" ]
+if [ "${KERNCACHE}" != "" ]
then
gen_kerncache_is_valid
fi
@@ -224,13 +224,13 @@ if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" =
'0' ]
then
# Configure kernel
config_kernel
-
+
# Make prepare
if [ "${ARCH_HAVENOPREPARE}" = '' ]
then
compile_generic prepare kernel
fi
-
+
# KV may have changed due to the configuration
get_KV
@@ -254,13 +254,13 @@ fi
if isTrue "${CMD_INSTALL}"
then
- if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
+ if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
then
gen_kerncache_extract_kernel
fi
fi
-if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
+if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
then
[ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules
gen_kerncache_extract_config
