[PATCH] img/live: add rootfs attribute passthru
This allows to get access to rootfs and kernel from device images. Signed-off-by: Yuri Nesterov <yuriy.nesterov@unikie.com> --- img/live/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/img/live/default.nix b/img/live/default.nix index 65ad058..5461384 100644 --- a/img/live/default.nix +++ b/img/live/default.nix @@ -45,4 +45,6 @@ stdenvNoCC.mkDerivation { ''; enableParallelBuilding = true; + + passthru = { inherit rootfs; }; } -- 2.34.1
On 9/22/22 17:47, Yuri Nesterov wrote:
This allows to get access to rootfs and kernel from device images.
Signed-off-by: Yuri Nesterov <yuriy.nesterov@unikie.com> --- img/live/default.nix | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/img/live/default.nix b/img/live/default.nix index 65ad058..5461384 100644 --- a/img/live/default.nix +++ b/img/live/default.nix @@ -45,4 +45,6 @@ stdenvNoCC.mkDerivation { '';
enableParallelBuilding = true; + + passthru = { inherit rootfs; }; }
Thanks, fixes the issue and takes us to the next issue before out-of-tree build reference configs with imx8 variants are supported. ~/out-of-tree-build ❯ nix-build spectrum-config-imx8/imx8qxp/ -I nixpkgs=nixpkgs-spectrum/ this derivation will be built: /nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv building '/nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv'... /nix/store/nlzy51mvniqk080jlszm37j0hzi6m9rv-stdenv-linux/setup: line 1340: spectrum: command not found Tested-by: Ville Ilvonen <ville.ilvonen@unikie.com> -Ville
Hello, There is a typo in imx8qxp config file: diff --git a/imx8qxp/default.nix b/imx8qxp/default.nix index 096d6aa..dc1d41f 100644 --- a/imx8qxp/default.nix +++ b/imx8qxp/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation { ]; buildCommand = '' - install -m 0644 $(spectrum) spectrum-live-imx8qxp.img + install -m 0644 ${spectrum} spectrum-live-imx8qxp.img dd if=${uboot}/flash.bin of=spectrum-live-imx8qxp.img bs=1k seek=32 conv=notrunc IMG=spectrum-live-imx8qxp.img ESP_OFFSET=$(sfdisk --json $IMG | jq -r ' Fixing this allows to proceed to the next error: make: *** No rule to make target '.......systemd-bootx64.efi', needed by 'build/boot.fat'. Stop. But this one is pretty straightforward. Ivan On 9/23/22 10:51, Ville Ilvonen wrote:
On 9/22/22 17:47, Yuri Nesterov wrote:
This allows to get access to rootfs and kernel from device images.
Signed-off-by: Yuri Nesterov <yuriy.nesterov@unikie.com> --- img/live/default.nix | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/img/live/default.nix b/img/live/default.nix index 65ad058..5461384 100644 --- a/img/live/default.nix +++ b/img/live/default.nix @@ -45,4 +45,6 @@ stdenvNoCC.mkDerivation { ''; enableParallelBuilding = true; + + passthru = { inherit rootfs; }; }
Thanks, fixes the issue and takes us to the next issue before out-of-tree build reference configs with imx8 variants are supported.
~/out-of-tree-build ❯ nix-build spectrum-config-imx8/imx8qxp/ -I nixpkgs=nixpkgs-spectrum/ this derivation will be built:
/nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv
building '/nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv'... /nix/store/nlzy51mvniqk080jlszm37j0hzi6m9rv-stdenv-linux/setup: line 1340: spectrum: command not found
Tested-by: Ville Ilvonen <ville.ilvonen@unikie.com>
-Ville
On 9/23/22 13:10, Ivan Nikolaenko wrote:
Hello, There is a typo in imx8qxp config file:
Thanks Ivan, I noticed it in the morning and fixed it in the out-of-spectrum-tree config at https://github.com/tiiuae/spectrum-config-imx8/blob/main/imx8qxp/default.nix... -Ville
diff --git a/imx8qxp/default.nix b/imx8qxp/default.nix index 096d6aa..dc1d41f 100644 --- a/imx8qxp/default.nix +++ b/imx8qxp/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation { ];
buildCommand = '' - install -m 0644 $(spectrum) spectrum-live-imx8qxp.img + install -m 0644 ${spectrum} spectrum-live-imx8qxp.img dd if=${uboot}/flash.bin of=spectrum-live-imx8qxp.img bs=1k seek=32 conv=notrunc IMG=spectrum-live-imx8qxp.img ESP_OFFSET=$(sfdisk --json $IMG | jq -r '
Fixing this allows to proceed to the next error: make: *** No rule to make target '.......systemd-bootx64.efi', needed by 'build/boot.fat'. Stop. But this one is pretty straightforward.
Ivan
On 9/23/22 10:51, Ville Ilvonen wrote:
On 9/22/22 17:47, Yuri Nesterov wrote:
This allows to get access to rootfs and kernel from device images.
Signed-off-by: Yuri Nesterov <yuriy.nesterov@unikie.com> --- img/live/default.nix | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/img/live/default.nix b/img/live/default.nix index 65ad058..5461384 100644 --- a/img/live/default.nix +++ b/img/live/default.nix @@ -45,4 +45,6 @@ stdenvNoCC.mkDerivation { ''; enableParallelBuilding = true; + + passthru = { inherit rootfs; }; }
Thanks, fixes the issue and takes us to the next issue before out-of-tree build reference configs with imx8 variants are supported.
~/out-of-tree-build ❯ nix-build spectrum-config-imx8/imx8qxp/ -I nixpkgs=nixpkgs-spectrum/ this derivation will be built:
/nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv building '/nix/store/0xgldphzh2kjgckd13k3azarzvkdqqvs-spectrum-live-imx8qxp.img-0.1.drv'... /nix/store/nlzy51mvniqk080jlszm37j0hzi6m9rv-stdenv-linux/setup: line 1340: spectrum: command not found
Tested-by: Ville Ilvonen <ville.ilvonen@unikie.com>
-Ville
This patch has been committed as e0e912a70f6c3307f58b843df0813ebf1c2940bc, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=e0e912a70f6c3307f58b843df081.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
This patch has been committed as c40097fe9aa371b998506b199466d9f0a7cdfa21, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=c40097fe9aa371b998506b199466.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
This patch has been committed as 0ca216d4ff06caa2ff6416e247c68f1e968d14d4, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=0ca216d4ff06caa2ff6416e247c6.... This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
Alyssa Ross <qyliss@atuin.qyliss.net> writes:
This patch has been committed as 0ca216d4ff06caa2ff6416e247c68f1e968d14d4, which can be viewed online at https://spectrum-os.org/git/spectrum/commit/?id=0ca216d4ff06caa2ff6416e247c6....
This is an automated message. Send comments/questions/requests to: Alyssa Ross <hi@alyssa.is>
Just to explain what happened here for transparency: I noticed that I'd accidentally dropped Yuri's authorship information from the commit, so I did a quick force push to restore it. (I know force pushes can be disruptive — I would not have done this if I hadn't noticed /immediately/ after publishing. And the commit notification bot does a nice job of making it clear and transparent what happened — it might be nice to extend that to something that sent an email every time a push happened, not just when a patch was taken from devel@. Maybe to a separate list to avoid spamming people who're not interested.)
participants (5)
-
Alyssa Ross -
Alyssa Ross -
Ivan Nikolaenko -
Ville Ilvonen -
Yuri Nesterov