소스 검색

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 <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 15 년 전
부모
커밋
2ab8ec9e26
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 4 3
      CHANGES
  2. 4 3
      package/kismet/kismet.mk

+ 4 - 3
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
 

+ 4 - 3
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