From 420ef2830a168dda3f41bde4442488cfc68c6736 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 14 Jan 2019 21:22:07 +0100 Subject: build-submodules support FRR build from 'master' branch --- scripts/build-submodules | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) (limited to 'scripts/build-submodules') diff --git a/scripts/build-submodules b/scripts/build-submodules index 747b02d2..768294f5 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -116,18 +116,51 @@ if [ $INIT_PACKAGES ]; then fi build_frr() { - # FRR upstream version is specified here - FRR_VER="debian/frr-6.0.2-1" PKG=frr - status_start "Building package: $PKG (Git commit/tag: $FRR_VER)" + + status_start "Building package: $PKG" if [ ! -f "$PKGDIR/$PKG/README.md" ]; then status_skip "No source for: $PKG" return 1 fi + ( set -e; set -x cd $PKGDIR/$PKG - git checkout $FRR_VER - dpkg-buildpackage -uc -us -tc -b + + # Run bootstrap.sh and make a dist tarball + # http://docs.frrouting.org/projects/dev-guide/en/latest/packaging-debian.html + ./bootstrap.sh + ./configure --with-pkg-extra-version=-vyos + make dist + + # Create backports debian sources + mv debianpkg debian + make -f debian/rules backports + + # Create a new directory to build the package and populate with package source. + mkdir frrpkg + cd frrpkg + tar xf ../frr_*.orig.tar.gz + cd frr* + source /etc/os-release + ls -al ../../frr_*${ID}${VERSION_ID}* + tar xf ../../frr_*${ID}${VERSION_ID}*.debian.tar.xz + + # As libyang is not (yet) build and installed as native Debian package FRR + # build system reports the following error: + # + # "dpkg-shlibdeps: error: no dependency information found for + # /usr/lib/x86_64-linux-gnu/libyang.so.0.16" + # + # It is "overruled" by + sed '/dh_systemd_enable frr.service/ a override_dh_shlibdeps:\n\tdh_shlibdeps \ + --dpkg-shlibdeps-params=--ignore-missing-info\n' -i debian/rules + + # Build Debian Package + debuild --no-lintian --set-envvar=WANT_SNMP=1 --set-envvar=WANT_RPKI=1 \ + --set-envvar=WANT_CUMULUS_MODE=0 -b -uc -us + + mv ../frr_*.deb $PKGDIR ) >>$PKGDIR/$PKG.buildlog 2>&1 if [ $? -ne 0 ]; then status_fail -- cgit v1.2.3 From f95182eb157949519e91d640d23c70d273f8c657 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 14 Jan 2019 21:22:07 +0100 Subject: build-submodules: remove vyatta-vrrp which is no longer required vyatta-vrrp code has been replaced by vyos-1x implementation --- .gitmodules | 4 ---- packages/vyatta-vrrp | 1 - scripts/build-submodules | 1 - 3 files changed, 6 deletions(-) delete mode 160000 packages/vyatta-vrrp (limited to 'scripts/build-submodules') diff --git a/.gitmodules b/.gitmodules index dafb012a..f2892fca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,10 +74,6 @@ path = packages/vyatta-cluster url = https://github.com/vyos/vyatta-cluster.git branch = current -[submodule "packages/vyatta-vrrp"] - path = packages/vyatta-vrrp - url = https://github.com/vyos/vyatta-vrrp.git - branch = current [submodule "packages/vyatta-eventwatch"] path = packages/vyatta-eventwatch url = https://github.com/vyos/vyatta-eventwatch.git diff --git a/packages/vyatta-vrrp b/packages/vyatta-vrrp deleted file mode 160000 index c6411d8c..00000000 --- a/packages/vyatta-vrrp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c6411d8c4c1a11f0305ddee2824d7081cd2654a3 diff --git a/scripts/build-submodules b/scripts/build-submodules index 768294f5..a0bda9f4 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -201,7 +201,6 @@ for PKG in mdns-repeater \ vyatta-op-vpn \ vyatta-openvpn \ vyatta-ravpn \ - vyatta-vrrp \ vyatta-wanloadbalance \ vyatta-webgui \ vyatta-webproxy \ -- cgit v1.2.3 From f23cd2137e12ffcdeb4a60c2bd9698350d4b5fb1 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 14 Jan 2019 21:45:22 +0100 Subject: build-submodules: fix 'sed' script for FRR Debian packaging --- scripts/build-submodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build-submodules') diff --git a/scripts/build-submodules b/scripts/build-submodules index a0bda9f4..4bfaef33 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -153,8 +153,8 @@ build_frr() { # /usr/lib/x86_64-linux-gnu/libyang.so.0.16" # # It is "overruled" by - sed '/dh_systemd_enable frr.service/ a override_dh_shlibdeps:\n\tdh_shlibdeps \ - --dpkg-shlibdeps-params=--ignore-missing-info\n' -i debian/rules + sed '/dh_systemd_enable frr.service/ a \\noverride_dh_shlibdeps:\n\tdh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info\n' -i debian/rules + # Build Debian Package debuild --no-lintian --set-envvar=WANT_SNMP=1 --set-envvar=WANT_RPKI=1 \ -- cgit v1.2.3 From db9b292a980518ce535479b98e233c2da3e014be Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 14 Jan 2019 22:00:01 +0100 Subject: build-submodules: remove vyos-pppoe-server which is replaced by vyos-1x --- .gitmodules | 4 ---- packages/vyos-pppoe-server | 1 - scripts/build-submodules | 1 - 3 files changed, 6 deletions(-) delete mode 160000 packages/vyos-pppoe-server (limited to 'scripts/build-submodules') diff --git a/.gitmodules b/.gitmodules index f2892fca..44f0265f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -126,10 +126,6 @@ path = packages/vyatta-ravpn url = https://github.com/vyos/vyatta-ravpn.git branch = current -[submodule "packages/vyos-pppoe-server"] - path = packages/vyos-pppoe-server - url = https://github.com/vyos/vyos-pppoe-server.git - branch = current [submodule "packages/vyos-nhrp"] path = packages/vyos-nhrp url = https://github.com/vyos/vyos-nhrp.git diff --git a/packages/vyos-pppoe-server b/packages/vyos-pppoe-server deleted file mode 160000 index 56670914..00000000 --- a/packages/vyos-pppoe-server +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 566709144fb119d32cc029615cff2e688a8a7557 diff --git a/scripts/build-submodules b/scripts/build-submodules index 4bfaef33..44b1c60d 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -209,7 +209,6 @@ for PKG in mdns-repeater \ vyatta-zone \ vyos-keepalived \ vyos-nhrp \ - vyos-pppoe-server \ vyos-strongswan \ vyos-world \ ; do -- cgit v1.2.3 From c5cef286f3d8a6e0d23ffd71e40186869dd68a29 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 16 Jan 2019 19:34:05 +0100 Subject: build-submodules: add conntrack-tools --- .gitmodules | 5 +++++ packages/conntrack-tools | 1 + scripts/build-submodules | 1 + 3 files changed, 7 insertions(+) create mode 160000 packages/conntrack-tools (limited to 'scripts/build-submodules') diff --git a/.gitmodules b/.gitmodules index 44f0265f..d1f203fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -185,3 +185,8 @@ [submodule "packages/frr"] path = packages/frr url = https://github.com/FRRouting/frr.git + branch = master +[submodule "packages/conntrack-tools"] + path = packages/conntrack-tools + url = https://github.com/vyos/conntrack-tools.git + branch = current diff --git a/packages/conntrack-tools b/packages/conntrack-tools new file mode 160000 index 00000000..77cf2ae1 --- /dev/null +++ b/packages/conntrack-tools @@ -0,0 +1 @@ +Subproject commit 77cf2ae1cfc281ab11d3fa5ddc73c11bcb60ccd9 diff --git a/scripts/build-submodules b/scripts/build-submodules index 44b1c60d..909f6905 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -174,6 +174,7 @@ build_frr for PKG in mdns-repeater \ pmacct \ udp-broadcast-relay \ + conntrack-tools \ vyatta-bash \ vyatta-cfg \ vyatta-cfg-firewall \ -- cgit v1.2.3 From 04389cbef57a5f36eb8dccd5dc2d81ef5e94f9b2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 16 Jan 2019 20:28:27 +0100 Subject: build-submodules: add eventwatchd --- .gitmodules | 4 ++++ packages/eventwatchd | 1 + scripts/build-submodules | 1 + 3 files changed, 6 insertions(+) create mode 160000 packages/eventwatchd (limited to 'scripts/build-submodules') diff --git a/.gitmodules b/.gitmodules index d1f203fd..939d77c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -190,3 +190,7 @@ path = packages/conntrack-tools url = https://github.com/vyos/conntrack-tools.git branch = current +[submodule "packages/eventwatchd"] + path = packages/eventwatchd + url = https://github.com/vyos/eventwatchd.git + branch = current \ No newline at end of file diff --git a/packages/eventwatchd b/packages/eventwatchd new file mode 160000 index 00000000..c3d8ae73 --- /dev/null +++ b/packages/eventwatchd @@ -0,0 +1 @@ +Subproject commit c3d8ae7352f3e9c65b0f05dda245d144252574ca diff --git a/scripts/build-submodules b/scripts/build-submodules index 909f6905..c36dccca 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -175,6 +175,7 @@ for PKG in mdns-repeater \ pmacct \ udp-broadcast-relay \ conntrack-tools \ + eventwatchd \ vyatta-bash \ vyatta-cfg \ vyatta-cfg-firewall \ -- cgit v1.2.3