From a8ad99b3d94421b90dfa2c5fe3e9e841cb59fe84 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 27 Nov 2020 11:59:49 +0100 Subject: [PATCH] Update Genode Labs sources --- flake.lock | 6 +-- packages/genodelabs/depot-targets.nix | 4 +- packages/genodelabs/make-targets.nix | 5 +-- packages/genodelabs/patches/curl-port.patch | 13 ------- packages/genodelabs/patches/test-pci.patch | 43 --------------------- packages/genodelabs/ports.nix | 16 ++++---- tests/bash.nix | 4 +- 7 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 packages/genodelabs/patches/curl-port.patch delete mode 100644 packages/genodelabs/patches/test-pci.patch diff --git a/flake.lock b/flake.lock index a33a5f8..533fdb6 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "genode": { "flake": false, "locked": { - "lastModified": 1603455398, - "narHash": "sha256-/ABZEGffnm6Tp3mem1MbMpL1TQbc+LcprQELvvox0Ks=", + "lastModified": 1606465266, + "narHash": "sha256-V6cL4RVpwG7sF9pQpsCDtRywJ2pxE1+D2u9eG+ps/T0=", "owner": "genodelabs", "repo": "genode", - "rev": "5be1c793a5c600b37f3df346b7438ad2aced9fc6", + "rev": "f2e0c164c29e7fd4b2e3ff7c8a9031d3dd915802", "type": "github" }, "original": { diff --git a/packages/genodelabs/depot-targets.nix b/packages/genodelabs/depot-targets.nix index 2ac7a92..7dc471a 100644 --- a/packages/genodelabs/depot-targets.nix +++ b/packages/genodelabs/depot-targets.nix @@ -22,7 +22,7 @@ in { acpica = { }; ahci_drv = { }; backdrop.portInputs = with ports; [ libc libpng zlib ]; - bash = { + bash-minimal = { enableParallelBuilding = false; nativeBuildInputs = with buildPackages; [ autoconf ]; portInputs = with ports; [ bash libc ]; @@ -39,7 +39,7 @@ in { cached_fs_rom.patches = [ ./patches/cached_fs_rom.patch ]; chroot = { }; clipboard = { }; - coreutils = { + coreutils-minimal = { enableParallelBuilding = false; portInputs = with ports; [ coreutils libc ]; postInstall = '' diff --git a/packages/genodelabs/make-targets.nix b/packages/genodelabs/make-targets.nix index f5ac510..05ac18c 100644 --- a/packages/genodelabs/make-targets.nix +++ b/packages/genodelabs/make-targets.nix @@ -7,10 +7,7 @@ nic_dump.targets = [ "server/nic_dump" ]; - test-pci = { - targets = [ "test/pci" ]; - patches = [ ./patches/test-pci.patch ]; - }; + test-pci.targets = [ "test/pci" ]; test-rtc.targets = [ "test/rtc" ]; diff --git a/packages/genodelabs/patches/curl-port.patch b/packages/genodelabs/patches/curl-port.patch deleted file mode 100644 index b3b770f..0000000 --- a/packages/genodelabs/patches/curl-port.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/repos/libports/ports/curl.port b/repos/libports/ports/curl.port -index bf784c1d22..167f650d74 100644 ---- a/repos/libports/ports/curl.port -+++ b/repos/libports/ports/curl.port -@@ -2,7 +2,7 @@ LICENSE := MIT - DOWNLOADS := curl.archive - VERSION := 7.29.0 - --URL(curl) := http://curl.haxx.se/download/curl-$(VERSION).tar.gz -+URL(curl) := https://curl.se/download/archeology/curl-7.29.0.tar.gz - SHA(curl) := 67dc5b952ac489191b62dbe95b18d336b821649f61404a280186c72e8cd0b9d6 - SIG(curl) := ${URL(curl)}.asc - KEY(curl) := daniel@haxx.se diff --git a/packages/genodelabs/patches/test-pci.patch b/packages/genodelabs/patches/test-pci.patch deleted file mode 100644 index 47fcc8d..0000000 --- a/packages/genodelabs/patches/test-pci.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/repos/os/src/test/pci/test.cc b/repos/os/src/test/pci/test.cc -index c6d9e2012b..050de6136c 100644 ---- a/repos/os/src/test/pci/test.cc -+++ b/repos/os/src/test/pci/test.cc -@@ -92,4 +92,5 @@ void Component::construct(Genode::Env &env) - pci.release_device(prev_device_cap); - - log("--- Platform test finished ---"); -+ env.parent().exit(0); - } -commit 03a5f469313e9fdc9ee1135ebf0b167e4d3d3266 -Author: Emery Hemingway -Date: Wed Oct 21 15:16:34 2020 +0200 - - test-pci: recognize VirtIO vendor IDs - -diff --git a/repos/os/src/test/pci/test.cc b/repos/os/src/test/pci/test.cc -index c6d9e2012b..9cc2a2ac4b 100644 ---- a/repos/os/src/test/pci/test.cc -+++ b/repos/os/src/test/pci/test.cc -@@ -19,7 +19,10 @@ - - using namespace Genode; - --enum { INTEL_VENDOR_ID = 0x8086 }; -+enum { -+ INTEL_VENDOR_ID = 0x8086, -+ VIRTIO_VENDOR_ID = 0x1af4, -+}; - - - /** -@@ -45,7 +48,9 @@ static void print_device_info(Platform::Device_capability device_cap) - Hex(fun, Hex::OMIT_PREFIX), " " - "class=", Hex(class_code), " " - "vendor=", Hex(vendor_id), " ", -- (vendor_id == INTEL_VENDOR_ID ? "(Intel)" : "(unknown)"), -+ (vendor_id == INTEL_VENDOR_ID ? "(Intel)" : -+ vendor_id == VIRTIO_VENDOR_ID ? "(VirtIO)" : -+ "(unknown)"), - " device=", Hex(device_id)); - - for (int resource_id = 0; resource_id < 6; resource_id++) { diff --git a/packages/genodelabs/ports.nix b/packages/genodelabs/ports.nix index f39c3c2..8d8c2d8 100644 --- a/packages/genodelabs/ports.nix +++ b/packages/genodelabs/ports.nix @@ -6,18 +6,13 @@ with pkgs; { bash.hash = "sha256-Se03Eyh8grk+QGAXLGoig7oXqmHtAwtHJX54fCVHw+8="; - binutils = { hash = "sha256-ERzYT3TjbK3fzRVN1UE7RM6XiPPeMKzkeulKx5IQa2o="; nativeBuildInputs = [ autoconf ]; }; - coreutils.hash = "sha256-ZVlFfLghHcXxwwRsN5xw2bVdIvvXoCNj2oZniOlSXrg="; - curl = { - patches = [ ./patches/curl-port.patch ]; - hash = "sha256-wpaT6RupLXwgtLdA8v+fpadmWKUiZUCPw8MePXD7SfI="; - }; - dde_bsd.hash = "sha256-/n9aHPU6/+AgRSyFD545p3BT63n3myymez1tIRhJisA="; + curl.hash = "sha256-5+nRKLrho9oO0XlzDO6ppZ2kLfWaIReY24YFYSQT7Xc="; + dde_bsd.hash = "sha256-KPA/ua3jETcHgWzhfhFm6ppds55Xi5YXJKDJvufJmU8="; dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4="; dde_linux.hash = "sha256-xHAgeKfArgMGKCGHi0762qkUcY97vbiAQYjM/ZRXCes="; dde_rump = { @@ -51,7 +46,10 @@ with pkgs; mpc.hash = "sha256-MOs51NYXkNYxBG4d97/fMCx/iYzrNum8jHe3QujF24o="; mpfr.hash = "sha256-TSZCAHU7Vtuo9Pbi7v7oDV5Wc6YBVICriR4IbErYW4Q="; mupdf.hash = "sha256-6NX7zvOwReBBdz83RxGW2FJWUkqI/DTBkSOCqukidYs="; - ncurses = { nativeBuildInputs = [ gcc mawk ]; }; + ncurses = { + nativeBuildInputs = [ gcc mawk ncurses ]; + hash = "sha256-ufWjzMvV1LaDOthNSelpcFsd7Fa6LCXBm0eRXqeGs8M="; + }; openssl.hash = "sha256-epRL3SobYQ7xf8qwp6D5xu/Ms2T/LhUjjs273ywWRWg="; qemu-usb.hash = "sha256-F4ZXeH5sx3FOcD42zFOxKFMsqGookKdav1NJ7YgVw98="; seoul = { @@ -60,7 +58,7 @@ with pkgs; hash = "sha256-0TYtZrLGl3IOFpRjBRf0fkUXDd1aDlOF8RePfqoKEwA="; }; stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc="; - stdcxx.hash = "sha256-4Gn/TyA/q83kyO8f5Wr+gv8fNYR5YPDNZIk7+Ty5fn4="; + stdcxx.hash = "sha256-4L9HUG1Wz3oCCuyyakRYOXzRna26JeeTngIS+jvJDBc="; virtualbox5 = { hash = "sha256-ERI+j2thvyMj+TJSHDdA9sOQdIxrXfNfMNJIa8VRE0M="; nativeBuildInputs = [ iasl libxslt unzip yasm ]; diff --git a/tests/bash.nix b/tests/bash.nix index 26309d1..ccf49b4 100644 --- a/tests/bash.nix +++ b/tests/bash.nix @@ -5,10 +5,10 @@ configFile = pkgs.writeText "bash.child.dhall" '' ${ ./bash.dhall - } { bash = "${pkgs.genodePackages.bash}", coreutils = "${pkgs.coreutils}" } + } { bash = "${pkgs.bash}", coreutils = "${pkgs.coreutils}" } ''; inputs = with pkgs.genodePackages; [ - bash + pkgs.bash cached_fs_rom libc posix