[pisa-src] r1742 - in trunk/openwrt/package: hipl/Makefile libxml2/Makefile pisa/Makefile
- From: Tobias Heer <tobias.heer@xxxxxxxxxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Mon, 23 Nov 2009 13:26:00 +0100
Author: heer
Date: Mon Nov 23 13:26:00 2009
New Revision: 1742
Log:
Undid the tab->space replacements introduced in r1738.
Modified:
trunk/openwrt/package/hipl/Makefile
trunk/openwrt/package/libxml2/Makefile
trunk/openwrt/package/pisa/Makefile
Modified: trunk/openwrt/package/hipl/Makefile
==============================================================================
--- trunk/openwrt/package/hipl/Makefile Mon Nov 23 13:22:45 2009 (r1741)
+++ trunk/openwrt/package/hipl/Makefile Mon Nov 23 13:26:00 2009 (r1742)
@@ -15,13 +15,13 @@
include $(INCLUDE_DIR)/package.mk
define Package/hipl-hipd
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-common +genl +ip +kmod-ipsec +kmod-ipsec4 +kmod-ipsec6
+kmod-loop +kmod-nbd +kmod-tun +libpthread +libuuid +losetup +kmod-dummy
+kmod-ipip +kmod-crypto-authenc
- # TODO: probably not needed:
- #+kmod-capi +libpcap +udevtrigger +ipsec-tools +isakmpd
- TITLE:=HIPL deamon
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-common +genl +ip +kmod-ipsec +kmod-ipsec4 +kmod-ipsec6
+kmod-loop +kmod-nbd +kmod-tun +libpthread +libuuid +losetup +kmod-dummy
+kmod-ipip +kmod-crypto-authenc
+ # TODO: probably not needed:
+ #+kmod-capi +libpcap +udevtrigger +ipsec-tools +isakmpd
+ TITLE:=HIPL deamon
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipd/description
@@ -29,13 +29,13 @@
endef
define Package/hipl-hipfw
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-common +iptables +ip6tables +kmod-ip6tables +kmod-ipt-queue
- # TUN/TAP support - might be needed at some point instead of
kmod-ipt-queue
- #+kmod-tun
- TITLE:=HIPL firewall
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-common +iptables +ip6tables +kmod-ip6tables +kmod-ipt-queue
+ # TUN/TAP support - might be needed at some point instead of
kmod-ipt-queue
+ #+kmod-tun
+ TITLE:=HIPL firewall
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipfw/description
@@ -43,11 +43,11 @@
endef
define Package/hipl-hipconf
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd
- TITLE:=HIPL configuration application
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd
+ TITLE:=HIPL configuration application
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipconf/description
@@ -55,11 +55,11 @@
endef
define Package/hipl-hipproxy
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd +hipl-hipfw
- TITLE:=HIPL proxy
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd +hipl-hipfw
+ TITLE:=HIPL proxy
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipproxy/description
@@ -67,11 +67,11 @@
endef
define Package/hipl-test
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd
- TITLE:=HIPL testing application
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd
+ TITLE:=HIPL testing application
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-test/description
@@ -79,15 +79,15 @@
endef
define Package/hipl-common
- SECTION:=net
- CATEGORY:=Network
- #this list includes ALL modules necessary for running hipl on openwrt
- #note: modules will be automatically selected for compilation and
- #will be required by ipkg on the openwrt box
- #TODO remove unnecessary modules
- DEPENDS:=+kmod-crypto-aes +kmod-crypto-hmac +kmod-crypto-null
+kmod-crypto-sha1 +kmod-ipv6 +libgcc +libopenssl +libxml2
- TITLE:=HIPL common files
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+#this list includes ALL modules necessary for running hipl on openwrt
+#note: modules will be automatically selected for compilation and
+#will be required by ipkg on the openwrt box
+#TODO remove unnecessary modules
+ DEPENDS:=+kmod-crypto-aes +kmod-crypto-hmac +kmod-crypto-null
+kmod-crypto-sha1 +kmod-ipv6 +libgcc +libopenssl +libxml2
+ TITLE:=HIPL common files
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-common/description
@@ -96,102 +96,106 @@
# seen when compiling hipl: -lxml2 -lcap -lsqlite3 -lipq -luuid -lm -lcrypto
CONFIGURE_VARS += \
- LIBS="-lxml2 -lcrypto -lm -lz" \
- CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-I$(TOOLCHAIN_DIR)/include" \
- LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
- OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
+ LIBS="-lxml2 -lcrypto -lm -lz" \
+ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-I$(TOOLCHAIN_DIR)/include" \
+ LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
+ OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
define Build/Configure
- (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
- ./autogen.sh --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
-
- (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include;);
-
- (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/);
-
- (cd ..;);
-
- $(CONFIGURE_VARS);
-
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-force-shlib \
- --enable-midauth \
- --enable-openwrt \
- --enable-optimizations \
- --disable-opendht \
- --disable-nls \
- --disable-agent \
- --disable-privsep \
- --disable-i3 \
- --disable-debug \
- );
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+ ./autogen.sh --host=$(GNU_TARGET_NAME)
--target=$(GNU_TARGET_NAME) \
+ );
+
+ (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include; \
+ );
+
+ (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/
\
+ );
+
+ (cd ..; \
+ );
+
+ $(CONFIGURE_VARS);
+
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-force-shlib \
+ --enable-midauth \
+ --enable-openwrt \
+ --enable-optimizations \
+ --disable-opendht \
+ --disable-nls \
+ --disable-agent \
+ --disable-privsep \
+ --disable-i3 \
+ --disable-debug \
+ );
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ ($(CONFIGURE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR));
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" \
+ install
endef
define Package/hipl-hipd/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
endef
define Package/hipl-hipfw/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
endef
define Package/hipl-hipconf/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
endef
define Package/hipl-hipproxy/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
endef
define Package/hipl-test/install
- $(INSTALL_DIR) $(1)/etc/hip/test/
- $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/test/
+ $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
+ $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
endef
define Package/hipl-common/install
- $(INSTALL_DIR) $(1)/etc/hip/
- $(INSTALL_DIR) $(1)/etc/modules.d/
- $(INSTALL_DIR) $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/include/libipsec
-
- $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/
+ $(INSTALL_DIR) $(1)/etc/modules.d/
+ $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/include/libipsec
+
+ $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so*
$(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la
$(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
endef
$(eval $(call BuildPackage,hipl-common))
Modified: trunk/openwrt/package/libxml2/Makefile
==============================================================================
--- trunk/openwrt/package/libxml2/Makefile Mon Nov 23 13:22:45 2009
(r1741)
+++ trunk/openwrt/package/libxml2/Makefile Mon Nov 23 13:26:00 2009
(r1742)
@@ -14,7 +14,7 @@
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
- ftp://fr.rpmfind.net/pub/libxml/
+ ftp://fr.rpmfind.net/pub/libxml/
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -31,68 +31,69 @@
endef
define Build/Configure
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-static \
- --with-c14n \
- --with-html \
- --without-ftp \
- --without-http \
- --without-iconv \
- --without-iso8859x \
- --with-legacy \
- --with-output \
- --with-reader \
- --with-sax1 \
- --with-schemas \
- --with-threads \
- --with-tree \
- --with-valid \
- --with-writer \
- --with-xinclude \
- --with-xpath \
- --with-xptr \
- --with-zlib \
- --with-regexp \
- )
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-static \
+ --with-c14n \
+ --with-html \
+ --without-ftp \
+ --without-http \
+ --without-iconv \
+ --without-iso8859x \
+ --with-legacy \
+ --with-output \
+ --with-reader \
+ --with-sax1 \
+ --with-schemas \
+ --with-threads \
+ --with-tree \
+ --with-valid \
+ --with-writer \
+ --with-xinclude \
+ --with-xpath \
+ --with-xptr \
+ --with-zlib \
+ --with-regexp \
+ )
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install
endef
define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
- mkdir -p $(STAGING_DIR)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
- mkdir -p $(STAGING_DIR)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
- mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
- $(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ mkdir -p $(STAGING_DIR)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
+ mkdir -p $(STAGING_DIR)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
+ mkdir -p $(STAGING_DIR)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
+ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
+ $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) 's,-L$$$${libdir},,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Build/UninstallDev
- rm -rf $(STAGING_DIR)/usr/bin/xml2-config \
- $(STAGING_DIR)/usr/include/libxml2 \
- $(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
- $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ rm -rf \
+ $(STAGING_DIR)/usr/bin/xml2-config \
+ $(STAGING_DIR)/usr/include/libxml2 \
+ $(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
+ $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Package/libxml2/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libxml2))
Modified: trunk/openwrt/package/pisa/Makefile
==============================================================================
--- trunk/openwrt/package/pisa/Makefile Mon Nov 23 13:22:45 2009 (r1741)
+++ trunk/openwrt/package/pisa/Makefile Mon Nov 23 13:26:00 2009 (r1742)
@@ -13,10 +13,10 @@
include $(INCLUDE_DIR)/package.mk
define Package/pisa/Default
- SECTION:=net
- CATEGORY:=Network
- TITLE:=Peer-to-peer Internet Wi-Fi Sharing System
- URL:=http://localhost/
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=Peer-to-peer Internet Wi-Fi Sharing System
+ URL:=http://localhost/
endef
define Package/pisa/Default/description
@@ -25,36 +25,36 @@
define Package/pisa
$(call Package/pisa/Default)
- DEPENDS:=+libconfig +libopenssl +pisa-mobile-guest +pisa-trust-point
+ DEPENDS:=+libconfig +libopenssl +pisa-mobile-guest +pisa-trust-point
endef
CONFIGURE_VARS += \
- CPPFLAGS="$$$$CPPFLAGS \
- -I$(STAGING_DIR)/usr/include/libconfig \
- -I$(PKG_BUILD_DIR)/include"
+ CPPFLAGS="$$$$CPPFLAGS \
+ -I$(STAGING_DIR)/usr/include/libconfig \
+ -I$(PKG_BUILD_DIR)/include"
define Build/Configure
- $(CONFIGURE_VARS);
+ $(CONFIGURE_VARS);
- $(call Build/Configure/Default, --enable-shared \
- --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
+ $(call Build/Configure/Default, --enable-shared \
+ --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
+ ($(CONFIGURE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR));
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" \
+ install
endef
define Package/libpisa
$(call Package/pisa/Default)
- TITLE:=PISA common libraries
- CATEGORY:=Libraries
- DEPENDS:=+libconfig
+ TITLE:=PISA common libraries
+ CATEGORY:=Libraries
+ DEPENDS:=+libconfig
endef
define Package/libpisa/description
@@ -62,15 +62,15 @@
endef
define Package/libpisa/install
- $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/
- cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
+ cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
endef
define Package/pisa-beacon
$(call Package/pisa/Default)
- TITLE:=PISA beacon application
- DEPENDS:=+libpisa
+ TITLE:=PISA beacon application
+ DEPENDS:=+libpisa
endef
define Package/pisa-beacon/description
@@ -78,17 +78,17 @@
endef
define Package/pisa-beacon/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
endef
define Package/pisa-mobile-guest
$(call Package/pisa/Default)
- TITLE:=PISA mobile guest applications
- DEPENDS:=+libpisa
+ TITLE:=PISA mobile guest applications
+ DEPENDS:=+libpisa
endef
define Package/pisa-mobile-guest/description
@@ -96,19 +96,19 @@
endef
define Package/pisa-mobile-guest/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
endef
define Package/pisa-trust-point
$(call Package/pisa/Default)
- TITLE:=PISA trust point applications
- DEPENDS:=+libpisa
+ TITLE:=PISA trust point applications
+ DEPENDS:=+libpisa
endef
define Package/pisa-trust-point/description
@@ -116,13 +116,13 @@
endef
define Package/pisa-trust-point/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,pisa))
Other related posts:
- » [pisa-src] r1742 - in trunk/openwrt/package: hipl/Makefile libxml2/Makefile pisa/Makefile - Tobias Heer
