FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Development

 
 
LinkBack Thread Tools
 
Old 12-16-2009, 07:05 PM
Eric Bélanger
 
Default makechrootpkg: Use the host's SRCDEST and PKGDEST if they are defined

On Wed, Dec 16, 2009 at 1:56 PM, Aaron Griffin <aaronmgriffin@gmail.com> wrote:
> On Wed, Dec 16, 2009 at 12:17 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>> On Fri, Nov 20, 2009 at 2:50 AM, Firmicus <Firmicus@gmx.net> wrote:
>>> Aaron Griffin wrote:
>>>>> Aaron Griffin wrote:
>>>>>
>>>>>> On Wed, Nov 4, 2009 at 8:02 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>>>>>>
>>>>>>
>>>>>>> Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
>>>>>>> ---
>>>>>>> *makechrootpkg | * *3 +++
>>>>>>> *1 files changed, 3 insertions(+), 0 deletions(-)
>>>>>>>
>>>>>>> diff --git a/makechrootpkg b/makechrootpkg
>>>>>>> index 5095425..d1dcf32 100755
>>>>>>> --- a/makechrootpkg
>>>>>>> +++ b/makechrootpkg
>>>>>>> @@ -150,6 +150,9 @@ if [ "$REPACK" != "1" ]; then
>>>>>>> * * rm -rf "$uniondir/build/"*
>>>>>>> *fi
>>>>>>>
>>>>>>> +eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>>>> +eval $(grep '^PKGDEST=' /etc/makepkg.conf)
>>>>>>> +
>>>>>>> *[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
>>>>>>> *if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
>>>>>>> * * echo "Setting PKGDEST in makepkg.conf"
>>>>>>>
>>>>>>>
>>>> <snip>
>>>>
>>>> I was thinking more along the lines of:
>>>>
>>>> Original: eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>
>>>> SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>> PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>>
>>>>
>>>
>>> Re: Eric's request of November 11 in another thread, I am in favour of
>>> committing the above fix to devtools, and then release a new version. Is
>>> it ok with you Aaron?
>>>
>>> F
>>>
>>
>> Bump. Any resolution yet for this SRCDEST/PKGDEST "sourcing" issue?
>
> Sorry, this has been marked in my little patch queue for too long. I
> pushed the latest change up there.
>
> Let me know if that looks ok to everyone
>

Thanks. Looks good to me.

BTW, do you have this other patch in your queue?
http://mailman.archlinux.org/pipermail/arch-dev-public/2009-November/014498.html
 
Old 12-16-2009, 07:50 PM
Aaron Griffin
 
Default makechrootpkg: Use the host's SRCDEST and PKGDEST if they are defined

On Wed, Dec 16, 2009 at 2:05 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
> On Wed, Dec 16, 2009 at 1:56 PM, Aaron Griffin <aaronmgriffin@gmail.com> wrote:
>> On Wed, Dec 16, 2009 at 12:17 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>>> On Fri, Nov 20, 2009 at 2:50 AM, Firmicus <Firmicus@gmx.net> wrote:
>>>> Aaron Griffin wrote:
>>>>>> Aaron Griffin wrote:
>>>>>>
>>>>>>> On Wed, Nov 4, 2009 at 8:02 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>>>>>>>
>>>>>>>
>>>>>>>> Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
>>>>>>>> ---
>>>>>>>> *makechrootpkg | * *3 +++
>>>>>>>> *1 files changed, 3 insertions(+), 0 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/makechrootpkg b/makechrootpkg
>>>>>>>> index 5095425..d1dcf32 100755
>>>>>>>> --- a/makechrootpkg
>>>>>>>> +++ b/makechrootpkg
>>>>>>>> @@ -150,6 +150,9 @@ if [ "$REPACK" != "1" ]; then
>>>>>>>> * * rm -rf "$uniondir/build/"*
>>>>>>>> *fi
>>>>>>>>
>>>>>>>> +eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>>>>> +eval $(grep '^PKGDEST=' /etc/makepkg.conf)
>>>>>>>> +
>>>>>>>> *[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
>>>>>>>> *if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
>>>>>>>> * * echo "Setting PKGDEST in makepkg.conf"
>>>>>>>>
>>>>>>>>
>>>>> <snip>
>>>>>
>>>>> I was thinking more along the lines of:
>>>>>
>>>>> Original: eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>>
>>>>> SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>>> PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>>>
>>>>>
>>>>
>>>> Re: Eric's request of November 11 in another thread, I am in favour of
>>>> committing the above fix to devtools, and then release a new version. Is
>>>> it ok with you Aaron?
>>>>
>>>> F
>>>>
>>>
>>> Bump. Any resolution yet for this SRCDEST/PKGDEST "sourcing" issue?
>>
>> Sorry, this has been marked in my little patch queue for too long. I
>> pushed the latest change up there.
>>
>> Let me know if that looks ok to everyone
>>
>
> Thanks. Looks good to me.
>
> BTW, do you have this other patch in your queue?
> http://mailman.archlinux.org/pipermail/arch-dev-public/2009-November/014498.html

Yup, just merged that one too. Thanks
 
Old 12-17-2009, 04:51 AM
Eric Bélanger
 
Default makechrootpkg: Use the host's SRCDEST and PKGDEST if they are defined

On Wed, Dec 16, 2009 at 1:56 PM, Aaron Griffin <aaronmgriffin@gmail.com> wrote:
> On Wed, Dec 16, 2009 at 12:17 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>> On Fri, Nov 20, 2009 at 2:50 AM, Firmicus <Firmicus@gmx.net> wrote:
>>> Aaron Griffin wrote:
>>>>> Aaron Griffin wrote:
>>>>>
>>>>>> On Wed, Nov 4, 2009 at 8:02 PM, Eric Bélanger <snowmaniscool@gmail.com> wrote:
>>>>>>
>>>>>>
>>>>>>> Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
>>>>>>> ---
>>>>>>> *makechrootpkg | * *3 +++
>>>>>>> *1 files changed, 3 insertions(+), 0 deletions(-)
>>>>>>>
>>>>>>> diff --git a/makechrootpkg b/makechrootpkg
>>>>>>> index 5095425..d1dcf32 100755
>>>>>>> --- a/makechrootpkg
>>>>>>> +++ b/makechrootpkg
>>>>>>> @@ -150,6 +150,9 @@ if [ "$REPACK" != "1" ]; then
>>>>>>> * * rm -rf "$uniondir/build/"*
>>>>>>> *fi
>>>>>>>
>>>>>>> +eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>>>> +eval $(grep '^PKGDEST=' /etc/makepkg.conf)
>>>>>>> +
>>>>>>> *[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
>>>>>>> *if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
>>>>>>> * * echo "Setting PKGDEST in makepkg.conf"
>>>>>>>
>>>>>>>
>>>> <snip>
>>>>
>>>> I was thinking more along the lines of:
>>>>
>>>> Original: eval $(grep '^SRCDEST=' /etc/makepkg.conf)
>>>>
>>>> SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>> PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
>>>>
>>>>
>>>
>>> Re: Eric's request of November 11 in another thread, I am in favour of
>>> committing the above fix to devtools, and then release a new version. Is
>>> it ok with you Aaron?
>>>
>>> F
>>>
>>
>> Bump. Any resolution yet for this SRCDEST/PKGDEST "sourcing" issue?
>
> Sorry, this has been marked in my little patch queue for too long. I
> pushed the latest change up there.
>
> Let me know if that looks ok to everyone
>

You should remove the:

# Source global makepkg.conf for SRCDEST and PKGDEST vars
[ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
[ -f ~/.makepkg.conf ] && source ~/.makepkg.conf

near the end of makechrootpkg. It's no longer needed.
 

Thread Tools




All times are GMT. The time now is 06:31 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org