From 449066f39538dd2b522280e7d3936dad60ec63e5 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 19 Jan 2019 23:17:10 +0000 Subject: [PATCH 1/7] update_chroot: Drop old workarounds for package renames --- update_chroot | 3 --- 1 file changed, 3 deletions(-) diff --git a/update_chroot b/update_chroot index 293d6bfef7..870d599ef6 100755 --- a/update_chroot +++ b/update_chroot @@ -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" From 7b7c78b5929b78f40dcb53f6f5dca6f4db7c84e6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 21 Jan 2019 21:09:41 +0000 Subject: [PATCH 2/7] build_library: Drop old workarounds for toolchain binpkgs --- build_library/toolchain_util.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 26cf2a6bd5..2b3969af8c 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -190,9 +190,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 ### From 7d99b4dbddf9d4bd0ae9777e41d0fac82067c6f6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 25 Jan 2019 18:12:55 +0000 Subject: [PATCH 3/7] catalyst: Temporarily disable update_seed again The Perl update will break SDK bootstrapping during seed update, so disable it again. This can be reverted after bumping the SDK to a version that includes the new Perl. --- build_library/catalyst.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 6b3f571966..5df356559e 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -120,7 +120,7 @@ cat < Date: Fri, 25 Jan 2019 21:52:27 +0000 Subject: [PATCH 4/7] check_root: Silence libperl warnings --- build_library/check_root | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_library/check_root b/build_library/check_root index b4d7615706..a0d8359028 100755 --- a/build_library/check_root +++ b/build_library/check_root @@ -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"), From cea88d9c52d5a96c76ab9f14fd6b2ddc98cc8230 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 28 Jan 2019 15:58:47 +0000 Subject: [PATCH 5/7] Revert "catalyst: Temporarily disable update_seed again" This reverts commit 7d99b4dbddf9d4bd0ae9777e41d0fac82067c6f6. --- build_library/catalyst.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 5df356559e..6b3f571966 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -120,7 +120,7 @@ cat < Date: Sun, 10 Feb 2019 02:44:01 +0000 Subject: [PATCH 6/7] disk_util: Add -I for mkfs.vfat When loop device partition nodes aren't cleaned up, building images will fail with: mkfs.vfat: Partitions or virtual mappings on device '/dev/loop0', not making filesystem (use -I to override) Just add the flag unconditionally to work around it. --- build_library/disk_util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/disk_util b/build_library/disk_util index 9c400c1cab..0e79976860 100755 --- a/build_library/disk_util +++ b/build_library/disk_util @@ -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': From 3254c63690fafdb6636fd63c200c6e3ba480d01f Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Mar 2019 16:29:48 +0000 Subject: [PATCH 7/7] build_library: Drop whitelisted systemd GLSA This no longer matches since upgrading to 241. --- build_library/test_image_content.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh index d22ab677c6..1071465c04 100644 --- a/build_library/test_image_content.sh +++ b/build_library/test_image_content.sh @@ -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() {