Skip to content

Commit

Permalink
Merge branch 'ubuntu-22.04' into ROCKS-994-openssl_data-slice-22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
zhijie-yang authored Jun 24, 2024
2 parents c3ff99b + fe35feb commit a954705
Show file tree
Hide file tree
Showing 6 changed files with 303 additions and 1 deletion.
5 changes: 4 additions & 1 deletion slices/libpython3.11-stdlib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,10 @@ slices:
- libpython3.11-stdlib_osx-support
contents:
/usr/lib/python3.11/_distutils_system_mod.py:
/usr/lib/python3.11/distutils/**:
# Due to conflicts with python3-distutils_python3-11 and chisel not being able to
# reconcile 2 slices with globs on the same folder, I have to specify the files explicitly
/usr/lib/python3.11/distutils/__init__.py:
/usr/lib/python3.11/distutils/version.py:
/usr/lib/python3.11/venv/**:
/usr/lib/python3.11/zipapp.py:

Expand Down
104 changes: 104 additions & 0 deletions slices/python3-distutils.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
package: python3-distutils

essential:
- python3-distutils_copyright

slices:
python3-11:
essential:
- python3-lib2to3_python3-10
- python3.11_core
contents:
# Due to conflicts with libpython3.11-stdlib_distribution and chisel not being able to
# reconcile 2 slices with globs on the same folder, I have to specify the files explicitly.
# Also the original package uses hardlink for the common files between python3.10 and
# python3.11. Chisel doesn't seem to support hardlinks so I need to use copy as a workaround
/usr/lib/python3.11/distutils/_msvccompiler.py:
{copy: /usr/lib/python3.10/distutils/_msvccompiler.py}
/usr/lib/python3.11/distutils/archive_util.py:
{copy: /usr/lib/python3.10/distutils/archive_util.py}
/usr/lib/python3.11/distutils/bcppcompiler.py:
{copy: /usr/lib/python3.10/distutils/bcppcompiler.py}
/usr/lib/python3.11/distutils/ccompiler.py:
{copy: /usr/lib/python3.10/distutils/ccompiler.py}
/usr/lib/python3.11/distutils/cmd.py:
{copy: /usr/lib/python3.10/distutils/cmd.py}
/usr/lib/python3.11/distutils/command/__init__.py:
{copy: /usr/lib/python3.10/distutils/command/__init__.py}
/usr/lib/python3.11/distutils/command/bdist.py:
/usr/lib/python3.11/distutils/command/bdist_dumb.py:
{copy: /usr/lib/python3.10/distutils/command/bdist_dumb.py}
/usr/lib/python3.11/distutils/command/bdist_rpm.py:
{copy: /usr/lib/python3.10/distutils/command/bdist_rpm.py}
/usr/lib/python3.11/distutils/command/build.py:
{copy: /usr/lib/python3.10/distutils/command/build.py}
/usr/lib/python3.11/distutils/command/build_clib.py:
{copy: /usr/lib/python3.10/distutils/command/build_clib.py}
/usr/lib/python3.11/distutils/command/build_ext.py:
/usr/lib/python3.11/distutils/command/build_py.py:
{copy: /usr/lib/python3.10/distutils/command/build_py.py}
/usr/lib/python3.11/distutils/command/build_scripts.py:
{copy: /usr/lib/python3.10/distutils/command/build_scripts.py}
/usr/lib/python3.11/distutils/command/check.py:
{copy: /usr/lib/python3.10/distutils/command/check.py}
/usr/lib/python3.11/distutils/command/clean.py:
{copy: /usr/lib/python3.10/distutils/command/clean.py}
/usr/lib/python3.11/distutils/command/command_template:
{copy: /usr/lib/python3.10/distutils/command/command_template}
/usr/lib/python3.11/distutils/command/config.py:
{copy: /usr/lib/python3.10/distutils/command/config.py}
/usr/lib/python3.11/distutils/command/install.py:
{copy: /usr/lib/python3.10/distutils/command/install.py}
/usr/lib/python3.11/distutils/command/install_data.py:
{copy: /usr/lib/python3.10/distutils/command/install_data.py}
/usr/lib/python3.11/distutils/command/install_egg_info.py:
{copy: /usr/lib/python3.10/distutils/command/install_egg_info.py}
/usr/lib/python3.11/distutils/command/install_headers.py:
{copy: /usr/lib/python3.10/distutils/command/install_headers.py}
/usr/lib/python3.11/distutils/command/install_lib.py:
{copy: /usr/lib/python3.10/distutils/command/install_lib.py}
/usr/lib/python3.11/distutils/command/install_scripts.py:
{copy: /usr/lib/python3.10/distutils/command/install_scripts.py}
/usr/lib/python3.11/distutils/command/register.py:
{copy: /usr/lib/python3.10/distutils/command/register.py}
/usr/lib/python3.11/distutils/command/sdist.py:
{copy: /usr/lib/python3.10/distutils/command/sdist.py}
/usr/lib/python3.11/distutils/command/upload.py:
{copy: /usr/lib/python3.10/distutils/command/upload.py}
/usr/lib/python3.11/distutils/config.py:
/usr/lib/python3.11/distutils/core.py: {copy: /usr/lib/python3.10/distutils/core.py}
/usr/lib/python3.11/distutils/cygwinccompiler.py:
{copy: /usr/lib/python3.10/distutils/cygwinccompiler.py}
/usr/lib/python3.11/distutils/debug.py: {copy: /usr/lib/python3.10/distutils/debug.py}
/usr/lib/python3.11/distutils/dep_util.py: {copy: /usr/lib/python3.10/distutils/dep_util.py}
/usr/lib/python3.11/distutils/dir_util.py: {copy: /usr/lib/python3.10/distutils/dir_util.py}
/usr/lib/python3.11/distutils/dist.py: {copy: /usr/lib/python3.10/distutils/dist.py}
/usr/lib/python3.11/distutils/errors.py: {copy: /usr/lib/python3.10/distutils/errors.py}
/usr/lib/python3.11/distutils/extension.py: {copy: /usr/lib/python3.10/distutils/extension.py}
/usr/lib/python3.11/distutils/fancy_getopt.py:
{copy: /usr/lib/python3.10/distutils/fancy_getopt.py}
/usr/lib/python3.11/distutils/file_util.py: {copy: /usr/lib/python3.10/distutils/file_util.py}
/usr/lib/python3.11/distutils/filelist.py: {copy: /usr/lib/python3.10/distutils/filelist.py}
/usr/lib/python3.11/distutils/log.py: {copy: /usr/lib/python3.10/distutils/log.py}
/usr/lib/python3.11/distutils/msvc9compiler.py:
{copy: /usr/lib/python3.10/distutils/msvc9compiler.py}
/usr/lib/python3.11/distutils/msvccompiler.py:
/usr/lib/python3.11/distutils/spawn.py: {copy: /usr/lib/python3.10/distutils/spawn.py}
/usr/lib/python3.11/distutils/sysconfig.py:
/usr/lib/python3.11/distutils/text_file.py: {copy: /usr/lib/python3.10/distutils/text_file.py}
/usr/lib/python3.11/distutils/unixccompiler.py:
{copy: /usr/lib/python3.10/distutils/unixccompiler.py}
/usr/lib/python3.11/distutils/util.py: {copy: /usr/lib/python3.10/distutils/util.py}
/usr/lib/python3.11/distutils/versionpredicate.py:
{copy: /usr/lib/python3.10/distutils/versionpredicate.py}

python3-10:
essential:
- python3-lib2to3_python3-10
contents:
/usr/lib/python3.10/distutils/*.py:
/usr/lib/python3.10/distutils/command/*.py:

copyright:
contents:
/usr/share/doc/python3-distutils/copyright:
156 changes: 156 additions & 0 deletions slices/python3-lib2to3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
package: python3-lib2to3

essential:
- python3-lib2to3_copyright

slices:
python3-10:
contents:
/usr/lib/python3.10/lib2to3/**:

python3-11:
essential:
- python3.11_core
contents:
# TODO: Replace with globing once chisel supports hardlinks.
/usr/lib/python3.11/lib2to3/Grammar.txt: {copy: /usr/lib/python3.10/lib2to3/Grammar.txt}
/usr/lib/python3.11/lib2to3/PatternGrammar.txt:
{copy: /usr/lib/python3.10/lib2to3/PatternGrammar.txt}
/usr/lib/python3.11/lib2to3/__init__.py:
/usr/lib/python3.11/lib2to3/__main__.py: {copy: /usr/lib/python3.10/lib2to3/__main__.py}
/usr/lib/python3.11/lib2to3/btm_matcher.py:
{copy: /usr/lib/python3.10/lib2to3/btm_matcher.py}
/usr/lib/python3.11/lib2to3/btm_utils.py:
/usr/lib/python3.11/lib2to3/fixer_base.py: {copy: /usr/lib/python3.10/lib2to3/fixer_base.py}
/usr/lib/python3.11/lib2to3/fixer_util.py: {copy: /usr/lib/python3.10/lib2to3/fixer_util.py}
/usr/lib/python3.11/lib2to3/fixes/__init__.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/__init__.py}
/usr/lib/python3.11/lib2to3/fixes/fix_apply.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_apply.py}
/usr/lib/python3.11/lib2to3/fixes/fix_asserts.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_asserts.py}
/usr/lib/python3.11/lib2to3/fixes/fix_basestring.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_basestring.py}
/usr/lib/python3.11/lib2to3/fixes/fix_buffer.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_buffer.py}
/usr/lib/python3.11/lib2to3/fixes/fix_dict.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_dict.py}
/usr/lib/python3.11/lib2to3/fixes/fix_except.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_except.py}
/usr/lib/python3.11/lib2to3/fixes/fix_exec.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_exec.py}
/usr/lib/python3.11/lib2to3/fixes/fix_execfile.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_execfile.py}
/usr/lib/python3.11/lib2to3/fixes/fix_exitfunc.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_exitfunc.py}
/usr/lib/python3.11/lib2to3/fixes/fix_filter.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_filter.py}
/usr/lib/python3.11/lib2to3/fixes/fix_funcattrs.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_funcattrs.py}
/usr/lib/python3.11/lib2to3/fixes/fix_future.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_future.py}
/usr/lib/python3.11/lib2to3/fixes/fix_getcwdu.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_getcwdu.py}
/usr/lib/python3.11/lib2to3/fixes/fix_has_key.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_has_key.py}
/usr/lib/python3.11/lib2to3/fixes/fix_idioms.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_idioms.py}
/usr/lib/python3.11/lib2to3/fixes/fix_import.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_import.py}
/usr/lib/python3.11/lib2to3/fixes/fix_imports.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_imports.py}
/usr/lib/python3.11/lib2to3/fixes/fix_imports2.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_imports2.py}
/usr/lib/python3.11/lib2to3/fixes/fix_input.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_input.py}
/usr/lib/python3.11/lib2to3/fixes/fix_intern.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_intern.py}
/usr/lib/python3.11/lib2to3/fixes/fix_isinstance.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_isinstance.py}
/usr/lib/python3.11/lib2to3/fixes/fix_itertools.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_itertools.py}
/usr/lib/python3.11/lib2to3/fixes/fix_itertools_imports.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_itertools_imports.py}
/usr/lib/python3.11/lib2to3/fixes/fix_long.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_long.py}
/usr/lib/python3.11/lib2to3/fixes/fix_map.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_map.py}
/usr/lib/python3.11/lib2to3/fixes/fix_metaclass.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_metaclass.py}
/usr/lib/python3.11/lib2to3/fixes/fix_methodattrs.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_methodattrs.py}
/usr/lib/python3.11/lib2to3/fixes/fix_ne.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_ne.py}
/usr/lib/python3.11/lib2to3/fixes/fix_next.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_next.py}
/usr/lib/python3.11/lib2to3/fixes/fix_nonzero.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_nonzero.py}
/usr/lib/python3.11/lib2to3/fixes/fix_numliterals.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_numliterals.py}
/usr/lib/python3.11/lib2to3/fixes/fix_operator.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_operator.py}
/usr/lib/python3.11/lib2to3/fixes/fix_paren.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_paren.py}
/usr/lib/python3.11/lib2to3/fixes/fix_print.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_print.py}
/usr/lib/python3.11/lib2to3/fixes/fix_raise.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_raise.py}
/usr/lib/python3.11/lib2to3/fixes/fix_raw_input.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_raw_input.py}
/usr/lib/python3.11/lib2to3/fixes/fix_reduce.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_reduce.py}
/usr/lib/python3.11/lib2to3/fixes/fix_reload.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_reload.py}
/usr/lib/python3.11/lib2to3/fixes/fix_renames.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_renames.py}
/usr/lib/python3.11/lib2to3/fixes/fix_repr.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_repr.py}
/usr/lib/python3.11/lib2to3/fixes/fix_set_literal.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_set_literal.py}
/usr/lib/python3.11/lib2to3/fixes/fix_standarderror.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_standarderror.py}
/usr/lib/python3.11/lib2to3/fixes/fix_sys_exc.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_sys_exc.py}
/usr/lib/python3.11/lib2to3/fixes/fix_throw.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_throw.py}
/usr/lib/python3.11/lib2to3/fixes/fix_tuple_params.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_tuple_params.py}
/usr/lib/python3.11/lib2to3/fixes/fix_types.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_types.py}
/usr/lib/python3.11/lib2to3/fixes/fix_unicode.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_unicode.py}
/usr/lib/python3.11/lib2to3/fixes/fix_urllib.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_urllib.py}
/usr/lib/python3.11/lib2to3/fixes/fix_ws_comma.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_ws_comma.py}
/usr/lib/python3.11/lib2to3/fixes/fix_xrange.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_xrange.py}
/usr/lib/python3.11/lib2to3/fixes/fix_xreadlines.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_xreadlines.py}
/usr/lib/python3.11/lib2to3/fixes/fix_zip.py:
{copy: /usr/lib/python3.10/lib2to3/fixes/fix_zip.py}
/usr/lib/python3.11/lib2to3/main.py: {copy: /usr/lib/python3.10/lib2to3/main.py}
/usr/lib/python3.11/lib2to3/patcomp.py: {copy: /usr/lib/python3.10/lib2to3/patcomp.py}
/usr/lib/python3.11/lib2to3/pgen2/__init__.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/__init__.py}
/usr/lib/python3.11/lib2to3/pgen2/conv.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/conv.py}
/usr/lib/python3.11/lib2to3/pgen2/driver.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/driver.py}
/usr/lib/python3.11/lib2to3/pgen2/grammar.py:
/usr/lib/python3.11/lib2to3/pgen2/literals.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/literals.py}
/usr/lib/python3.11/lib2to3/pgen2/parse.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/parse.py}
/usr/lib/python3.11/lib2to3/pgen2/pgen.py: {copy: /usr/lib/python3.10/lib2to3/pgen2/pgen.py}
/usr/lib/python3.11/lib2to3/pgen2/token.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/token.py}
/usr/lib/python3.11/lib2to3/pgen2/tokenize.py:
{copy: /usr/lib/python3.10/lib2to3/pgen2/tokenize.py}
/usr/lib/python3.11/lib2to3/pygram.py: {copy: /usr/lib/python3.10/lib2to3/pygram.py}
/usr/lib/python3.11/lib2to3/pytree.py: {copy: /usr/lib/python3.10/lib2to3/pytree.py}
/usr/lib/python3.11/lib2to3/refactor.py: {copy: /usr/lib/python3.10/lib2to3/refactor.py}

copyright:
contents:
/usr/share/doc/python3-lib2to3/copyright:
15 changes: 15 additions & 0 deletions slices/python3-pip-whl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: python3-pip-whl

essential:
- python3-pip-whl_copyright

slices:
wheels:
essential:
- ca-certificates_data
contents:
/usr/share/python-wheels/pip-*-py3-none-any.whl:

copyright:
contents:
/usr/share/doc/python3-pip-whl/copyright:
13 changes: 13 additions & 0 deletions slices/python3-setuptools-whl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package: python3-setuptools-whl

essential:
- python3-setuptools-whl_copyright

slices:
wheels:
contents:
/usr/share/python-wheels/setuptools-*-py3-none-any.whl:

copyright:
contents:
/usr/share/doc/python3-setuptools-whl/copyright:
11 changes: 11 additions & 0 deletions slices/python3.11-venv.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package: python3.11-venv

slices:
ensurepip:
essential:
- python3-distutils_python3-11
- python3-pip-whl_wheels
- python3-setuptools-whl_wheels
- python3.11_standard
contents:
/usr/lib/python3.11/ensurepip/*.py:

0 comments on commit a954705

Please sign in to comment.