| 1 |
On Wed, Jan 29, 2014 at 05:24:30PM -0500, Rick "Zero_Chaos" Farina wrote: |
| 2 |
> Please use the gentoo-catalyst ML for these. I have added to the cc |
| 3 |
> so the proper eyes will see it. |
| 4 |
|
| 5 |
Thanks. Should I cull catalyst@ and hppa@ from future responses? |
| 6 |
|
| 7 |
> On 01/29/2014 10:19 AM, Guy Martin wrote: |
| 8 |
> > https://github.com/gmsoft-tuxicoman/catalyst/compare/6046e57...gmsoft?expand=1 |
| 9 |
|
| 10 |
Since the patches aren't inline, I'll respond to the log output: |
| 11 |
|
| 12 |
$ git log --graph --topo-order --oneline --decorate origin/2.X..gmsoft/gmsoft |
| 13 |
* 333808b (gmsoft/gmsoft) Fix kernel build when kerncache is disabled. |
| 14 |
* a5b80e5 update-modules doens't exists anymore. |
| 15 |
* 0f4c970 Add 'panic=30' to palo's command line. |
| 16 |
* 6046e57 Add the executable bit to all shell script. |
| 17 |
|
| 18 |
I think 6046e57 is useful, but it's already in pending with 70f7cfc |
| 19 |
and fcbcea4 [1]. That series has been warmly received by me on the |
| 20 |
mailing list, although others have been silent ;). I think we should |
| 21 |
just merge that into master instead of 6046e57. I don't care if it's |
| 22 |
backported to 2.X. |
| 23 |
|
| 24 |
I've never used PALO [2], so I'm agnostic on 0f4c970. I agree with |
| 25 |
dol-sen's #gentoo-releng comment that it would be better to make this |
| 26 |
timeout configurable, but since this is code I'll never use, I don't |
| 27 |
feel very strongly about it ;). |
| 28 |
|
| 29 |
a5b80e5 looks good to me; I'd merge it into master too. In general, I |
| 30 |
think better error detection in Catalyst's target scripts would be |
| 31 |
useful to help catch this sort of thing. |
| 32 |
|
| 33 |
> > Regarding commit 333808b, |
| 34 |
|
| 35 |
I don't understand the first hunk in 333808b: |
| 36 |
|
| 37 |
--- a/targets/support/kmerge.sh |
| 38 |
+++ b/targets/support/kmerge.sh |
| 39 |
@@ -199,9 +199,10 @@ fi |
| 40 |
[ -e /etc/portage/make.conf ] && \ |
| 41 |
echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf |
| 42 |
|
| 43 |
+mkdir -p /tmp/kerncache/${clst_kname} |
| 44 |
+ |
| 45 |
if [ -n "${clst_KERNCACHE}" ] |
| 46 |
then |
| 47 |
- mkdir -p /tmp/kerncache/${clst_kname} |
| 48 |
clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1 |
| 49 |
KERNELVERSION=`portageq best_visible / "${clst_ksource}"` |
| 50 |
if [ ! -e /etc/portage/profile/package.provided ] |
| 51 |
|
| 52 |
Why create /tmp/kerncache if kerncache is disabled? |
| 53 |
|
| 54 |
> > the second hunk adds --selective=n to emerge always merge the |
| 55 |
> > kernel. When having two kernels in the livecd specs, the first |
| 56 |
> > build works fine but the second one fails because the sources are |
| 57 |
> > removed and not reemerged. |
| 58 |
|
| 59 |
I'm not entirely sure how this is supposed to work, but I'm not wild |
| 60 |
about --selective=n. Are the two kernels you're adding to the livecd |
| 61 |
both from the same package? I don't see how that could be, but |
| 62 |
otherwise I'm not sure why the current invocation doesn't work. Maybe |
| 63 |
there were more details in the original message? I haven't built a |
| 64 |
livecd stage in a while, so I don't have much more than vague |
| 65 |
skepticism here. I'll try and run some local tests this weekend. |
| 66 |
|
| 67 |
Cheers, |
| 68 |
Trevor |
| 69 |
|
| 70 |
[1]: http://thread.gmane.org/gmane.linux.gentoo.catalyst/2614 |
| 71 |
[2]: http://www.pateam.org/parisc-linux-boot/PA-RISC-Linux-Boot-HOWTO/palo.html |
| 72 |
|
| 73 |
-- |
| 74 |
This email may be signed or encrypted with GnuPG (http://www.gnupg.org). |
| 75 |
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy |
Archives