Skip to content

Commit

Permalink
Add patch to ensure we can use librump in hurd and generate rumpdisk.…
Browse files Browse the repository at this point in the history
…static
  • Loading branch information
flavioc committed Dec 22, 2023
1 parent 78e76e3 commit c20747b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
1 change: 1 addition & 0 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ install_hurd() {
--prefix=$SYS_ROOT \
--without-parted \
--with-libgcrypt-prefix=$SYS_ROOT \
--enable-static-progs='ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi' \
--disable-profile &&
make -j$PROCS all &&
fakeroot make -j$PROCS install &&
Expand Down
7 changes: 6 additions & 1 deletion download-funcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ download_mig () {

download_hurd () {
download_from_git hurd git://git.savannah.gnu.org/hurd/hurd.git
pushd hurd &&
apply_patch $SCRIPT_DIR/patches/hurd/link-rump.patch 1
popd
}

download_rumpkernel () {
Expand All @@ -110,7 +113,9 @@ download_libacpica () {

apply_patch() {
print_info "Using patch $1 (level: $2)"
patch -Np$2 < $1 || exit 1
if patch -f -Np$2 --dry-run < $1 > /dev/null 2>&1; then
patch -Np$2 < $1 || exit 1
fi
}

download_glibc () {
Expand Down
13 changes: 13 additions & 0 deletions patches/hurd/link-rump.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index dd2481b0..6e754a7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ AS_IF([test "x$with_rump" != xno], [
# Save
oldLIBS="$LIBS"

- LIBS="$oldLIBS -lrump"
+ LIBS="$oldLIBS -lrump -lrumpuser -lrumpvfs -lrumpvfs_fifofs -lrumpnet -lrumpnet_net -lrumpnet_local"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <hurd.h>

0 comments on commit c20747b

Please sign in to comment.