diff --git a/Cargo.lock b/Cargo.lock index fbbc4a49c2..a56460325d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -576,9 +576,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libredox" diff --git a/config/redbear-mini.toml b/config/redbear-mini.toml index c2099ac1ea..d821662081 100644 --- a/config/redbear-mini.toml +++ b/config/redbear-mini.toml @@ -45,7 +45,7 @@ redbear-nmap = {} redbear-wifictl = {} # Diagnostics and shell-side utilities. -mc = {} +#mc = {} # suppressed: requires glib-2.0 (gettext, pcre2, libiconv chain); desktop pkg, not needed for boot/recovery redbear-info = {} # Keep package builder utility in live environment. diff --git a/local/patches/bash/P1-mksyntax-host-headers.patch b/local/patches/bash/P1-mksyntax-host-headers.patch index 0aee93ee39..17047b48c2 100644 --- a/local/patches/bash/P1-mksyntax-host-headers.patch +++ b/local/patches/bash/P1-mksyntax-host-headers.patch @@ -1,15 +1,17 @@ --- a/mksyntax.c +++ b/mksyntax.c -@@ --#include "config.h" -- - #include +@@ -20,16 +20,15 @@ + along with Bash. If not, see . + */ + ++#include +#include +#include +#include + -+#include "config.h" -+ + #include "config.h" + +-#include #include "bashansi.h" #include "chartypes.h" -#include diff --git a/local/recipes/dev/m4/recipe.toml b/local/recipes/dev/m4/recipe.toml index 0e77e26e48..0e3262f7b8 100644 --- a/local/recipes/dev/m4/recipe.toml +++ b/local/recipes/dev/m4/recipe.toml @@ -5,7 +5,9 @@ patches = ["redox.patch"] [build] template = "custom" script = """ +export CFLAGS="-fcommon ${CFLAGS}" DYNAMIC_INIT +export LDFLAGS="-Wl,--allow-multiple-definition ${LDFLAGS}" COOKBOOK_CONFIGURE_FLAGS+=( --disable-nls ac_cv_func___freadahead=yes diff --git a/local/recipes/dev/m4/source/lib/getlocalename_l-unsafe.c b/local/recipes/dev/m4/source/lib/getlocalename_l-unsafe.c index d6fba1f760..12e2136fe3 100644 --- a/local/recipes/dev/m4/source/lib/getlocalename_l-unsafe.c +++ b/local/recipes/dev/m4/source/lib/getlocalename_l-unsafe.c @@ -658,9 +658,8 @@ getlocalename_l_unsafe (int category, locale_t locale) }; const char *name = ((struct __locale_t *) locale)->mb_cur_max == 4 ? "C.UTF-8" : "C"; return (struct string_with_storage) { name, STORAGE_INDEFINITE }; -#elif defined __redox__ && HAVE_GETLOCALENAME_L - const char *name = getlocalename_l (category, locale); - return (struct string_with_storage) { name != NULL ? name : "", STORAGE_OBJECT }; +#elif defined __redox__ + return (struct string_with_storage) { "C", STORAGE_INDEFINITE }; #else #error "Please port gnulib getlocalename_l-unsafe.c to your platform! Report this to bug-gnulib." #endif diff --git a/local/recipes/drivers/redox-driver-sys/recipe.toml b/local/recipes/drivers/redox-driver-sys/recipe.toml index 50ece1c7d3..01bc3e9cfc 100644 --- a/local/recipes/drivers/redox-driver-sys/recipe.toml +++ b/local/recipes/drivers/redox-driver-sys/recipe.toml @@ -15,8 +15,8 @@ mkdir -p "${COOKBOOK_STAGE}/usr/lib" -j "${COOKBOOK_MAKE_JOBS}" \ ${COOKBOOK_CARGO_FLAGS[@]} -cp "${COOKBOOK_SOURCE}/target/${TARGET}/release/libredox_driver_sys.a" \ +cp "${CARGO_TARGET_DIR}/${TARGET}/release/libredox_driver_sys.a" \ "${COOKBOOK_STAGE}/usr/lib/libredox_driver_sys.a" -cp "${COOKBOOK_SOURCE}/target/${TARGET}/release/libredox_driver_sys.rlib" \ +cp "${CARGO_TARGET_DIR}/${TARGET}/release/libredox_driver_sys.rlib" \ "${COOKBOOK_STAGE}/usr/lib/libredox_driver_sys.rlib" """ diff --git a/local/recipes/drivers/redox-driver-sys/source/src/lib.rs b/local/recipes/drivers/redox-driver-sys/source/src/lib.rs index 583accd7f4..ed7cb4a2a1 100644 --- a/local/recipes/drivers/redox-driver-sys/source/src/lib.rs +++ b/local/recipes/drivers/redox-driver-sys/source/src/lib.rs @@ -35,6 +35,8 @@ pub mod pci; pub mod pcid_client; pub mod quirks; +pub use quirks::PciQuirkFlags; + use thiserror::Error; use syscall as redox_syscall; diff --git a/local/sources/base b/local/sources/base index fa7ff28c4b..f97da5b023 160000 --- a/local/sources/base +++ b/local/sources/base @@ -1 +1 @@ -Subproject commit fa7ff28c4b4b865c42c2370fed13244ad37670f7 +Subproject commit f97da5b0235e8184db1fe83a8db3c4ffb5075b1c diff --git a/local/sources/kernel b/local/sources/kernel index 6f022a5ee2..58da03715b 160000 --- a/local/sources/kernel +++ b/local/sources/kernel @@ -1 +1 @@ -Subproject commit 6f022a5ee200f2d6b85f578ab3333ea2a8d33aa4 +Subproject commit 58da03715b09290a0fea4157fd0b79cbaee6fe0d diff --git a/local/sources/relibc b/local/sources/relibc index 4575af6ab0..9ab514e870 160000 --- a/local/sources/relibc +++ b/local/sources/relibc @@ -1 +1 @@ -Subproject commit 4575af6ab0b0e1a07da4c31355465be2f970bf49 +Subproject commit 9ab514e87007ec6c85ee28c58b8cce59bd51593c