| 1 |
commit: 9213296399a6eaca67185ca65e309e1e6b6518f3 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 22 02:08:37 2014 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 22 02:08:37 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=92132963 |
| 7 |
|
| 8 |
Whitepace. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
gen_cmdline.sh | 2 +- |
| 14 |
gen_configkernel.sh | 20 ++++++++++---------- |
| 15 |
gen_determineargs.sh | 2 +- |
| 16 |
gen_initramfs.sh | 4 ++-- |
| 17 |
gen_package.sh | 2 +- |
| 18 |
genkernel | 12 ++++++------ |
| 19 |
6 files changed, 21 insertions(+), 21 deletions(-) |
| 20 |
|
| 21 |
diff --git a/gen_cmdline.sh b/gen_cmdline.sh |
| 22 |
index 7bee618..ca6cbcf 100755 |
| 23 |
--- a/gen_cmdline.sh |
| 24 |
+++ b/gen_cmdline.sh |
| 25 |
@@ -77,7 +77,7 @@ longusage() { |
| 26 |
echo " autodetect." |
| 27 |
echo " --makeopts=<makeopts> Make options such as -j2, etc..." |
| 28 |
echo " --mountboot Mount BOOTDIR automatically if mountable" |
| 29 |
- echo " --no-mountboot Don't mount BOOTDIR automatically" |
| 30 |
+ echo " --no-mountboot Don't mount BOOTDIR automatically" |
| 31 |
echo " --bootdir=<dir> Set the location of the boot-directory, default is /boot" |
| 32 |
echo " --modprobedir=<dir> Set the location of the modprobe.d-directory, default is /etc/modprobe.d" |
| 33 |
echo " Initialization" |
| 34 |
|
| 35 |
diff --git a/gen_configkernel.sh b/gen_configkernel.sh |
| 36 |
index a69c713..b935de8 100755 |
| 37 |
--- a/gen_configkernel.sh |
| 38 |
+++ b/gen_configkernel.sh |
| 39 |
@@ -118,12 +118,12 @@ config_kernel() { |
| 40 |
fi |
| 41 |
|
| 42 |
# Multipath |
| 43 |
- if isTrue ${CMD_MULTIPATH} |
| 44 |
- then |
| 45 |
- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g' |
| 46 |
- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g' |
| 47 |
- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g' |
| 48 |
- fi |
| 49 |
+ if isTrue ${CMD_MULTIPATH} |
| 50 |
+ then |
| 51 |
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g' |
| 52 |
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g' |
| 53 |
+ sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g' |
| 54 |
+ fi |
| 55 |
|
| 56 |
# Make sure dmraid modules are on if --dmraid |
| 57 |
if isTrue ${CMD_DMRAID} |
| 58 |
@@ -147,10 +147,10 @@ config_kernel() { |
| 59 |
then |
| 60 |
sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g' |
| 61 |
fi |
| 62 |
- |
| 63 |
+ |
| 64 |
# VirtIO |
| 65 |
- if isTrue ${CMD_VIRTIO} |
| 66 |
- then |
| 67 |
+ if isTrue ${CMD_VIRTIO} |
| 68 |
+ then |
| 69 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g' |
| 70 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g' |
| 71 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g' |
| 72 |
@@ -159,5 +159,5 @@ config_kernel() { |
| 73 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g' |
| 74 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g' |
| 75 |
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g' |
| 76 |
- fi |
| 77 |
+ fi |
| 78 |
} |
| 79 |
|
| 80 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 81 |
index 615f274..dc6b2c4 100755 |
| 82 |
--- a/gen_determineargs.sh |
| 83 |
+++ b/gen_determineargs.sh |
| 84 |
@@ -4,7 +4,7 @@ |
| 85 |
get_KV() { |
| 86 |
if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ] |
| 87 |
then |
| 88 |
- /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config |
| 89 |
+ /bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config |
| 90 |
if [ -e ${TEMP}/kerncache.config ] |
| 91 |
then |
| 92 |
VER=`grep ^VERSION\ \= ${TEMP}/kerncache.config | awk '{ print $3 };'` |
| 93 |
|
| 94 |
diff --git a/gen_initramfs.sh b/gen_initramfs.sh |
| 95 |
index d5ee5f6..90a6547 100755 |
| 96 |
--- a/gen_initramfs.sh |
| 97 |
+++ b/gen_initramfs.sh |
| 98 |
@@ -15,7 +15,7 @@ CPIO_ARGS="--quiet -o -H newc --owner root:root --force-local" |
| 99 |
# CC0 are compatible with the GNU GPL." |
| 100 |
# (from https://www.gnu.org/licenses/license-list.html#CC0) |
| 101 |
# |
| 102 |
-# Written by: |
| 103 |
+# Written by: |
| 104 |
# - Sebastian Pipping <sebastian@×××××××.org> (error checking) |
| 105 |
# - Robin H. Johnson <robbat2@g.o> (complete rewrite) |
| 106 |
# - Richard Yao <ryao@×××××××××××××.edu> (original concept) |
| 107 |
@@ -942,7 +942,7 @@ create_initramfs() { |
| 108 |
gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;; |
| 109 |
lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;; |
| 110 |
esac |
| 111 |
- |
| 112 |
+ |
| 113 |
if [ -n "${compression}" ]; then |
| 114 |
print_info 1 " >> Compressing cpio data (${compress_ext})..." |
| 115 |
${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed" |
| 116 |
|
| 117 |
diff --git a/gen_package.sh b/gen_package.sh |
| 118 |
index fa155b9..95cc469 100755 |
| 119 |
--- a/gen_package.sh |
| 120 |
+++ b/gen_package.sh |
| 121 |
@@ -55,7 +55,7 @@ gen_modulespackage() { |
| 122 |
then |
| 123 |
mkdir -p ${TEMP}/modulespackage/lib/modules |
| 124 |
cp -r "${INSTALL_MOD_PATH}/lib/modules/${KV}" "${TEMP}/modulespackage/lib/modules" |
| 125 |
- cd "${TEMP}/modulespackage" |
| 126 |
+ cd "${TEMP}/modulespackage" |
| 127 |
/bin/tar -jcpf ${MODULESPACKAGE} * || gen_die 'Could not compress the modules package!' |
| 128 |
else |
| 129 |
print_info 1 "Could not create a modules package ${INSTALL_MOD_PATH}/lib/modules/${KV} was not found" |
| 130 |
|
| 131 |
diff --git a/genkernel b/genkernel |
| 132 |
index e6c7520..d1f6d4f 100755 |
| 133 |
--- a/genkernel |
| 134 |
+++ b/genkernel |
| 135 |
@@ -156,7 +156,7 @@ then |
| 136 |
isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot' |
| 137 |
else |
| 138 |
[[ -d ${BOOTDIR} ]] || gen_die "${BOOTDIR} is not a directory" |
| 139 |
- |
| 140 |
+ |
| 141 |
if ! egrep -q "[[:space:]]${BOOTDIR}[[:space:]]" /proc/mounts |
| 142 |
then |
| 143 |
if egrep -q "^[^#].+[[:space:]]${BOOTDIR}[[:space:]]" /etc/fstab |
| 144 |
@@ -215,7 +215,7 @@ fi |
| 145 |
#fi |
| 146 |
|
| 147 |
KERNCACHE_IS_VALID=0 |
| 148 |
-if [ "${KERNCACHE}" != "" ] |
| 149 |
+if [ "${KERNCACHE}" != "" ] |
| 150 |
then |
| 151 |
gen_kerncache_is_valid |
| 152 |
fi |
| 153 |
@@ -224,13 +224,13 @@ if [ ${BUILD_KERNEL} = '1' -a "${KERNCACHE_IS_VALID}" = '0' ] |
| 154 |
then |
| 155 |
# Configure kernel |
| 156 |
config_kernel |
| 157 |
- |
| 158 |
+ |
| 159 |
# Make prepare |
| 160 |
if [ "${ARCH_HAVENOPREPARE}" = '' ] |
| 161 |
then |
| 162 |
compile_generic prepare kernel |
| 163 |
fi |
| 164 |
- |
| 165 |
+ |
| 166 |
# KV may have changed due to the configuration |
| 167 |
get_KV |
| 168 |
|
| 169 |
@@ -254,13 +254,13 @@ fi |
| 170 |
|
| 171 |
if isTrue "${CMD_INSTALL}" |
| 172 |
then |
| 173 |
- if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] |
| 174 |
+ if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] |
| 175 |
then |
| 176 |
gen_kerncache_extract_kernel |
| 177 |
fi |
| 178 |
fi |
| 179 |
|
| 180 |
-if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] |
| 181 |
+if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] |
| 182 |
then |
| 183 |
[ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules |
| 184 |
gen_kerncache_extract_config |
Archives