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

Port rpmostree-builtin-compose to C++

Browse Source 
Prep for using https://cxx.rs/
This commit is contained in:
Colin Walters 2020-12-21 16:08:51 +00:00 committed by OpenShift Merge Robot
parent 642c8b1453
commit d8263d2c38
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -59,7 +59,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
src/app/rpmostree-compose-builtin-tree.cxx \
src/app/rpmostree-composeutil.cxx \
src/app/rpmostree-composeutil.h \
src/app/rpmostree-builtin-compose.c \
src/app/rpmostree-builtin-compose.cxx \
$(librpmostreed_sources) \
$(librpmostreepriv_sources) \
$(NULL)

10
src/app/rpmostree-builtin-compose.c → src/app/rpmostree-builtin-compose.cxx
View File

@ -32,21 +32,21 @@ static RpmOstreeCommand compose_subcommands[] = {
{ "tree", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Process a \"treefile\"; install packages and commit the result to an OSTree repository",
rpmostree_compose_builtin_tree },
{ "install", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
{ "install", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT),
"Install packages into a target path",
rpmostree_compose_builtin_install },
{ "postprocess", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
{ "postprocess", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT),
"Perform final postprocessing on an installation root",
rpmostree_compose_builtin_postprocess },
{ "commit", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT,
{ "commit", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_REQUIRES_ROOT),
"Commit a target path to an OSTree repository",
rpmostree_compose_builtin_commit },
#ifdef BUILDOPT_ROJIG
{ "rojig", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_HIDDEN,
{ "rojig", (RpmOstreeBuiltinFlags)(RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD | RPM_OSTREE_BUILTIN_FLAG_HIDDEN),
"EXPERIMENTAL: Build a rojig RPM from a treefile, output to a local rpm-md repo",
rpmostree_compose_builtin_rojig },
#endif
{ NULL, 0, NULL, NULL }
{ NULL, (RpmOstreeBuiltinFlags)0, NULL, NULL }
};
gboolean