scripts: Ignore new glibc lua %post

Tried a `--unified-core` build of Silverblue and it blew up on this.
Just copy-pasting the comment in the code:

34927af202

From a read of that script, none of it is necessary for rpm-ostree.  It's about working around
bugs from a traditional RPM in-place update, but rpm-ostree always starts from a clean
filesystem checkout.

Closes: #1869
Approved by: jlebon
This commit is contained in:
Colin Walters 2019-07-13 17:22:04 +00:00 committed by Atomic Bot
parent 4439567316
commit 3ea364ee61
2 changed files with 12 additions and 0 deletions

View File

@ -73,6 +73,7 @@ librpmostreepriv_la_CFLAGS = \
-I$(srcdir)/src/lib \
-I$(srcdir)/src/libpriv \
-I$(libglnx_srcpath) \
-DLIBDIR=\"$(libdir)\" \
-DPKGLIBDIR=\"$(pkglibdir)\" \
-fvisibility=hidden \
$(PKGDEP_RPMOSTREE_CFLAGS) \

View File

@ -159,6 +159,17 @@ static const RpmOstreeLuaReplacement lua_replacements[] = {
"/usr/bin/sh",
glibc_langpacks_script
},
/* See https://src.fedoraproject.org/rpms/glibc/pull-request/12
* Code originally introduced in https://src.fedoraproject.org/rpms/glibc/c/34927af202deb7d97dbb211a3cb13b1c53b496d3?branch=master
* Most of that script is about working around bugs from a traditional RPM in-place update,
* but rpm-ostree always starts from a clean filesystem checkout. We just need step (4)
* which is updating the iconv cache.
*/
{ "glibc.post",
"/usr/bin/bash",
"libdir=" LIBDIR "\n"
"exec iconvconfig -o ${libdir}/gconv/gconv-modules.cache --nostdlib ${libdir}/gconv"
},
/* Just for the tests */
{ "rpmostree-lua-override-test.post",
"/usr/bin/sh",