From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/kismet/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kismet/Makefile') diff --git a/package/kismet/Makefile b/package/kismet/Makefile index e6ecf710c..a14a54838 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -18,6 +18,8 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +INSTALL_STYLE:= manual + ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y) TCFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ TLDFLAGS+= -luClibc++ -lc -lm -lgcc_s -nodefaultlibs @@ -26,12 +28,10 @@ CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ else TLDFLAGS+= -shared endif -CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --sysconfdir=/etc/kismet \ --enable-syspcap=yes \ --disable-setuid \ --disable-gpsmap -BUILD_STYLE= auto do-install: ${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/ -- cgit v1.2.3 From a0b5535db39c64864a2ea96a20b2fa2712fc2ffd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 15 Feb 2010 19:40:16 +0100 Subject: reenable kismet, let it compile with stdc++ --- package/kismet/Makefile | 64 ++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) (limited to 'package/kismet/Makefile') diff --git a/package/kismet/Makefile b/package/kismet/Makefile index a14a54838..319d4b2e6 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -4,54 +4,46 @@ include ${TOPDIR}/rules.mk PKG_NAME:= kismet -PKG_VERSION:= 2008-05-R1 +PKG_VERSION:= 2010-01-R1 PKG_RELEASE:= 1 +PKG_DESCR:= Kismet PKG_BUILDDEP+= libpcap ncurses -PKG_CXX:= KISMET -PKG_MD5SUM:= 6ee365d36354b4dee4945e67f8149294 +PKG_DEPENDS:= libpcap libncurses +PKG_MD5SUM:= a6d6edcf65d5bb2cb5de6472bcc16f19 +PKG_URL:= http://www.kismetwireless.net/ PKG_SITES:= http://www.kismetwireless.net/code/ +PKG_DESCR_CLIENT:= Kismet client +PKG_DESCR_SERVER:= Kismet server +PKG_DESCR_DRONE:= Kismet drone + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,KISMET,kismet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -INSTALL_STYLE:= manual - -ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y) -TCFLAGS+= -fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -lc -lm -lgcc_s -nodefaultlibs -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ - -I${STAGING_DIR}/usr/include/uClibc++" -else -TLDFLAGS+= -shared -endif +$(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DRONE},${PKG_SECTION})) +$(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SERVER},${PKG_SECTION})) + CONFIGURE_ARGS+= --sysconfdir=/etc/kismet \ - --enable-syspcap=yes \ - --disable-setuid \ - --disable-gpsmap + --disable-linuxwext + +pre-build: + (cd ${WRKBUILD} && ${MAKE} dep); -do-install: +post-install: ${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/ - ${INSTALL_BIN} ${WRKBUILD}/kismet ${IDIR_KISMET}/usr/bin/kismet + ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet ${IDIR_KISMET}/usr/bin/kismet ${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/usr/bin - ${INSTALL_DIR} ${IDIR_KISMET_CLIENT}/etc/kismet/ - ${INSTALL_DATA} ./files/ap_manuf ${IDIR_KISMET_CLIENT}/etc/kismet/ - ${INSTALL_DATA} ./files/client_manuf ${IDIR_KISMET_CLIENT}/etc/kismet/ - ${INSTALL_DATA} ./files/kismet.conf ${IDIR_KISMET_CLIENT}/etc/kismet/ - ${INSTALL_DATA} ./files/kismet_ui.conf ${IDIR_KISMET_CLIENT}/etc/kismet/ - ${CP} ${WRKBUILD}/kismet_client ${IDIR_KISMET_CLIENT}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_client \ + ${IDIR_KISMET_CLIENT}/usr/bin/ ${INSTALL_DIR} ${IDIR_KISMET_DRONE}/usr/bin - ${INSTALL_DIR} ${IDIR_KISMET_DRONE}/etc/kismet/ - ${INSTALL_DATA} ./files/kismet_drone.conf ${IDIR_KISMET_DRONE}/etc/kismet/ - ${CP} ${WRKBUILD}/kismet_drone ${IDIR_KISMET_DRONE}/usr/bin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_drone \ + ${IDIR_KISMET_DRONE}/usr/bin/ ${INSTALL_DIR} ${IDIR_KISMET_SERVER}/usr/bin - ${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet/ - ${INSTALL_DATA} ./files/ap_manuf ${IDIR_KISMET_SERVER}/etc/kismet/ - ${INSTALL_DATA} ./files/client_manuf ${IDIR_KISMET_SERVER}/etc/kismet/ - ${INSTALL_DATA} ./files/kismet.conf ${IDIR_KISMET_SERVER}/etc/kismet/ - ${CP} ${WRKBUILD}/kismet_server ${IDIR_KISMET_SERVER}/usr/bin/ + ${INSTALL_DIR} ${IDIR_KISMET_SERVER}/etc/kismet + ${INSTALL_BIN} ${WRKINST}/usr/bin/kismet_server \ + ${IDIR_KISMET_SERVER}/usr/bin/ + ${INSTALL_DATA} ${WRKINST}/etc/kismet/kismet.conf \ + ${IDIR_KISMET_SERVER}/etc/kismet include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3