From 79dc6e747288aa2e18fa6819f8de3aa347a63c38 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 19 Apr 2021 13:55:24 +0200 Subject: [PATCH] Update Travis, Alpine, and Void build options - Fallback shell has been removed - Built-in watchdog has been renamed Signed-off-by: Joachim Wiberg --- .travis.yml | 4 ++-- contrib/alpine/build.sh | 2 +- contrib/void/build.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3cebe3b0..742e1497 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ addons: name: "troglobit/finit" description: "finit | Fast & Extensible init for Linux" notification_email: troglobit@gmail.com - build_command_prepend: "./autogen.sh && ./configure --prefix= --disable-doc --disable-contrib --enable-watchdog --enable-fallback-shell" + build_command_prepend: "./autogen.sh && ./configure --prefix= --disable-doc --disable-contrib --with-watchdog" build_command: "make" branch_pattern: dev @@ -45,7 +45,7 @@ script: - ./configure --prefix= --enable-static - make clean - make V=1 -j5 - - ./configure --prefix= --enable-x11-common-plugin --enable-fallback-shell --enable-watchdog + - ./configure --prefix= --enable-x11-common-plugin --with-watchdog - cat config.log - make clean - make V=1 -j5 diff --git a/contrib/alpine/build.sh b/contrib/alpine/build.sh index 66974b91..c9cdceb3 100755 --- a/contrib/alpine/build.sh +++ b/contrib/alpine/build.sh @@ -17,7 +17,7 @@ PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure \ --prefix=/usr --exec-prefix= \ --sysconfdir=/etc --localstatedir=/var \ --enable-dbus-plugin --enable-x11-common-plugin \ - --enable-alsa-utils-plugin --enable-watchdog \ + --enable-alsa-utils-plugin --with-watchdog \ --with-heading="Alpine Linux 3.13" echo diff --git a/contrib/void/build.sh b/contrib/void/build.sh index 6b8cb7e8..3d78fadd 100755 --- a/contrib/void/build.sh +++ b/contrib/void/build.sh @@ -17,7 +17,7 @@ PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure \ --prefix=/usr --exec-prefix= \ --sysconfdir=/etc --localstatedir=/var \ --enable-dbus-plugin --enable-x11-common-plugin \ - --enable-alsa-utils-plugin --enable-watchdog \ + --enable-alsa-utils-plugin --with-watchdog \ --with-heading="Void Linux" echo