From 70e7cd9bbb3f3bcc158fb4cfd058299f820c48af Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 22 Dec 2020 20:31:26 +0000 Subject: [PATCH] build-sys: Remove --with-bubblewrap This was only needed for RHEL7; RHEL8 and above ships bwrap with the OS. Drop this as part of thinning out our Autotools build system in preparation for moving to `build.rs`. --- configure.ac | 7 ------- src/libpriv/rpmostree-bwrap.cxx | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 541703d9..6df4e042 100644 --- a/configure.ac +++ b/configure.ac @@ -164,12 +164,6 @@ GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ]) -AC_ARG_WITH(bubblewrap, - AS_HELP_STRING([--with-bubblewrap], - [Path to bubblewrap binary (default: /usr/bin/bwrap)]),, - [with_bubblewrap=/usr/bin/bwrap]) -AC_DEFINE_UNQUOTED(WITH_BUBBLEWRAP_PATH, ["$with_bubblewrap"], [Define to bubblewrap path]) - AC_ARG_ENABLE(sqlite_rpmdb_default, AS_HELP_STRING([--enable-sqlite-rpmdb-default], [Default to sqlite rpmdb backend (default: no)]),, @@ -286,7 +280,6 @@ echo " introspection: $found_introspection rojig: ${enable_rojig:-no} - bubblewrap: $with_bubblewrap gtk-doc: $enable_gtk_doc rust: $rust_debug_release cbindgen: ${cbindgen:-internal} diff --git a/src/libpriv/rpmostree-bwrap.cxx b/src/libpriv/rpmostree-bwrap.cxx index 00bca835..be5fcf80 100644 --- a/src/libpriv/rpmostree-bwrap.cxx +++ b/src/libpriv/rpmostree-bwrap.cxx @@ -282,7 +282,7 @@ rpmostree_bwrap_new_base (int rootfs_fd, GError **error) /* ⚠⚠⚠ If you change this, also update scripts/bwrap-script-shell.sh ⚠⚠⚠ */ rpmostree_bwrap_append_bwrap_argv (ret, - WITH_BUBBLEWRAP_PATH, + "bwrap", "--dev", "/dev", "--proc", "/proc", "--dir", "/run",