From patchwork Wed Mar 20 23:04:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 1515 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 906D716DB5; Wed, 20 Mar 2019 23:06:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E267116DB7 for ; Wed, 20 Mar 2019 23:06:27 +0000 (GMT) Received: from localhost ([127.0.0.1]:56200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6kHz-00082K-FW for patchwork@mira.cbaines.net; Wed, 20 Mar 2019 19:06:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6kHf-0007rp-4i for guix-patches@gnu.org; Wed, 20 Mar 2019 19:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6kHe-0003QG-1y for guix-patches@gnu.org; Wed, 20 Mar 2019 19:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h6kHd-0003Po-Op for guix-patches@gnu.org; Wed, 20 Mar 2019 19:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h6kHd-0005iE-IN for guix-patches@gnu.org; Wed, 20 Mar 2019 19:06:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34929] [PATCH 10/12] gnu: Add loadkeys-static. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Mar 2019 23:06:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34929 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34929@debbugs.gnu.org Received: via spool by 34929-submit@debbugs.gnu.org id=B34929.155312310821829 (code B ref 34929); Wed, 20 Mar 2019 23:06:05 +0000 Received: (at 34929) by debbugs.gnu.org; 20 Mar 2019 23:05:08 +0000 Received: from localhost ([127.0.0.1]:52455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6kGi-0005ft-7c for submit@debbugs.gnu.org; Wed, 20 Mar 2019 19:05:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h6kGb-0005dS-Rk for 34929@debbugs.gnu.org; Wed, 20 Mar 2019 19:05:02 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6kGW-0002U6-KH; Wed, 20 Mar 2019 19:04:56 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57670 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1h6kGW-0004wC-0j; Wed, 20 Mar 2019 19:04:56 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 21 Mar 2019 00:04:33 +0100 Message-Id: <20190320230435.25458-10-ludo@gnu.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190320230435.25458-1-ludo@gnu.org> References: <20190320230435.25458-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (loadkeys-static): New variable. --- gnu/packages/linux.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e9d8ea45c1..de1a9ba24e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1995,6 +1995,43 @@ for systems using the Linux kernel. This includes commands such as 'loadkeys', 'setfont', 'kbdinfo', and 'chvt'.") (license license:gpl2+))) +(define-public loadkeys-static + (package + (inherit kbd) + (name "loadkeys-static") + (arguments + (substitute-keyword-arguments (package-arguments kbd) + ((#:configure-flags flags ''()) + `(append '("LDFLAGS=-static" "--disable-shared" "--disable-nls" + "--disable-vlock" ;so we don't need libpam + "--disable-libkeymap") + ,flags)) + ((#:make-flags flags ''()) + `(cons "LDFLAGS=-all-static" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The binary keeps references to gzip, among other things, + ;; which we don't need in the initrd, so strip references. + (remove-store-references "src/loadkeys") + + (install-file "src/loadkeys" + (string-append out "/bin")) + #t))) + (delete 'post-install))) + ((#:strip-flags _ '()) + ''("--strip-all")) + ((#:allowed-references _ '()) + '()))) + + (synopsis "Statically-linked @command{loadkeys} program") + + ;; This package is meant to be used internally in the initrd so don't + ;; expose it. + (properties '((hidden? . #t))))) + (define-public inotify-tools (package (name "inotify-tools")