keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-sys: Remove --with-bubblewrap

Browse Source 
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`.
This commit is contained in:
Colin Walters 2020-12-22 20:31:26 +00:00 committed by OpenShift Merge Robot
parent de749fb2a5
commit 70e7cd9bbb
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -164,12 +164,6 @@ GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) 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, AC_ARG_ENABLE(sqlite_rpmdb_default,
AS_HELP_STRING([--enable-sqlite-rpmdb-default], AS_HELP_STRING([--enable-sqlite-rpmdb-default],
[Default to sqlite rpmdb backend (default: no)]),, [Default to sqlite rpmdb backend (default: no)]),,
@ -286,7 +280,6 @@ echo "
introspection: $found_introspection introspection: $found_introspection
rojig: ${enable_rojig:-no} rojig: ${enable_rojig:-no}
bubblewrap: $with_bubblewrap
gtk-doc: $enable_gtk_doc gtk-doc: $enable_gtk_doc
rust: $rust_debug_release rust: $rust_debug_release
cbindgen: ${cbindgen:-internal} cbindgen: ${cbindgen:-internal}

2
src/libpriv/rpmostree-bwrap.cxx
View File

@ -282,7 +282,7 @@ rpmostree_bwrap_new_base (int rootfs_fd, GError **error)
/* ⚠⚠⚠ If you change this, also update scripts/bwrap-script-shell.sh ⚠⚠⚠ */ /* ⚠⚠⚠ If you change this, also update scripts/bwrap-script-shell.sh ⚠⚠⚠ */
rpmostree_bwrap_append_bwrap_argv (ret, rpmostree_bwrap_append_bwrap_argv (ret,
WITH_BUBBLEWRAP_PATH, "bwrap",
"--dev", "/dev", "--dev", "/dev",
"--proc", "/proc", "--proc", "/proc",
"--dir", "/run", "--dir", "/run",