From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 200CB15852A for ; Thu, 22 Aug 2024 18:42:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B5F62BC01E; Thu, 22 Aug 2024 18:42:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F14F2BC01E for ; Thu, 22 Aug 2024 18:42:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AEDC340B57 for ; Thu, 22 Aug 2024 18:42:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 932761F06 for ; Thu, 22 Aug 2024 18:42:20 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1724352135.b01e14ada4fc51a754ee17a918b046ff0a4d63b6.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/livecd-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/livecd-tools/livecd-tools-9999.ebuild X-VCS-Directories: app-misc/livecd-tools/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: b01e14ada4fc51a754ee17a918b046ff0a4d63b6 X-VCS-Branch: master Date: Thu, 22 Aug 2024 18:42:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a6cf15c6-03b0-45a3-851a-641e34221349 X-Archives-Hash: 9e07099b6fd034ccec56a115cf56ef57 commit: b01e14ada4fc51a754ee17a918b046ff0a4d63b6 Author: Ian Jordan gmail com> AuthorDate: Wed Jul 31 21:44:47 2024 +0000 Commit: Ben Kohler gentoo org> CommitDate: Thu Aug 22 18:42:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01e14ad app-misc/livecd-tools: update livebuild Match livebuild to 2.11 Signed-off-by: Ian Jordan gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37827 Signed-off-by: Ben Kohler gentoo.org> app-misc/livecd-tools/livecd-tools-9999.ebuild | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild index d9caac398248..b088e11e6125 100644 --- a/app-misc/livecd-tools/livecd-tools-9999.ebuild +++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info +KEYMAP_VER=v1.0.0 + if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/proj/livecd-tools.git" inherit git-r3 @@ -15,18 +17,14 @@ fi DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware" HOMEPAGE="https://gitweb.gentoo.org/proj/livecd-tools.git/" - -SLOT="0" LICENSE="GPL-2" +SLOT="0" RDEPEND=" dev-util/dialog media-sound/alsa-utils net-dialup/mingetty - || ( - sys-apps/openrc - sys-apps/openrc-navi - ) + sys-apps/openrc sys-apps/pciutils " @@ -45,4 +43,12 @@ src_install() { dosbin net-setup into / dosbin livecd-functions.sh + # Add the keymap hook for dracut + insinto /usr/lib/dracut/modules.d + doins -r dracut/90dokeymap + insinto /lib + doins -r lib/keymaps + # Copying Genkernel's hack to create /mnt/gentoo until a cleaner + # solution is created. + keepdir /mnt/gentoo }