[bug#30446] [PATCH 0/3] Add Intel ME tools.

[bug#30446] [PATCH 0/3] Add Intel ME tools.

[Danny Milosavljevic]

Danny Milosavljevic (3):
  gnu: Add ifdtool.
  gnu: Add intelmetool.
  gnu: Add me-cleaner.

 gnu/packages/flashing-tools.scm | 107 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

[bug#30446] [PATCH 1/3] gnu: Add ifdtool.

[Danny Milosavljevic]

* gnu/packages/flashing-tools.scm (ifdtool): New variable.
---
 gnu/packages/flashing-tools.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 9683c6b4a..c29982551 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -330,3 +330,38 @@ USB and interacts with low-level software running on the device, known as Loke.
 Loke and Heimdall communicate via the custom Samsung-developed protocol typically
 referred to as the \"Odin 3 protocol\".")
     (license license:expat)))
+
+(define-public ifdtool
+  (let ((commit "1b64ae1119fc7891b043d5d29bf93859ef9dbfa1")
+        (revision "0"))
+    (package
+      (name "ifdtool")
+      (version (git-version "0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://review.coreboot.org/p/coreboot")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0i3h9ns5f0z9ffapmlcj1mcgi5b1kzdlakixs2i8s4mkjn0aidsc"))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:make-flags
+         (list "CC=gcc"
+               "INSTALL=install"
+               (string-append "PREFIX=" (assoc-ref %outputs "out")))
+         #:phases
+         (modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/ifdtool")
+              #t))
+          (delete 'configure)
+          (delete 'check))))
+      (home-page "https://github.com/corna/me_cleaner/")
+      (synopsis "Intel Firmware Descriptor dumper")
+      (description "This package provides @ifdtool}, a program to
+dump Intel Firmware Descriptor data of an image file.")
+      (license license:gpl2))))

[bug#30446] [PATCH 2/3] gnu: Add intelmetool.

[Danny Milosavljevic]

* gnu/packages/flashing-tools.scm (intelmetool): New variable.
---
 gnu/packages/flashing-tools.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index c29982551..78981f4b6 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages pciutils)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages libftdi)
@@ -365,3 +366,43 @@ referred to as the \"Odin 3 protocol\".")
       (description "This package provides @ifdtool}, a program to
 dump Intel Firmware Descriptor data of an image file.")
       (license license:gpl2))))
+
+(define-public intelmetool
+  (let ((commit "1b64ae1119fc7891b043d5d29bf93859ef9dbfa1")
+        (revision "0"))
+    (package
+      (name "intelmetool")
+      (version (git-version "0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://review.coreboot.org/p/coreboot")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0i3h9ns5f0z9ffapmlcj1mcgi5b1kzdlakixs2i8s4mkjn0aidsc"))))
+      (build-system gnu-build-system)
+      (inputs
+       `(("pciutils" ,pciutils)
+         ("zlib" ,zlib)))
+      (arguments
+       `(#:make-flags
+         (list "CC=gcc"
+               "INSTALL=install"
+               (string-append "PREFIX=" (assoc-ref %outputs "out")))
+         #:phases
+         (modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _
+              (chdir "util/intelmetool")
+              #t))
+          (delete 'configure)
+          (delete 'check))))
+      (home-page "https://github.com/zamaudio/intelmetool")
+      (synopsis "Intel ME tools")
+      (description "This package provides tools for working with Intel
+Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
+@code{sudo rmmod mei} before using this tool.  Also pass
+@code{iomem=relaxed} to the Linux kernel command line.")
+      (license license:gpl2))))

[bug#30446] [PATCH 3/3] gnu: Add me-cleaner.

[Danny Milosavljevic]

* gnu/packages/flashing-tools.scm (me-cleaner): New variable.
---
 gnu/packages/flashing-tools.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 78981f4b6..1c32d0745 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages flex)
@@ -406,3 +407,33 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
 @code{sudo rmmod mei} before using this tool.  Also pass
 @code{iomem=relaxed} to the Linux kernel command line.")
       (license license:gpl2))))
+
+(define-public me-cleaner
+  (package
+    (name "me-cleaner")
+    (version "1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/corna/me_cleaner/"
+                                  "archive/v" version ".tar.gz"))
+              (sha256
+               (base32
+                "1pgwdqy0jly80nhxmlmyibs343497yjzs6dwfbkcw0l1gjm8i5hw"))
+              (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+ (add-after 'unpack 'create-setup.py
+           (lambda _
+             (call-with-output-file "setup.py"
+               (lambda (port)
+                 (format port "\
+from setuptools import setup
+setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py'])
+" ,version))))))))
+    (home-page "https://github.com/corna/me_cleaner")
+    (synopsis "Intel ME cleaner")
+    (description "This package provides tools for disabling Intel
+ME as far as possible (in image files).")
+    (license license:gpl3+)))

[bug#30446] [PATCH 1/3] gnu: Add ifdtool.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

On Tue, Feb 13, 2018 at 07:01:43PM +0100, Danny Milosavljevic wrote:
> * gnu/packages/flashing-tools.scm (ifdtool): New variable.

> +(define-public ifdtool
> +  (let ((commit "1b64ae1119fc7891b043d5d29bf93859ef9dbfa1")
> +        (revision "0"))
> +    (package
> +      (name "ifdtool")
> +      (version (git-version "0.0" revision commit))

I notice the Git repo has tagged versions. If the latest one is
inappropriate to build from, please use it in the git-version like this:

(git-version "4.7" revision commit)

Otherwise, LGTM!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30446] [PATCH 2/3] gnu: Add intelmetool.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

On Tue, Feb 13, 2018 at 07:01:44PM +0100, Danny Milosavljevic wrote:
> * gnu/packages/flashing-tools.scm (intelmetool): New variable.

> +(define-public intelmetool
> +  (let ((commit "1b64ae1119fc7891b043d5d29bf93859ef9dbfa1")
> +        (revision "0"))
> +    (package
> +      (name "intelmetool")
> +      (version (git-version "0.0" revision commit))

Same feedback about the version string as with the other coreboot-based
package.

> +      (synopsis "Intel ME tools")
> +      (description "This package provides tools for working with Intel
> +Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
> +@code{sudo rmmod mei} before using this tool.  Also pass
> +@code{iomem=relaxed} to the Linux kernel command line.")

Overall LGTM, but I don't think we should use the description as a
source of copy-and-paste instructions. Does the package include any
docs?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30446] [PATCH 3/3] gnu: Add me-cleaner.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

On Tue, Feb 13, 2018 at 07:01:45PM +0100, Danny Milosavljevic wrote:
> * gnu/packages/flashing-tools.scm (me-cleaner): New variable.

> +    (build-system python-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> + (add-after 'unpack 'create-setup.py
> +           (lambda _
> +             (call-with-output-file "setup.py"
> +               (lambda (port)
> +                 (format port "\
> +from setuptools import setup
> +setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py'])
> +" ,version))))))))

Okay if it works!

> +    (description "This package provides tools for disabling Intel
> +ME as far as possible (in image files).")

Can you clarify "image files"? I'm not sure what it means here.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30446] [PATCH 2/3] gnu: Add intelmetool.

[Danny Milosavljevic]

Hi Leo,

> Overall LGTM, but I don't think we should use the description as a
> source of copy-and-paste instructions. Does the package include any
> docs?

Apparently not.  While coreboot has docs, it doesn't mention intelmetool anywhere.

I just thought to include those things in the description because if you don't
do the stuff (note: Guix doesn't do it by default) it will fail in strange ways
(and did for me).

[bug#30446] [PATCH 1/3] gnu: Add ifdtool.

[Danny Milosavljevic]

Hi Leo,

On Tue, 13 Feb 2018 14:18:43 -0500
Leo Famulari <leo@famulari.name> wrote:

> I notice the Git repo has tagged versions. If the latest one is
> inappropriate to build from, please use it in the git-version like this:

How do I find out which commit corresponds to a tag (or which commits are
not in the 4.7 tag) ? 

[bug#30446] [PATCH 3/3] gnu: Add me-cleaner.

[Danny Milosavljevic]

On Tue, 13 Feb 2018 14:21:50 -0500
Leo Famulari <leo@famulari.name> wrote:

> On Tue, Feb 13, 2018 at 07:01:45PM +0100, Danny Milosavljevic wrote:
> > * gnu/packages/flashing-tools.scm (me-cleaner): New variable.  
> 
> > +    (build-system python-build-system)
> > +    (arguments
> > +     `(#:phases
> > +       (modify-phases %standard-phases
> > + (add-after 'unpack 'create-setup.py
> > +           (lambda _
> > +             (call-with-output-file "setup.py"
> > +               (lambda (port)
> > +                 (format port "\
> > +from setuptools import setup
> > +setup(name='me_cleaner', version='~a', scripts=['me_cleaner.py'])
> > +" ,version))))))))  

Note to self: forgot the #t.

[bug#30446] [PATCH 1/3] gnu: Add ifdtool.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> Hi Leo,
>
> On Tue, 13 Feb 2018 14:18:43 -0500
> Leo Famulari <leo@famulari.name> wrote:
>
>> I notice the Git repo has tagged versions. If the latest one is
>> inappropriate to build from, please use it in the git-version like this:
>
> How do I find out which commit corresponds to a tag (or which commits are
> not in the 4.7 tag) ? 

You can use the tag name in the (revision ...) field (see e.g. libvpx).

To find which commits are not in a given tag, use something along the
lines of...

$ git log --format=oneline v4.7..master

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#30446] [PATCH 1/3] gnu: Add ifdtool.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On Tue, Feb 13, 2018 at 10:50:49PM +0100, Marius Bakke wrote:
> Danny Milosavljevic <dannym@scratchpost.org> writes:
> 
> > Hi Leo,
> >
> > On Tue, 13 Feb 2018 14:18:43 -0500
> > Leo Famulari <leo@famulari.name> wrote:
> >
> >> I notice the Git repo has tagged versions. If the latest one is
> >> inappropriate to build from, please use it in the git-version like this:
> >
> > How do I find out which commit corresponds to a tag (or which commits are
> > not in the 4.7 tag) ? 
> 
> You can use the tag name in the (revision ...) field (see e.g. libvpx).
> 
> To find which commits are not in a given tag, use something along the
> lines of...
> 
> $ git log --format=oneline v4.7..master

Also, `git describe --contains $commit` will tell you the latest tag
that contains the commit.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30446] [PATCH 2/3] gnu: Add intelmetool.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 724 bytes --]

On Tue, Feb 13, 2018 at 09:36:26PM +0100, Danny Milosavljevic wrote:
> Hi Leo,
> 
> > Overall LGTM, but I don't think we should use the description as a
> > source of copy-and-paste instructions. Does the package include any
> > docs?
> 
> Apparently not.  While coreboot has docs, it doesn't mention intelmetool anywhere.
> 
> I just thought to include those things in the description because if you don't
> do the stuff (note: Guix doesn't do it by default) it will fail in strange ways
> (and did for me).

Are the instructions mostly distro-agnostic? Maybe upstream would accept
a simple README file.

Or we could even add our own in the meantime. But hopefully we don't end
up having to support it :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]