2
0
Fork 0

WiP! filter base-* packages by platform

This commit is contained in:
Ehmry - 2020-12-28 11:27:16 +01:00
parent 84f89dee00
commit 567c51ba59
1 changed files with 24 additions and 19 deletions

View File

@ -337,22 +337,21 @@ in makePackages // depotPackages // {
stdenv = stdenv';
};
base-hw-pc = buildUpstream {
name = "base-hw-pc";
outputs = [ "out" "coreObj" "bootstrapObj" ];
KERNEL = "hw";
BOARD = "pc";
targets = [ "bootstrap" "core" "timer" "lib/ld" ];
base-linux = buildUpstream {
name = "base-linux";
KERNEL = "linux";
BOARD = "linux";
targets = [ "core" "timer" "lib/ld" ];
patches = basePatches;
postInstall = ''
mv $out/lib/ld-hw.lib.so $out/lib/ld.lib.so
mv $out/bin/hw_timer_drv $out/bin/timer_drv
install build/bin/core-hw-pc.o $coreObj
install build/bin/bootstrap-hw-pc.o $bootstrapObj
mv $out/lib/ld-linux.lib.so $out/lib/ld.lib.so
mv $out/bin/linux_timer_drv $out/bin/timer_drv
'';
meta.platforms = [ "x86_64-genode" ];
HOST_INC_DIR = buildPackages.glibc.dev + "/include";
};
} // lib.optionalAttrs pkgs.hostPlatform.isAarch64 {
base-hw-virt_qemu = buildUpstream {
name = "base-hw-virt_qemu";
outputs = [ "out" "coreObj" "bootstrapObj" ];
@ -369,17 +368,22 @@ in makePackages // depotPackages // {
meta.platforms = [ "aarch64-genode" ];
};
base-linux = buildUpstream {
name = "base-linux";
KERNEL = "linux";
BOARD = "linux";
targets = [ "core" "timer" "lib/ld" ];
} // lib.optionalAttrs pkgs.hostPlatform.isx86 {
base-hw-pc = buildUpstream {
name = "base-hw-pc";
outputs = [ "out" "coreObj" "bootstrapObj" ];
KERNEL = "hw";
BOARD = "pc";
targets = [ "bootstrap" "core" "timer" "lib/ld" ];
patches = basePatches;
postInstall = ''
mv $out/lib/ld-linux.lib.so $out/lib/ld.lib.so
mv $out/bin/linux_timer_drv $out/bin/timer_drv
mv $out/lib/ld-hw.lib.so $out/lib/ld.lib.so
mv $out/bin/hw_timer_drv $out/bin/timer_drv
install build/bin/core-hw-pc.o $coreObj
install build/bin/bootstrap-hw-pc.o $bootstrapObj
'';
HOST_INC_DIR = buildPackages.glibc.dev + "/include";
meta.platforms = [ "x86_64-genode" ];
};
base-nova = buildUpstream {
@ -394,4 +398,5 @@ in makePackages // depotPackages // {
install build/bin/core-nova.o $coreObj
'';
};
}