scripts: Support overriding lua, use for glibc-all-langpacks

Today in Fedora the `glibc-all-langpacks.posttrans` is implemented
in lua, for no good reason.  See:
https://bugzilla.redhat.com/show_bug.cgi?id=1367585

Since that's stalled out, let's add support for overrides.  This
is obviously a much bigger step with more long term maintenance
implications over our current "ignore scripts" list.  But we can't
block either.

This is needed for unified core work:
https://github.com/projectatomic/rpm-ostree/issues/729

(We also override `fedora-release-atomichost` but I'll likely
 submit a patch for that upstream)

Closes: #980
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-08-29 20:15:28 -04:00 committed by Atomic Bot
parent e40eaebbe0
commit 150de0087e
2 changed files with 86 additions and 11 deletions

View File

@ -48,6 +48,9 @@ typedef struct {
rpmTagVal flagtag; rpmTagVal flagtag;
} KnownRpmScriptKind; } KnownRpmScriptKind;
/* The RPM interpreter for built-in lua */
static const char lua_builtin[] = "<lua>";
#if 0 #if 0
static const KnownRpmScriptKind ignored_scripts[] = { static const KnownRpmScriptKind ignored_scripts[] = {
/* Ignore all of the *un variants since we never uninstall /* Ignore all of the *un variants since we never uninstall
@ -89,13 +92,46 @@ static const KnownRpmScriptKind unsupported_scripts[] = {
RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG, RPMTAG_VERIFYSCRIPTFLAGS}, RPMTAG_VERIFYSCRIPT, RPMTAG_VERIFYSCRIPTPROG, RPMTAG_VERIFYSCRIPTFLAGS},
}; };
typedef struct {
const char *pkgname_script;
const char *interp;
const char *replacement;
} RpmOstreeLuaReplacement;
static const RpmOstreeLuaReplacement lua_replacements[] = {
/* No bug yet */
{ "fedora-release-atomichost.post",
"/usr/bin/sh",
"set -euo pipefail\n"
"ln -s os.release.d/os-release-atomichost /usr/lib/os-release\n"
},
/* https://bugzilla.redhat.com/show_bug.cgi?id=1367585 */
{ "glibc-all-langpacks.posttrans",
"/usr/bin/sh",
"set -euo pipefail\n"
"if test -s \"/usr/lib/locale/locale-archive.tmpl\"; then\n"
" exec /usr/sbin/build-locale-archive --install-langs \"%{_install_langs}\"\n"
"fi\n"
},
/* Just for the tests */
{ "rpmostree-lua-override-test.post",
"/usr/bin/sh",
"set -euo pipefail\n"
"echo %{_install_langs} >/usr/share/rpmostree-lua-override-test\n"
},
{ "rpmostree-lua-override-test-expand.post",
"/usr/bin/sh",
"set -euo pipefail\n"
"echo %{_install_langs} >/usr/share/rpmostree-lua-override-test-expand\n"
},
};
static gboolean static gboolean
fail_if_interp_is_lua (const char *interp, fail_if_interp_is_lua (const char *interp,
const char *pkg_name, const char *pkg_name,
const char *script_desc, const char *script_desc,
GError **error) GError **error)
{ {
static const char lua_builtin[] = "<lua>";
if (g_strcmp0 (interp, lua_builtin) == 0) if (g_strcmp0 (interp, lua_builtin) == 0)
return glnx_throw (error, "Package '%s' has (currently) unsupported %s script in '%s'", return glnx_throw (error, "Package '%s' has (currently) unsupported %s script in '%s'",
pkg_name, lua_builtin, script_desc); pkg_name, lua_builtin, script_desc);
@ -258,22 +294,45 @@ impl_run_rpm_script (const KnownRpmScriptKind *rpmscript,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
g_autofree char *script_owned = NULL;
const char *script = headerGetString (hdr, rpmscript->tag);
g_assert (script);
const rpmFlags flags = headerGetNumber (hdr, rpmscript->flagtag);
if (flags & RPMSCRIPT_FLAG_EXPAND)
script = script_owned = rpmExpand (script, NULL);
struct rpmtd_s td; struct rpmtd_s td;
g_autofree char **args = NULL; g_autofree char **args = NULL;
if (headerGet (hdr, rpmscript->progtag, &td, (HEADERGET_ALLOC|HEADERGET_ARGV))) if (headerGet (hdr, rpmscript->progtag, &td, (HEADERGET_ALLOC|HEADERGET_ARGV)))
args = td.data; args = td.data;
const char *script;
const char *interp = (args && args[0]) ? args[0] : "/bin/sh"; const char *interp = (args && args[0]) ? args[0] : "/bin/sh";
/* Check for lua; see also https://github.com/projectatomic/rpm-ostree/issues/749 */ if (g_str_equal (interp, lua_builtin))
if (!fail_if_interp_is_lua (interp, dnf_package_get_name (pkg), rpmscript->desc, error)) {
/* This is a lua script; look for a built-in override/replacement */
const char *pkg_scriptid = glnx_strjoina (dnf_package_get_name (pkg), ".", rpmscript->desc + 1);
gboolean found_replacement = FALSE;
for (guint i = 0; i < G_N_ELEMENTS (lua_replacements); i++)
{
const RpmOstreeLuaReplacement *repl = &lua_replacements[i];
if (!g_str_equal (repl->pkgname_script, pkg_scriptid))
continue;
found_replacement = TRUE;
interp = repl->interp;
script = repl->replacement;
break;
}
if (!found_replacement)
{
/* No override found, throw an error and return */
g_assert (!fail_if_interp_is_lua (interp, dnf_package_get_name (pkg), rpmscript->desc, error));
return FALSE; return FALSE;
}
}
else
{
script = headerGetString (hdr, rpmscript->tag);
}
g_autofree char *script_owned = NULL;
g_assert (script);
const rpmFlags flags = headerGetNumber (hdr, rpmscript->flagtag);
if (flags & RPMSCRIPT_FLAG_EXPAND)
script = script_owned = rpmExpand (script, NULL);
/* http://ftp.rpm.org/max-rpm/s1-rpm-inside-scripts.html#S2-RPM-INSIDE-ERASE-TIME-SCRIPTS */ /* http://ftp.rpm.org/max-rpm/s1-rpm-inside-scripts.html#S2-RPM-INSIDE-ERASE-TIME-SCRIPTS */
const char *script_arg = NULL; const char *script_arg = NULL;
switch (dnf_package_get_action (pkg)) switch (dnf_package_get_action (pkg))

View File

@ -103,6 +103,22 @@ vm_cmd cat /usr/lib/prefixtest.txt > prefixtest.txt
assert_file_has_content prefixtest.txt "/usr" assert_file_has_content prefixtest.txt "/usr"
echo "ok script expansion" echo "ok script expansion"
# script overrides (also one that expands)
vm_build_rpm rpmostree-lua-override-test \
post_args "-p <lua>" \
post 'posix.stat("/")'
vm_build_rpm rpmostree-lua-override-test-expand \
post_args "-e -p <lua>" \
post 'posix.stat("/")'
vm_rpmostree install rpmostree-lua-override-test{,-expand}
vm_rpmostree ex livefs
vm_cmd cat /usr/share/rpmostree-lua-override-test > lua-override.txt
assert_file_has_content lua-override.txt _install_langs
vm_cmd rpm --eval '%{_install_langs}' > install-langs.txt
vm_cmd cat /usr/share/rpmostree-lua-override-test-expand > lua-override-expand.txt
diff -u install-langs.txt lua-override-expand.txt
echo "ok script override"
vm_rpmostree rollback vm_rpmostree rollback
vm_reboot vm_reboot
vm_rpmostree cleanup -p vm_rpmostree cleanup -p