diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-01-05 22:10:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-05 22:10:34 +0200 |
| commit | 8728ae46c84d24b07c8598e84edcbcfbad28b807 (patch) | |
| tree | dcaa858047a80f14ed3ed7e7f04b96fc87a94fa2 | |
| parent | 00a93d03a40413ece3b59f54a0d5e37505156da6 (diff) | |
| parent | c3a61f38038327bbceaebcb01f653bba3e73b3b8 (diff) | |
Merge pull request #5467 from pogojotz/alpine-linux-build
alpine: fix build on current 'edge' version of Alpine
| -rw-r--r-- | alpine/APKBUILD.in | 8 | ||||
| -rw-r--r-- | docker/alpine/Dockerfile | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 1c579a8e72..f740a34583 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -17,7 +17,7 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl 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 py-sphinx rtrlib + squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev" checkdepends="pytest py-setuptools" install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall" @@ -34,6 +34,12 @@ _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 \ diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 88c8f88f81..ed6453e2b1 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -42,6 +42,7 @@ USER builder RUN cd /dist \ && abuild-keygen -a -n \ && abuild checksum \ + && git init \ && abuild -r -P /pkgs/apk # This stage installs frr from the apk |