| Message ID | 20160926103447.31830-2-david@craven.ch |
|---|---|
| State | New |
| Headers | show |
Hi David, David Craven <david@craven.ch> skribis: > * gnu/packages/linux.scm (%default-extra-linux-options): Remove > redundant options. This patches appears to break things: --8<---------------cut here---------------start------------->8--- $ sudo ./pre-inst-env guix system reconfigure ~/src/configuration/pluto-configuration.scm --fallback [...] Backtrace: In ice-9/boot-9.scm: 157: 13 [catch #t #<catch-closure 8c9aa0> ...] In unknown file: ?: 12 [apply-smob/1 #<catch-closure 8c9aa0>] In ice-9/boot-9.scm: 63: 11 [call-with-prompt prompt0 ...] In ice-9/eval.scm: 432: 10 [eval # #] In ice-9/boot-9.scm: 2401: 9 [save-module-excursion #<procedure 8e7800 at ice-9/boot-9.scm:4045:3 ()>] 4050: 8 [#<procedure 8e7800 at ice-9/boot-9.scm:4045:3 ()>] 1724: 7 [%start-stack load-stack #<procedure 8faae0 at ice-9/boot-9.scm:4041:10 ()>] 1729: 6 [#<procedure 8fd9c0 ()>] In unknown file: ?: 5 [primitive-load "/gnu/store/8lmcdhipd7ccjpaqd3a8pbb2yvn9d7v0-linux-modules-builder"] In ice-9/eval.scm: 432: 4 [eval # ()] 453: 3 [eval # ()] 411: 2 [eval # ()] In srfi/srfi-1.scm: 578: 1 [map #<procedure lookup (a)> ("ahci" "usb-storage" "uas" ...)] In unknown file: ?: 0 [scm-error misc-error #f ...] ERROR: In procedure scm-error: ERROR: module not found "virtio_pci.ko" "/gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules" builder for `/gnu/store/x0jqyr639karxakl0q2807ka608g4k3n-linux-modules.drv' failed with exit code 1 --8<---------------cut here---------------end--------------->8--- “make check-system TESTS=basic” fails similarly. Indeed, most of the virtio modules disappeared: --8<---------------cut here---------------start------------->8--- $ find "/gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules" -name virtio\* /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/char/hw_random/virtio-rng.ko /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/scsi/virtio_scsi.ko /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/gpu/drm/virtio /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/virtio /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules/4.7.5-gnu/kernel/drivers/virtio/virtio_input.ko --8<---------------cut here---------------end--------------->8--- I think we need to revert this patch. Could you please look at it? TIA! Ludo’.
I'll look at it I'm ca 1h afk. That's possible, the kernel configs may use y instead of m, but I checked that they're all there. I think that the configs should probably be changed, or wdyt? On Sep 29, 2016 10:41 AM, "Ludovic Courtès" <ludo@gnu.org> wrote: > Hi David, > > David Craven <david@craven.ch> skribis: > > > * gnu/packages/linux.scm (%default-extra-linux-options): Remove > > redundant options. > > This patches appears to break things: > > --8<---------------cut here---------------start------------->8--- > $ sudo ./pre-inst-env guix system reconfigure ~/src/configuration/pluto-configuration.scm > --fallback > > [...] > > Backtrace: > In ice-9/boot-9.scm: > 157: 13 [catch #t #<catch-closure 8c9aa0> ...] > In unknown file: > ?: 12 [apply-smob/1 #<catch-closure 8c9aa0>] > In ice-9/boot-9.scm: > 63: 11 [call-with-prompt prompt0 ...] > In ice-9/eval.scm: > 432: 10 [eval # #] > In ice-9/boot-9.scm: > 2401: 9 [save-module-excursion #<procedure 8e7800 at > ice-9/boot-9.scm:4045:3 ()>] > 4050: 8 [#<procedure 8e7800 at ice-9/boot-9.scm:4045:3 ()>] > 1724: 7 [%start-stack load-stack #<procedure 8faae0 at > ice-9/boot-9.scm:4041:10 ()>] > 1729: 6 [#<procedure 8fd9c0 ()>] > In unknown file: > ?: 5 [primitive-load "/gnu/store/8lmcdhipd7ccjpaqd3a8pbb2yvn9d7 > v0-linux-modules-builder"] > In ice-9/eval.scm: > 432: 4 [eval # ()] > 453: 3 [eval # ()] > 411: 2 [eval # ()] > In srfi/srfi-1.scm: > 578: 1 [map #<procedure lookup (a)> ("ahci" "usb-storage" "uas" ...)] > In unknown file: > ?: 0 [scm-error misc-error #f ...] > > ERROR: In procedure scm-error: > ERROR: module not found "virtio_pci.ko" "/gnu/store/ > kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules" > builder for `/gnu/store/x0jqyr639karxakl0q2807ka608g4k3n-linux-modules.drv' > failed with exit code 1 > --8<---------------cut here---------------end--------------->8--- > > “make check-system TESTS=basic” fails similarly. > > Indeed, most of the virtio modules disappeared: > > --8<---------------cut here---------------start------------->8--- > $ find "/gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/modules" > -name virtio\* > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/char/hw_random/virtio-rng.ko > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/scsi/virtio_scsi.ko > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/gpu/drm/virtio > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/gpu/drm/virtio/virtio-gpu.ko > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/virtio > /gnu/store/kzia9krx5ax1pm2pq5476v5fv71x36ai-linux-libre-4.7.5/lib/ > modules/4.7.5-gnu/kernel/drivers/virtio/virtio_input.ko > --8<---------------cut here---------------end--------------->8--- > > I think we need to revert this patch. Could you please look at it? > > TIA! > > Ludo’. >
>> I think we need to revert this patch. Could you please look at it?
m and y aren't equivalent after all. The default initrd requires these
to be modules.
So there are two options, revert the patch or change the y's to m's.
I think your're right. I can revert it and add a comment saying why
they are needed.
David Craven <david@craven.ch> skribis: >>> I think we need to revert this patch. Could you please look at it? > > m and y aren't equivalent after all. The default initrd requires these > to be modules. > > So there are two options, revert the patch or change the y's to m's. > > I think your're right. I can revert it and add a comment saying why > they are needed. Right, thanks for the quick response! I think it’s best to have them as modules, because I imagine one would want to avoid loading them when the system runs on the bare metal. Ludo’.
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c8be533..d8d14d4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -187,18 +187,8 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (search-path %load-path file))) (define %default-extra-linux-options - `(("CONFIG_NET_9P" . m) - ("CONFIG_NET_9P_VIRTIO" . m) - ("CONFIG_VIRTIO_BLK" . m) - ("CONFIG_VIRTIO_NET" . m) - ;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html - ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t) - ("CONFIG_VIRTIO_PCI" . m) - ("CONFIG_VIRTIO_BALLOON" . m) - ("CONFIG_VIRTIO_MMIO" . m) - ("CONFIG_FUSE_FS" . m) - ("CONFIG_CIFS" . m) - ("CONFIG_9P_FS" . m))) + `(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html + ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t))) (define (config->string options) (string-join (map (match-lambda