diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 4da6cce18ba..ef1603b719b 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -259,6 +259,9 @@ dev-python/cython dev-python/distro dev-python/docutils dev-python/editables +dev-python/ensurepip-pip +dev-python/ensurepip-setuptools +dev-python/ensurepip-wheels dev-python/fasteners dev-python/flit-core dev-python/gentoo-common diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh index 5e0f8be448f..c52a2f5c4a6 100644 --- a/build_library/extra_sysexts.sh +++ b/build_library/extra_sysexts.sh @@ -1,4 +1,5 @@ EXTRA_SYSEXTS=( zfs:sys-fs/zfs podman:app-containers/podman,net-misc/passt + python:dev-lang/python,dev-python/pip ) diff --git a/build_library/prefix_util.sh b/build_library/prefix_util.sh index a8a7734e3c0..a3c3db8a4d1 100644 --- a/build_library/prefix_util.sh +++ b/build_library/prefix_util.sh @@ -128,7 +128,6 @@ EMERGE_DEFAULT_OPTS=${emerge_opts@Q} USE=" -desktop --ensurepip -installkernel -llvm -nls diff --git a/build_library/sysext_mangle_flatcar-python b/build_library/sysext_mangle_flatcar-python new file mode 100755 index 00000000000..47dc37e2e1b --- /dev/null +++ b/build_library/sysext_mangle_flatcar-python @@ -0,0 +1,10 @@ +#!/bin/bash + +set -euo pipefail +rootfs="${1}" + +pushd "${rootfs}" + +rm -rf ./usr/{lib/debug,share,include,lib64/pkgconfig} + +popd diff --git a/changelog/changes/2024-05-04-python.md b/changelog/changes/2024-05-04-python.md new file mode 100644 index 00000000000..434a4813df2 --- /dev/null +++ b/changelog/changes/2024-05-04-python.md @@ -0,0 +1 @@ +- Provided a Python Flatcar extension as optional systemd-sysext image with the release. Write 'python' to `/etc/flatcar/enabled-sysext.conf` through Ignition and the sysext will be installed during provisioning ([scripts#1979](https://github.com/flatcar/scripts/pull/1979)) \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 9c09ff12f9b..00b13c433ed 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -36,6 +36,8 @@ RDEPEND=" coreos-base/flatcar-eks net-misc/chrony sys-fs/zfs - app-containers/podman + app-containers/podman net-misc/passt + dev-lang/python + dev-python/pip " diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index b25c16a12d0..85f795b138e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -17,8 +17,5 @@ sys-libs/ncurses cxx # which is defined in portage-stable. app-editors/nano unicode -# We don't use pip. -dev-lang/python ensurepip - # Pulls dev-python/sphinx, which in turn pulls a lot of other python stuff. sys-fs/btrfs-progs man diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/Manifest new file mode 100644 index 00000000000..081d5679743 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/Manifest @@ -0,0 +1 @@ +DIST pip-24.0-py3-none-any.whl 2110226 BLAKE2B 6a0c8c9796cd574ef1d709de40a8530a15e50158143e332b79e5ad3edceda6ce93c5ef4df49b169062598618dcc6967c2115ac2c10b05abf345318204f1eeffc SHA512 5d7462a584105bccaa9cf376f5a8c5827ead099c813c8af7392d478a4398f373d9e8cac7bbad2db51b335411ab966b21e119b1b1234c9a7ab70c6ddfc9306da6 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild new file mode 100644 index 00000000000..724559d6532 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-pip/ensurepip-pip-24.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit pypi + +DESCRIPTION="Shared pip wheel for ensurepip Python module" +HOMEPAGE="https://pypi.org/project/pip/" +SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")" +S=${DISTDIR} + +LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + ! + + + + python@gentoo.org + + + + pip + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest new file mode 100644 index 00000000000..db11cb48ddc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest @@ -0,0 +1,3 @@ +DIST setuptools-69.0.3-py3-none-any.whl 819530 BLAKE2B 6ecef64755181255d935e234f77db3a4a9ce6426621d5d95196f55820a6bd62ff6bd3efcbf2e66221501b0c7c5296a35f80d275c59a8075392a0e802ee6713f1 SHA512 20c68e4f279a133f33ac85885b2c7e05b68c8c2faf15c9bb251229a6668c5c6b54c4065c54a0b711dae36d7fd161d3dc34218c579e739a2b2c573b85ccc79820 +DIST setuptools-69.2.0-py3-none-any.whl 821485 BLAKE2B 7b5fdc519f57327e323c15c12650d7c820909664d5f45e18f0c3203ced4c68b3f42598481158b3ae899f16ba56b702724f5b362757369ccc5d61a6cdeae64129 SHA512 fa6b2927b16c00a30b135373be399cfec7ab1b0e9b410de6502172d50ba2a191214a4a4adb443d362198d43e86a662565155ea4c8d37f3305e9f7d1aef724b25 +DIST setuptools-69.5.1-py3-none-any.whl 894566 BLAKE2B a9d24f51240fd528f87642e8765a4a72ae9e03e936acec3e26edd1c5b40127f00dee53db2dd171404778c2e2910d095b5de49e0af3d2f7a67d8edd52d16a0a45 SHA512 d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.0.3.ebuild new file mode 100644 index 00000000000..6e384d8b8a5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.0.3.ebuild @@ -0,0 +1,24 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit pypi + +DESCRIPTION="Shared setuptools wheel for ensurepip Python module" +HOMEPAGE="https://pypi.org/project/setuptools/" +SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")" +S=${DISTDIR} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + ! + + + + python@gentoo.org + + + + setuptools + + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild new file mode 100644 index 00000000000..d532659ecef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/ensurepip-wheels-100.ebuild @@ -0,0 +1,16 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Shared wheels for ensurepip Python module" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools +" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/metadata.xml new file mode 100644 index 00000000000..7d421671d88 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-wheels/metadata.xml @@ -0,0 +1,8 @@ + + + + + python@gentoo.org + + +