[Haiku-commits] r30875 - in haiku/trunk: . build/jam data/bin data/system/boot src/bin

[Matt Madia]

On Sat, Jun 13, 2009 at 6:55 PM, Ingo Weinhold<ingo_weinhold at gmx.de> wrote:
>
> On 2009-06-13 at 16:58:05 [+0200], Matt Madia <mattmadia at gmail.com> wrote:
>> On Wed, May 27, 2009 at 1:12 AM, <bonefish at mail.berlios.de> wrote:
>> > @@ -416,7 +465,7 @@
>> >        if $(TARGET_ARCH) != x86 {
>> >                Echo "No optional package OpenSSH available for
>> >                $(TARGET_ARCH)" ;
>> >        } else {
>> > -               if ! $(HAIKU_IMAGE_HOST_NAME) {
>> > +               if ! $(HAIKU_IMAGE_HOST_NAME) && !
>> > $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
>> >                        Exit "Optional package OpenSSH requires the
>> >                        HAIKU_IMAGE_HOST_NAME"
>> >                                "variable to be set!" ;
>> >                }
>>
>> sorry for dragging up an older commit email...
>>
>> What's the reason for having OpenSSH test for
>> && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) ?
>
> HAIKU_IGNORE_USER_BUILD_CONFIG was mainly intended for the "alternative"
> part of the hybrid build. And in that case HAIKU_IMAGE_HOST_NAME won't be
> set, so this check would always fail.


>> The usage case I was looking at is an end-user or build factory
>> building official images with this command :
>> `jam -q -sHAIKU_IGNORE_USER_BUILD_CONFIG=1 @alpha-raw`
>
> Since the build profile explicitly sets the host name variable, there
> shouldn't be any problem. Or do I miss something?
>
With the above jam command, OpenSSH will be skipped due to this test
in OptionalPackages
 if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {

Oddly, OpenSSH is the only package that checks for
!$(HAIKU_IGNORE_USER_BUILD_CONFIG)

So basically, i'm wondering if the 2nd part of the above if statement
could be removed.