From 513a28b87576410b247978aede2a3e22263bb9d6 Mon Sep 17 00:00:00 2001 From: Manolis Ragkousis Date: Mon, 29 Sep 2014 18:52:57 +0300 Subject: [PATCH] gnu: Move flashrom and avrdude to (gnu packages flashing-tools). * gnu/packages/admin.scm (flashrom): Move this and... * gnu/packages/avrdude.scm (avrdude): ... this to... * gnu/packages/flashing-tools.scm: ... this. New file. * gnu-system.am (GNU_SYSTEM_MODULES): Remove gnu/packages/avrdude.scm and add gnu/packages/flashing-tools.scm. --- gnu-system.am | 2 +- gnu/packages/admin.scm | 44 ----------------- gnu/packages/avrdude.scm | 58 ---------------------- gnu/packages/flashing-tools.scm | 106 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 103 deletions(-) delete mode 100644 gnu/packages/avrdude.scm create mode 100644 gnu/packages/flashing-tools.scm diff --git a/gnu-system.am b/gnu-system.am index bb944fb..8601a50 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -38,7 +38,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/autogen.scm \ gnu/packages/autotools.scm \ gnu/packages/avahi.scm \ - gnu/packages/avrdude.scm \ gnu/packages/backup.scm \ gnu/packages/base.scm \ gnu/packages/bash.scm \ @@ -82,6 +81,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/enchant.scm \ gnu/packages/file.scm \ gnu/packages/fish.scm \ + gnu/packages/flashing-tools.scm \ gnu/packages/flex.scm \ gnu/packages/fltk.scm \ gnu/packages/fonts.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f6ff32c..a5b84af 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -794,50 +794,6 @@ status for the CPU sockets, expansion slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of I/O ports (e.g. serial, parallel, USB).") (license gpl2+))) -(define-public flashrom - (package - (name "flashrom") - (version "0.9.7") - (source (origin - (method url-fetch) - (uri (string-append - "http://download.flashrom.org/releases/flashrom-" - version ".tar.bz2")) - (sha256 - (base32 - "1s9pc4yls2s1gcg2ar4q75nym2z5v6lxq36bl6lq26br00nj2mas")) - (patches (list (search-patch "flashrom-use-libftdi1.patch"))))) - (build-system gnu-build-system) - (inputs `(("dmidecode" ,dmidecode) - ("pciutils" ,pciutils) - ("libusb" ,libusb) - ("libftdi" ,libftdi))) - (native-inputs `(("pkg-config" ,pkg-config))) - (arguments - '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) - #:tests? #f ; no 'check' target - #:phases - (alist-delete - 'configure - (alist-cons-before - 'build 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmi.c" - (("\"dmidecode\"") - (format #f "~S" - (string-append (assoc-ref inputs "dmidecode") - "/sbin/dmidecode"))))) - %standard-phases)))) - (home-page "http://flashrom.org/") - (synopsis "Identify, read, write, erase, and verify ROM/flash chips") - (description - "flashrom is a utility for identifying, reading, writing, -verifying and erasing flash chips. It is designed to flash -BIOS/EFI/coreboot/firmware/optionROM images on mainboards, -network/graphics/storage controller cards, and various other -programmer devices.") - (license gpl2))) - (define-public acpica (package (name "acpica") diff --git a/gnu/packages/avrdude.scm b/gnu/packages/avrdude.scm deleted file mode 100644 index 2845604..0000000 --- a/gnu/packages/avrdude.scm +++ /dev/null @@ -1,58 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014 Manolis Fragkiskos Ragkousis -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages avrdude) - #:use-module (guix licenses) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (gnu packages) - #:use-module (guix build-system gnu) - #:use-module (gnu packages bison) - #:use-module (gnu packages flex) - #:use-module (gnu packages elf) - #:use-module (gnu packages libusb) - #:use-module (gnu packages libftdi)) - -(define-public avrdude - (package - (name "avrdude") - (version "6.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://savannah/avrdude/avrdude-" - version ".tar.gz")) - (sha256 - (base32 - "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y")) - (patches (list (search-patch "avrdude-fix-libusb.patch"))))) - (build-system gnu-build-system) - (inputs - `(("libelf" ,libelf) - ("libusb" ,libusb) - ("libftdi" ,libftdi))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex))) - (home-page "http://www.nongnu.org/avrdude/") - (synopsis "AVR downloader and uploader") - (description - "AVRDUDE is a utility to download/upload/manipulate the ROM and -EEPROM contents of AVR microcontrollers using the in-system programming -technique (ISP).") - (license gpl2+))) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm new file mode 100644 index 0000000..d2f1b46 --- /dev/null +++ b/gnu/packages/flashing-tools.scm @@ -0,0 +1,106 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2014 Manolis Fragkiskos Ragkousis +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages flashing-tools) + #:use-module (guix licenses) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (guix build-system gnu) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages elf) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages libusb) + #:use-module (gnu packages libftdi) + #:use-module (gnu packages pciutils) + #:use-module (gnu packages admin)) + +(define-public flashrom + (package + (name "flashrom") + (version "0.9.7") + (source (origin + (method url-fetch) + (uri (string-append + "http://download.flashrom.org/releases/flashrom-" + version ".tar.bz2")) + (sha256 + (base32 + "1s9pc4yls2s1gcg2ar4q75nym2z5v6lxq36bl6lq26br00nj2mas")) + (patches (list (search-patch "flashrom-use-libftdi1.patch"))))) + (build-system gnu-build-system) + (inputs `(("dmidecode" ,dmidecode) + ("pciutils" ,pciutils) + ("libusb" ,libusb) + ("libftdi" ,libftdi))) + (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:tests? #f ; no 'check' target + #:phases + (alist-delete + 'configure + (alist-cons-before + 'build 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dmi.c" + (("\"dmidecode\"") + (format #f "~S" + (string-append (assoc-ref inputs "dmidecode") + "/sbin/dmidecode"))))) + %standard-phases)))) + (home-page "http://flashrom.org/") + (synopsis "Identify, read, write, erase, and verify ROM/flash chips") + (description + "flashrom is a utility for identifying, reading, writing, +verifying and erasing flash chips. It is designed to flash +BIOS/EFI/coreboot/firmware/optionROM images on mainboards, +network/graphics/storage controller cards, and various other +programmer devices.") + (license gpl2))) + +(define-public avrdude + (package + (name "avrdude") + (version "6.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/avrdude/avrdude-" + version ".tar.gz")) + (sha256 + (base32 + "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y")) + (patches (list (search-patch "avrdude-fix-libusb.patch"))))) + (build-system gnu-build-system) + (inputs + `(("libelf" ,libelf) + ("libusb" ,libusb) + ("libftdi" ,libftdi))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (home-page "http://www.nongnu.org/avrdude/") + (synopsis "AVR downloader and uploader") + (description + "AVRDUDE is a utility to download/upload/manipulate the ROM and +EEPROM contents of AVR microcontrollers using the in-system programming +technique (ISP).") + (license gpl2+))) -- 2.1.1