2
0
Fork 0

Update Genode Labs sources

reinit
Emery Hemingway 2 years ago
parent 0c4c969fa4
commit 77e0aa3e05
  1. 6
      flake.lock
  2. 4
      packages/NOVA/default.nix
  3. 4
      packages/genodelabs/depot-targets.nix
  4. 5
      packages/genodelabs/make-targets.nix
  5. 13
      packages/genodelabs/patches/curl-port.patch
  6. 43
      packages/genodelabs/patches/test-pci.patch
  7. 16
      packages/genodelabs/ports.nix
  8. 4
      tests/bash.nix

@ -3,11 +3,11 @@
"genode": {
"flake": false,
"locked": {
"lastModified": 1603455398,
"narHash": "sha256-/ABZEGffnm6Tp3mem1MbMpL1TQbc+LcprQELvvox0Ks=",
"lastModified": 1606482107,
"narHash": "sha256-XgN1fBUsmX8oKk4ZBvROwEWlpILRlJz+UuK4kMDSI1Y=",
"owner": "genodelabs",
"repo": "genode",
"rev": "5be1c793a5c600b37f3df346b7438ad2aced9fc6",
"rev": "3fac8b106d83721914797c202793ec1d8ea02d2f",
"type": "github"
},
"original": {

@ -22,8 +22,8 @@ else
src = fetchFromGitHub {
owner = "alex-ab";
repo = "NOVA";
rev = "68c2fb1671e75d811a4787e35b0d0c6cc85815c0";
sha256 = "06zxz8hvzqgp8vrh6kv65j0z1m3xfm2ac8ppkv6ql0rivm1rv07s";
rev = "af931a15fc6b032615f076e946b6026a31dbacaf";
sha256 = "1phx5dx8bqw4ibz4kva1k7vidbp21djjch5r9lilbl4bcpj4kd17";
};
enableParallelBuilding = true;

@ -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 = ''

@ -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" ];

@ -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

@ -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 <ehmry@posteo.net>
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++) {

@ -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 ];

@ -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

Loading…
Cancel
Save