diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-26 14:41:26 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-26 14:41:26 +0000 |
| commit | 1e586bc75d4732eb0d7fea4f4307575b93e3a813 (patch) | |
| tree | 779348e1f1e163a768c44487085143a57a9142e4 | |
| parent | fa0bcf5acf04e075bce048cb84744318647d50e8 (diff) | |
| download | upstream-1e586bc75d4732eb0d7fea4f4307575b93e3a813.tar.gz upstream-1e586bc75d4732eb0d7fea4f4307575b93e3a813.tar.bz2 upstream-1e586bc75d4732eb0d7fea4f4307575b93e3a813.zip | |
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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19346 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6912cc5b4a..ae86a89183 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=36 +PKG_RELEASE:=37 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ @@ -299,6 +299,7 @@ define Package/ldconfig/config endef +ifneq ($(CONFIG_PREINITOPT),) define ImageConfigOptions mkdir -p $(1)/lib/preinit echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf @@ -310,10 +311,11 @@ define ImageConfigOptions echo 'pi_ifname=$(if $(CONFIG_TARGET_PREINIT_IFNAME),$(CONFIG_TARGET_PREINIT_IFNAME),"")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_ip=$(if $(CONFIG_TARGET_PREINIT_IP),$(CONFIG_TARGET_PREINIT_IP),"192.168.1.1")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_netmask=$(if $(CONFIG_TARGET_PREINIT_NETMASK),$(CONFIG_TARGET_PREINIT_NETMASK),"255.255.255.0")' >>$(1)/lib/preinit/00_preinit.conf - echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf endef +endif define Build/Prepare mkdir -p $(PKG_BUILD_DIR) |