Changeset 19346


Ignore:
Timestamp:
2010-01-26T15:41:26+01:00 (6 years ago)
Author:
juhosg
Message:

base-files: don't build '00_preinit.conf' if CONFIG_PREINITOPT is not selected

Also, use the default pi_broadcast address if it is not specified

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r19331 r19346  
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=36 
     13PKG_RELEASE:=37 
    1414 
    1515PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
     
    300300 
    301301 
     302ifneq ($(CONFIG_PREINITOPT),) 
    302303define ImageConfigOptions 
    303304        mkdir -p $(1)/lib/preinit 
     
    311312        echo 'pi_ip=$(if $(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),"192.168.1.1")' >>$(1)/lib/preinit/00_preinit.conf 
    312313        echo 'pi_netmask=$(if $(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),"255.255.255.0")' >>$(1)/lib/preinit/00_preinit.conf 
    313         echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"")' >>$(1)/lib/preinit/00_preinit.conf 
     314        echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")' >>$(1)/lib/preinit/00_preinit.conf 
    314315        echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf 
    315316        echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf 
    316317endef 
     318endif 
    317319 
    318320define Build/Prepare 
Note: See TracChangeset for help on using the changeset viewer.