Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to upstream Python 3.10.11 #15

Closed
wants to merge 5 commits into from
Closed

Update to upstream Python 3.10.11 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50f39a9
Update to upstream Python 3.10.11
andreittr Jul 18, 2023
bf2b496
Makefile.uk: Remove forceful setting of config
andreittr Jul 18, 2023
625f63f
Makefile.uk: Improve generating the python rootfs
andreittr Jul 18, 2023
65fb05c
Makefile.uk: remove malloc_closure.c from ctypes
andreittr Jul 25, 2023
6e1b31a
Update CONTRIBUTING
andreittr Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Contributing to Unikraft
========================
# Contributing to Unikraft

Please refer to the `CONTRIBUTING.md` file in the main Unikraft repository.
Contributions to Unikraft are welcome!
Please refer to the [Contributing](https://unikraft.org/docs/contributing/) page for further information.
19 changes: 10 additions & 9 deletions Config.uk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
menuconfig LIBPYTHON3
bool "Python 3"
default n
select LIBNEWLIBC
select LIBNEWLIBC_WANT_IO_C99_FORMATS if LIBNEWLIBC
select LIBNEWLIBC_LINUX_ERRNO_EXTENSIONS if LIBNEWLIBC
imply LIBMUSL
imply LIBCOMPILER_RT
select LIBUKDEBUG
select LIBUKALLOC
select LIBUKSCHED
select LIBUKSIGNAL
select LIBPOSIX_SYSINFO
select LIBPOSIX_USER
select LIBPOSIX_LIBDL
Expand All @@ -15,20 +15,20 @@ menuconfig LIBPYTHON3
select LIBPTHREAD_EMBEDDED
select LIBPOSIX_SOCKET
select LIBPOSIX_EVENT
select LIBLWIP
select LWIP_DHCP
select LWIP_DNS
select LWIP_IPV6
imply LIBLWIP
imply LWIP_DHCP
imply LWIP_DNS
imply LWIP_IPV6
Comment on lines +18 to +21
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason to imply instead of select?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, so one can select an alternative network stack without hacking the Config.uk file, while keeping a sane default.


if LIBPYTHON3

config LIBPYTHON3_PYTHONHOME
string "Python home directory"
default "/lib/python3.7"
default "/lib/python3.10"

config LIBPYTHON3_PYTHONPATH
string "Python path"
default "/lib/python3.7"
default "/lib/python3.10"

config LIBPYTHON3_TMPDIR
string "Temp directory location"
Expand All @@ -55,6 +55,7 @@ config LIBPYTHON3_EXTENSION_EXPAT
if LIBFFI
config LIBPYTHON3_EXTENSION_CTYPES
bool "ctypes"
select LIBFFI_NO_TYPES
default y
endif
config LIBPYTHON3_EXTENSION_LIBMPDEC
Expand Down
134 changes: 79 additions & 55 deletions Makefile.uk
View file
Open in desktop

Large diffs are not rendered by default.

Loading