diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2020-05-31 10:10:33 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2020-05-31 10:10:33 +0200 |
| commit | 582f35c88cef8ef8f711d78fd585b1b4816b2f41 (patch) | |
| tree | c2f65a5ec009f5d3a8aabc6e9f4a271698cf0fcf /alpine | |
| parent | Merge pull request #6375 from adharkar/frr-master-l3vni_label (diff) | |
| download | frr-582f35c88cef8ef8f711d78fd585b1b4816b2f41.tar.xz frr-582f35c88cef8ef8f711d78fd585b1b4816b2f41.zip | |
alpine: update packages
Alpine builds have been failing for some time as a consequence of only
installing python 2 development packages when we have build scripts that
require python 3.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/APKBUILD.in | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index d4657dfe5..c7d699bd4 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -6,7 +6,7 @@ pkgdesc="FRRouting is a fork of quagga" url="https://frrouting.org/" arch="x86_64" license="GPL-2.0" -depends="json-c c-ares ipsec-tools iproute2 python py-ipaddr bash" +depends="json-c c-ares ipsec-tools iproute2 python3 py-ipaddr bash" makedepends="ncurses-dev net-snmp-dev gawk texinfo perl acct autoconf automake bash binutils bison bsd-compat-headers build-base c-ares c-ares-dev ca-certificates cryptsetup-libs curl device-mapper-libs @@ -16,9 +16,9 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl libltdl libressl libssh2 libstdc++ libtool libuuid libyang-dev linux-headers lzip lzo m4 make mkinitfs mpc1 mpfr4 mtools musl-dev ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre - perl pkgconf python2 python2-dev readline readline-dev sqlite-libs - squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib - rtrlib-dev" + perl pkgconf python3 python3-dev readline readline-dev sqlite-libs + squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev + py3-sphinx" checkdepends="pytest py-setuptools" install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" @@ -35,11 +35,6 @@ _user=frr build() { cd "$builddir" - _localpythondir=$PWD/.python - pip2 install --prefix $_localpythondir sphinx - export PATH=${_localpythondir}/bin:$PATH - export PYTHONPATH=${_localpythondir}/lib/python2.7/site-packages - ./configure \ --prefix=/usr \ --sbindir=$_sbindir \ |