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

Remove internal postprocessing support

Browse Source 
It was too hacky.  If we do this it should be a higher level language
like what Lorax has.
This commit is contained in:
Colin Walters 2014-05-14 13:59:07 -04:00
parent a231114ad5
commit 18b2121c91
6 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile-rpm-ostree.am
View File

@ -48,11 +48,3 @@ rpm_ostree_LDADD = $(AM_LDFLAGS) $(PKGDEP_RPMOSTREE_LIBS) librpmostree.la
privdatadir=$(pkglibdir)
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))

4
src/postprocessing/remove-docs
View File

@ -1,4 +0,0 @@
#!/bin/sh
set -e
rm -rf ./usr/share/doc ./usr/share/man

4
src/postprocessing/remove-gpu-drivers
View File

@ -1,4 +0,0 @@
#!/bin/sh
set -e
rm -rf ./usr/lib/modules/*/kernel/drivers/gpu/drm/{nouveau,i915,radeon}

4
src/postprocessing/remove-locales
View File

@ -1,4 +0,0 @@
#!/bin/sh
set -e
rm -rf ./usr/lib/locale ./usr/share/locale

5
src/postprocessing/remove-root-password
View File

@ -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,}

31
src/rpmostree-builtin-treecompose.c
View File

@ -642,7 +642,6 @@ rpmostree_builtin_treecompose (int argc,
const char *ref;
JsonNode *treefile_rootval = NULL;
JsonObject *treefile = NULL;
JsonArray *internal_postprocessing = NULL;
JsonArray *units = NULL;
guint len;
gs_free char *ref_unix = NULL;
@ -813,36 +812,6 @@ rpmostree_builtin_treecompose (int argc,
if (!rpmostree_postprocess (yumroot, cancellable, error))
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"))
units = json_object_get_array_member (treefile, "units");