]> git.puffer.fish Git - matthieu/frr.git/commitdiff
docker: Fix post function for Alpine build (package)
authorDonatas Abraitis <donatas@opensourcerouting.org>
Thu, 29 Feb 2024 12:43:57 +0000 (14:43 +0200)
committerton31337 <3352707+ton31337@users.noreply.github.com>
Tue, 12 Mar 2024 20:34:30 +0000 (20:34 +0000)
It was using a wrong sysdir.

```
--------------------
  72 |     # Own the config / PID files
  73 |     RUN mkdir -p /var/run/frr
  74 | >>> RUN chown -R frr:frr /etc/frr /var/run/frr
  75 |
  76 |     # Simple init manager for reaping processes and forwarding signals
--------------------
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit b0b0d7ab08960ed7b43b4d1dabeaf377fad40942)

alpine/APKBUILD.in

index 98d3e51452f4573bf630229bc5c8e18deeb04cb4..2cb3feec157f2ec7e2c0502b01a98e2ed8d02f93 100644 (file)
@@ -27,6 +27,7 @@ source="$pkgname-$pkgver.tar.gz"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+_sysconfdir=/etc
 _sbindir=/usr/lib/frr
 _libdir=/usr/lib
 _user=frr
@@ -36,7 +37,7 @@ build() {
 
        ./configure \
                --prefix=/usr \
-               --sysconfdir=/etc \
+               --sysconfdir=$_sysconfdir \
                --localstatedir=/var \
                --sbindir=$_sbindir \
                --libdir=$_libdir \
@@ -61,7 +62,9 @@ package() {
        cd "$builddir"
        make DESTDIR="$pkgdir" install
 
-       install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons
-       install -d "$pkgdir"/etc/init.d
-       ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr
+       install -d $pkgdir/$_sysconfdir/frr
+       install -m 0644 tools/etc/frr/daemons $pkgdir/$_sysconfdir/frr/daemons
+
+       install -d $pkgdir/$_sysconfdir/init.d
+       ln -s ${_sbindir}/frr $pkgdir/$_sysconfdir/init.d/frr
 }