Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 139337

Summary: Mips and misc patches for catalyst
Product: Gentoo Hosted Projects Reporter: Joshua Kinard <kumba>
Component: CatalystAssignee: Gentoo Catalyst Developers <catalyst>
Status: RESOLVED FIXED    
Severity: normal Keywords: InVCS
Priority: High    
Version: unspecified   
Hardware: All   
OS: Other   
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: mips tweaks for targets/support/create-iso.sh
Update the source file for generating the arcload config
Update gdm.conf handling to account for gdm-2.14 differences
Prevent catalyst from re-merging sources all the time
Favour settings in the specfile versus make.conf
Add sanity checks to mips' bootloader-setup section
Fix chost/c[xx]flags/ldflags overrides

Description Joshua Kinard gentoo-dev 2006-07-05 09:59:30 UTC
Attached are several patches for catalyst to get in some final mips tweaks and miscellaneous catalyst tweaks.  Some are safe to go right in, others could use a review and consideration.  I'll denote which should need review.
Comment 1 Joshua Kinard gentoo-dev 2006-07-05 10:01:46 UTC
Created attachment 90980 [details, diff]
mips tweaks for targets/support/create-iso.sh

Changes the supported fstype to squashfs, adds some additional comments to better explain things, and some conditional checks before shifting files around.
Comment 2 Joshua Kinard gentoo-dev 2006-07-05 10:03:40 UTC
Created attachment 90981 [details, diff]
Update the source file for generating the arcload config

Modifies the arcload config source file so that the generated config passes needed variables for loading an X-based LiveCD.
Comment 3 Joshua Kinard gentoo-dev 2006-07-05 10:45:30 UTC
Created attachment 90988 [details, diff]
Update gdm.conf handling to account for gdm-2.14 differences

gdm-2.14 uses defaults in /usr/share/gdm/defaults.conf and desired changes go into an overlay config in /etc/X11/gdm/custom.conf versus the old behavior of applying sed maginc to /etc/X11/gdm/gdm.conf.
Comment 4 Joshua Kinard gentoo-dev 2006-07-05 10:47:52 UTC
Created attachment 90989 [details, diff]
Prevent catalyst from re-merging sources all the time

This one needs some review.  In my test runs for both netboot2 and livecd-stage2, catalyst would always wipe out and re-merge the kernel sources even when kerncache was set, which got annoying.  The deleted block of code doesn't make a whole lot of sense to me, but removing it makes catalyst keep the sourcetree around unless -p is passed or the kerncache is manually deleted.  Some review on this behavior might be warranted.
Comment 5 Joshua Kinard gentoo-dev 2006-07-05 10:49:31 UTC
Created attachment 90990 [details, diff]
Favour settings in the specfile versus make.conf

If a particular setting is specified in the spec files, use that instead fo what may be specified in the make.conf in the chroot.  If no spec file setting is available, then the value from make.conf is used if it exists.

This one might need some review too.
Comment 6 Joshua Kinard gentoo-dev 2006-07-05 10:57:19 UTC
Created attachment 90992 [details, diff]
Add sanity checks to mips' bootloader-setup section

Before moving or deleting directories, check that the target exists first.
Comment 7 Joshua Kinard gentoo-dev 2006-07-05 13:45:01 UTC
Created attachment 91008 [details, diff]
Fix chost/c[xx]flags/ldflags overrides

This modifies generic_stage_target so that the override functions for chost, cflags, cxxflags, and ldflags only pull their values from the make.conf file by default.  As such, stage3, stage4, grp, tinderbox, netboot[1|2], and the embedded targets all use this method to set these values.  stage1 and stage2 override this behavior, however, and pull their values from the spec file.
Comment 8 Chris Gianelloni (RETIRED) gentoo-dev 2006-07-11 14:42:05 UTC
OK.  I put these in CVS.  I did do a little shuffling of the gdm stuff because I didn't like how it read and preferred to try to keep things to 80 columns.  It doesn't change the functionality, except in places where the patch made incorrect assumptions, such as defaulting to the "gentoo" user.  This will show up in 2.0_rc50.
Comment 9 Andrew Gaffney (RETIRED) gentoo-dev 2006-07-11 15:48:31 UTC
The gdm patch was a bit wrong. It tries to interpolate ${sedxtra} in a single-quoted string, which just doesn't work. I modifed it a bit locally, and it works fine.

First, I changed sedxtra to autologin_user:

                [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ] \
                    && autologin_user="${first_user}" \
                    || autologin_user="gentoo"

Then I changed the sed a bit:

                sed -e 's:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10\nTimedLogin='${autologin_user}':'
Comment 10 Chris Gianelloni (RETIRED) gentoo-dev 2006-07-12 11:32:18 UTC
Umm... Andrew?  Did you read the patch I actually *applied* versus what was posted here?  :P
Comment 11 Andrew Gaffney (RETIRED) gentoo-dev 2006-07-12 11:41:57 UTC
Nope :P
Comment 12 Chris Gianelloni (RETIRED) gentoo-dev 2006-07-19 17:13:52 UTC
Fixed in 2.0_rc50...