Changeset d73ce80 in rtems-tools


Ignore:
Timestamp:
Jun 12, 2019, 4:44:36 AM (5 days ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
48afbab
Parents:
98f2f02
Message:

misc/boot-image: Fix macro set logic and --net-boot-dhcp processing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • misc/tools/boot.py

    r98f2f02 rd73ce80  
    161161        if value is None:
    162162            value = 'None'
    163         if isinstance(value, int):
    164             value = str(int)
     163        elif isinstance(value, bool):
     164            value = '1' if value else '0'
     165        elif isinstance(value, int):
     166            value = str(value)
    165167        self.macros[key] = value
    166168
     
    378380        else:
    379381            template = None
    380             if self['net_dhcp'] is not None or \
    381                self['net_ip'] is not None:
    382                 if self['net_dhcp'] is not None:
     382            if self['net_dhcp'] or self['net_ip'] is not None:
     383                if self['net_dhcp']:
    383384                    template = 'uenv_net_dhcp'
    384385                else:
Note: See TracChangeset for help on using the changeset viewer.