Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 298717 Details for
Bug 398477
sys-kernel/genkernel - add sys-apps/tuxonice-userui support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Badly made tuxonice-userui support for genkernel.
genkernel-3.4.22.1-tuxonice-userui.patch (text/plain), 6.05 KB, created by
Tomasz Wasiak
on 2012-01-12 05:55:04 UTC
(
hide
)
Description:
Badly made tuxonice-userui support for genkernel.
Filename:
MIME Type:
Creator:
Tomasz Wasiak
Created:
2012-01-12 05:55:04 UTC
Size:
6.05 KB
patch
obsolete
>diff -ruN genkernel-3.4.22.1-vanilla/arch/x86/modules_load genkernel-3.4.22.1/arch/x86/modules_load >--- genkernel-3.4.22.1-vanilla/arch/x86/modules_load 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/arch/x86/modules_load 2012-01-12 06:21:02.233763998 +0100 >@@ -27,3 +27,5 @@ > # Filesystems > MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse" > >+# TuxOnIce >+MODULES_TOI="tuxonice_bio tuxonice_compress tuxonice_core tuxonice_file tuxonice_swap tuxonice_userui" >diff -ruN genkernel-3.4.22.1-vanilla/arch/x86_64/modules_load genkernel-3.4.22.1/arch/x86_64/modules_load >--- genkernel-3.4.22.1-vanilla/arch/x86_64/modules_load 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/arch/x86_64/modules_load 2012-01-12 06:21:02.234097319 +0100 >@@ -25,3 +25,6 @@ > > # Filesystems > MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs fuse" >+ >+# TuxOnIce >+MODULES_TOI="tuxonice_bio tuxonice_compress tuxonice_core tuxonice_file tuxonice_swap tuxonice_userui" >diff -ruN genkernel-3.4.22.1-vanilla/gen_cmdline.sh genkernel-3.4.22.1/gen_cmdline.sh >--- genkernel-3.4.22.1-vanilla/gen_cmdline.sh 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/gen_cmdline.sh 2012-01-12 06:21:02.234430640 +0100 >@@ -80,6 +80,8 @@ > echo " --splash-res=<res> Select splash theme resolutions to install" > echo " --splash=<theme> Enable framebuffer splash using <theme>" > echo " --splash-res=<res> Select splash theme resolutions to install" >+ echo " --tuxonice Include tuxonice support" >+ echo " --no-tuxonice Exclude tuxonice support" > echo " --do-keymap-auto Forces keymap selection at boot" > echo " --keymap Enables keymap selection support" > echo " --no-keymap Disables keymap selection support" >@@ -395,6 +397,10 @@ > SPLASH_RES=`parse_opt "$*"` > print_info 2 "SPLASH_RES: ${SPLASH_RES}" > ;; >+ --tuxonice|--no-tuxonice) >+ CMD_TUXONICE=`parse_optbool "$*"` >+ print_info 2 "CMD_TUXONICE: ${CMD_TUXONICE}" >+ ;; > --install|--no-install) > CMD_INSTALL=`parse_optbool "$*"` > print_info 2 "CMD_INSTALL: ${CMD_INSTALL}" >diff -ruN genkernel-3.4.22.1-vanilla/gen_configkernel.sh genkernel-3.4.22.1/gen_configkernel.sh >--- genkernel-3.4.22.1-vanilla/gen_configkernel.sh 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/gen_configkernel.sh 2012-01-12 06:29:06.932526677 +0100 >@@ -133,4 +133,17 @@ > 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 > } >diff -ruN genkernel-3.4.22.1-vanilla/gen_determineargs.sh genkernel-3.4.22.1/gen_determineargs.sh >--- genkernel-3.4.22.1-vanilla/gen_determineargs.sh 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/gen_determineargs.sh 2012-01-12 06:21:02.234763961 +0100 >@@ -90,6 +90,7 @@ > set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot" > > set_config_with_override BOOL SPLASH CMD_SPLASH >+ set_config_with_override BOOL TUXONICE CMD_TUXONICE "no" > set_config_with_override BOOL POSTCLEAR CMD_POSTCLEAR > set_config_with_override BOOL MRPROPER CMD_MRPROPER > set_config_with_override BOOL MENUCONFIG CMD_MENUCONFIG >diff -ruN genkernel-3.4.22.1-vanilla/gen_initramfs.sh genkernel-3.4.22.1/gen_initramfs.sh >--- genkernel-3.4.22.1-vanilla/gen_initramfs.sh 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/gen_initramfs.sh 2012-01-12 06:21:02.235430602 +0100 >@@ -373,6 +373,46 @@ > 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}" \ >@@ -662,6 +701,8 @@ > > append_data 'splash' "${SPLASH}" > >+ append_data 'tuxonice' "${TUXONICE}" >+ > if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ] > then > append_data 'firmware' >diff -ruN genkernel-3.4.22.1-vanilla/genkernel.conf genkernel-3.4.22.1/genkernel.conf >--- genkernel-3.4.22.1-vanilla/genkernel.conf 2012-01-08 03:31:04.000000000 +0100 >+++ genkernel-3.4.22.1/genkernel.conf 2012-01-12 06:21:02.235763922 +0100 >@@ -112,6 +112,10 @@ > # This supersedes the "SPLASH_THEME" option of /etc/conf.d/splash (in early space). > # SPLASH_THEME="gentoo" > >+# Include tuxonice support (tuxoniceui). Default is "no". >+# It will support splash (tuxoniceui_fbsplash) if SPLASH is enabled. >+# TUXONICE="yes" >+ > > # =========Keymap Settings========= > #
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 398477
:
298603
|
298695
|
298705
|
298715
|
298717
|
298775