Merge pull request #11 from flatcar-linux/dongsu/merge-fl-to-edge-20190417

merge flatcar-master to flatcar-master-edge 20190417
This commit is contained in:
Dongsu Park 2019-04-17 15:43:47 +02:00 committed by GitHub
commit 28a4ea8de7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 9 deletions

View File

@ -29,7 +29,8 @@ IGNORE_MISSING = {
SonameAtom("x86_64", "libc.so.6")],
# RPATHs and symlinks apparently confuse the perl-5.24 package
"dev-lang/perl": [SonameAtom("x86_64", "libperl.so.5.24.1")],
"dev-lang/perl": [SonameAtom("x86_64", "libperl.so.5.26.2")],
"sys-apps/texinfo": [SonameAtom("x86_64", "libperl.so.5.26")],
# https://bugs.gentoo.org/show_bug.cgi?id=554582
"net-firewall/ebtables": [SonameAtom("x86_64", "libebt_802_3.so"),

View File

@ -420,7 +420,7 @@ def FormatFat(part, device):
vfat_block_size = 1024
vfat_blocks = part['bytes'] // vfat_block_size
cmd = ['mkfs.vfat']
cmd = ['mkfs.vfat', '-I']
if 'fs_label' in part:
cmd += ['-n', part['fs_label']]
if part['type'] == 'efi':

View File

@ -4,7 +4,6 @@
GLSA_WHITELIST=(
201412-09 # incompatible CA certificate version numbers
201810-10 # we fixed the systemd CVEs in 238, but this wants 239
)
glsa_image() {

View File

@ -189,9 +189,7 @@ get_cross_pkgs() {
# Get portage arguments restricting toolchains to binary packages only.
get_binonly_args() {
local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
# XXX: Drop this exception after stable > 1925.
local tmppkgs=( ${pkgs[*]##*/glibc} ) ; tmppkgs=( ${tmppkgs[*]##*/binutils} )
echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
}
### Toolchain building utilities ###

View File

@ -233,9 +233,6 @@ if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
done
fi
# XXX: Work around a rename; delete this after SDKs contain the new package.
sudo -E ${EMERGE_CMD} --rage-clean app-crypt/sbsigntool dev-util/cargo 2>/dev/null || :
# Second pass, update everything else.
EMERGE_FLAGS+=( --deep )
info "Updating all SDK packages"