diff options
| author | Allen Bai <abai@redhat.com> | 2019-05-28 14:02:54 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-06-18 14:29:14 +0000 |
| commit | be2572bf68090a5e277338d2613d3c7d53b0c9e8 (patch) | |
| tree | 6e304051c55177fdf49d502f5865feeb777ed139 /Makefile-libostree.am | |
| parent | 2db79fb398fba2f9ab2e05c517ebccfe1834674b (diff) | |
| download | ostree-be2572bf68090a5e277338d2613d3c7d53b0c9e8.tar.gz | |
lib/kargs: Make API public and upstream new rpm-ostree APIs
This change makes public the current kargs API in src/libostree/ostree-kernel-args.c
and adds documentations.
Upstreams the new kargs API from rpm-ostree/src/libpriv/rpmostree-kargs-process.c
Merges libostree_kernel_args_la_SOURCES to libostree_1_la_SOURCES in Makefile-libostree.am
Upstreams tests/check/test-kargs.c from rpm-ostree.
Closes: #1833
Closes: #1869
Approved by: jlebon
Diffstat (limited to 'Makefile-libostree.am')
| -rw-r--r-- | Makefile-libostree.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index dbc9ebb8..0ea54cf8 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -21,8 +21,6 @@ include Makefile-libostree-defines.am -noinst_LTLIBRARIES += libostree-kernel-args.la - if ENABLE_RUST bupsplitpath = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/libbupsplit_rs.a @@ -36,13 +34,6 @@ noinst_LTLIBRARIES += libbupsplit.la libbupsplit_la_SOURCES = src/libostree/bupsplit.h src/libostree/bupsplit.c endif # ENABLE_RUST -libostree_kernel_args_la_SOURCES = \ - src/libostree/ostree-kernel-args.h \ - src/libostree/ostree-kernel-args.c \ - $(NULL) -libostree_kernel_args_la_CFLAGS = -I$(srcdir)/libglnx $(OT_INTERNAL_GIO_UNIX_CFLAGS) -libostree_kernel_args_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) - lib_LTLIBRARIES += libostree-1.la libostreeincludedir = $(includedir)/ostree-1 @@ -147,6 +138,8 @@ libostree_1_la_SOURCES = \ src/libostree/ostree-repo-finder-config.c \ src/libostree/ostree-repo-finder-mount.c \ src/libostree/ostree-repo-finder-override.c \ + src/libostree/ostree-kernel-args.h \ + src/libostree/ostree-kernel-args.c \ $(NULL) if USE_LIBARCHIVE libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \ @@ -191,7 +184,7 @@ libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff -I$(srcdir)/libglnx -I$( $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) $(OT_DEP_CRYPTO_CFLAGS) \ -fvisibility=hidden '-D_OSTREE_PUBLIC=__attribute__((visibility("default"))) extern' libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions $(addprefix $(wl_versionscript_arg),$(symbol_files)) -libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \ +libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \ $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_CRYPTO_LIBS) # Some change between rust-1.21.0-1.fc27 and rust-1.22.1-1.fc27.x86_64 if ENABLE_RUST |