From ecbdeb0500cc92b514a7442a09b9e90973fa3554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 16 May 2018 12:24:00 +0200 Subject: [PATCH] bird: Rename to bird1 and bump to v1.6.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This renames the bird and bird-openwrt packages to bird1, to make it possible for bird2 (added in a subsequent commit) to coexist with it. The packages are renamed to bird1-ipv{4,6} to avoid the confusion of having packages named 'bird2', 'bird4' and 'bird6'. Also bump to v1.6.4 as that contains important bug fixes. Signed-off-by: Toke Høiland-Jørgensen --- .../LUCI-DOCUMENTATION.md | 0 {bird-openwrt => bird1-openwrt}/README.md | 0 .../UCI-DOCUMENTATION.md | 0 .../bird1-ipv4-openwrt}/Makefile | 17 +-- .../bird1-ipv4-openwrt}/src/config/bird4 | 0 .../src/controller/bird4.lua | 0 .../bird1-ipv4-openwrt}/src/init.d/bird4 | 0 .../src/init.d/bird4-lib.sh | 0 .../src/model/bgp_proto.lua | 0 .../bird1-ipv4-openwrt}/src/model/filters.lua | 0 .../src/model/functions.lua | 0 .../src/model/gen_proto.lua | 0 .../src/model/overview.lua | 0 .../bird1-ipv4-openwrt}/src/model/status.lua | 0 .../src/uci-defaults/99-relocate-filters | 0 .../src/uci-defaults/bird-uci-install-init.d | 0 .../bird1-ipv4-openwrt}/src/view/log.htm | 0 .../bird1-ipv4-openwrt}/src/view/tvalue.htm | 0 .../bird1-ipv6-openwrt}/Makefile | 17 +-- .../bird1-ipv6-openwrt}/src/config/bird6 | 0 .../src/controller/bird6.lua | 0 .../bird1-ipv6-openwrt}/src/init.d/bird6 | 0 .../src/init.d/bird6-lib.sh | 0 .../src/model/bgp_proto.lua | 0 .../bird1-ipv6-openwrt}/src/model/filters.lua | 0 .../src/model/functions.lua | 0 .../src/model/gen_proto.lua | 0 .../src/model/overview.lua | 0 .../bird1-ipv6-openwrt}/src/model/status.lua | 0 .../src/uci-defaults/99-relocate-filters | 0 .../src/uci-defaults/bird-uci-install-init.d | 0 .../bird1-ipv6-openwrt}/src/view/log.htm | 0 .../bird1-ipv6-openwrt}/src/view/tvalue.htm | 0 {bird => bird1}/Makefile | 129 ++++++++++-------- {bird => bird1}/files/bird4.conf | 0 {bird => bird1}/files/bird4.init | 0 {bird => bird1}/files/bird6.conf | 0 {bird => bird1}/files/bird6.init | 0 38 files changed, 88 insertions(+), 75 deletions(-) rename {bird-openwrt => bird1-openwrt}/LUCI-DOCUMENTATION.md (100%) rename {bird-openwrt => bird1-openwrt}/README.md (100%) rename {bird-openwrt => bird1-openwrt}/UCI-DOCUMENTATION.md (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/Makefile (90%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/config/bird4 (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/controller/bird4.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/init.d/bird4 (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/init.d/bird4-lib.sh (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/bgp_proto.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/filters.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/functions.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/gen_proto.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/overview.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/model/status.lua (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/uci-defaults/99-relocate-filters (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/uci-defaults/bird-uci-install-init.d (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/view/log.htm (100%) rename {bird-openwrt/bird4-openwrt => bird1-openwrt/bird1-ipv4-openwrt}/src/view/tvalue.htm (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/Makefile (90%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/config/bird6 (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/controller/bird6.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/init.d/bird6 (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/init.d/bird6-lib.sh (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/bgp_proto.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/filters.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/functions.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/gen_proto.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/overview.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/model/status.lua (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/uci-defaults/99-relocate-filters (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/uci-defaults/bird-uci-install-init.d (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/view/log.htm (100%) rename {bird-openwrt/bird6-openwrt => bird1-openwrt/bird1-ipv6-openwrt}/src/view/tvalue.htm (100%) rename {bird => bird1}/Makefile (57%) rename {bird => bird1}/files/bird4.conf (100%) rename {bird => bird1}/files/bird4.init (100%) rename {bird => bird1}/files/bird6.conf (100%) rename {bird => bird1}/files/bird6.init (100%) diff --git a/bird-openwrt/LUCI-DOCUMENTATION.md b/bird1-openwrt/LUCI-DOCUMENTATION.md similarity index 100% rename from bird-openwrt/LUCI-DOCUMENTATION.md rename to bird1-openwrt/LUCI-DOCUMENTATION.md diff --git a/bird-openwrt/README.md b/bird1-openwrt/README.md similarity index 100% rename from bird-openwrt/README.md rename to bird1-openwrt/README.md diff --git a/bird-openwrt/UCI-DOCUMENTATION.md b/bird1-openwrt/UCI-DOCUMENTATION.md similarity index 100% rename from bird-openwrt/UCI-DOCUMENTATION.md rename to bird1-openwrt/UCI-DOCUMENTATION.md diff --git a/bird-openwrt/bird4-openwrt/Makefile b/bird1-openwrt/bird1-ipv4-openwrt/Makefile similarity index 90% rename from bird-openwrt/bird4-openwrt/Makefile rename to bird1-openwrt/bird1-ipv4-openwrt/Makefile index 87b9181..781d5d8 100644 --- a/bird-openwrt/bird4-openwrt/Makefile +++ b/bird1-openwrt/bird1-ipv4-openwrt/Makefile @@ -18,13 +18,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk BIRD := bird4 -PKG_NAME := $(BIRD)-openwrt +BIRD_PKG := bird1-ipv4 +PKG_NAME := $(BIRD_PKG)-openwrt PKG_VERSION := 0.3 PKG_RELEASE := 1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_LICENSE := GPL-3.0+ -uci := $(BIRD)-uci -luci := luci-app-$(BIRD) +uci := $(BIRD_PKG)-uci +luci := luci-app-$(BIRD_PKG) include $(INCLUDE_DIR)/package.mk @@ -34,17 +35,17 @@ define Build/Compile endef define Package/$(uci) - TITLE:=The BIRD UCI module + TITLE:=The BIRD UCI module (v1.6) (IPv4) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection MAINTAINER:=Eloi Carbo URL:=https://github.com/eloicaso/bird-openwrt/ - DEPENDS:=+$(BIRD) +libuci +uci + DEPENDS:=+$(BIRD_PKG) +libuci +uci endef define Package/$(uci)/description -$(BIRD) UCI integration module +$(BIRD_PKG) UCI integration module endef define Package/$(uci)/conffiles @@ -77,13 +78,13 @@ endef $(eval $(call BuildPackage,$(uci))) define Package/$(luci) - TITLE:=LuCI support for $(BIRD) + TITLE:=LuCI support for $(BIRD_PKG) SECTION:=luci CATEGORY:=LuCI SUBMENU:=3. Applications MAINTAINER:=Eloi Carbo URL:=https://github.com/eloicaso/bird-openwrt/ - DEPENDS:=+$(BIRD)-uci +luci-base + DEPENDS:=+$(BIRD_PKG)-uci +luci-base endef define Package/$(luci)/description diff --git a/bird-openwrt/bird4-openwrt/src/config/bird4 b/bird1-openwrt/bird1-ipv4-openwrt/src/config/bird4 similarity index 100% rename from bird-openwrt/bird4-openwrt/src/config/bird4 rename to bird1-openwrt/bird1-ipv4-openwrt/src/config/bird4 diff --git a/bird-openwrt/bird4-openwrt/src/controller/bird4.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/controller/bird4.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua diff --git a/bird-openwrt/bird4-openwrt/src/init.d/bird4 b/bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4 similarity index 100% rename from bird-openwrt/bird4-openwrt/src/init.d/bird4 rename to bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4 diff --git a/bird-openwrt/bird4-openwrt/src/init.d/bird4-lib.sh b/bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4-lib.sh similarity index 100% rename from bird-openwrt/bird4-openwrt/src/init.d/bird4-lib.sh rename to bird1-openwrt/bird1-ipv4-openwrt/src/init.d/bird4-lib.sh diff --git a/bird-openwrt/bird4-openwrt/src/model/bgp_proto.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/bgp_proto.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/bgp_proto.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/bgp_proto.lua diff --git a/bird-openwrt/bird4-openwrt/src/model/filters.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/filters.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/filters.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/filters.lua diff --git a/bird-openwrt/bird4-openwrt/src/model/functions.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/functions.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/functions.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/functions.lua diff --git a/bird-openwrt/bird4-openwrt/src/model/gen_proto.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/gen_proto.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/gen_proto.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/gen_proto.lua diff --git a/bird-openwrt/bird4-openwrt/src/model/overview.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/overview.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/overview.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/overview.lua diff --git a/bird-openwrt/bird4-openwrt/src/model/status.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/model/status.lua similarity index 100% rename from bird-openwrt/bird4-openwrt/src/model/status.lua rename to bird1-openwrt/bird1-ipv4-openwrt/src/model/status.lua diff --git a/bird-openwrt/bird4-openwrt/src/uci-defaults/99-relocate-filters b/bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/99-relocate-filters similarity index 100% rename from bird-openwrt/bird4-openwrt/src/uci-defaults/99-relocate-filters rename to bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/99-relocate-filters diff --git a/bird-openwrt/bird4-openwrt/src/uci-defaults/bird-uci-install-init.d b/bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/bird-uci-install-init.d similarity index 100% rename from bird-openwrt/bird4-openwrt/src/uci-defaults/bird-uci-install-init.d rename to bird1-openwrt/bird1-ipv4-openwrt/src/uci-defaults/bird-uci-install-init.d diff --git a/bird-openwrt/bird4-openwrt/src/view/log.htm b/bird1-openwrt/bird1-ipv4-openwrt/src/view/log.htm similarity index 100% rename from bird-openwrt/bird4-openwrt/src/view/log.htm rename to bird1-openwrt/bird1-ipv4-openwrt/src/view/log.htm diff --git a/bird-openwrt/bird4-openwrt/src/view/tvalue.htm b/bird1-openwrt/bird1-ipv4-openwrt/src/view/tvalue.htm similarity index 100% rename from bird-openwrt/bird4-openwrt/src/view/tvalue.htm rename to bird1-openwrt/bird1-ipv4-openwrt/src/view/tvalue.htm diff --git a/bird-openwrt/bird6-openwrt/Makefile b/bird1-openwrt/bird1-ipv6-openwrt/Makefile similarity index 90% rename from bird-openwrt/bird6-openwrt/Makefile rename to bird1-openwrt/bird1-ipv6-openwrt/Makefile index 1b3436b..939c1ee 100644 --- a/bird-openwrt/bird6-openwrt/Makefile +++ b/bird1-openwrt/bird1-ipv6-openwrt/Makefile @@ -18,13 +18,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk BIRD := bird6 -PKG_NAME := $(BIRD)-openwrt +BIRD_PKG := bird1-ipv6 +PKG_NAME := $(BIRD_PKG)-openwrt PKG_VERSION := 0.3 PKG_RELEASE := 1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_LICENSE := GPL-3.0+ -uci := $(BIRD)-uci -luci := luci-app-$(BIRD) +uci := $(BIRD_PKG)-uci +luci := luci-app-$(BIRD_PKG) include $(INCLUDE_DIR)/package.mk @@ -34,17 +35,17 @@ define Build/Compile endef define Package/$(uci) - TITLE:=The BIRD UCI module + TITLE:=The BIRD UCI module (v1.6) (IPv6) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection MAINTAINER:=Eloi Carbo URL:=https://github.com/eloicaso/bird-openwrt/ - DEPENDS:=+$(BIRD) +libuci +uci + DEPENDS:=+$(BIRD_PKG) +libuci +uci endef define Package/$(uci)/description -$(BIRD) UCI integration module +$(BIRD_PKG) UCI integration module endef define Package/$(uci)/conffiles @@ -77,13 +78,13 @@ endef $(eval $(call BuildPackage,$(uci))) define Package/$(luci) - TITLE:=LuCI support for $(BIRD) + TITLE:=LuCI support for $(BIRD_PKG) SECTION:=luci CATEGORY:=LuCI SUBMENU:=3. Applications MAINTAINER:=Eloi Carbo URL:=https://github.com/eloicaso/bird-openwrt/ - DEPENDS:=+$(BIRD)-uci +luci-base + DEPENDS:=+$(BIRD_PKG)-uci +luci-base endef define Package/$(luci)/description diff --git a/bird-openwrt/bird6-openwrt/src/config/bird6 b/bird1-openwrt/bird1-ipv6-openwrt/src/config/bird6 similarity index 100% rename from bird-openwrt/bird6-openwrt/src/config/bird6 rename to bird1-openwrt/bird1-ipv6-openwrt/src/config/bird6 diff --git a/bird-openwrt/bird6-openwrt/src/controller/bird6.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/controller/bird6.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua diff --git a/bird-openwrt/bird6-openwrt/src/init.d/bird6 b/bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6 similarity index 100% rename from bird-openwrt/bird6-openwrt/src/init.d/bird6 rename to bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6 diff --git a/bird-openwrt/bird6-openwrt/src/init.d/bird6-lib.sh b/bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6-lib.sh similarity index 100% rename from bird-openwrt/bird6-openwrt/src/init.d/bird6-lib.sh rename to bird1-openwrt/bird1-ipv6-openwrt/src/init.d/bird6-lib.sh diff --git a/bird-openwrt/bird6-openwrt/src/model/bgp_proto.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/bgp_proto.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/bgp_proto.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/bgp_proto.lua diff --git a/bird-openwrt/bird6-openwrt/src/model/filters.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/filters.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/filters.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/filters.lua diff --git a/bird-openwrt/bird6-openwrt/src/model/functions.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/functions.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/functions.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/functions.lua diff --git a/bird-openwrt/bird6-openwrt/src/model/gen_proto.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/gen_proto.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/gen_proto.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/gen_proto.lua diff --git a/bird-openwrt/bird6-openwrt/src/model/overview.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/overview.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/overview.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/overview.lua diff --git a/bird-openwrt/bird6-openwrt/src/model/status.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/model/status.lua similarity index 100% rename from bird-openwrt/bird6-openwrt/src/model/status.lua rename to bird1-openwrt/bird1-ipv6-openwrt/src/model/status.lua diff --git a/bird-openwrt/bird6-openwrt/src/uci-defaults/99-relocate-filters b/bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/99-relocate-filters similarity index 100% rename from bird-openwrt/bird6-openwrt/src/uci-defaults/99-relocate-filters rename to bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/99-relocate-filters diff --git a/bird-openwrt/bird6-openwrt/src/uci-defaults/bird-uci-install-init.d b/bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/bird-uci-install-init.d similarity index 100% rename from bird-openwrt/bird6-openwrt/src/uci-defaults/bird-uci-install-init.d rename to bird1-openwrt/bird1-ipv6-openwrt/src/uci-defaults/bird-uci-install-init.d diff --git a/bird-openwrt/bird6-openwrt/src/view/log.htm b/bird1-openwrt/bird1-ipv6-openwrt/src/view/log.htm similarity index 100% rename from bird-openwrt/bird6-openwrt/src/view/log.htm rename to bird1-openwrt/bird1-ipv6-openwrt/src/view/log.htm diff --git a/bird-openwrt/bird6-openwrt/src/view/tvalue.htm b/bird1-openwrt/bird1-ipv6-openwrt/src/view/tvalue.htm similarity index 100% rename from bird-openwrt/bird6-openwrt/src/view/tvalue.htm rename to bird1-openwrt/bird1-ipv6-openwrt/src/view/tvalue.htm diff --git a/bird/Makefile b/bird1/Makefile similarity index 57% rename from bird/Makefile rename to bird1/Makefile index b44114e..e5e32a8 100644 --- a/bird/Makefile +++ b/bird1/Makefile @@ -6,46 +6,51 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=bird -PKG_VERSION:=1.6.3 +PKG_NAME:=bird1 +PKG_VERSION:=1.6.4 PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_MD5SUM:=39c51cf57c3ba8b5978b2a657ffa2f647ec7f3ae643e91cf42ee5cb070cf7e7c +PKG_MD5SUM:=c26b8caae988dba81a9dbbee93502463d4326d1b749d728d62aa5529c605afc0 PKG_BUILD_DEPENDS:=ncurses readline PKG_MAINTAINER:=Álvaro Fernández Rojas +PKG_BUILD_DIR:=$(BUILD_DIR)/bird-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk -define Package/bird/Default - TITLE:=The BIRD Internet Routing Daemon +define Package/bird1/Default + TITLE:=The BIRD Internet Routing Daemon (v1.6) URL:=http://bird.network.cz/ DEPENDS:=+libpthread endef -define Package/birdc/Default - TITLE:=The BIRD command-line client +define Package/bird1c/Default + TITLE:=The BIRD command-line client (v1.6) URL:=http://bird.network.cz/ DEPENDS:= +libreadline +libncurses endef -define Package/birdcl/Default - TITLE:=The BIRD lightweight command-line client +define Package/bird1cl/Default + TITLE:=The BIRD lightweight command-line client (v1.6) URL:=http://bird.network.cz/ endef -define Package/bird/Default/description1 +define Package/bird1/Default/description1 BIRD is an internet routing daemon which manages TCP/IP routing tables with support of modern routing protocols, easy to use configuration interface and powerful route filtering language. It is lightweight and efficient and therefore appropriate for small embedded routers. +This packages the legacy v1.6 branch of Bird, which splits IPv4 and IPv6 +support into separate binaries. See also the bird2 package for the newer +branch which integrates support for both IP protocols in a single binary. + endef -define Package/bird/Default/description2 +define Package/bird1/Default/description2 In BGP, BIRD supports communities, multiprotocol extensions, MD5 authentication, 32bit AS numbers and could act as a route server or a route reflector. BIRD also supports multiple RIBs, multiple kernel @@ -54,7 +59,7 @@ configuration syntax. endef -define Package/bird/Default/description3 +define Package/bird1/Default/description3 This is a BIRD command-line client. It is used to send commands to BIRD, commands can perform simple actions such as enabling/disabling of protocols, telling BIRD to show various information, telling it to show @@ -65,7 +70,7 @@ should install BIRD command-line client together with BIRD. endef -define Package/bird/Default/description4 +define Package/bird1/Default/description4 This is a BIRD lightweight command-line client. It is used to send commands to BIRD, commands can perform simple actions such as enabling/disabling of protocols, telling BIRD to show various information, telling it to show @@ -73,92 +78,98 @@ a routing table filtered by a filter, or asking BIRD to reconfigure. endef -define Package/bird4 -$(call Package/bird/Default) +define Package/bird1-ipv4 +$(call Package/bird1/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv4) + CONFLICTS+=bird4 endef -define Package/birdc4 -$(call Package/birdc/Default) +define Package/bird1c-ipv4 +$(call Package/bird1c/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv4) - DEPENDS+= +bird4 + DEPENDS+= +bird1-ipv4 + CONFLICTS+=birdc4 endef -define Package/birdcl4 -$(call Package/birdcl/Default) +define Package/bird1cl-ipv4 +$(call Package/bird1cl/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv4) - DEPENDS+= +bird4 + DEPENDS+= +bird1-ipv4 + CONFLICTS+=birdcl4 endef -define Package/bird6 -$(call Package/bird/Default) +define Package/bird1-ipv6 +$(call Package/bird1/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv6) + CONFLICTS+=bird6 endef -define Package/birdc6 -$(call Package/birdc/Default) +define Package/bird1c-ipv6 +$(call Package/bird1c/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv6) - DEPENDS+= +bird6 + DEPENDS+= +bird1-ipv6 + CONFLICTS+=birdc6 endef -define Package/birdcl6 -$(call Package/birdcl/Default) +define Package/bird1cl-ipv6 +$(call Package/bird1cl/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Routing and Redirection TITLE+= (IPv6) - DEPENDS+= +bird6 + DEPENDS+= +bird1-ipv6 + CONFLICTS+=birdcl6 endef -define Package/bird4/description -$(call Package/bird/Default/description1) +define Package/bird1-ipv4/description +$(call Package/bird1/Default/description1) This is IPv4 version of BIRD, it supports OSPFv2, RIPv2 and BGP protocols. -$(call Package/bird/Default/description2) +$(call Package/bird1/Default/description2) endef -define Package/birdc4/description -$(call Package/bird/Default/description1) -$(call Package/bird/Default/description3) +define Package/bird1c-ipv4/description +$(call Package/bird1/Default/description1) +$(call Package/bird1/Default/description3) endef -define Package/birdcl4/description -$(call Package/bird/Default/description1) -$(call Package/bird/Default/description4) +define Package/bird1cl-ipv4/description +$(call Package/bird1/Default/description1) +$(call Package/bird1/Default/description4) endef -define Package/bird6/description -$(call Package/bird/Default/description1) +define Package/bird1-ipv6/description +$(call Package/bird1/Default/description1) This is IPv6 version of BIRD, it supports OSPFv3, RIPng and BGP protocols. -$(call Package/bird/Default/description2) +$(call Package/bird1/Default/description2) endef -define Package/birdc6/description -$(call Package/bird/Default/description1) -$(call Package/bird/Default/description3) +define Package/bird1c-ipv6/description +$(call Package/bird1/Default/description1) +$(call Package/bird1/Default/description3) endef -define Package/birdcl6/description -$(call Package/bird/Default/description1) -$(call Package/bird/Default/description4) +define Package/bird1cl-ipv6/description +$(call Package/bird1/Default/description1) +$(call Package/bird1/Default/description4) endef CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)" @@ -176,7 +187,7 @@ $(STAMP_BUILT)-$(2): $(STAMP_PREPARED) $(STAMP_BUILT): $(STAMP_BUILT)-$(2) -define Package/bird$(2)/install +define Package/bird1-ipv$(2)/install $(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/ $(INSTALL_DIR) $$(1)/etc @@ -186,16 +197,16 @@ define Package/bird$(2)/install endef -define Package/bird$(2)/conffiles +define Package/bird1-ipv$(2)/conffiles /etc/bird$(2).conf endef -define Package/birdc$(2)/install +define Package/bird1c-ipv$(2)/install $(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/ endef -define Package/birdcl$(2)/install +define Package/bird1cl-ipv$(2)/install $(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdcl$(2) $$(1)/usr/sbin/ endef @@ -203,12 +214,12 @@ endef endef -$(eval $(call Build/Template,bird4,4, --disable-ipv6)) -$(eval $(call Build/Template,bird6,6, --enable-ipv6)) +$(eval $(call Build/Template,bird1-ipv4,4, --disable-ipv6)) +$(eval $(call Build/Template,bird1-ipv6,6, --enable-ipv6)) -$(eval $(call BuildPackage,bird4)) -$(eval $(call BuildPackage,birdc4)) -$(eval $(call BuildPackage,birdcl4)) -$(eval $(call BuildPackage,bird6)) -$(eval $(call BuildPackage,birdc6)) -$(eval $(call BuildPackage,birdcl6)) +$(eval $(call BuildPackage,bird1-ipv4)) +$(eval $(call BuildPackage,bird1c-ipv4)) +$(eval $(call BuildPackage,bird1cl-ipv4)) +$(eval $(call BuildPackage,bird1-ipv6)) +$(eval $(call BuildPackage,bird1c-ipv6)) +$(eval $(call BuildPackage,bird1cl-ipv6)) diff --git a/bird/files/bird4.conf b/bird1/files/bird4.conf similarity index 100% rename from bird/files/bird4.conf rename to bird1/files/bird4.conf diff --git a/bird/files/bird4.init b/bird1/files/bird4.init similarity index 100% rename from bird/files/bird4.init rename to bird1/files/bird4.init diff --git a/bird/files/bird6.conf b/bird1/files/bird6.conf similarity index 100% rename from bird/files/bird6.conf rename to bird1/files/bird6.conf diff --git a/bird/files/bird6.init b/bird1/files/bird6.init similarity index 100% rename from bird/files/bird6.init rename to bird1/files/bird6.init