From dca29439912dd72c35e4e7e1b7119c8321f4274f Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 6 May 2010 15:01:57 -0700 Subject: Generate wpa_supplicant.conf on the fly from the template Change-Id: I0c4df195362bf1213efc4416369c9e624b2095c8 http://b/issue?id=1800203 --- wpa_supplicant/wpa_supplicant_conf.mk | 38 +++++++++++++++++++++++++++++++++++ wpa_supplicant/wpa_supplicant_conf.sh | 25 +++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 wpa_supplicant/wpa_supplicant_conf.mk create mode 100755 wpa_supplicant/wpa_supplicant_conf.sh diff --git a/wpa_supplicant/wpa_supplicant_conf.mk b/wpa_supplicant/wpa_supplicant_conf.mk new file mode 100644 index 0000000..7033487 --- /dev/null +++ b/wpa_supplicant/wpa_supplicant_conf.mk @@ -0,0 +1,38 @@ +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Include this makefile to generate your hardware specific wpa_supplicant.conf +# Requires: WIFI_DRIVER_SOCKET_IFACE + +WPA_SUPPLICANT_STORED_LOCAL_PATH := $(LOCAL_PATH) +LOCAL_PATH := $(call my-dir) + +######################## + +WPA_SUPPLICANT_CONF_GENERATED := $(call intermediates-dir-for,ETC,wpa_supplicant.conf)/wpa_supplicant.conf +WPA_SUPPLICANT_CONF_TEMPLATE := $(LOCAL_PATH)/wpa_supplicant.conf +WPA_SUPPLICANT_CONF_SCRIPT := $(LOCAL_PATH)/wpa_supplicant_conf.sh +$(WPA_SUPPLICANT_CONF_GENERATED): $(WPA_SUPPLICANT_CONF_TEMPLATE) $(WPA_SUPPLICANT_CONF_SCRIPT) + @echo Target wpa_supplicant.conf: $@ + @mkdir -p $(dir $@) + $(hide) WIFI_DRIVER_SOCKET_IFACE="$(WIFI_DRIVER_SOCKET_IFACE)" \ + bash $(WPA_SUPPLICANT_CONF_SCRIPT) $(WPA_SUPPLICANT_CONF_TEMPLATE) > $@ + +PRODUCT_COPY_FILES += $(WPA_SUPPLICANT_CONF_GENERATED):system/etc/wifi/wpa_supplicant.conf + +######################## + +LOCAL_PATH := $(WPA_SUPPLICANT_STORED_LOCAL_PATH) diff --git a/wpa_supplicant/wpa_supplicant_conf.sh b/wpa_supplicant/wpa_supplicant_conf.sh new file mode 100755 index 0000000..ec5e92f --- /dev/null +++ b/wpa_supplicant/wpa_supplicant_conf.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Generate a wpa_supplicant.conf from the template. +# $1: the template file name +if [ -n "$WIFI_DRIVER_SOCKET_IFACE" ] +then + sed -e 's/#.*$//' -e 's/[ \t]*$//' -e '/^$/d' < $1 | sed -e "s/wlan0/$WIFI_DRIVER_SOCKET_IFACE/" +else + sed -e 's/#.*$//' -e 's/[ \t]*$//' -e '/^$/d' < $1 +fi -- cgit v1.2.3