diff options
Diffstat (limited to 'openwrt/package/quagga/Makefile')
| -rw-r--r-- | openwrt/package/quagga/Makefile | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/openwrt/package/quagga/Makefile b/openwrt/package/quagga/Makefile index fca54ecb9b..32d6d6603e 100644 --- a/openwrt/package/quagga/Makefile +++ b/openwrt/package/quagga/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quagga -PKG_VERSION:=0.98.3 +PKG_VERSION:=0.98.4 PKG_RELEASE:=1 -PKG_MD5SUM:=68be5e911e4d604c0f5959338263356e +PKG_MD5SUM:=c68e409931449afc5730289d3105f502 PKG_SOURCE_URL:=http://www.quagga.net/download/ \ http://www.de.quagga.net/download/ \ @@ -21,17 +21,17 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,QUAGGA,quagga,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,LIBOSPF,libospf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,QUAGGA_ZEBRA,quagga-zebra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -48,19 +48,18 @@ $(PKG_BUILD_DIR)/.configured: --infodir=/usr/share/info \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ - --localstatedir=/var \ + --localstatedir=/var/run/quagga \ --mandir=/usr/share/man \ --sbindir=/usr/sbin \ - --sysconfdir=/etc \ + --sysconfdir=/etc/quagga \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ --enable-shared \ --disable-static \ --enable-ipv6 \ - --disable-vtysh \ + --enable-vtysh \ --enable-user=quagga \ --enable-group=quagga \ - --sysconfdir=/etc/quagga \ ); touch $@ @@ -73,6 +72,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_QUAGGA): install -d -m0755 $(IDIR_QUAGGA)/usr/lib cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/ + install -d -m0755 $(IDIR_QUAGGA)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/ + # avoid /etc being set to 0750 + install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/ + chmod 0750 $(IDIR_QUAGGA)/etc/quagga/ + install -d -m0755 $(IDIR_QUAGGA)/etc/init.d/ + install -m0755 ./files/quagga.init $(IDIR_QUAGGA)/etc/init.d/quagga + ln -sf quagga $(IDIR_QUAGGA)/etc/init.d/S49quagga $(RSTRIP) $(IDIR_QUAGGA) $(IPKG_BUILD) $(IDIR_QUAGGA) $(PACKAGE_DIR) @@ -82,13 +90,9 @@ $(IPKG_QUAGGA_BGPD): $(RSTRIP) $(IDIR_QUAGGA_BGPD) $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR) -$(IPKG_LIBOSPF): - install -d -m0755 $(IDIR_LIBOSPF)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_LIBOSPF)/usr/lib/ - $(RSTRIP) $(IDIR_LIBOSPF) - $(IPKG_BUILD) $(IDIR_LIBOSPF) $(PACKAGE_DIR) - $(IPKG_QUAGGA_OSPFD): + install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/ install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPFD) @@ -96,7 +100,7 @@ $(IPKG_QUAGGA_OSPFD): $(IPKG_QUAGGA_OSPF6D): install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPF6D) $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR) @@ -112,9 +116,8 @@ $(IPKG_QUAGGA_RIPNGD): $(RSTRIP) $(IDIR_QUAGGA_RIPNGD) $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR) -$(IPKG_QUAGGA_ZEBRA): - install -d -m0755 $(IDIR_QUAGGA_ZEBRA)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA_ZEBRA)/usr/sbin/ - $(RSTRIP) $(IDIR_QUAGGA_ZEBRA) - $(IPKG_BUILD) $(IDIR_QUAGGA_ZEBRA) $(PACKAGE_DIR) - +$(IPKG_QUAGGA_VTYSH): + install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/ + $(RSTRIP) $(IDIR_QUAGGA_VTYSH) + $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR) |