[gentoo-commits] proj/releng:master commit in: releases/specs/x86/hardened/, releases/specs/amd64/hardened/, ...

[gentoo-commits] proj/releng:master commit in: releases/specs/x86/hardened/, releases/specs/amd64/hardened/, ...

[Ben Kohler]

commit:     fcd4f507cd0797f9543a923ccdc3e51593f9ec90
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May  1 14:29:59 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May  1 14:29:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=fcd4f507

specs/{amd64,x86}: add rust-bin to livecd/unmerge on installcd/admincd

This will start getting installed as an indirect dep of lvm2, but we
don't need to keep it installed for the shipped isos

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 releases/specs/amd64/hardened/admincd-stage2.spec            | 1 +
 releases/specs/amd64/installcd-stage2-minimal.spec           | 1 +
 releases/specs/x86/hardened/admincd-stage2-openrc.spec       | 1 +
 releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec | 1 +
 4 files changed, 4 insertions(+)

diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 360844b6..e1db885d 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -27,6 +27,7 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
+	dev-lang/rust-bin
 	dev-libs/gmp
 	dev-libs/libxml2
 	dev-libs/mpfr

diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec
index 37e4c9a8..8b6e54f6 100644
--- a/releases/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/specs/amd64/installcd-stage2-minimal.spec
@@ -27,6 +27,7 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
+	dev-lang/rust-bin
 	dev-libs/gmp
 	dev-libs/libxml2
 	dev-libs/mpfr

diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
index ce8cca9b..487c2808 100644
--- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec
+++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
@@ -27,6 +27,7 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
+	dev-lang/rust-bin
 	dev-libs/gmp
 	dev-libs/libxml2
 	dev-libs/mpfr

diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
index c2ab6e56..c2d15b4d 100644
--- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
+++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
@@ -28,6 +28,7 @@ livecd/unmerge:
 	app-admin/perl-cleaner
 	app-admin/python-updater
 	app-arch/cpio
+	dev-lang/rust-bin
 	dev-libs/gmp
 	dev-libs/libxml2
 	dev-libs/mpfr

[gentoo-commits] proj/releng:master commit in: releases/specs/x86/hardened/, releases/specs/amd64/hardened/, ...

[Ben Kohler]

commit:     0896aecdf380ce16a06b47101a93503c02be28ae
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 16:23:31 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 16:23:31 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=0896aecd

specs/{amd64,x86}: use DATESTAMP on volid

For the new naming schemes, TIMESTAMP was exceeding the 32 char limit on
volid.  Let's just use DATESTAMP instead.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 releases/specs/amd64/hardened/admincd-stage2.spec            | 2 +-
 releases/specs/amd64/installcd-stage2-minimal.spec           | 2 +-
 releases/specs/x86/hardened/admincd-stage2-openrc.spec       | 2 +-
 releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 8b6778f9..933b5c57 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -11,7 +11,7 @@ livecd/bootargs: dokeymap
 livecd/fstype: squashfs
 livecd/iso: admincd-amd64-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo-amd64-AdminCD-@TIMESTAMP@
+livecd/volid: Gentoo-amd64-AdminCD-@DATESTAMP@
 
 boot/kernel: gentoo
 

diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec b/releases/specs/amd64/installcd-stage2-minimal.spec
index 13404d3c..7d2ff460 100644
--- a/releases/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/specs/amd64/installcd-stage2-minimal.spec
@@ -11,7 +11,7 @@ livecd/bootargs: dokeymap
 livecd/fstype: squashfs
 livecd/iso: install-amd64-minimal-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo-amd64-@TIMESTAMP@
+livecd/volid: Gentoo-amd64-@DATESTAMP@
 
 boot/kernel: gentoo
 

diff --git a/releases/specs/x86/hardened/admincd-stage2-openrc.spec b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
index a77d47a9..9130c3ee 100644
--- a/releases/specs/x86/hardened/admincd-stage2-openrc.spec
+++ b/releases/specs/x86/hardened/admincd-stage2-openrc.spec
@@ -11,7 +11,7 @@ livecd/bootargs: dokeymap
 livecd/fstype: squashfs
 livecd/iso: admincd-x86-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo-x86-AdminCD-@TIMESTAMP@
+livecd/volid: Gentoo-x86-AdminCD-@DATESTAMP@
 
 boot/kernel: gentoo
 

diff --git a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
index 8b0972de..ae1a79af 100644
--- a/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
+++ b/releases/specs/x86/i486/installcd-stage2-minimal-openrc.spec
@@ -12,7 +12,7 @@ livecd/bootargs: dokeymap
 livecd/fstype: squashfs
 livecd/iso: install-x86-minimal-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo-x86-@TIMESTAMP@
+livecd/volid: Gentoo-x86-@DATESTAMP@
 
 boot/kernel: gentoo