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

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

[Jorge Manuel B. S. Vicetto]

commit:     5cee05651cb96ebff9d730c6f1d576fa6dfb83ec
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 14:45:28 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 14:45:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5cee0565

Update kernel config version to use on the amd64 CDs.

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

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 09f38bd..1720cce 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.2.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.4.2.config
 boot/kernel/gentoo/use:
 	-*
 	alsa

diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index 4b6df00..f23ba20 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -18,7 +18,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-2.6.38.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.4.2.config
 boot/kernel/gentoo/use:
 	-*
 	alsa

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

[Jorge Manuel B. S. Vicetto]

commit:     ce2fee86cfd823c53c382bf0f1471e6765bdd65e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  5 17:10:53 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Nov  5 17:10:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ce2fee86

Unmasked sys-apps/pcmciautils for amd64 now that a newer version was finally marked stable on bug 434082.

---
 .../specs/amd64/hardened/admincd-stage2.spec       |    3 +--
 .../specs/amd64/installcd-stage2-minimal.spec      |    3 +--
 releases/weekly/specs/amd64/livecd-stage2.spec     |    3 +--
 releases/weekly/specs/amd64/livedvd-stage2.spec    |    3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 52a13da..92dd479 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -90,8 +90,7 @@ boot/kernel/gentoo/packages:
 #	net-wireless/ipw3945
 #	net-wireless/rt2500
 
-# fails to build
-#	sys-apps/pcmciautils
+	sys-apps/pcmciautils
 	sys-kernel/spl
 	sys-fs/zfs-kmod
 

diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index e8326a4..142b877 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -89,8 +89,7 @@ boot/kernel/gentoo/packages:
 #	net-wireless/ipw3945
 #	net-wireless/rt2500
 
-# fails to build
-#	sys-apps/pcmciautils
+	sys-apps/pcmciautils
 
 livecd/unmerge:
 	app-admin/eselect

diff --git a/releases/weekly/specs/amd64/livecd-stage2.spec b/releases/weekly/specs/amd64/livecd-stage2.spec
index b542cb0..82deef8 100644
--- a/releases/weekly/specs/amd64/livecd-stage2.spec
+++ b/releases/weekly/specs/amd64/livecd-stage2.spec
@@ -44,8 +44,7 @@ boot/kernel/gentoo/packages:
 ### Masked (~amd64)
 #	net-wireless/rtl8187
 
-# fails to build
-#	sys-apps/pcmciautils
+	sys-apps/pcmciautils
 
 	sys-fs/ntfs3g
 

diff --git a/releases/weekly/specs/amd64/livedvd-stage2.spec b/releases/weekly/specs/amd64/livedvd-stage2.spec
index 34ef051..367a25b 100644
--- a/releases/weekly/specs/amd64/livedvd-stage2.spec
+++ b/releases/weekly/specs/amd64/livedvd-stage2.spec
@@ -45,8 +45,7 @@ boot/kernel/gentoo/packages:
 ### Masked (~amd64)
 #	net-wireless/rtl8187
 
-# fails to build
-#	sys-apps/pcmciautils
+	sys-apps/pcmciautils
 
 livecd/empty:
 	/var/tmp

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

[Jorge Manuel B. S. Vicetto]

commit:     b36964e8eabc7a85e74a3cedff6a4d173fc60526
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 16:57:39 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 16:58:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=b36964e8

Update the kernel config used by the install-cd and admin-cd.

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

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
index 3ab9c2a..8e032dd 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: hardened-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.9.5.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/admincd-3.11.7.config
 boot/kernel/gentoo/use:
 	-*
 	alsa

diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index 9f2a231..ca09b85 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -19,7 +19,7 @@ livecd/rcdel: keymaps|boot
 boot/kernel: gentoo
 
 boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.8.13.config
+boot/kernel/gentoo/config: /release/releng/releases/weekly/kconfig/amd64/installcd-3.10.17.config
 boot/kernel/gentoo/use:
 	-*
 	alsa

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

[Robin H. Johnson]

commit:     37a3ced6126007c901cdfc23d49e1f2ff9ed7b2d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 08:19:28 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 08:19:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=37a3ced6

weekly/amd64/stage4: tweak version_stamp.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 releases/weekly/specs/amd64/hardened/stage4-cloud.spec            | 2 +-
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec | 2 +-
 releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
index 24fdc20..f326102 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
@@ -1,6 +1,6 @@
 subarch: amd64
 target: stage4
-version_stamp: 2008.0
+version_stamp: hardened-2008.0
 rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: 2008.0

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
index a39e360..de02425 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
@@ -1,6 +1,6 @@
 subarch: amd64
 target: stage4
-version_stamp: 2008.0
+version_stamp: hardened+nomultilib-2008.0
 rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: 2008.0

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
index 5c00c79..b855752 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
@@ -1,6 +1,6 @@
 subarch: amd64
 target: stage4
-version_stamp: 2008.0
+version_stamp: nomultilib-2008.0
 rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: 2008.0

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

[Matt Thode]

commit:     18a00bdd76a549fc9fa26cc45698e16d0c20f27f
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Jan 22 16:58:23 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:58:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=18a00bdd

remove portage cache from /var/cache

 releases/weekly/specs/amd64/hardened/stage4-cloud.spec            | 2 +-
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec | 2 +-
 releases/weekly/specs/amd64/stage4-cloud.spec                     | 1 +
 releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec          | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
index 03a2e79..62152fd 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
@@ -16,7 +16,6 @@ stage4/use:
 	sse
 	sse2
 	urandom
-  xattr
 
 stage4/packages:
 	app-admin/logrotate
@@ -70,6 +69,7 @@ stage4/empty:
 	/usr/src
 	/var/cache/edb/dep
 	/var/cache/genkernel
+  /var/cache/portage/distfiles
 	/var/empty
 	/var/run
 	/var/state

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
index 1d1b0bd..826b0b7 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
@@ -16,7 +16,6 @@ stage4/use:
 	sse
 	sse2
 	urandom
-  xattr
 
 stage4/packages:
 	app-admin/logrotate
@@ -70,6 +69,7 @@ stage4/empty:
 	/usr/src
 	/var/cache/edb/dep
 	/var/cache/genkernel
+  /var/cache/portage/distfiles
 	/var/empty
 	/var/run
 	/var/state

diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
index e396b4b..013ec2e 100644
--- a/releases/weekly/specs/amd64/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-cloud.spec
@@ -71,6 +71,7 @@ stage4/empty:
 	/usr/src
 	/var/cache/edb/dep
 	/var/cache/genkernel
+  /var/cache/portage/distfiles
 	/var/empty
 	/var/run
 	/var/state

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
index 1536211..2121557 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
@@ -69,6 +69,7 @@ stage4/empty:
 	/usr/src
 	/var/cache/edb/dep
 	/var/cache/genkernel
+  /var/cache/portage/distfiles
 	/var/empty
 	/var/run
 	/var/state

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

[Matt Thode]

commit:     c46707dcb8b817f0846e4f879ab4a2b81f7e6c9a
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 05:27:09 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 05:27:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=c46707dc

we are still using the cloud portage confdir

 releases/weekly/specs/amd64/hardened/stage4-minimal.spec            | 2 +-
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 2 +-
 releases/weekly/specs/amd64/stage4-minimal.spec                     | 2 +-
 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index f011c59..3a3819e 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: /release/releng/releases/weekly/portage/minimal-stages
+portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index d863797..7de5f56 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/minimal-stages
+portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
index c0a5024..bce2c81 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
-portage_confdir: /release/releng/releases/weekly/portage/minimal-stages
+portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index ba41bc4..da3837e 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: /release/releng/releases/weekly/portage/minimal-stages
+portage_confdir: /release/releng/releases/weekly/portage/cloud-stages
 
 stage4/use:
 	bindist

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

[Matt Thode]

commit:     14f5b424e8f08ad8aad2942cc6c9e3119773c9c2
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Nov 21 05:52:59 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 05:52:59 2017 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=14f5b424

stop building cloud stage4 stages

It's only used by diskimage-builder and been diskimage-builder has
not been using cloud stages since at least a year ago.

https://github.com/openstack/diskimage-builder/blob/97c01e48edd278dad3258d9e708cdbbe4c729691/diskimage_builder/elements/gentoo/root.d/10-gentoo-image

 .../weekly/specs/amd64/hardened/stage4-cloud.spec  | 89 ---------------------
 .../amd64/hardened/stage4-nomultilib-cloud.spec    | 89 ---------------------
 releases/weekly/specs/amd64/stage4-cloud.spec      | 91 ----------------------
 .../specs/amd64/stage4-nomultilib-cloud.spec       | 89 ---------------------
 4 files changed, 358 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
deleted file mode 100644
index e0e94138..00000000
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ /dev/null
@@ -1,89 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: hardened+cloud-latest
-rel_type: hardened
-profile: hardened/linux/amd64
-snapshot: latest
-source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
-
-stage4/use:
-	bash-completion
-	bzip2
-	idm
-	ipv6
-	mmx
-	sse
-	sse2
-	urandom
-
-stage4/packages:
-	app-admin/logrotate
-	app-admin/sudo
-	app-admin/syslog-ng
-	app-editors/vim
-	app-emulation/cloud-init
-	app-portage/eix
-	app-portage/gentoolkit
-	net-misc/dhcpcd
-	sys-boot/grub
-	sys-apps/dmidecode
-	sys-apps/gptfdisk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/pciutils
-	sys-block/parted
-	sys-devel/bc
-	sys-power/acpid
-	sys-process/cronie
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
-stage4/rcadd:
-	acpid|default
-	cloud-config|default
-	cloud-final|default
-	cloud-init-local|default
-	cloud-init|default
-	cronie|default
-	dhcpcd|default
-	net.lo|default
-	netmount|default
-	sshd|default
-	syslog-ng|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
-boot/kernel/gentoo/extraversion: openstack
-boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
-
-# all of the cleanup...
-stage4/unmerge:
-	sys-kernel/genkernel
-	sys-kernel/gentoo-sources
-
-stage4/empty:
-	/root/.ccache
-	/tmp
-	/usr/portage/distfiles
-	/usr/src
-	/var/cache/edb/dep
-	/var/cache/genkernel
-	/var/cache/portage/distfiles
-	/var/empty
-	/var/run
-	/var/state
-	/var/tmp
-
-stage4/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/ssh/ssh_host_*
-	/root/.*history
-	/root/.lesshst
-	/root/.ssh/known_hosts
-	/root/.viminfo
-	# Remove any generated stuff by genkernel
-	/usr/share/genkernel
-	# This is 3MB of crap for each copy
-	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
deleted file mode 100644
index eb4d91fd..00000000
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ /dev/null
@@ -1,89 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: hardened+cloud-nomultilib-latest
-rel_type: hardened
-profile: hardened/linux/amd64/no-multilib
-snapshot: latest
-source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
-
-stage4/use:
-	bash-completion
-	bzip2
-	idm
-	ipv6
-	mmx
-	sse
-	sse2
-	urandom
-
-stage4/packages:
-	app-admin/logrotate
-	app-admin/sudo
-	app-admin/syslog-ng
-	app-editors/vim
-	app-emulation/cloud-init
-	app-portage/eix
-	app-portage/gentoolkit
-	net-misc/dhcpcd
-	sys-boot/grub
-	sys-apps/dmidecode
-	sys-apps/gptfdisk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/pciutils
-	sys-block/parted
-	sys-devel/bc
-	sys-power/acpid
-	sys-process/cronie
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
-stage4/rcadd:
-	acpid|default
-	cloud-config|default
-	cloud-final|default
-	cloud-init-local|default
-	cloud-init|default
-	cronie|default
-	dhcpcd|default
-	net.lo|default
-	netmount|default
-	sshd|default
-	syslog-ng|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
-boot/kernel/gentoo/extraversion: openstack
-boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
-
-# all of the cleanup...
-stage4/unmerge:
-	sys-kernel/genkernel
-	sys-kernel/gentoo-sources
-
-stage4/empty:
-	/root/.ccache
-	/tmp
-	/usr/portage/distfiles
-	/usr/src
-	/var/cache/edb/dep
-	/var/cache/genkernel
-	/var/cache/portage/distfiles
-	/var/empty
-	/var/run
-	/var/state
-	/var/tmp
-
-stage4/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/ssh/ssh_host_*
-	/root/.*history
-	/root/.lesshst
-	/root/.ssh/known_hosts
-	/root/.viminfo
-	# Remove any generated stuff by genkernel
-	/usr/share/genkernel
-	# This is 3MB of crap for each copy
-	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
deleted file mode 100644
index b25f8cde..00000000
--- a/releases/weekly/specs/amd64/stage4-cloud.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: cloud-latest
-rel_type: default
-profile: default/linux/amd64/13.0
-snapshot: latest
-source_subpath: default/stage3-amd64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
-
-stage4/use:
-	bash-completion
-	bindist
-	bzip2
-	idm
-	ipv6
-	mmx
-	sse
-	sse2
-	urandom
-
-stage4/packages:
-	app-admin/logrotate
-	app-admin/sudo
-	app-admin/syslog-ng
-	app-editors/vim
-	app-emulation/cloud-init
-	app-portage/eix
-	app-portage/gentoolkit
-	net-misc/dhcpcd
-	net-misc/iputils
-	sys-boot/grub
-	sys-apps/dmidecode
-	sys-apps/gptfdisk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/pciutils
-	sys-block/parted
-	sys-devel/bc
-	sys-power/acpid
-	sys-process/cronie
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
-stage4/rcadd:
-	acpid|default
-	cloud-config|default
-	cloud-final|default
-	cloud-init-local|default
-	cloud-init|default
-	cronie|default
-	dhcpcd|default
-	net.lo|default
-	netmount|default
-	sshd|default
-	syslog-ng|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
-boot/kernel/gentoo/extraversion: openstack
-boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
-
-# all of the cleanup...
-stage4/unmerge:
-	sys-kernel/genkernel
-	sys-kernel/gentoo-sources
-
-stage4/empty:
-	/root/.ccache
-	/tmp
-	/usr/portage/distfiles
-	/usr/src
-	/var/cache/edb/dep
-	/var/cache/genkernel
-	/var/cache/portage/distfiles
-	/var/empty
-	/var/run
-	/var/state
-	/var/tmp
-
-stage4/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/ssh/ssh_host_*
-	/root/.*history
-	/root/.lesshst
-	/root/.ssh/known_hosts
-	/root/.viminfo
-	# Remove any generated stuff by genkernel
-	/usr/share/genkernel
-	# This is 3MB of crap for each copy
-	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
deleted file mode 100644
index 6043c1ed..00000000
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ /dev/null
@@ -1,89 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: cloud-nomultilib-latest
-rel_type: default
-profile: default/linux/amd64/13.0/no-multilib
-snapshot: latest
-source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
-
-stage4/use:
-	bash-completion
-	bzip2
-	idm
-	ipv6
-	mmx
-	sse
-	sse2
-	urandom
-
-stage4/packages:
-	app-admin/logrotate
-	app-admin/sudo
-	app-admin/syslog-ng
-	app-editors/vim
-	app-emulation/cloud-init
-	app-portage/eix
-	app-portage/gentoolkit
-	net-misc/dhcpcd
-	sys-boot/grub
-	sys-apps/dmidecode
-	sys-apps/gptfdisk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/pciutils
-	sys-block/parted
-	sys-devel/bc
-	sys-power/acpid
-	sys-process/cronie
-stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
-stage4/rcadd:
-	acpid|default
-	cloud-config|default
-	cloud-final|default
-	cloud-init-local|default
-	cloud-init|default
-	cronie|default
-	dhcpcd|default
-	net.lo|default
-	netmount|default
-	sshd|default
-	syslog-ng|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/weekly/kconfig/amd64/cloud-amd64-gentoo.config
-boot/kernel/gentoo/extraversion: openstack
-boot/kernel/gentoo/gk_kernargs: --all-ramdisk-modules
-
-# all of the cleanup...
-stage4/unmerge:
-	sys-kernel/genkernel
-	sys-kernel/gentoo-sources
-
-stage4/empty:
-	/root/.ccache
-	/tmp
-	/usr/portage/distfiles
-	/usr/src
-	/var/cache/edb/dep
-	/var/cache/genkernel
-	/var/cache/portage/distfiles
-	/var/empty
-	/var/run
-	/var/state
-	/var/tmp
-
-stage4/rm:
-	/etc/*-
-	/etc/*.old
-	/etc/ssh/ssh_host_*
-	/root/.*history
-	/root/.lesshst
-	/root/.ssh/known_hosts
-	/root/.viminfo
-	# Remove any generated stuff by genkernel
-	/usr/share/genkernel
-	# This is 3MB of crap for each copy
-	/usr/lib64/python*/site-packages/gentoolkit/test/eclean/testdistfiles.tar.gz

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

[Jorge Manuel B. S. Vicetto]

commit:     e12c57ccbf58549f4187552502b3feb287e8d5bf
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 02:03:21 2018 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 02:04:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=e12c57cc

Use isos portage confdir for the stage 4 specs.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 releases/weekly/specs/amd64/hardened/stage4-minimal.spec            | 2 +-
 releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 2 +-
 releases/weekly/specs/amd64/stage4-minimal.spec                     | 2 +-
 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index ba0f14a8..c59a0cff 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.0/hardened
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index 3986cee8..384ee892 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: hardened
 profile: default/linux/amd64/17.0/no-multilib/hardened
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
index 312150ab..58f65773 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/17.0
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 stage4/use:
 	bindist

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index 32f5629a..169e9508 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -5,7 +5,7 @@ rel_type: default
 profile: default/linux/amd64/17.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-nomultilib-latest
-portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 stage4/use:
 	bindist

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

[Ben Kohler]

commit:     4f1a9d2e0d71be7a6ef05c5c5754ce05d72b730e
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 19:26:11 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 19:26:46 2019 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=4f1a9d2e

specs: add nvme-cli to amd64 livecds

Closes: https://bugs.gentoo.org/703766

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

 releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 1 +
 releases/weekly/specs/amd64/hardened/admincd-stage1.spec         | 1 +
 releases/weekly/specs/amd64/installcd-stage1.spec                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index 7eebd1c9..5db7798b 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -151,6 +151,7 @@ livecd/packages:
 	sys-apps/memtester
 	sys-apps/mlocate
 	sys-apps/netplug
+	sys-apps/nvme-cli
 	sys-apps/pciutils
 	sys-apps/pcmciautils
 	sys-apps/sdparm

diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index 4523e0e9..9f36b3f9 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -154,6 +154,7 @@ livecd/packages:
 	sys-apps/memtester
 	sys-apps/mlocate
 	sys-apps/netplug
+	sys-apps/nvme-cli
 	sys-apps/pciutils
 	sys-apps/pcmciautils
 	sys-apps/sdparm

diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
index 84d7c3b1..d2beb872 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -76,6 +76,7 @@ livecd/packages:
 	sys-apps/iproute2
 	sys-apps/memtester
 	sys-apps/netplug
+	sys-apps/nvme-cli
 	sys-apps/pciutils
 	sys-apps/pcmciautils
 	sys-apps/sdparm