bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] quagga, quagga-unstable: Clean up packages

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@18095 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2009-10-20 09:11:29 +00:00
parent ca5710b724
commit aadbaaa9cc
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/quagga-unstable/Makefile
View File

@ -21,7 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/quagga-$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_quagga-unstable-isisd \ CONFIG_PACKAGE_quagga-unstable-isisd \
CONFIG_PACKAGE_quagga-unstable-ripngd \ CONFIG_PACKAGE_quagga-unstable-ripngd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -122,8 +122,8 @@ endef
define Package/quagga-unstable/install define Package/quagga-unstable/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
# avoid /etc being set to 0750 # avoid /etc being set to 0750
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
@ -183,7 +183,7 @@ endef
define Package/quagga-unstable-bgpd/install define Package/quagga-unstable-bgpd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
@ -191,7 +191,7 @@ endef
define Package/quagga-unstable-isisd/install define Package/quagga-unstable-isisd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/isisd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
@ -199,7 +199,7 @@ endef
define Package/quagga-unstable-ospfd/install define Package/quagga-unstable-ospfd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
@ -207,7 +207,7 @@ endef
define Package/quagga-unstable-ospf6d/install define Package/quagga-unstable-ospf6d/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
@ -215,7 +215,7 @@ endef
define Package/quagga-unstable-ripd/install define Package/quagga-unstable-ripd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
@ -223,7 +223,7 @@ endef
define Package/quagga-unstable-ripngd/install define Package/quagga-unstable-ripngd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
@ -231,7 +231,7 @@ endef
define Package/quagga-unstable-vtysh/install define Package/quagga-unstable-vtysh/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(1)/usr/bin/
endef endef
define Package/quagga-unstable-libospf/install define Package/quagga-unstable-libospf/install

52
net/quagga/Makefile
View File

@ -17,6 +17,10 @@ PKG_SOURCE_URL:=http://www.quagga.net/download/ \
http://www.uk.quagga.net/download/ http://www.uk.quagga.net/download/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_quagga-unstable-isisd \
CONFIG_PACKAGE_quagga-unstable-ripngd
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/quagga/Default define Package/quagga/Default
@ -90,8 +94,7 @@ define Package/quagga-vtysh
TITLE:=integrated shell for Quagga routing software TITLE:=integrated shell for Quagga routing software
endef endef
define Build/Configure CONFIGURE_ARGS+= \
$(call Build/Configure/Default, \
--localstatedir=/var/run/quagga \ --localstatedir=/var/run/quagga \
--sysconfdir=/etc/quagga/ \ --sysconfdir=/etc/quagga/ \
--enable-shared \ --enable-shared \
@ -100,9 +103,14 @@ define Build/Configure
--enable-user=quagga \ --enable-user=quagga \
--enable-group=quagga \ --enable-group=quagga \
--enable-multipath=8 \ --enable-multipath=8 \
--enable-isisd \
) ifneq ($(CONFIG_PACKAGE_quagga-isisd),)
endef CONFIGURE_ARGS+= --enable-isisd
endif
ifneq ($(CONFIG_PACKAGE_quagga-ripngd),)
CONFIGURE_ARGS+= --enable-ripngd
endif
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
@ -115,10 +123,10 @@ define Package/quagga/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(1)/usr/sbin/
# avoid /etc being set to 0750 # avoid /etc being set to 0750
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/zebra.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/zebra.conf
$(INSTALL_DIR) $(1)/etc/init.d/ $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init $(INSTALL_BIN) ./files/quagga $(1)/usr/sbin/quagga.init
$(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga $(INSTALL_BIN) ./files/quagga.init $(1)/etc/init.d/quagga
endef endef
@ -174,48 +182,48 @@ endef
define Package/quagga-bgpd/install define Package/quagga-bgpd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/bgpd.conf
endef endef
define Package/quagga-isisd/install define Package/quagga-isisd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/isisd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/isisd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/isisd.conf
endef endef
define Package/quagga-ospfd/install define Package/quagga-ospfd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospfd.conf
endef endef
define Package/quagga-ospf6d/install define Package/quagga-ospf6d/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ospf6d.conf
endef endef
define Package/quagga-ripd/install define Package/quagga-ripd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripd.conf
endef endef
define Package/quagga-ripngd/install define Package/quagga-ripngd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/quagga/ $(INSTALL_DIR) $(1)/etc/quagga
chmod 0750 $(1)/etc/quagga/ chmod 0750 $(1)/etc/quagga
$(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf $(INSTALL_DATA) ./files/quagga.conf $(1)/etc/quagga/ripngd.conf
endef endef
@ -231,7 +239,7 @@ endef
define Package/quagga-libzebra/install define Package/quagga-libzebra/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,quagga)) $(eval $(call BuildPackage,quagga))