diff --git a/local/patches/base/P0-redox-ioctl-path-override.patch b/local/patches/base/P0-redox-ioctl-path-override.patch new file mode 100644 index 0000000000..91cec58b2a --- /dev/null +++ b/local/patches/base/P0-redox-ioctl-path-override.patch @@ -0,0 +1,7 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -120,3 +120,3 @@ acpi = { git = "https://gitlab.redox-os.org/redox-os/acpi.git", branch = "redox-6.x" } + + [patch."https://gitlab.redox-os.org/redox-os/relibc.git"] +-#redox-ioctl = { path = "../../relibc/source/redox-ioctl" } ++redox-ioctl = { path = "../../relibc/source/redox-ioctl" } diff --git a/local/patches/gettext/01-external-gettext.patch b/local/patches/gettext/01-external-gettext.patch index 96cb41a332..9dc66f9235 100644 --- a/local/patches/gettext/01-external-gettext.patch +++ b/local/patches/gettext/01-external-gettext.patch @@ -11,10 +11,7 @@ AC_ARG_WITH([installed-libtextstyle], --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac -@@ -107,7 +107,7 @@ - AM_CONDITIONAL([WINDOWS_NATIVE], [test $is_windows_native = yes]) - - dnl Checks for libraries. +@@ -108,7 +108,7 @@ dnl These are the only lines required to internationalize the package. dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.) diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml index 4a4659e347..da504b6856 100644 --- a/recipes/core/base/recipe.toml +++ b/recipes/core/base/recipe.toml @@ -4,6 +4,7 @@ rev = "463f76b9608a896e6f6c9f63457f57f6409873c7" patches = [ "P0-redox-scheme-bump-0.11.1.patch", "P0-daemon-comprehensive-fix.patch", + "P0-redox-ioctl-path-override.patch", "P0-add-missing-driver-members.patch", "P0-init-continuous-scheduling.patch", "P0-dhcpd-auto-iface.patch", diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml index 986db03e83..1c8a874f25 100644 --- a/recipes/core/relibc/recipe.toml +++ b/recipes/core/relibc/recipe.toml @@ -3,7 +3,6 @@ git = "https://gitlab.redox-os.org/redox-os/relibc.git" rev = "861bbb0" patches = [ # Bump redox-ioctl's redox_syscall pin to 0.8.1 (matches rest of build) - "P0-redox-ioctl-syscall-0.8.1.patch", "P3-eventfd-mod.patch", # Add pub mod bits_eventfd to header/mod.rs "P3-bits-eventfd-mod.patch",