Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 532084 | Differences between
and this patch

Collapse All | Expand All

(-)genkernel/gen_determineargs.sh (-4 / +4 lines)
Lines 2-8 Link Here
2
# $Id: dc6b2c4d993280a079ed58f28c3b67b870c7e48e $
2
# $Id: dc6b2c4d993280a079ed58f28c3b67b870c7e48e $
3
3
4
get_KV() {
4
get_KV() {
5
	if [ "${KERNEL_SOURCES}" = '0' -a -e "${KERNCACHE}" ]
5
	if isTrue ${KERNEL_SOURCES} && [ -e "${KERNCACHE}" ]
6
	then
6
	then
7
		/bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
7
		/bin/tar -xj -C ${TEMP} -f ${KERNCACHE} kerncache.config
8
		if [ -e ${TEMP}/kerncache.config ]
8
		if [ -e ${TEMP}/kerncache.config ]
Lines 175-181 Link Here
175
		fi
175
		fi
176
	fi
176
	fi
177
177
178
	if [ "${KERNEL_SOURCES}" != "0" ]
178
	if isTrue "${KERNEL_SOURCES}"
179
	then
179
	then
180
		if [ ! -d ${KERNEL_DIR} ]
180
		if [ ! -d ${KERNEL_DIR} ]
181
		then
181
		then
Lines 185-195 Link Here
185
185
186
	if [ -z "${KERNCACHE}" ]
186
	if [ -z "${KERNCACHE}" ]
187
	then
187
	then
188
		if [ "${KERNEL_DIR}" = '' -a "${KERNEL_SOURCES}" != "0" ]
188
		if [ "${KERNEL_DIR}" = '' ] && isTrue "${KERNEL_SOURCES}"
189
		then
189
		then
190
			gen_die 'No kernel source directory!'
190
			gen_die 'No kernel source directory!'
191
		fi
191
		fi
192
		if [ ! -e "${KERNEL_DIR}" -a "${KERNEL_SOURCES}" != "0" ]
192
		if [ ! -e "${KERNEL_DIR}" ] $$ isTrue "${KERNEL_SOURCES}"
193
		then
193
		then
194
			gen_die 'No kernel source directory!'
194
			gen_die 'No kernel source directory!'
195
		fi
195
		fi
(-)genkernel/gen_funcs.sh (-3 / +3 lines)
Lines 299-305 Link Here
299
	# Old product might be a different version.  If so, we need to read
299
	# Old product might be a different version.  If so, we need to read
300
	# the symlink to see what it's name is, if there are symlinks.
300
	# the symlink to see what it's name is, if there are symlinks.
301
	cd ${KERNEL_OUTPUTDIR}
301
	cd ${KERNEL_OUTPUTDIR}
302
	if [ "${SYMLINK}" = '1' ]
302
	if isTrue "${SYMLINK}"
303
	then
303
	then
304
 		print_info 4 "automatically managing symlinks and old images." 1 0
304
 		print_info 4 "automatically managing symlinks and old images." 1 0
305
		if [ -e "${BOOTDIR}/${symlinkName}" ]
305
		if [ -e "${BOOTDIR}/${symlinkName}" ]
Lines 345-351 Link Here
345
345
346
	# When symlinks are not being managed by genkernel, old symlinks might
346
	# When symlinks are not being managed by genkernel, old symlinks might
347
    # still be useful.  Leave 'em alone unless managed.
347
    # still be useful.  Leave 'em alone unless managed.
348
	if [ "${SYMLINK}" = '1' ]
348
	if isTrue "${SYMLINK}"
349
	then
349
	then
350
		print_info 5 "  Deleting old symlinks, if any."
350
		print_info 5 "  Deleting old symlinks, if any."
351
		rm -f "${BOOTDIR}/${symlinkName}"
351
		rm -f "${BOOTDIR}/${symlinkName}"
Lines 391-397 Link Here
391
	cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" ||
391
	cp "${newSrceImage}" "${BOOTDIR}/${currDestImage}" ||
392
	    gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
392
	    gen_die "Could not copy the ${symlinkName} image to ${BOOTDIR}!"
393
393
394
	if [ "${SYMLINK}" = '1' ]
394
	if isTrue "${SYMLINK}"
395
	then
395
	then
396
		print_info 5 "  Make new symlink(s) (from ${BOOTDIR}):"
396
		print_info 5 "  Make new symlink(s) (from ${BOOTDIR}):"
397
		print_info 5 "    ${symlinkName} -> ${currDestImage}"
397
		print_info 5 "    ${symlinkName} -> ${currDestImage}"
(-)genkernel/gen_initramfs.sh (-3 / +3 lines)
Lines 179-185 Link Here
179
	cd ${TEMP}
179
	cd ${TEMP}
180
	mkdir -p "${TEMP}/initramfs-blkid-temp/"
180
	mkdir -p "${TEMP}/initramfs-blkid-temp/"
181
181
182
	if [[ "${DISKLABEL}" = "1" ]]; then
182
	if isTrue "${DISKLABEL}"; then
183
		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
183
		copy_binaries "${TEMP}"/initramfs-blkid-temp/ /sbin/blkid
184
	fi
184
	fi
185
185
Lines 395-401 Link Here
395
	cd ${TEMP}
395
	cd ${TEMP}
396
	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
396
	mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/"
397
	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
397
	mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/"
398
	if [ "${MDADM}" = '1' ]
398
	if isTrue "${MDADM}"
399
	then
399
	then
400
		if [ -n "${MDADM_CONFIG}" ]
400
		if [ -n "${MDADM_CONFIG}" ]
401
		then
401
		then
Lines 807-813 Link Here
807
	append_data 'multipath' "${MULTIPATH}"
807
	append_data 'multipath' "${MULTIPATH}"
808
	append_data 'gpg' "${GPG}"
808
	append_data 'gpg' "${GPG}"
809
809
810
	if [ "${RAMDISKMODULES}" = '1' ]
810
	if isTrue "${RAMDISKMODULES}"
811
	then
811
	then
812
		append_data 'modules'
812
		append_data 'modules'
813
	else
813
	else
(-)genkernel/genkernel (-12 / +12 lines)
Lines 237-248 Link Here
237
	compile_kernel
237
	compile_kernel
238
238
239
	# Compile modules
239
	# Compile modules
240
	if [ "${BUILD_MODULES}" = '1' -a "${BUILD_STATIC}" = '0' ]
240
	if [ "${BUILD_MODULES}" = '1' ] && isTrue "${BUILD_STATIC}"
241
	then
241
	then
242
		compile_modules
242
		compile_modules
243
	fi
243
	fi
244
244
245
	if [ "${SAVE_CONFIG}" = '1' ]
245
	if isTrue "${SAVE_CONFIG}"
246
	then
246
	then
247
		print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}"
247
		print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-${ARCH}-${KV}"
248
		[ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
248
		[ ! -e '/etc/kernels' ] && mkdir -p /etc/kernels
Lines 262-268 Link Here
262
262
263
if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
263
if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ]
264
then
264
then
265
	[ "${BUILD_STATIC}" = '0' ] && gen_kerncache_extract_modules
265
	isTrue "${BUILD_STATIC}" && gen_kerncache_extract_modules
266
	gen_kerncache_extract_config
266
	gen_kerncache_extract_config
267
fi
267
fi
268
268
Lines 301-307 Link Here
301
301
302
if [ "${BUILD_RAMDISK}" = '1' ]
302
if [ "${BUILD_RAMDISK}" = '1' ]
303
then
303
then
304
	if [ "${BUSYBOX}" = '1' ]
304
	if isTrue "${BUSYBOX}"
305
	then
305
	then
306
		# Compile Busybox
306
		# Compile Busybox
307
		compile_busybox
307
		compile_busybox
Lines 363-376 Link Here
363
	echo
363
	echo
364
	print_warning 1 'WARNING... WARNING... WARNING...'
364
	print_warning 1 'WARNING... WARNING... WARNING...'
365
	print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
365
	print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
366
	[ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
366
	isTrue "${SPLASH}" && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
367
	[ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
367
	isTrue "${LVM}" && print_warning 1 'add "dolvm" for lvm support'
368
	[ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
368
	isTrue "${DMRAID}" && print_warning 1 'add "dodmraid" for dmraid support'
369
	[ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
369
	isTrue "${MDADM}" && print_warning 1 'add "domdadm" for RAID support'
370
	[ "${DMRAID}" = '1' ] && print_warning 1 '	or "dodmraid=<additional options>"'
370
	isTrue "${DMRAID}" && print_warning 1 '	or "dodmraid=<additional options>"'
371
	[ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
371
	isTrue "${ZFS}" && print_warning 1 'add "dozfs" for ZFS volume management support'
372
	[ "${ZFS}" = '1' ] && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
372
	isTrue "${ZFS}" && print_warning 1 '	and either "root=ZFS" to use bootfs autodetection or "root=ZFS=<dataset>" to force booting from a specific dataset'
373
	[ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
373
	isTrue "${ISCSI}" && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
374
374
375
	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
375
	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
376
		# Support --kernel-config=/proc/config.gz, mainly
376
		# Support --kernel-config=/proc/config.gz, mainly
(-)genkernel/gen_moddeps.sh (-1 / +1 lines)
Lines 56-62 Link Here
56
56
57
gen_dep_list()
57
gen_dep_list()
58
{
58
{
59
	if [ "${ALLRAMDISKMODULES}" = "1" ]; then
59
	if isTrue "${ALLRAMDISKMODULES}"; then
60
		strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
60
		strip_mod_paths $(find "${INSTALL_MOD_PATH}/lib/modules/${KV}" -name "*$(modules_kext)") | sort
61
	else
61
	else
62
		local group_modules
62
		local group_modules

Return to bug 532084