[arch-dev-public] [PATCH] makechrootpkg: Use the host's SRCDEST and PKGDEST if they are defined

Eric Bélanger snowmaniscool at gmail.com
Thu Dec 17 00:51:10 EST 2009


On Wed, Dec 16, 2009 at 1:56 PM, Aaron Griffin <aaronmgriffin at gmail.com> wrote:
> On Wed, Dec 16, 2009 at 12:17 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
>> On Fri, Nov 20, 2009 at 2:50 AM, Firmicus <Firmicus at gmx.net> wrote:
>>> Aaron Griffin wrote:
>>>>> Aaron Griffin wrote:
>>>>>
>>>>>> On Wed, Nov 4, 2009 at 8:02 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
>>>>>>
>>>>>>
>>>>>>> Signed-off-by: Eric Bélanger <snowmaniscool at 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.


More information about the arch-dev-public mailing list