Re: [Ltib] patchmerge problems with newer Linux kernels

[Stuart Hughes]

Hi Peter,

I've checked this in with LINTARCH.  I don't bother with the test to see
if $pcf->{LINTARCH} is set as this is tested earlier in the
check_basic_deps() subr.  I've not done a full test.

Thank you for the patch.

Regards, Stuart

Stuart Hughes wrote:
> Hi Peter,
> 
> Yes LINTARCH would be better.  The difference is that LINTARCH is the
> kernel's idea of the ARCH rather than the GNU version.  In older days we
> had ppc in the kernel and powerpc for GNU (configure).
> 
> I'll go ahead and apply you patch but with LINTARCH
> 
> Regards, Stuart
> 
> Peter Barada wrote:
>> On Wed, 2010-04-07 at 15:23 +0100, Stuart Hughes wrote:
>>> Hi Peter,
>>>
>>> This looks like a good change to make.  The only question I have is
>>> whether this may break on older kernels, I can't see why it should?
>>> have you tried this on an older kernel?  If so I will apply.
>> Yes, I've tried it on a 2.6.28-rc8 kernel with no problems.  But looking
>> over dist/lfs-5.1/kernel/kernel-common.tmpl, I see it uses LINTARCH
>> instead of GNUTARCH for the kernel arch directory specifier.  I think
>> the patch should use $pcf->{LINTARCH} instead of $pcf->{GNUTARCH}.
>>
>> What's the difference between LINTARCH and GNUTARCH in LTIB?
>>
>>> Thanks, Stuart
>>>
>>> Peter Barada wrote:
>>>> Stuart,
>>>>
>>>> Somewhere around kernel version 2.6.32, the "make distclean" command
>>>> used in f_patchmerge() doesn't clean out generated files in the
>>>> appropriate arch directory which requires hand editing the patch to
>>>> clean them up.
>>>>
>>>> In the f_patchmerge() subroutine, I've tried modifying the "make
>>>> distclean" to be:
>>>>
>>>> if [ "$tok->{name}" = "kernel" -a -n "$pcf->{GNUTARCH}" ]; then
>>>>        make ARCH=$pcf->{GNUTARCH} distclean
>>>> else
>>>>        make distclean
>>>> fi
>>>>   
>>>> with good results:
>>>>
>>>> + cd 
>>>> /home/peter/work/logic/eps_svn/software/products/linux/LTIB/trunk/ltib-20091102-omap3logic.32/rpm/BUILD/linux-2.6.32.modified
>>>> + '[' kernel = kernel -a -n arm ']'
>>>> + make ARCH=arm distclean
>>>>   
>>>>
>>>> -- 
>>>> Peter Barada <address@hidden <mailto:address@hidden>>
>>>> Logic Product Development, Inc.
>>>>
>>>>
>>>> ------------------------------------------------------------------------
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> LTIB home page: http://ltib.org
>>>>
>>>> Ltib mailing list
>>>> address@hidden <mailto:address@hidden>
>>>> http://lists.nongnu.org/mailman/listinfo/ltib
>>>>   
> 
> 
> _______________________________________________
> LTIB home page: http://ltib.org
> 
> Ltib mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/ltib
>