bird doesn't build succesfully on latest trunk and openwrt is using an old
version.
Configs were moved:
bird4: /etc/bird4.conf - /etc/config/bird4
bird6: /etc/bird6.conf - /etc/config/bird6
ftp://bird.network.cz/pub/bird/bird-1.3.11.tar.gz needs to be added to
http://downloads.openwrt.org/sources/
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
v2: Fix bash error on bird4loop and bird6loop
diff --git a/net/bird/Makefile b/net/bird/Makefile
index 6565f01..5d4ed6e 100644
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bird
-PKG_VERSION:=1.3.7
+PKG_VERSION:=1.3.11
PKG_RELEASE:=1
PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird
-PKG_MD5SUM:=c400b008ef834d9e7288dcdbe41b7c15
+PKG_MD5SUM:=8ad2eb997fb8251bc5b24cf32619571b
PKG_BUILD_DEPENDS:=libncurses libreadline
include $(INCLUDE_DIR)/package.mk
@@ -132,15 +132,15 @@ define Package/bird$(2)/install
$(INSTALL_DIR) $$(1)/usr/sbin
$(INSTALL_BIN) $$(PKG_BUILD_DIR)/bird$(2) $$(1)/usr/sbin/
$(INSTALL_BIN) ./files/bird$(2)loop $$(1)/usr/sbin/
- $(INSTALL_DIR) $$(1)/etc
- $(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/
+ $(INSTALL_DIR) $$(1)/etc/config
+ $(INSTALL_DATA) ./files/bird$(2).conf $$(1)/etc/config/bird$(2)
$(INSTALL_DIR) $$(1)/etc/init.d
$(INSTALL_BIN) ./files/bird$(2).init $$(1)/etc/init.d/bird$(2)
endef
define Package/bird$(2)/conffiles
-/etc/bird$(2).conf
+/etc/config/bird$(2)
endef
define Package/birdc$(2)/install
diff --git a/net/bird/files/bird4.init b/net/bird/files/bird4.init
index 8ac5e75..365e98f 100644
--- a/net/bird/files/bird4.init
+++ b/net/bird/files/bird4.init
@@ -6,16 +6,18 @@ START=50
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
+BIRD=/usr/sbin/bird4 -c /etc/config/bird4
+
start() {
- service_start /usr/sbin/bird4 -d
+ service_start $BIRD -d
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop )
}
stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop )
- service_stop /usr/sbin/bird4
+ service_stop $BIRD
}
reload() {
- service_reload /usr/sbin/bird4
+ service_reload $BIRD
}
diff --git a/net/bird/files/bird4loop b/net/bird/files/bird4loop
index 074a9a2..ad2d8e6 100644
--- a/net/bird/files/bird4loop
+++ b/net/bird/files/bird4loop
@@ -1,6 +1,6 @@
#!/bin/sh
-BIRD=/usr/sbin/bird4
+BIRD=/usr/sbin/bird4 -c /etc/config/bird4
$BIRD -p || return 1
diff --git a/net/bird/files/bird6.init b/net/bird/files/bird6.init
index 2efb4f0..9106309 100644
--- a/net/bird/files/bird6.init
+++ b/net/bird/files/bird6.init
@@ -6,16 +6,18 @@ START=50
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
+BIRD=/usr/sbin/bird6 -c /etc/config/bird6
+
start() {
- service_start /usr/sbin/bird6 -d
+ service_start $BIRD -d
# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop )
}
stop() {
# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop )
- service_stop /usr/sbin/bird6
+ service_stop $BIRD
}
reload() {
- service_reload /usr/sbin/bird6
+ service_reload $BIRD
}
diff --git a/net/bird/files/bird6loop b/net/bird/files/bird6loop
index c01cf2e..f63c67f 100644
--- a/net/bird/files/bird6loop
+++ b/net/bird/files/bird6loop
@@ -1,6 +1,6 @@
#!/bin/sh
-BIRD=/usr/sbin/bird6
+BIRD=/usr/sbin/bird6 -c /etc/config/bird6
$BIRD -p || return 1
diff --git a/net/bird/patches/0001-change_config_name.patch
b/net/bird/patches/0001-change_config_name.patch
deleted file mode 100644
index 98532f7..000
--- a/net/bird/patches/0001-change_config_name.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdep/config.h b/sysdep/config.h
-index 03399bd..bc5eb77 100644
a/sysdep/config.h
-+++ b/sysdep/config.h
-@@ -46,11 +46,11 @@ typedef u16 word;
- # endif
- #else
- # ifdef DEBUGGING
--#define PATH_CONFIG bird.conf
--#define PATH_CONTROL_SOCKET bird.ctl
-+#define PATH_CONFIG bird4.conf
-+#define PATH_CONTROL_SOCKET bird4.ctl
- # else
--#define PATH_CONFIG PATH_CONFIG_DIR /bird.conf
--#define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR /bird.ctl
-+#define PATH_CONFIG PATH_CONFIG_DIR /bird4.conf
-+#define PATH_CONTROL_SOCKET PATH_CONTROL_SOCKET_DIR /bird4.ctl
- # endif
- #endif
-
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
