From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-992453-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9F04F139083
for <garchives@archives.gentoo.org>; Sat, 23 Dec 2017 14:15:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C0004E0B73;
Sat, 23 Dec 2017 14:15:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9A19CE0B73
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2017 14:15:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0183833FE60
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2017 14:15:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 623EFAE8B
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2017 14:15:05 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org>
Message-ID: <1514038494.f2fbce01954b6fadc3d18d7e9dba2934bdf204aa.blueness@gentoo>
Subject: [gentoo-commits] proj/grss:master commit in: grs/
X-VCS-Repository: proj/grss
X-VCS-Files: grs/Interpret.py grs/Kernel.py
X-VCS-Directories: grs/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: f2fbce01954b6fadc3d18d7e9dba2934bdf204aa
X-VCS-Branch: master
Date: Sat, 23 Dec 2017 14:15:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6979aed9-5efa-46eb-aacf-e378a4d7045d
X-Archives-Hash: 03b734407562a63eadde14184d38fa5e
commit: f2fbce01954b6fadc3d18d7e9dba2934bdf204aa
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 14:14:54 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 14:14:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=f2fbce01
grs/Kernel.p: add arch on the kernel directive line
grs/Interpret.py | 2 +-
grs/Kernel.py | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/grs/Interpret.py b/grs/Interpret.py
index ab16cfa..45eca5f 100644
--- a/grs/Interpret.py
+++ b/grs/Interpret.py
@@ -227,7 +227,7 @@ class Interpret(Daemon):
elif verb == 'pivot':
semantic_action(_line, objs, 1, _pc.pivot, objs[0], _md)
elif verb == 'kernel':
- semantic_action(_line, objs, 0, _ke.kernel)
+ semantic_action(_line, objs, 0, _ke.kernel, objs[0])
elif verb == 'tarit':
# 'tarit' can either be just a verb, or a 'verb obj' pair.
if len(objs):
diff --git a/grs/Kernel.py b/grs/Kernel.py
index cd2ecee..fe411bd 100644
--- a/grs/Kernel.py
+++ b/grs/Kernel.py
@@ -69,7 +69,7 @@ class Kernel():
return (gentoo_version, pkg_name, has_modules)
- def kernel(self):
+ def kernel(self, arch='x86_64'):
""" This emerges the kernel sources to a directory outside of the
fledgeling system's portage configroot, builds and installs it
to yet another external directory, bundles the kernel and modules
@@ -108,8 +108,8 @@ class Kernel():
# Build and install the image outside the portage configroot so
# we can both rsync it in *and* tarball it for downloads via grsup.
- # TODO: add more options (eg splash and firmware), which can be
- # specified vi the kernel line in the build script.
+ # NOTE: more options (eg splash and firmware), can be specified
+ # via the kernel line in the build script.
cmd = 'genkernel '
cmd += '--logfile=/dev/null '
cmd += '--no-save-config '
@@ -122,6 +122,7 @@ class Kernel():
cmd += '--bootdir=%s ' % boot_dir
cmd += '--module-prefix=%s ' % image_dir
cmd += '--modprobedir=%s ' % modprobe_dir
+ cmd += '--arch-override=%s ' % arch
if has_modules:
cmd += 'all'
else: