diff options
| author | Juergen Werner <juergen@opensourcerouting.org> | 2019-12-03 21:24:02 +0100 |
|---|---|---|
| committer | Juergen Werner <juergen@opensourcerouting.org> | 2019-12-03 21:36:30 +0100 |
| commit | c3a61f38038327bbceaebcb01f653bba3e73b3b8 (patch) | |
| tree | a70c96dc97c70f00ff0161630c3129ac64e4087f | |
| parent | e25ca4514f851658347ec8f91da4ac15fefe1595 (diff) | |
alpine: fix build on current 'edge' version of Alpine
The python2 packet py-sphinx was removed from the edge repository, so we
use pip to install it localy for the package build process.
Also abuild assumes it is executed in a git folder and fails if no .git
is found in the folder or its parent folders, so we work around this, by
initializing an empty git repo with `git init`.
Signed-off-by: Juergen Werner <juergen@opensourcerouting.org>
| -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 |