From 295fa956f899af37acb6bda9c76ad77748eb9a4a Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sat, 5 Jun 2021 09:23:06 +0200 Subject: [PATCH] Quick fix for changing of Hamlib's FILPATHLEN macro This patch was prepared for Guix by Jack Hill by squashing together the changes from upstream #268 . It allows the released version of Tlf to build against the version 4.2 of hamlib in Guix. --- src/sendqrg.c | 6 +++--- src/sendqrg.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/sendqrg.c b/src/sendqrg.c index ceeb356..5d4420e 100644 --- a/src/sendqrg.c +++ b/src/sendqrg.c @@ -87,7 +87,7 @@ int init_tlf_rig(void) { rigportname[strlen(rigportname) - 1] = '\0'; // remove '\n' strncpy(my_rig->state.rigport.pathname, rigportname, - FILPATHLEN - 1); + TLFFILPATHLEN - 1); caps = my_rig->caps; @@ -104,9 +104,9 @@ int init_tlf_rig(void) { if (dcd_type != RIG_DCD_NONE) my_rig->state.dcdport.type.dcd = dcd_type; if (ptt_file) - strncpy(my_rig->state.pttport.pathname, ptt_file, FILPATHLEN); + strncpy(my_rig->state.pttport.pathname, ptt_file, TLFFILPATHLEN); if (dcd_file) - strncpy(my_rig->state.dcdport.pathname, dcd_file, FILPATHLEN); + strncpy(my_rig->state.dcdport.pathname, dcd_file, TLFFILPATHLEN); my_rig->state.rigport.parm.serial.rate = serial_rate; diff --git a/src/sendqrg.h b/src/sendqrg.h index 8c53f2e..1ef85a6 100644 --- a/src/sendqrg.h +++ b/src/sendqrg.h @@ -23,6 +23,16 @@ #include +#ifdef HAMLIB_FILPATHLEN + #define TLFFILPATHLEN HAMLIB_FILPATHLEN +#else + #ifdef FILPATHLEN + #define TLFFILPATHLEN FILPATHLEN + #else + #error "(HAMLIB_)FILPATHLEN macro not found" + #endif +#endif + int init_tlf_rig(void); void close_tlf_rig(RIG *my_rig); -- 2.32.0 e='range'>range
path: root/gnu/build/linux-modules.scm
AgeCommit message (Expand)Author
2021-12-16linux-modules: Ignore EINVAL in ‘modprobe’ mode....Loading the framebuffer-coreboot module simply fails with EINVAL on a non-Corebooted system. Crashing the system with a kernel panic is not a reasonable reaction to loading valid modules on unsupported hardware. The kernel should log an error, which the user is expected to see. Bogus module names will still be fatally reported by linux-modules.drv. * gnu/build/linux-modules.scm (load-linux-module*): Ignore EINVAL errors when operating recursively. Tobias Geerinckx-Rice via Guix-patches via
2020-08-25linux-libre: Support module compression....This commit adds support for GZIP compression for linux-libre kernel modules. The initrd modules are kept uncompressed as the initrd is already compressed as a whole. The linux-libre kernel also supports XZ compression, but as Guix does not have any available bindings for now, and the compression time is far more significant, GZIP seems to be a better option. * gnu/build/linux-modules.scm (modinfo-section-contents): Use 'call-with-gzip-input-port' to read from a module file using '.gz' extension, (strip-extension): new procedure, (dot-ko): adapt to support compression, (ensure-dot-ko): ditto, (file-name->module-name): ditto, (find-module-file): ditto, (load-linux-module*): ditto, (module-name->file-name/guess): ditto, (module-name-lookup): ditto, (write-module-name-database): ditto, (write-module-alias-database): ditto, (write-module-device-database): ditto. * gnu/installer.scm (installer-program): Add "guile-zlib" to the extensions. * gnu/machine/ssh.scm (machine-check-initrd-modules): Ditto. * gnu/services.scm (activation-script): Ditto. * gnu/services/base.scm (default-serial-port): Ditto, (agetty-shepherd-service): ditto, (udev-service-type): ditto. * gnu/system/image.scm (gcrypt-sqlite3&co): Ditto. * gnu/system/linux-initrd.scm (flat-linux-module-directory): Add "guile-zlib" to the extensions and make sure that the initrd only contains uncompressed module files. * gnu/system/shadow.scm (account-shepherd-service): Add "guile-zlib" to the extensions. * guix/profiles.scm (linux-module-database): Ditto. Mathieu Othacehe
2020-03-22system: Add kernel-loadable-modules to operating-system....* gnu/system.scm (<operating-system>): Add kernel-loadable-modules. (operating-system-directory-base-entries): Use it. * doc/guix.texi (operating-system Reference): Document KERNEL-LOADABLE-MODULES. * gnu/build/linux-modules.scm (depmod): New procedure. (make-linux-module-directory): New procedure. Export it. * guix/profiles.scm (linux-module-database): New procedure. Export it. * gnu/tests/linux-modules.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/linux.scm (make-linux-libre*)[arguments]<#:phases>[install]: Disable depmod. Remove "build" and "source" symlinks. [native-inputs]: Remove kmod. Danny Milosavljevic