Attachment #298717 for bug #398477

Lines 27-29 Link Here

(-)genkernel-3.4.22.1-vanilla/arch/x86/modules_load (+2 lines)
27	# Filesystems	27	# Filesystems
28	MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"	28	MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
29		29
		30	# TuxOnIce
		31	MODULES_TOI="tuxonice_bio tuxonice_compress tuxonice_core tuxonice_file tuxonice_swap tuxonice_userui"

Lines 25-27 Link Here

(-)genkernel-3.4.22.1-vanilla/arch/x86_64/modules_load (+3 lines)
25		25
26	# Filesystems	26	# Filesystems
27	MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"	27	MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse"
		28
		29	# TuxOnIce
		30	MODULES_TOI="tuxonice_bio tuxonice_compress tuxonice_core tuxonice_file tuxonice_swap tuxonice_userui"

Lines 80-85 Link Here

(-)genkernel-3.4.22.1-vanilla/gen_cmdline.sh (+6 lines)
80	echo " --splash-res=<res> Select splash theme resolutions to install"	80	echo " --splash-res=<res> Select splash theme resolutions to install"
81	echo " --splash=<theme> Enable framebuffer splash using <theme>"	81	echo " --splash=<theme> Enable framebuffer splash using <theme>"
82	echo " --splash-res=<res> Select splash theme resolutions to install"	82	echo " --splash-res=<res> Select splash theme resolutions to install"
		83	echo " --tuxonice Include tuxonice support"
		84	echo " --no-tuxonice Exclude tuxonice support"
83	echo " --do-keymap-auto Forces keymap selection at boot"	85	echo " --do-keymap-auto Forces keymap selection at boot"
84	echo " --keymap Enables keymap selection support"	86	echo " --keymap Enables keymap selection support"
85	echo " --no-keymap Disables keymap selection support"	87	echo " --no-keymap Disables keymap selection support"
Lines 395-400 Link Here
395	SPLASH_RES=`parse_opt "$*"`	397	SPLASH_RES=`parse_opt "$*"`
396	print_info 2 "SPLASH_RES: ${SPLASH_RES}"	398	print_info 2 "SPLASH_RES: ${SPLASH_RES}"
397	;;	399	;;
		400	--tuxonice\|--no-tuxonice)
		401	CMD_TUXONICE=`parse_optbool "$*"`
		402	print_info 2 "CMD_TUXONICE: ${CMD_TUXONICE}"
		403	;;
398	--install\|--no-install)	404	--install\|--no-install)
399	CMD_INSTALL=`parse_optbool "$*"`	405	CMD_INSTALL=`parse_optbool "$*"`
400	print_info 2 "CMD_INSTALL: ${CMD_INSTALL}"	406	print_info 2 "CMD_INSTALL: ${CMD_INSTALL}"




	then
		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
	fi

	if isTrue ${CMD_TUXONICE}
	then
		if isTrue ${SPLASH} && [ -x "/sbin/tuxoniceui_fbsplash" ]
		then
			sed -i ${KERNEL_DIR}/.config \
				-e 's/#\? \?CONFIG_TOI_USERUI_DEFAULT_PATH.*/CONFIG_TOI_USERUI_DEFAULT_PATH=\"\/sbin\/tuxoniceui_fbsplash\"/g'
		elif [ -x "/sbin/tuxoniceui_text" ]
		then
			sed -i ${KERNEL_DIR}/.config \
				-e 's/#\? \?CONFIG_TOI_USERUI_DEFAULT_PATH.*/CONFIG_TOI_USERUI_DEFAULT_PATH=\"\/sbin\/tuxoniceui_text\"/g'
		fi
	fi
}

Lines 90-95 Link Here

(-)genkernel-3.4.22.1-vanilla/gen_determineargs.sh (+1 lines)
90	set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot"	90	set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot"
91		91
92	set_config_with_override BOOL SPLASH CMD_SPLASH	92	set_config_with_override BOOL SPLASH CMD_SPLASH
		93	set_config_with_override BOOL TUXONICE CMD_TUXONICE "no"
93	set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR	94	set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR
94	set_config_with_override BOOL MRPROPER CMD_MRPROPER	95	set_config_with_override BOOL MRPROPER CMD_MRPROPER
95	set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG	96	set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG




	fi
}

append_tuxonice(){
	if ! grep -q -E '^CONFIG_TOI_CORE=[y|m]' ${KERNEL_DIR}/.config
	then
		if isTrue ${SPLASH}
		then
			tuxonice_bin="tuxoniceui_fbsplash"
		else
			tuxonice_bin="tuxoniceui_text"
		fi
		if [ -x "/sbin/${tuxonice_bin}" ]
		then
			print_info 1 "  >> Installing tuxonice support [ using ${tuxonice_bin} ]..."
			if [ -d "${TEMP}/initramfs-tuxonice-temp" ]
			then
				rm -r "${TEMP}/initramfs-tuxonice-temp/"
			fi
			mkdir -p "${TEMP}/initramfs-tuxonice-temp/sbin"
			cp "/sbin/${tuxonice_bin}" "${TEMP}/initramfs-tuxonice-temp/sbin" || gen_die "Could not copy over ${tuxonice_bin}!"
			if isTrue ${SPLASH}
			then
				[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
				[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
				print_info 1 "  >> Using ${SPLASH_THEME} theme..."
				mkdir -p "${TEMP}/initramfs-tuxonice-temp/etc/splash"
				cd "${TEMP}/initramfs-tuxonice-temp/etc/splash"
				ln -snf "${SPLASH_THEME}" tuxonice
			fi
			cd "${TEMP}/initramfs-tuxonice-temp/"
			find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
				|| gen_die "compressing tuxonice cpio"
			cd "${TEMP}"
			rm -r "${TEMP}/initramfs-tuxonice-temp/"
		else
			print_warning 1 '               >> No tuxonice-userui detected; skipping!'
		fi
	else
		print_warning 1 '               >> TuxOnIce not compiled into kernel; skipping!'
	fi
}

append_overlay(){
	cd ${INITRAMFS_OVERLAY}
	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \


	append_data 'splash' "${SPLASH}"

	append_data 'tuxonice' "${TUXONICE}"

	if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
	then
		append_data 'firmware'

Lines 112-117 Link Here

(-)genkernel-3.4.22.1-vanilla/genkernel.conf (+4 lines)
112	# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).	112	# This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space).
113	# SPLASH_THEME="gentoo"	113	# SPLASH_THEME="gentoo"
114		114
		115	# Include tuxonice support (tuxoniceui). Default is "no".
		116	# It will support splash (tuxoniceui_fbsplash) if SPLASH is enabled.
		117	# TUXONICE="yes"
		118
115		119
116	# =========Keymap Settings=========	120	# =========Keymap Settings=========
117	#	121	#

Return to bug 398477

Lines 133-136 Link Here

(-)genkernel-3.4.22.1-vanilla/gen_configkernel.sh (+13 lines)
133	then	133	then
134	sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'	134	sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
135	fi	135	fi
		136
		137	if isTrue ${CMD_TUXONICE}
		138	then
		139	if isTrue ${SPLASH} && [ -x "/sbin/tuxoniceui_fbsplash" ]
		140	then
		141	sed -i ${KERNEL_DIR}/.config \
		142	-e 's/#\? \?CONFIG_TOI_USERUI_DEFAULT_PATH.*/CONFIG_TOI_USERUI_DEFAULT_PATH=\"\/sbin\/tuxoniceui_fbsplash\"/g'
		143	elif [ -x "/sbin/tuxoniceui_text" ]
		144	then
		145	sed -i ${KERNEL_DIR}/.config \
		146	-e 's/#\? \?CONFIG_TOI_USERUI_DEFAULT_PATH.*/CONFIG_TOI_USERUI_DEFAULT_PATH=\"\/sbin\/tuxoniceui_text\"/g'
		147	fi
		148	fi
136	}	149	}

Lines 373-378 Link Here

(-)genkernel-3.4.22.1-vanilla/gen_initramfs.sh (+42 lines)
373	fi	373	fi
374	}	374	}
375		375
		376	append_tuxonice(){
		377	if ! grep -q -E '^CONFIG_TOI_CORE=[y\|m]' ${KERNEL_DIR}/.config
		378	then
		379	if isTrue ${SPLASH}
		380	then
		381	tuxonice_bin="tuxoniceui_fbsplash"
		382	else
		383	tuxonice_bin="tuxoniceui_text"
		384	fi
		385	if [ -x "/sbin/${tuxonice_bin}" ]
		386	then
		387	print_info 1 " >> Installing tuxonice support [ using ${tuxonice_bin} ]..."
		388	if [ -d "${TEMP}/initramfs-tuxonice-temp" ]
		389	then
		390	rm -r "${TEMP}/initramfs-tuxonice-temp/"
		391	fi
		392	mkdir -p "${TEMP}/initramfs-tuxonice-temp/sbin"
		393	cp "/sbin/${tuxonice_bin}" "${TEMP}/initramfs-tuxonice-temp/sbin" \|\| gen_die "Could not copy over ${tuxonice_bin}!"
		394	if isTrue ${SPLASH}
		395	then
		396	[ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
		397	[ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
		398	print_info 1 " >> Using ${SPLASH_THEME} theme..."
		399	mkdir -p "${TEMP}/initramfs-tuxonice-temp/etc/splash"
		400	cd "${TEMP}/initramfs-tuxonice-temp/etc/splash"
		401	ln -snf "${SPLASH_THEME}" tuxonice
		402	fi
		403	cd "${TEMP}/initramfs-tuxonice-temp/"
		404	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}" \
		405	\|\| gen_die "compressing tuxonice cpio"
		406	cd "${TEMP}"
		407	rm -r "${TEMP}/initramfs-tuxonice-temp/"
		408	else
		409	print_warning 1 ' >> No tuxonice-userui detected; skipping!'
		410	fi
		411	else
		412	print_warning 1 ' >> TuxOnIce not compiled into kernel; skipping!'
		413	fi
		414	}
		415
376	append_overlay(){	416	append_overlay(){
377	cd ${INITRAMFS_OVERLAY}	417	cd ${INITRAMFS_OVERLAY}
378	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}" \	418	find . -print \| cpio ${CPIO_ARGS} --append -F "${CPIO}" \
Lines 662-667 Link Here
662		701
663	append_data 'splash' "${SPLASH}"	702	append_data 'splash' "${SPLASH}"
664		703
		704	append_data 'tuxonice' "${TUXONICE}"
		705
665	if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]	706	if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
666	then	707	then
667	append_data 'firmware'	708	append_data 'firmware'