Makefile change to compile modules, minor change in patch

[openwrt.git] / openwrt / package / quagga / Makefile

diff --git a/openwrt/package/quagga/Makefile b/openwrt/package/quagga/Makefile
index e78f6f5..32d6d66 100644 (file)
--- a/openwrt/package/quagga/Makefile
+++ b/openwrt/package/quagga/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga

-PKG_VERSION:=0.98.2
+PKG_VERSION:=0.98.4

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=8757b155aa2458f6158ccd330d0e1b39
+PKG_MD5SUM:=c68e409931449afc5730289d3105f502

 
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
 
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \


@@ -13,158 +13,111 @@ PKG_SOURCE_URL:=http://www.quagga.net/download/ \
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat

-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)-all_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg/quagga

 
 

-PKG_ZEBRA_DIR:=$(PKG_BUILD_DIR)/ipkg/zebra
-PKG_BGPD_DIR:=$(PKG_BUILD_DIR)/ipkg/bgpd
-PKG_OSPFD_DIR:=$(PKG_BUILD_DIR)/ipkg/ospfd
-PKG_RIPD_DIR:=$(PKG_BUILD_DIR)/ipkg/ripd
-
-# separate ipkg for zebra,bgpd,ospf and ripd
-PKG_ZEBRA:=$(PACKAGE_DIR)/$(PKG_NAME)-zebra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_BGPD:=$(PACKAGE_DIR)/$(PKG_NAME)-bgpd_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_RIPD:=$(PACKAGE_DIR)/$(PKG_NAME)-ripd_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_OSPFD:=$(PACKAGE_DIR)/$(PKG_NAME)-ospfd_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-TARGETS:=$(PKG_IPK)
-ifneq ($(BR2_PACKAGE_QUAGGA_ZEBRA),)
-TARGETS += $(PKG_ZEBRA)
-endif
-ifneq ($(BR2_PACKAGE_QUAGGA_BGPD),)
-TARGETS += $(PKG_BGPD)
-endif
-ifneq ($(BR2_PACKAGE_QUAGGA_RIPD),)
-TARGETS += $(PKG_RIPD)
-endif
-ifneq ($(BR2_PACKAGE_QUAGGA_OSPFD),)
-TARGETS += $(PKG_OSPFD)
-endif
-
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/quagga.list
-ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y)
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/quagga-zebra.list
-endif
-ifeq ($(BR2_PACKAGE_QUAGGA_BGPD),y)
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/quagga-bgpd.list
-endif
-ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y)
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/quagga-ripd.list
-endif
-ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y)
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/quagga-ospfd.list
-endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+include $(TOPDIR)/package/rules.mk

 
 

-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.unpacked
+$(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,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_VTYSH,quagga-vtysh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured:
+       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \

                $(TARGET_CONFIGURE_OPTS) \
                $(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) \
                --build=$(GNU_HOST_NAME) \
                ./configure \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \

+               --program-prefix="" \
+               --program-suffix="" \

                --prefix=/usr \
                --exec-prefix=/usr \
                --bindir=/usr/bin \
                --sbindir=/usr/sbin \
                --libexecdir=/usr/lib \
                --datadir=/usr/share \
                --prefix=/usr \
                --exec-prefix=/usr \
                --bindir=/usr/bin \
                --sbindir=/usr/sbin \
                --libexecdir=/usr/lib \
                --datadir=/usr/share \

-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
+               --includedir=/usr/include \
+               --infodir=/usr/share/info \
+               --libdir=/usr/lib \
+               --libexecdir=/usr/lib \
+               --localstatedir=/var/run/quagga \
+               --mandir=/usr/share/man \
+               --sbindir=/usr/sbin \
+               --sysconfdir=/etc/quagga \
+               $(DISABLE_NLS) \
+               $(DISABLE_LARGEFILE) \
+               --enable-shared \

                --disable-static \
                --disable-static \

-               --disable-ipv6 \
-               --disable-vtysh \
+               --enable-ipv6 \
+               --enable-vtysh \

                --enable-user=quagga \
                --enable-group=quagga \
                --enable-user=quagga \
                --enable-group=quagga \

-               --sysconfdir=/etc/quagga \
-               --disable-exampledir \

        );
        );

-       touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_IPK_DIR)/zebra: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(MAKE) DESTDIR=$(PKG_IPK_DIR) -C $(PKG_BUILD_DIR) install
-
-$(PKG_IPK): $(PKG_IPK_DIR)/zebra
-       cp -a ./ipkg/* $(PKG_IPK_DIR)/
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) control/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/usr/sbin
-       mkdir -p $(PKG_IPK_DIR)/usr/lib
-       mkdir -p $(PKG_IPK_DIR)/etc/quagga
-       rm $(PKG_IPK_DIR)/usr/lib/*.la
-       rm -rf $(PKG_IPK_DIR)/usr/include
-       rm -rf $(PKG_IPK_DIR)/usr/info
-       rm -rf $(PKG_IPK_DIR)/usr/man
-       $(STRIP) $(PKG_IPK_DIR)/usr/lib/*
-       $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/quagga.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-$(PKG_ZEBRA): $(PKG_IPK_DIR)/zebra
-       mkdir -p $(PKG_ZEBRA_DIR)/etc/quagga
-       mkdir -p $(PKG_ZEBRA_DIR)/usr/sbin
-       mkdir -p $(PKG_ZEBRA_DIR)/usr/lib
-       cp -a ./ipkg/* $(PKG_ZEBRA_DIR)/
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_ZEBRA_DIR) control/$(PKG_NAME)-zebra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       cp $(PKG_IPK_DIR)/usr/sbin/zebra $(PKG_ZEBRA_DIR)/usr/sbin
-       cp $(PKG_IPK_DIR)/usr/lib/libzebra* $(PKG_ZEBRA_DIR)/usr/lib    
-       $(IPKG_BUILD) $(PKG_ZEBRA_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/quagga-zebra.list: $(PKG_ZEBRA)
-       $(IPKG) install $(PKG_ZEBRA)
-
-$(PKG_BGPD): $(PKG_IPK_DIR)/zebra
-       mkdir -p $(PKG_BGPD_DIR)/etc/quagga
-       mkdir -p $(PKG_BGPD_DIR)/usr/sbin
-       cp -a ./ipkg/* $(PKG_BGPD_DIR)/
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BGPD_DIR) control/$(PKG_NAME)-bgpd.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       cp $(PKG_IPK_DIR)/usr/sbin/bgpd $(PKG_BGPD_DIR)/usr/sbin
-       $(IPKG_BUILD) $(PKG_BGPD_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/quagga-bgpd.list: $(PKG_BGPD)
-       $(IPKG) install $(PKG_BGPD)
-
-$(PKG_RIPD): $(PKG_IPK_DIR)/zebra
-       mkdir -p $(PKG_RIPD_DIR)/etc/quagga
-       mkdir -p $(PKG_RIPD_DIR)/usr/sbin
-       cp -a ./ipkg/* $(PKG_RIPD_DIR)/
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_RIPD_DIR) control/$(PKG_NAME)-ripd.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       cp $(PKG_IPK_DIR)/usr/sbin/ripd $(PKG_RIPD_DIR)/usr/sbin
-       $(IPKG_BUILD) $(PKG_RIPD_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/quagga-ripd.list: $(PKG_RIPD)
-       $(IPKG) install $(PKG_RIPD)
-
-$(PKG_OSPFD): $(PKG_IPK_DIR)/zebra
-       mkdir -p $(PKG_OSPFD_DIR)/etc/quagga
-       mkdir -p $(PKG_OSPFD_DIR)/usr/sbin
-       mkdir -p $(PKG_OSPFD_DIR)/usr/lib
-       cp -a ./ipkg/* $(PKG_OSPFD_DIR)/
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_OSPFD_DIR) control/$(PKG_NAME)-ospfd.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       cp $(PKG_IPK_DIR)/usr/sbin/ospfd $(PKG_OSPFD_DIR)/usr/sbin
-       cp $(PKG_IPK_DIR)/usr/lib/libospf* $(PKG_OSPFD_DIR)/usr/lib     
-       $(IPKG_BUILD) $(PKG_OSPFD_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/quagga-ospfd.list: $(PKG_OSPFD)
-       $(IPKG) install $(PKG_OSPFD)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(TARGETS)
-install: $(INSTALL_TARGETS)
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK) $(PKG_ZEBRA) $(PKG_OSPFD) $(PKG_RIPD) $(PKG_BGPD)
+       touch $@
+
+$(PKG_BUILD_DIR)/.built:
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR=$(PKG_INSTALL_DIR) \
+               all install
+       touch $@
+
+$(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)
+
+$(IPKG_QUAGGA_BGPD):
+       install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/
+       $(RSTRIP) $(IDIR_QUAGGA_BGPD)
+       $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(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)
+       $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR)
+
+$(IPKG_QUAGGA_OSPF6D):
+       install -d -m0755 $(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)
+
+$(IPKG_QUAGGA_RIPD):
+       install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/
+       $(RSTRIP) $(IDIR_QUAGGA_RIPD)
+       $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR)
+
+$(IPKG_QUAGGA_RIPNGD):
+       install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/
+       $(RSTRIP) $(IDIR_QUAGGA_RIPNGD)
+       $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(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)