Commit Graph

291 Commits

Author SHA1 Message Date
Maxim Cournoyer f44fa21c3e
gnu: patman: Apply patch for new Change-Id setting.
* gnu/packages/bootloaders.scm (u-boot) [source]: Apply patch.
* gnu/packages/patches/u-boot-patman-change-id.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* .patman (keep_change_id): Use it.

Series-changes: 3
 - New commit
Change-Id: I33c03013f6a260b5f5d80212b7b6ebe8a3f97efa
2023-10-22 16:09:04 -04:00
Maxim Cournoyer a6170fcd2b
gnu: Remove extraneous imports.
Found by running 'guild compile -W3 gnu/packages/$module.scm', using guild
from the upcoming Guile.

* gnu/packages/admin.scm: Remove extraneous imports.
* gnu/packages/avr.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/bootloaders.scm: Likewise.
* gnu/packages/firmware.scm: Likewise.
* gnu/packages/linphone.scm: Likewise.
* gnu/packages/telephony.scm: Likewise.
* gnu/packages/cran.scm: Likewise.
* gnu/packages/kde.scm: Likewise.
* gnu/packages/libcanberra.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/mes.scm: Likewise.
* gnu/packages/mingw.scm: Likewise.
* gnu/packages/serialization.scm: Likewise.
* gnu/packages/sync.scm: Likewise.
* gnu/packages/syncthing.scm: Likewise.
* gnu/packages/terminals.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/emulators.scm: Likewise.

Reviewed-by: Ludovic Courtès <ludo@gnu.org>
2023-09-17 16:22:03 -04:00
Maxim Cournoyer c7c500dd61
gnu: patman: Fix execution.
Before this change, patman would fail at run time with "AttributeError: module
'patman.__main__' has no attribute 'run_patman'" since the last U-Boot update.

* gnu/packages/bootloaders.scm (patman) [arguments]
<phases>: New patch-pyproject.toml phase.
2023-09-01 01:19:22 -04:00
Tobias Geerinckx-Rice 789f7e9a3d
gnu: fuse@3: Bind to default FUSE variable.
* gnu/packages/linux.scm (fuse): Rename this…
(fuse-2): …to this, and…
(fuse-3): …rename this…
(fuse): …to this!
(fuse-static): Rename this…
(fuse-2-static): …to this.
Adjust all users.
2023-07-23 02:00:00 +02:00
Ludovic Courtès 0ab46ef3f9
gnu: bootloaders: Avoid top-level circular references.
Fixes <https://issues.guix.gnu.org/64745>.

The regression was introduced in
ed5dc3a25d858a394bb7db937a51d866c3cdc6ed: at the top level,
bootloaders.scm and firmware.scm would depend on each other, leading to
unbound variables when loaded, depending on the order in which they got
loaded.

* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Expect
'scp-firmware' to be a promise; force it in 'native-inputs'.
(u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Wrap the 3rd
argument to 'make-u-boot-sunxi64-package' into 'delay'.

Reported-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-07-20 23:49:48 +02:00
Maxim Cournoyer cf1216d876
gnu: patman: Add python-u-boot-pylib to inputs.
* gnu/packages/bootloaders.scm (patman) [inputs]: Add python-u-boot-pylib.
[phases]: Remove 'sanity-check.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2023-07-19 22:54:44 -07:00
Maxim Cournoyer ffbcc113df
gnu: Add python-u-boot-pylib.
* gnu/packages/bootloaders.scm (python-u-boot-pylib): New variable.
* gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
2023-07-19 22:54:34 -07:00
Vagrant Cascadian ed5dc3a25d
gnu: u-boot: Add crust firmware to pinebook, pine64_plus and pine64-lts.
* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package): Take argument
for System Control Processor (SCP) firmware.
[native-inputs]: Add SCP firmware.
[phases]: Adjust 'set-environment to also set SCP variable.
(u-boot-pine64-plus, u-boot-pine64-lts, u-boot-pinebook): Pass appropriate
crust firmware as the SCP firmware.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-07-19 22:54:20 -07:00
Vagrant Cascadian b0d47d9e18
gnu: u-boot: Update to 2023.07.02.
* gnu/packages/patches/u-boot-infodocs-target.patch: Delete file.
* gnu/packages/patches/u-boot-patman-guix-integration.patch: Delete file.
* gnu/local.mk: De-register patches.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
* gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch: Refresh.
* gnu/packages/bootloaders.scm (u-boot): Update to 2023.07.02.
[native-inputs]: Add python-pyelftools.
[source]: Remove patches.
(u-boot-tools)[phases]: Update substitution for python3-coverage.
Adjust 'patch to catch more openssl incompatibilities.
Split lines in 'patch phase.
[native-inputs]: Add python-filelock and python-pytest-xdist.
(make-u-boot-sunxi64-package): Set SCP environment variable.
(u-boot-sifive-unleashed): Update to use opensbi.
(u-boot-puma-rk3399)[inputs]: Add arm-trusted-firmware-rk3399 to
package-inputs instead of native-inputs.
(u-boot-rockpro64-rk3399): Disable CONFIG_SPL_FIT_SIGNATURE in config.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-07-19 22:54:08 -07:00
Maxim Cournoyer 14888e5b25
gnu: u-boot-ts7970-q-2g-1000mhz-c: Fix build.
* gnu/packages/bootloaders.scm (u-boot-ts-mx6) [arguments]: Replace
adjust-for-gcc10 phase with adjust-for-current-gcc.
2023-07-07 15:59:28 -04:00
Maxim Cournoyer 55d5771ff0
gnu: u-boot: Remove extraneous space.
* gnu/packages/bootloaders.scm (u-boot) [build-system]: Remove extraneous space.
2023-07-07 15:59:28 -04:00
Josselin Poiret 68793b702e
gnu: u-boot: Fix build under Python 3.10.
* gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/bootloaders.scm (u-boot): Apply patch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-03-26 22:19:29 +02:00
Efraim Flashner 4f4e4abd3a
gnu: ipxe: Update to 1.21.1-1.9e1f7a3.
* gnu/packages/bootloaders.scm (ipxe): Update to 1.21.1-1.9e1f7a3.
[source]: Remove patch.
[arguments]: Add phase to skip 1 i386 firmware file. Move setting
syslinux path from make-flags to phases.
* gnu/packages/patches/ipxe-reproducible-geniso.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2023-03-09 15:10:16 +02:00
Efraim Flashner e9c1ea84fc
gnu: grub-efi: Remove test inputs.
* gnu/packages/bootloaders.scm (grub-efi)[native-inputs]: Remove parted,
qemu-minimal, xorriso.
2023-03-02 16:13:56 +02:00
Maxim Cournoyer 01fd830f2f
gnu: u-boot-ts7970-q-2g-1000mhz-c: Adjust description.
* gnu/packages/bootloaders.scm (u-boot-ts7970-q-2g-1000mhz-c): Adjust the
u-boot.imx file name on the SD card to the default one used by the
'u-boot-ts7970-q-2g-1000mhz-c-bootloader' bootloader.
2023-02-24 23:30:27 -05:00
Simon South df8b8f0c76
gnu: u-boot-rock64-rk3328: Fix typo that causes boot failure.
* gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)[arguments]: Fix typo.

Signed-off-by: Leo Famulari <leo@famulari.name>
2023-02-24 15:44:47 -05:00
Denis 'GNUtoo' Carikli 8a68407ac1
gnu: Add u-boot-qemu-arm64.
* gnu/packages/bootloaders.scm (u-boot-qemu-arm64): New variable.
2023-02-14 17:16:18 -05:00
Denis 'GNUtoo' Carikli 36f7b1f02f
gnu: Add u-boot-qemu-arm
* gnu/packages/bootloaders.scm (u-boot-qemu-arm): New variable.
2023-02-14 17:16:17 -05:00
Maxim Cournoyer d393e89d45
gnu: Add u-boot-ts7970-q-2g-1000mhz-c.
* gnu/packages/bootloaders.scm (u-boot-ts-mx6): New variable.
(u-boot-ts7970-q-2g-1000mhz-c): Likewise.
2023-01-18 21:25:17 -05:00
Maxim Cournoyer 6433d49ab7
gnu: Add u-boot-sandbox.
* gnu/packages/bootloaders.scm (u-boot-sandbox): New variable.
2023-01-18 21:11:15 -05:00
Maxim Cournoyer 12f1b5fe4e
gnu: u-boot-puma-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-puma-rk3399)
[arguments]: Use gexps.
[native-inputs]: Turn into...
[inputs]: ... this, and use modify-inputs.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:25 -05:00
Maxim Cournoyer ea0d3e1ec4
gnu: u-boot-rockpro64-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)
[phases]: Use gexps.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:25 -05:00
Maxim Cournoyer 4dd0378d47
gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels.
* gnu/packages/bootloaders.scm (u-boot-sifive-unmatched)
[arguments]: Use gexps.  Use search-input-file.
[inputs]: Remove labels.  Use modify-inputs.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:25 -05:00
Maxim Cournoyer e7d82f4722
gnu: u-boot-rock64-rk3328: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)
[arguments]: Use gexps.
[native-inputs]: Remove input labels and use modify-inputs, and turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:25 -05:00
Maxim Cournoyer 126e07a28e
gnu: make-u-boot-sunxi64-package: Use gexps and fix build.
* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)
[native-inputs]: Turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:24 -05:00
Maxim Cournoyer 3f398ea952
gnu: u-boot-firefly-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:24 -05:00
Maxim Cournoyer c9c195936d
gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps.
* gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]:
Remove input labels.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:24 -05:00
Maxim Cournoyer 980abad24d
gnu: make-u-boot-package: Allow disabling cross-compilation.
* gnu/packages/bootloaders.scm (make-u-boot-package): Accept #f for the
TRIPLET argument to disable cross-compilation.  Update doc.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:24 -05:00
Maxim Cournoyer c6a8b1384d
gnu: make-uboot-package: Simplify build.
* gnu/packages/bootloaders.scm (make-u-boot-package) <same-arch?>: Rename
procedure to 'native-build?'.
[native-inputs]: Remove field.
[arguments]: Specify the #:target argument, when not natively building.
Adjust for the above renaming.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:24 -05:00
Maxim Cournoyer 680a768384
gnu: u-boot: Reduce the number of native inputs.
The extra python inputs are only needed for running the u-boot-test-tools test
suite.  This lowers the requirements for cross-building the various u-boot
packages.

* gnu/packages/bootloaders.scm (u-boot) [native-inputs]: Delete bc.
Move python-coverage, python-pycryptodomex and python-pytest to...
* gnu/packages/bootloaders.scm (u-boot-tools) [native-inputs]: ... here.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:23 -05:00
Maxim Cournoyer 64e526c374
gnu: make-u-boot-package: Install .imx files.
* gnu/packages/bootloaders.scm
(make-u-boot-package) [phases] <install>: Add imx to the regexp of files
considered for installation.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:23 -05:00
Maxim Cournoyer d970d6a04a
gnu: make-u-boot-package: Add a u-boot argument and use gexps.
And have that u-boot argument used as the complete base of the template, so
that a user can override it.

* gnu/packages/bootloaders.scm (make-u-boot-package): New U-BOOT argument.
Document it.
[native-inputs]: Move the native-inputs of U-BOOT first, so that the
cross compilation tools can be overridden via U-BOOT.
[arguments]: Rewrite using substitute-keyword-arguments, extending rather than
overriding most arguments.  Use gexps.  Do not bind OUTPUTS.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 21:04:23 -05:00
Maxim Cournoyer 358ae8e12e
gnu: Remove u-boot-malta.
Relates to <https://issues.guix.gnu.org/60786>.

The mips64el architecture is not currently supported, causing (guix platform)
to raise an exception when attempting to cross-build the package.

* gnu/packages/bootloaders.scm (u-boot-malta): Delete variable.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2023-01-18 20:53:15 -05:00
Maxim Cournoyer c42ae60a84
gnu: patman: Fix incomplete get-maintainer patch.
The full set of patches already merged into the U-Boot is included for
simplicity and avoiding mistakes like the previous one, where a conflicting
hunk got dropped, causing the following error when running patman:

    WARNING: Unknown setting get_maintainer_script

* gnu/packages/bootloaders.scm (u-boot) [source]: Replace the
u-boot-patman-fix-help.patch, u-boot-patman-local-conf.patch and
u-boot-patman-get-maintainer.patch with u-boot-patman-guix-integration.patch.
* gnu/local.mk (dist_patch_DATA): Update patch registrations.
* gnu/packages/patches/u-boot-patman-fix-help.patch: Delete file.
* gnu/packages/patches/u-boot-patman-get-maintainer.patch: Likewise.
* gnu/packages/patches/u-boot-patman-local-conf.patch: Likewise.
* gnu/packages/patches/u-boot-patman-guix-integration.patch: New file.

Reported-by: Jelle Licht <jlicht@fsfe.org>
2023-01-10 11:37:29 -05:00
Marius Bakke d15972194a
gnu: ipxe: Enable syslinux only on i686-linux and x86_64-linux.
* gnu/packages/bootloaders.scm (ipxe)[native-inputs]: Conditionally add
SYSLINUX.
[arguments]: Adjust accordingly.
2023-01-07 21:04:27 +01:00
Marius Bakke b435f631a6
gnu: ipxe: Use G-expression.
* gnu/packages/bootloaders.scm (ipxe)[arguments]: Convert to G-expression.
While at it, remove trailing #t's and label usage.
2023-01-07 21:04:27 +01:00
Maxim Cournoyer 5dc8cf849b
gnu: dtc: Install documentation.
* gnu/packages/bootloaders.scm (dtc) [modules]: New argument.
[phases]: Add install-doc phase.
2023-01-03 16:03:26 -05:00
Maxim Cournoyer a5b00d2733
gnu: dtc: Use gexps.
* gnu/packages/bootloaders.scm (dtc) [arguments]: Use gexps.
2023-01-03 16:03:26 -05:00
Maxim Cournoyer ec3c37d733
gnu: dtc: Move native-inputs and inputs after arguments.
* gnu/packages/bootloaders.scm (dtc) [native-inputs, inputs]: Move after the
arguments field, per convention.
2023-01-03 16:03:26 -05:00
Maxim Cournoyer d6ea9f8b38
gnu: u-boot-am335x-boneblack: Revert to old name.
This reverts to the name this package had previous to commit
c2c1dfdf57 ("gnu: bootloader: Add U-Boot
packages for Raspberry Pi models."), which caused the package name to be
derived from the board name.

* gnu/packages/bootloaders.scm (u-boot-am335x-evm-boneblack): Remove the
NAME-SUFFIX keyword argument.  Specify the full name via the name field.
* gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust to
the renamed package.

Reported-by: Vagrant Cascadian <vagrant@debian.org>
2022-12-28 22:14:16 -05:00
Maxim Cournoyer bcd131dafb
gnu: Add patman.
* gnu/packages/bootloaders.scm (patman): New variable.
* gnu/packages/patches/u-boot-patman-fix-help.patch: New patch.
* gnu/packages/patches/u-boot-patman-get-maintainer.patch: Likewise.
* gnu/packages/patches/u-boot-patman-local-conf.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): Register them.
2022-12-28 16:03:20 -05:00
Maxim Cournoyer 0d4587d65f
gnu: Add u-boot-documentation.
* gnu/packages/patches/u-boot-infodocs-target.patch: New patch.
* gnu/local.mk: (dist_patch_DATA): Register it.
* gnu/packages/bootloaders.scm (u-boot): Apply it.
(u-boot-documentation): New variable.
2022-12-28 16:03:20 -05:00
Efraim Flashner 10a661c8c8
gnu: syslinux: Honor #:tests? flag.
* gnu/packages/bootloaders.scm (syslinux)[arguments]: Adjust custom
'check phase to honor the #:tests? flag.
2022-12-25 22:07:32 +02:00
Efraim Flashner 6ce7904a85
gnu: ipxe-qemu: Fix building on 32-bit systems.
* gnu/packages/bootloaders.scm (ipxe-qemu)[native-inputs]: When building
from a 32-bit system add a binutils variant capable of assembling 64-bit
instructions and an ld-wrapper using it.
2022-12-22 22:09:58 +02:00
Marius Bakke 9279775d69
gnu: iPXE: Embed the actual package version.
* gnu/packages/bootloaders.scm (ipxe)[arguments]: Add phase to set the proper
version.
2022-12-22 16:50:47 +01:00
Marius Bakke 209aed9511
gnu: Install QEMU firmare files to 'share/qemu'.
This paves the way for using a native search path in the future.

* gnu/packages/bootloaders.scm (ipxe-qemu)[arguments]: Install firmware files
to 'share/qemu' instead of 'share/firmware'.
* gnu/packages/firmware.scm (seabios-qemu)[arguments]: Likewise.
* gnu/packages/virtualization.scm (qemu)[arguments]: Adjust accordingly.
2022-12-22 16:50:47 +01:00
Marius Bakke a5dbe84a61
gnu: ipxe-qemu: Cross-compile on non x86_64.
* gnu/packages/bootloaders.scm (ipxe-qemu)[native-inputs]: When not targeting
x86_64, add CROSS-GCC and CROSS-BINUTILS.
[arguments]: Set CROSS_COMPILE in that case.
2022-12-22 16:50:47 +01:00
Maxim Cournoyer c04528d2a2
gnu: u-boot-am335x-evm-boneblack: Fix variable name.
* gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to...
(u-boot-am335x-evm-boneblack), to match the package name.
* gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust
accordingly.
2022-12-20 21:29:25 -05:00
Maxim Cournoyer 57abc2b7b2
gnu: u-boot: Add pkg-config to native inputs.
* gnu/packages/bootloaders.scm (u-boot) [native-inputs]: Add pkg-config.
2022-12-20 21:19:37 -05:00
Maxim Cournoyer 4a4f2d226e
gnu: u-boot-tools: Delete trailing #t.
* gnu/packages/bootloaders.scm (u-boot-tools) [phases]: Delete trailing #t.
2022-12-20 21:16:16 -05:00