mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 01:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1548 from flatcar-linux/krnowak/update-profiles

Browse Source 
Drop obsolete stuff after updating profiles
This commit is contained in:
Krzesimir Nowak 2022-01-14 14:38:23 +01:00 committed by GitHub
commit d98a0ac0ca
9 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask vendored
View File

@ -14,3 +14,10 @@
# Since version 2, it tries to write liblto symlinks with absolute paths that
# don't work when building for the board root directories.
>=sys-devel/gcc-config-2
# Overwrite portage-stable mask. We are delaying the transition to
# libxcrypt, because we need to figure out how to solve the dep loop
# that results from the migration (python -> virtual/libcrypt ->
# libxcrypt -> glibc -> python), and also we need to update gcc to
# version 10 or later.
>=virtual/libcrypt-2

7
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask vendored
View File

@ -5,3 +5,10 @@
# gentoo. We still need it, since sys-libs/libsemanage still requires
# it. When we update selinux, this can be dropped.
=dev-libs/ustr-1.0.4-r8
# Overwrite portage-stable mask. We are delaying the transition to
# libxcrypt, because we need to figure out how to solve the dep loop
# that results from the migration (python -> virtual/libcrypt ->
# libxcrypt -> glibc -> python), and also we need to update gcc to
# version 10 or later.
=virtual/libcrypt-1-r1

7
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask vendored
View File

@ -19,3 +19,10 @@ sys-libs/ncurses cxx
# To fix that, exclude the unicode USE flag from packages.use.force list,
# which is defined in portage-stable.
app-editors/nano unicode
# Overwrite portage-stable mask. We are delaying the transition to
# libxcrypt, because we need to figure out how to solve the dep loop
# that results from the migration (python -> virtual/libcrypt ->
# libxcrypt -> glibc -> python), and also we need to update gcc to
# version 10 or later.
sys-libs/glibc -crypt

1
sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords vendored
View File

@ -1,3 +1,2 @@
# Various dependencies that also need to be up-to-date
sys-apps/hwids ~amd64 ~x86
sys-apps/kmod ~amd64 ~x86

1
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-3.0.28-r1.ebuild vendored
View File

@ -61,7 +61,6 @@ RDEPEND="
)
elibc_glibc? ( >=sys-apps/sandbox-2.2 )
elibc_musl? ( >=sys-apps/sandbox-2.2 )
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
kernel_linux? ( sys-apps/util-linux )
>=app-misc/pax-utils-0.1.17
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

11
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
# Flatcar: Dropped static-libs, we don't care about static libraries.
IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
REQUIRED_USE="
homed? ( cryptsetup pam )
@ -115,6 +115,7 @@ RDEPEND="${COMMON_DEPEND}
sys-process/procps[kill(+)]
sys-apps/coreutils[kill(-)]
) )
!sys-apps/hwids[udev]
!sys-auth/nss-myhostname
!sys-fs/eudev
!sys-fs/udev
@ -124,7 +125,6 @@ RDEPEND="${COMMON_DEPEND}
#
# Flatcar: We don't have sys-fs/udev-init-scripts-34, so it's dropped.
PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
hwdb? ( sys-apps/hwids[systemd(+),udev] )
policykit? ( sys-auth/polkit )
!vanilla? ( sys-apps/gentoo-systemd-integration )"
@ -282,7 +282,6 @@ multilib_src_configure() {
-Defi-ld="$(tc-getLD)"
-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
$(meson_native_use_bool homed)
$(meson_native_use_bool hwdb)
$(meson_native_use_bool http microhttpd)
$(meson_native_use_bool idn)
$(meson_native_use_bool importd)
@ -412,10 +411,6 @@ multilib_src_install_all() {
# Flatcar: TODO: Consider using that instead of
# dotmpfiles "${FILESDIR}"/systemd-flatcar.conf below.
if use hwdb; then
rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
fi
if use split-usr; then
# Avoid breaking boot/reboot
dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
@ -585,9 +580,7 @@ pkg_postinst() {
# Keep this here in case the database format changes so it gets updated
# when required.
if use hwdb; then
systemd-hwdb --root="${ROOT}" update
fi
udev_reload || FAIL=1

1
sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-2.3.0-r2.ebuild vendored
View File

@ -22,7 +22,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
RDEPEND="
!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
dev-libs/popt[${MULTILIB_USEDEP}]
>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]

4
sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019b-r2.ebuild vendored
View File

@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
LICENSE="BSD public-domain"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="nls leaps-timezone elibc_FreeBSD"
IUSE="nls leaps-timezone"
DEPEND="nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
@ -38,7 +38,7 @@ src_configure() {
append-lfs-flags #471102
if use elibc_FreeBSD || use elibc_Darwin ; then
if use elibc_Darwin ; then
append-cppflags -DSTD_INSPIRED #138251
fi

4
sdk_container/src/third_party/coreos-overlay/sys-libs/timezone-data/timezone-data-2019c.ebuild vendored
View File

@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
LICENSE="BSD public-domain"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="nls leaps-timezone elibc_FreeBSD"
IUSE="nls leaps-timezone"
DEPEND="nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
@ -38,7 +38,7 @@ src_configure() {
append-lfs-flags #471102
if use elibc_FreeBSD || use elibc_Darwin ; then
if use elibc_Darwin ; then
append-cppflags -DSTD_INSPIRED #138251
fi