| Message ID | 1335164155-20004-1-git-send-email-yegorslists@googlemail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Peter Korsgaard |
| Headers | show |
>>>>> "yegorslists" == yegorslists <yegorslists@googlemail.com> writes:
yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
yegorslists> ---
yegorslists> package/wpa_supplicant/wpa_supplicant.conf | 6 ++++++
yegorslists> package/wpa_supplicant/wpa_supplicant.mk | 8 ++++++++
yegorslists> 2 files changed, 14 insertions(+), 0 deletions(-)
yegorslists> create mode 100755 package/wpa_supplicant/wpa_supplicant.conf
yegorslists> +define WPA_SUPPLICANT_INSTALL_CONFIG
yegorslists> + $(INSTALL) -m 644 \
yegorslists> + package/wpa_supplicant/wpa_supplicant.conf $(TARGET_DIR)/etc/wpa_supplicant.conf
Normally we only install these default files if not already present in
the rootfs, so people can put their own version in the skeleton if they
need something else. See ifplugd for an example.
yegorslists> +
yegorslists> define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS
yegorslists> rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS))
yegorslists> rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
yegorslists> rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service
yegorslists> + rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf
This doesn't work so well when you add the check before installation as
adding/removing/adding wpasupplicant again would then overwrite the
skeleton one. I suggest you just skip this.
Hello, Le Tue, 24 Apr 2012 22:13:46 +0200, Peter Korsgaard <jacmet@uclibc.org> a écrit : > yegorslists> +define WPA_SUPPLICANT_INSTALL_CONFIG > yegorslists> + $(INSTALL) -m 644 \ > yegorslists> + package/wpa_supplicant/wpa_supplicant.conf $(TARGET_DIR)/etc/wpa_supplicant.conf > > Normally we only install these default files if not already present in > the rootfs, so people can put their own version in the skeleton if they > need something else. See ifplugd for an example. I am less and less sure this is a scenario we should support. We have been talking for a while of removing the ability of using a custom target skeleton, and instead recommend all users to use the post-build script capability, which is much more appropriate. Thomas
Am 24.04.2012 22:13, schrieb Peter Korsgaard: >>>>>> "yegorslists" == yegorslists <yegorslists@googlemail.com> writes: > > yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com> > yegorslists> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> > yegorslists> --- > yegorslists> package/wpa_supplicant/wpa_supplicant.conf | 6 ++++++ > yegorslists> package/wpa_supplicant/wpa_supplicant.mk | 8 ++++++++ > yegorslists> 2 files changed, 14 insertions(+), 0 deletions(-) > yegorslists> create mode 100755 package/wpa_supplicant/wpa_supplicant.conf > > > yegorslists> +define WPA_SUPPLICANT_INSTALL_CONFIG > yegorslists> + $(INSTALL) -m 644 \ > yegorslists> + package/wpa_supplicant/wpa_supplicant.conf $(TARGET_DIR)/etc/wpa_supplicant.conf > > Normally we only install these default files if not already present in > the rootfs, so people can put their own version in the skeleton if they > need something else. See ifplugd for an example. > > yegorslists> + > yegorslists> define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS > yegorslists> rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS)) > yegorslists> rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf > yegorslists> rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service > yegorslists> + rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf > > This doesn't work so well when you add the check before installation as > adding/removing/adding wpasupplicant again would then overwrite the > skeleton one. I suggest you just skip this. Should I just this file to default skeleton or drop it completely, so that user would supply it via custom script? Yegor
>>>>> "yegorslists" == yegorslists <yegorslists@googlemail.com> writes:
yegorslists> From: Yegor Yefremov <yegorslists@googlemail.com>
Committed, thanks.
diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf new file mode 100755 index 0000000..1994a6c --- /dev/null +++ b/package/wpa_supplicant/wpa_supplicant.conf @@ -0,0 +1,6 @@ +ctrl_interface=/var/run/wpa_supplicant +ap_scan=1 + +network={ + key_mgmt=NONE +} diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 0a672ee..4a1baea 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -118,10 +118,18 @@ ifeq ($(BR2_PACKAGE_DBUS),y) WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_DBUS endif +define WPA_SUPPLICANT_INSTALL_CONFIG + $(INSTALL) -m 644 \ + package/wpa_supplicant/wpa_supplicant.conf $(TARGET_DIR)/etc/wpa_supplicant.conf +endef + +WPA_SUPPLICANT_POST_INSTALL_TARGET_HOOKS += WPA_SUPPLICANT_INSTALL_CONFIG + define WPA_SUPPLICANT_UNINSTALL_TARGET_CMDS rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(WPA_SUPPLICANT_TARGET_BINS)) rm -f $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf rm -f $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_SERVICE).service + rm -f $(TARGET_DIR)/usr/etc/wpa_supplicant.conf endef $(eval $(call AUTOTARGETS))