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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF765158092 for ; Mon, 13 Sep 2021 04:49:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D495E086D; Mon, 13 Sep 2021 04:49:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDB5FE086D for ; Mon, 13 Sep 2021 04:49:41 +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 033A4342E5A for ; Mon, 13 Sep 2021 04:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 537E6E7 for ; Mon, 13 Sep 2021 04:49:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1631508570.e9064501872b6529ea79c9672df80664f426c942.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/hppa/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs/hppa/installcd-stage2-minimal.spec releases/specs/hppa/netboot-hppa32.spec releases/specs/hppa/netboot-hppa64.spec X-VCS-Directories: releases/specs/hppa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e9064501872b6529ea79c9672df80664f426c942 X-VCS-Branch: master Date: Mon, 13 Sep 2021 04:49:38 +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: 702b8b32-08c7-4856-954f-ffda0d9866ce X-Archives-Hash: 6b4824a775b1667d2ea0d31f2fe24101 commit: e9064501872b6529ea79c9672df80664f426c942 Author: Matt Turner gentoo org> AuthorDate: Sun Sep 12 04:21:15 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Sep 13 04:49:30 2021 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e9064501 specs/hppa: Rename kernels Now that the kernel configs are consolidated, maybe we can share them between the netboot images and the installcd. Signed-off-by: Matt Turner gentoo.org> releases/specs/hppa/installcd-stage2-minimal.spec | 20 ++++++++++---------- releases/specs/hppa/netboot-hppa32.spec | 8 ++++---- releases/specs/hppa/netboot-hppa64.spec | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/releases/specs/hppa/installcd-stage2-minimal.spec b/releases/specs/hppa/installcd-stage2-minimal.spec index ad132917..10a1a30d 100644 --- a/releases/specs/hppa/installcd-stage2-minimal.spec +++ b/releases/specs/hppa/installcd-stage2-minimal.spec @@ -14,11 +14,11 @@ livecd/fstype: squashfs livecd/iso: /var/tmp/catalyst/builds/default/install-hppa-minimal-@TIMESTAMP@.iso livecd/type: gentoo-release-minimal -boot/kernel: livecd32 livecd64 +boot/kernel: hppa32 hppa64 -boot/kernel/livecd32/sources: sys-kernel/gentoo-sources -boot/kernel/livecd32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config -boot/kernel/livecd32/use: +boot/kernel/hppa32/sources: sys-kernel/gentoo-sources +boot/kernel/hppa32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config +boot/kernel/hppa32/use: -* python_targets_python3_9 python_single_target_python3_9 @@ -38,16 +38,16 @@ boot/kernel/livecd32/use: unicode usb -boot/kernel/livecd64/sources: sys-kernel/gentoo-sources -boot/kernel/livecd64/config: @REPO_DIR@/releases/kconfig/hppa/hppa64.config -boot/kernel/livecd64/gk_kernargs: +boot/kernel/hppa64/sources: sys-kernel/gentoo-sources +boot/kernel/hppa64/config: @REPO_DIR@/releases/kconfig/hppa/hppa64.config +boot/kernel/hppa64/gk_kernargs: --all-ramdisk-modules --kernel-ar=hppa64-unknown-linux-gnu-ar --kernel-as=hppa64-unknown-linux-gnu-as --kernel-cc=hppa64-unknown-linux-gnu-cc --kernel-ld=hppa64-unknown-linux-gnu-ld --kernel-nm=hppa64-unknown-linux-gnu-nm -boot/kernel/livecd64/use: +boot/kernel/hppa64/use: -* python_targets_python3_9 python_single_target_python3_9 @@ -67,8 +67,8 @@ boot/kernel/livecd64/use: unicode usb -boot/kernel/livecd32/extraversion: livecd32 -boot/kernel/livecd64/extraversion: livecd64 +boot/kernel/hppa32/extraversion: hppa32 +boot/kernel/hppa64/extraversion: hppa64 livecd/unmerge: app-admin/eselect diff --git a/releases/specs/hppa/netboot-hppa32.spec b/releases/specs/hppa/netboot-hppa32.spec index 4908c222..5a04d882 100644 --- a/releases/specs/hppa/netboot-hppa32.spec +++ b/releases/specs/hppa/netboot-hppa32.spec @@ -11,10 +11,10 @@ rel_type: default profile: default/linux/hppa/17.0 # netboot stuff -boot/kernel: netboot32 -boot/kernel/netboot32/sources: sys-kernel/gentoo-sources -boot/kernel/netboot32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config -boot/kernel/netboot32/gk_kernargs: --all-ramdisk-modules +boot/kernel: hppa32 +boot/kernel/hppa32/sources: sys-kernel/gentoo-sources +boot/kernel/hppa32/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config +boot/kernel/hppa32/gk_kernargs: --all-ramdisk-modules netboot/use: -* diff --git a/releases/specs/hppa/netboot-hppa64.spec b/releases/specs/hppa/netboot-hppa64.spec index 992fc3db..75039c30 100644 --- a/releases/specs/hppa/netboot-hppa64.spec +++ b/releases/specs/hppa/netboot-hppa64.spec @@ -10,10 +10,10 @@ subarch: hppa2.0 rel_type: default profile: default/linux/hppa/17.0 -boot/kernel: netboot64 -boot/kernel/netboot64/sources: sys-kernel/gentoo-sources -boot/kernel/netboot64/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config -boot/kernel/netboot64/gk_kernargs: +boot/kernel: hppa64 +boot/kernel/hppa64/sources: sys-kernel/gentoo-sources +boot/kernel/hppa64/config: @REPO_DIR@/releases/kconfig/hppa/hppa32.config +boot/kernel/hppa64/gk_kernargs: --all-ramdisk-modules --kernel-ar=hppa64-unknown-linux-gnu-ar --kernel-as=hppa64-unknown-linux-gnu-as