From patchwork Wed Oct 2 21:16:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 15591 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 5E101174AA; Wed, 2 Oct 2019 22:18:04 +0100 (BST) 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 12A62174A7 for ; Wed, 2 Oct 2019 22:18:04 +0100 (BST) Received: from localhost ([::1]:59274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFm0Z-0001OA-IR for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 17:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37725) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFlzk-0000nR-Ep for guix-patches@gnu.org; Wed, 02 Oct 2019 17:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFlzi-0001dC-FM for guix-patches@gnu.org; Wed, 02 Oct 2019 17:17:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFlzd-0001bf-Q2 for guix-patches@gnu.org; Wed, 02 Oct 2019 17:17:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFlzd-00013x-KH for guix-patches@gnu.org; Wed, 02 Oct 2019 17:17:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37466] [WIP v4 7/7] gnu: Add heads-kgpe-d16. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 21:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37466 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37466@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 37466-submit@debbugs.gnu.org id=B37466.15700510004001 (code B ref 37466); Wed, 02 Oct 2019 21:17:05 +0000 Received: (at 37466) by debbugs.gnu.org; 2 Oct 2019 21:16:40 +0000 Received: from localhost ([127.0.0.1]:38452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFlzD-00012O-NL for submit@debbugs.gnu.org; Wed, 02 Oct 2019 17:16:40 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:45276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFlyx-00010v-3Y for 37466@debbugs.gnu.org; Wed, 02 Oct 2019 17:16:23 -0400 Received: from localhost.localdomain (77.116.228.175.wireless.dyn.drei.com [77.116.228.175]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 3C5013362003; Wed, 2 Oct 2019 23:16:22 +0200 (CEST) From: Danny Milosavljevic Date: Wed, 2 Oct 2019 23:16:02 +0200 Message-Id: <20191002211602.16635-8-dannym@scratchpost.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002211602.16635-1-dannym@scratchpost.org> References: <20190929110750.21214-1-dannym@scratchpost.org> <20191002211602.16635-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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/heads.scm (heads-kgpe-d16): New variable. * gnu/packages/patches/heads-kgpe-d16-nonalignment.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/heads.scm | 22 ++++++++++++++++++ .../patches/heads-kgpe-d16-nonalignment.patch | 23 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 gnu/packages/patches/heads-kgpe-d16-nonalignment.patch diff --git a/gnu/local.mk b/gnu/local.mk index fb3c913f2c..10bac6c77b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -948,6 +948,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heads-kgpe-d16-nonalignment.patch \ %D%/packages/patches/heads-make-environment.patch \ %D%/packages/patches/higan-remove-march-native-flag.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index 80e570b097..5e14c95775 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -591,3 +591,25 @@ servers.") `(#:make-flags '("BOARD=qemu-coreboot") ,@(package-arguments heads-coreboot))))) + +(define-public heads-kgpe-d16 + (package + (inherit heads-coreboot) + (name "heads-kgpe-d16") + (source + (origin + (inherit (package-source heads-coreboot)) + (patches (search-patches "heads-make-environment.patch" + "heads-kgpe-d16-nonalignment.patch")))) + (native-inputs + (alist-replace "gnupg" + (list (origin + (method url-fetch) + (uri "https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.21.tar.bz2") + (sha256 + (base32 "0xi2mshq8f6zbarb5f61c9w2qzwrdbjm4q8fqsrwlzc51h8a6ivb")))) + (package-native-inputs heads-coreboot))) + (arguments + `(#:make-flags + '("BOARD=kgpe-d16") + ,@(package-arguments heads-coreboot))))) diff --git a/gnu/packages/patches/heads-kgpe-d16-nonalignment.patch b/gnu/packages/patches/heads-kgpe-d16-nonalignment.patch new file mode 100644 index 0000000000..cbbab1ea40 --- /dev/null +++ b/gnu/packages/patches/heads-kgpe-d16-nonalignment.patch @@ -0,0 +1,23 @@ +Source: https://github.com/osresearch/heads/pull/478 +From 25113cb8c2f431bb0e0c038cbd2a306069159bcb Mon Sep 17 00:00:00 2001 +From: Francis Lam +Date: Sat, 10 Nov 2018 13:41:01 -0800 +Subject: [PATCH] Fix coreboot build for kgpe-d16 + +--- + modules/coreboot | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/coreboot b/modules/coreboot +index 7081fe08..7c62b6f3 100644 +--- a/modules/coreboot ++++ b/modules/coreboot +@@ -16,7 +16,7 @@ CONFIG_COREBOOT_CONFIG ?= config/coreboot-$(BOARD).config + # Ensure that touching the config file will force a rebuild + $(build)/$(coreboot_dir)/.configured: $(CONFIG_COREBOOT_CONFIG) + +-EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches ++EXTRA_FLAGS := -fdebug-prefix-map=$(pwd)=heads -gno-record-gcc-switches -Wno-error=packed-not-aligned + + coreboot_configure := \ + mkdir -p "$(build)/$(coreboot_dir)" \