Remove internal postprocessing support
It was too hacky. If we do this it should be a higher level language like what Lorax has.
This commit is contained in:
parent
a231114ad5
commit
18b2121c91
@ -48,11 +48,3 @@ rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) librpmostree.la
|
|||||||
|
|
||||||
privdatadir=$(pkglibdir)
|
privdatadir=$(pkglibdir)
|
||||||
privdata_DATA = src/tmpfiles-ostree-integration.conf
|
privdata_DATA = src/tmpfiles-ostree-integration.conf
|
||||||
|
|
||||||
internal_postscriptdir = $(pkglibdir)/postprocessing/
|
|
||||||
internal_postscript_SCRIPTS = $(addprefix src/postprocessing/, \
|
|
||||||
remove-docs \
|
|
||||||
remove-gpu-drivers \
|
|
||||||
remove-locales \
|
|
||||||
remove-root-password \
|
|
||||||
$(NULL))
|
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
rm -rf ./usr/share/doc ./usr/share/man
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
rm -rf ./usr/lib/modules/*/kernel/drivers/gpu/drm/{nouveau,i915,radeon}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
rm -rf ./usr/lib/locale ./usr/share/locale
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
sed -e 's,root:\*:,root::,' < ./usr/etc/shadow > ./usr/etc/shadow.new
|
|
||||||
mv ./usr/etc/shadow{.new,}
|
|
||||||
|
|
@ -642,7 +642,6 @@ rpmostree_builtin_treecompose (int argc,
|
|||||||
const char *ref;
|
const char *ref;
|
||||||
JsonNode *treefile_rootval = NULL;
|
JsonNode *treefile_rootval = NULL;
|
||||||
JsonObject *treefile = NULL;
|
JsonObject *treefile = NULL;
|
||||||
JsonArray *internal_postprocessing = NULL;
|
|
||||||
JsonArray *units = NULL;
|
JsonArray *units = NULL;
|
||||||
guint len;
|
guint len;
|
||||||
gs_free char *ref_unix = NULL;
|
gs_free char *ref_unix = NULL;
|
||||||
@ -813,36 +812,6 @@ rpmostree_builtin_treecompose (int argc,
|
|||||||
if (!rpmostree_postprocess (yumroot, cancellable, error))
|
if (!rpmostree_postprocess (yumroot, cancellable, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (json_object_has_member (treefile, "postprocess"))
|
|
||||||
internal_postprocessing = json_object_get_array_member (treefile, "postprocess");
|
|
||||||
|
|
||||||
if (internal_postprocessing)
|
|
||||||
len = json_array_get_length (internal_postprocessing);
|
|
||||||
else
|
|
||||||
len = 0;
|
|
||||||
|
|
||||||
for (i = 0; i < len; i++)
|
|
||||||
{
|
|
||||||
gs_unref_object GFile *pkglibdir = g_file_new_for_path (PKGLIBDIR);
|
|
||||||
gs_unref_object GFile *pkglibdir_posts = g_file_get_child (pkglibdir, "postprocessing");
|
|
||||||
gs_unref_object GFile *post_path = NULL;
|
|
||||||
const char *post_name = array_require_string_element (internal_postprocessing, i, error);
|
|
||||||
|
|
||||||
if (!post_name)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
post_path = g_file_get_child (pkglibdir_posts, post_name);
|
|
||||||
|
|
||||||
g_print ("Running internal postprocessing command '%s'\n",
|
|
||||||
gs_file_get_path_cached (post_path));
|
|
||||||
if (!gs_subprocess_simple_run_sync (gs_file_get_path_cached (yumroot),
|
|
||||||
GS_SUBPROCESS_STREAM_DISPOSITION_NULL,
|
|
||||||
cancellable, error,
|
|
||||||
gs_file_get_path_cached (post_path),
|
|
||||||
NULL))
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (json_object_has_member (treefile, "units"))
|
if (json_object_has_member (treefile, "units"))
|
||||||
units = json_object_get_array_member (treefile, "units");
|
units = json_object_get_array_member (treefile, "units");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user