From: Thomas Petazzoni Date: Sun, 29 Aug 2010 17:38:04 +0000 (+0200) Subject: kismet: fix build when none of client, server or drone are selected X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ab8ec9e266cda26d6c782c75f666c39a033b7c7;p=buildroot.git kismet: fix build when none of client, server or drone are selected Random package configuration can trigger the selection of kismet, but neither of client, server or drone suboptions. In this case, the KISMET_TARGET_BINARIES variable is empty, leading to failure during the installation stage. At the same time, we remove the useless stripping of the installed binaries, since this is done globally by the Buildroot infrastructure. Signed-off-by: Thomas Petazzoni --- diff --git a/CHANGES b/CHANGES index 3cc717104b..1cc9a387c5 100644 --- a/CHANGES +++ b/CHANGES @@ -18,9 +18,10 @@ fs: old-style squashfs for big endian archs fixed. Updated/fixed packages: busybox, gst-plugins-base, - imagemagick, libgail, libglib2, libgtk2, lua, luafilesystem, - lzo, ncurses, netcat, pango, php, pppd, proftpd, qt, samba, - startup-notification, swfdec, sysvinit, util-linux + imagemagick, kismet, libgail, libglib2, libgtk2, lua, + luafilesystem, lzo, ncurses, netcat, pango, php, pppd, + proftpd, qt, samba, startup-notification, swfdec, sysvinit, + util-linux Removed packages: stunnel diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 1b61ddda35..6135c88731 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -33,18 +33,19 @@ $(eval $(call AUTOTARGETS,package,kismet)) $(KISMET_TARGET_INSTALL_TARGET): $(call MESSAGE,"Installing") +ifdef KISMET_TARGET_BINARIES $(INSTALL) -m 755 $(addprefix $(KISMET_DIR)/, $(KISMET_TARGET_BINARIES)) $(TARGET_DIR)/usr/bin +endif ifdef KISMET_TARGET_CONFIGS $(INSTALL) -m 644 $(addprefix $(KISMET_DIR)/conf/, $(KISMET_TARGET_CONFIGS)) $(TARGET_DIR)/etc -endif -ifeq ($(BR2_ENABLE_DEBUG),) - $(STRIPCMD) $(STRIP_STRIP_ALL) $(addprefix $(TARGET_DIR)/usr/bin/, $(KISMET_TARGET_BINARIES)) endif touch $@ $(KISMET_TARGET_UNINSTALL): $(call MESSAGE,"Uninstalling") +ifdef KISMET_TARGET_BINARIES rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(KISMET_TARGET_BINARIES)) +endif ifdef KISMET_TARGET_CONFIGS rm -f $(addprefix $(TARGET_DIR)/etc/, $(KISMET_TARGET_CONFIGS)) endif