* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2020-06-04 13:26 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2020-06-04 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 20c1cdd0392aa563ad635357fc27a410ef5f6a10
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 4 13:23:53 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 13:23:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=20c1cdd0
specs/amd64: update admincd-stage2 to use new kconfig
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 617a4b01..cfcc5fc7 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -16,7 +16,7 @@ livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@
boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.14.83.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-5.4.38.config
#boot/kernel/gentoo/packages:
# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2020-06-04 13:26 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2020-06-04 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 38bf17bf829f67fbc46f68142f1f2bdabfcda287
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 4 13:24:34 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 13:24:34 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=38bf17bf
specs/amd64: enable zfs support on admincd again
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index cfcc5fc7..2ce3cbf9 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -18,11 +18,8 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-5.4.38.config
-#boot/kernel/gentoo/packages:
-# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
-# sys-kernel/spl
-# sys-fs/zfs
-# sys-fs/zfs-kmod
+boot/kernel/gentoo/packages:
+ sys-fs/zfs
livecd/unmerge:
app-admin/eselect
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2021-07-10 18:46 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2021-07-10 18:46 UTC (permalink / raw
To: gentoo-commits
commit: a8fc005f923ea7daa5ec3fa56f3bf5db4b98e5a7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 17:56:32 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 17:56:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a8fc005f
amd64: drop unused files
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../amd64/hardened/admincd-stage1-selinux.spec | 201 -----------------
.../amd64/hardened/admincd-stage2-selinux.spec | 248 ---------------------
releases/specs/amd64/hardened/stage4-minimal.spec | 70 ------
.../amd64/hardened/stage4-nomultilib-minimal.spec | 70 ------
4 files changed, 589 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
deleted file mode 100644
index 6c2d04f3..00000000
--- a/releases/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ /dev/null
@@ -1,201 +0,0 @@
-subarch: amd64
-version_stamp: @TIMESTAMP@-selinux
-target: livecd-stage1
-rel_type: hardened
-profile: default/linux/amd64/17.0/hardened/selinux
-snapshot: @TIMESTAMP@
-source_subpath: hardened/stage3-amd64-hardened-selinux-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/isos
-
-livecd/use:
- alsa
- caps
- compile-locales
- fbcon
- filecaps
- ipv6
- livecd
- modules
- ncurses
- nls
- nptl
- pam
- portaudio
- readline
- socks5
- ssl
- static-libs
- unicode
- xml
-
-livecd/packages:
- app-accessibility/brltty
- app-accessibility/espeakup
- app-admin/hddtemp
- app-admin/pwgen
- app-admin/syslog-ng
- app-admin/sysstat
- app-admin/testdisk
- app-arch/bzip2
- app-arch/cpio
- app-arch/gzip
- app-arch/mt-st
- app-arch/p7zip
- app-arch/pbzip2
- app-arch/tar
- app-arch/unrar
- app-arch/unzip
- app-backup/duplicity
- app-benchmarks/bonnie
- app-benchmarks/bonnie++
- app-benchmarks/dbench
- app-benchmarks/iozone
- app-benchmarks/stress
- app-benchmarks/tiobench
- app-crypt/gnupg
- app-crypt/pinentry
- app-editors/emacs
- app-editors/hexcurse
- app-editors/hexedit
- app-editors/mg
- app-editors/nano
- app-editors/vim
- app-emacs/ebuild-mode
- app-emulation/xen-tools
- app-misc/colordiff
- app-misc/livecd-tools
- app-misc/mc
- app-misc/pax-utils
- app-misc/screen
- app-misc/tmux
- app-portage/eix
- app-portage/gentoolkit
- app-portage/mirrorselect
- app-portage/portage-utils
- app-shells/bash-completion
- app-shells/gentoo-bashcomp
- app-shells/zsh
- app-text/tree
- app-text/dos2unix
- app-text/wgetpaste
- app-vim/gentoo-syntax
- dev-lang/perl
- dev-lang/python
- media-gfx/fbgrab
- media-sound/alsa-utils
- net-analyzer/iptraf-ng
- net-analyzer/openbsd-netcat
- net-analyzer/tcptraceroute
- net-analyzer/traceroute
- net-analyzer/traceroute-nanog
- net-analyzer/tcpdump
- net-analyzer/nmap
- net-dialup/mingetty
- net-dialup/minicom
- net-dialup/pptpclient
- net-dialup/rp-pppoe
- net-dns/bind-tools
- net-fs/cifs-utils
- net-fs/nfs-utils
- net-ftp/ftp
- net-ftp/ncftp
- net-irc/irssi
- net-misc/curl
- net-misc/dhcpcd
- net-misc/iputils
- net-misc/ndisc6
- net-misc/ntp
- net-misc/openssh
- net-misc/rdate
- net-misc/rsync
- net-misc/telnet-bsd
- net-misc/vconfig
- net-misc/wget
- net-misc/whois
- net-proxy/dante
- net-proxy/tsocks
- net-vpn/openvpn
- net-wireless/b43-fwcutter
- net-wireless/iw
- net-wireless/wireless-tools
- net-wireless/wpa_supplicant
- sys-apps/arrayprobe
- sys-apps/acl
- sys-apps/attr
- sys-apps/busybox
- sys-apps/cciss_vol_status
- sys-apps/chname
- sys-apps/coreutils
- sys-apps/dcfldd
- sys-apps/diffutils
- sys-apps/dmidecode
- sys-apps/dstat
- sys-apps/ethtool
- sys-apps/file
- sys-apps/findutils
- sys-apps/flashrom
- sys-apps/fxload
- sys-apps/gawk
- sys-apps/gptfdisk
- sys-apps/grep
- sys-apps/hdparm
- sys-apps/ipmitool
- sys-apps/iproute2
- sys-apps/less
- sys-apps/man-db
- sys-apps/man-pages
- sys-apps/man-pages-posix
- sys-apps/memtester
- sys-apps/mlocate
- sys-apps/netplug
- sys-apps/nvme-cli
- sys-apps/pciutils
- sys-apps/pcmciautils
- sys-apps/sdparm
- sys-apps/usbutils
- sys-apps/sed
- sys-apps/setserial
- sys-apps/sg3_utils
- sys-apps/smartmontools
- sys-apps/usbutils
- sys-apps/which
- sys-block/aoetools
- sys-block/fio
- sys-block/mtx
- sys-block/open-iscsi
- sys-block/parted
- sys-block/partimage
- sys-block/tw_cli
- sys-boot/grub
- sys-firmware/ipw2100-firmware
- sys-firmware/ipw2200-firmware
- sys-fs/btrfs-progs
- sys-fs/cryptsetup
- sys-fs/ddrescue
- sys-fs/dislocker
- sys-fs/dmraid
- sys-fs/dosfstools
- sys-fs/e2fsprogs
- sys-fs/exfat-utils
- sys-fs/ext3grep
- sys-fs/extundelete
- sys-fs/f2fs-tools
- sys-fs/jfsutils
- sys-fs/lsscsi
- sys-fs/lvm2
- sys-fs/mac-fdisk
- sys-fs/mdadm
- sys-fs/multipath-tools
- sys-fs/ntfs3g
- sys-fs/reiserfsprogs
- sys-fs/xfsprogs
- sys-kernel/linux-firmware
- sys-libs/gpm
- sys-power/acpid
- sys-process/htop
- sys-process/lsof
- sys-process/iotop
- sys-process/procps
- sys-process/psmisc
- www-client/links
diff --git a/releases/specs/amd64/hardened/admincd-stage2-selinux.spec b/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
deleted file mode 100644
index ccf70903..00000000
--- a/releases/specs/amd64/hardened/admincd-stage2-selinux.spec
+++ /dev/null
@@ -1,248 +0,0 @@
-subarch: amd64
-version_stamp: @TIMESTAMP@-selinux
-target: livecd-stage2
-rel_type: hardened
-profile: default/linux/amd64/17.0/hardened/selinux
-snapshot: @TIMESTAMP@
-source_subpath: hardened/livecd-stage1-amd64-@TIMESTAMP@-selinux
-portage_confdir: @REPO_DIR@/releases/portage/isos
-
-livecd/bootargs: dokeymap
-livecd/fstype: squashfs
-livecd/iso: admincd-amd64-@TIMESTAMP@.iso
-livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@
-
-boot/kernel: gentoo
-
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/admincd-4.4.8-r1-selinux.config
-
-#boot/kernel/gentoo/packages:
-# ZFS is disabled until spl can build with CONFIG_PAX_RANDKSTACK
-# sys-kernel/spl
-# sys-fs/zfs
-# sys-fs/zfs-kmod
-
-livecd/unmerge:
- app-admin/eselect
- app-admin/eselect-ctags
- app-admin/eselect-vi
- app-admin/perl-cleaner
- app-admin/python-updater
- app-arch/cpio
- dev-libs/gmp
- dev-libs/libxml2
- dev-libs/mpfr
- dev-python/pycrypto
- dev-util/pkgconfig
- perl-core/PodParser
- perl-core/Test-Harness
- sys-apps/debianutils
- sys-apps/groff
- sys-apps/man-db
- sys-apps/man-pages
- sys-apps/miscfiles
- sys-apps/sandbox
- sys-apps/texinfo
- sys-devel/autoconf
- sys-devel/autoconf-wrapper
- sys-devel/automake
- sys-devel/automake-wrapper
- sys-devel/binutils
- sys-devel/binutils-config
- sys-devel/bison
- sys-devel/flex
- sys-devel/gcc
- sys-devel/gcc-config
- sys-devel/gettext
- sys-devel/gnuconfig
- sys-devel/libtool
- sys-devel/m4
- sys-devel/make
- sys-devel/patch
- sys-libs/db
- sys-libs/gdbm
- sys-kernel/genkernel
- sys-kernel/linux-headers
-
-livecd/empty:
- /boot
- /etc/cron.daily
- /etc/cron.hourly
- /etc/cron.monthly
- /etc/cron.weekly
- /etc/logrotate.d
- /etc/modules.autoload.d
- /etc/runlevels/single
- /etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
- /root/.ccache
- /tmp
- /usr/diet/include
- /usr/diet/man
- /usr/include
- /usr/i?86-gentoo-linux-uclibc
- /usr/i?86-pc-linux-uclibc
- /usr/lib/X11/config
- /usr/lib/X11/doc
- /usr/lib/X11/etc
- /usr/lib/awk
- /usr/lib/ccache
- /usr/lib/gcc-config
- /usr/lib/nfs
- /usr/lib/perl5/site_perl
- /usr/lib/portage
- /usr/lib64/X11/config
- /usr/lib64/X11/doc
- /usr/lib64/X11/etc
- /usr/lib64/awk
- /usr/lib64/ccache
- /usr/lib64/gcc-config
- /usr/lib64/nfs
- /usr/lib64/perl5/site_perl
- /usr/lib64/portage
- /usr/local
- /usr/portage
- /usr/share/aclocal
- /usr/share/baselayout
- /usr/share/binutils-data
- /usr/share/consolefonts/partialfonts
- /usr/share/consoletrans
- /usr/share/dict
- /usr/share/et
- /usr/share/gcc-data
- /usr/share/genkernel
- /usr/share/gettext
- /usr/share/glib-2.0
- /usr/share/gnuconfig
- /usr/share/gtk-doc
- /usr/share/i18n
- /usr/share/info
- /usr/share/lcms
- /usr/share/libtool
- /usr/share/locale
- /usr/share/man
- /usr/share/rfc
- /usr/share/ss
- /usr/share/state
- /usr/share/texinfo
- /usr/share/unimaps
- /usr/share/zoneinfo
- /usr/src
- /var/cache
- /var/empty
- /var/lib/portage
- /var/log
- /var/spool
- /var/state
- /var/tmp
-
-livecd/rm:
- /boot/System*
- /boot/initr*
- /boot/kernel*
- /etc/*-
- /etc/*.old
- /etc/default/audioctl
- /etc/dispatch-conf.conf
- /etc/env.d/05binutils
- /etc/env.d/05gcc
- /etc/etc-update.conf
- /etc/hosts.bck
- /etc/issue*
- /etc/genkernel.conf
- /etc/make.conf*
- /etc/make.globals
- /etc/make.profile
- /etc/man.conf
- /etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
- /root/.bash_history
- /root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
- /usr/bin/addr2line
- /usr/bin/ar
- /usr/bin/as
- /usr/bin/audioctl
- /usr/bin/c++*
- /usr/bin/cc
- /usr/bin/cjpeg
- /usr/bin/cpp
- /usr/bin/djpeg
- /usr/bin/ebuild
- /usr/bin/egencache
- /usr/bin/emerge
- /usr/bin/emerge-webrsync
- /usr/bin/emirrordist
- /usr/bin/elftoaout
- /usr/bin/f77
- /usr/bin/g++*
- /usr/bin/g77
- /usr/bin/gcc*
- /usr/bin/genkernel
- /usr/bin/gprof
- /usr/bin/i?86-gentoo-linux-uclibc-*
- /usr/bin/i?86-pc-linux-*
- /usr/bin/jpegtran
- /usr/bin/ld
- /usr/bin/libpng*
- /usr/bin/nm
- /usr/bin/objcopy
- /usr/bin/objdump
- /usr/bin/piggyback*
- /usr/bin/portageq
- /usr/bin/ranlib
- /usr/bin/readelf
- /usr/bin/repoman
- /usr/bin/size
- /usr/bin/strip
- /usr/bin/tbz2tool
- /usr/bin/xpak
- /usr/bin/yacc
- /usr/lib*/*.a
- /usr/lib*/*.la
- /usr/lib*/perl5/site_perl
- /usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
- /usr/share/consolefonts/1*
- /usr/share/consolefonts/7*
- /usr/share/consolefonts/8*
- /usr/share/consolefonts/9*
- /usr/share/consolefonts/A*
- /usr/share/consolefonts/C*
- /usr/share/consolefonts/E*
- /usr/share/consolefonts/G*
- /usr/share/consolefonts/L*
- /usr/share/consolefonts/M*
- /usr/share/consolefonts/R*
- /usr/share/consolefonts/a*
- /usr/share/consolefonts/c*
- /usr/share/consolefonts/dr*
- /usr/share/consolefonts/g*
- /usr/share/consolefonts/i*
- /usr/share/consolefonts/k*
- /usr/share/consolefonts/l*
- /usr/share/consolefonts/r*
- /usr/share/consolefonts/s*
- /usr/share/consolefonts/t*
- /usr/share/consolefonts/v*
- /usr/share/misc/*.old
diff --git a/releases/specs/amd64/hardened/stage4-minimal.spec b/releases/specs/amd64/hardened/stage4-minimal.spec
deleted file mode 100644
index fad90b30..00000000
--- a/releases/specs/amd64/hardened/stage4-minimal.spec
+++ /dev/null
@@ -1,70 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: hardened+minimal-@TIMESTAMP@
-rel_type: hardened
-profile: default/linux/amd64/17.1/hardened
-snapshot: @TIMESTAMP@
-compression_mode: pixz_x
-source_subpath: hardened/stage3-amd64-hardened-@TIMESTAMP@
-portage_confdir: @REPO_DIR@/releases/portage/isos
-
-stage4/use:
- bindist
- bzip2
- idm
- ipv6
- urandom
-
-stage4/packages:
- net-misc/dhcp
- sys-boot/grub
- sys-apps/dmidecode
- sys-apps/gptfdisk
- sys-apps/iproute2
- sys-devel/bc
- sys-power/acpid
- app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
-stage4/rcadd:
- acpid|default
- net.lo|default
- netmount|default
- sshd|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/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-devel/bc
- 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/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
deleted file mode 100644
index cd6bc55d..00000000
--- a/releases/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ /dev/null
@@ -1,70 +0,0 @@
-subarch: amd64
-target: stage4
-version_stamp: hardened+minimal-nomultilib-@TIMESTAMP@
-rel_type: hardened
-profile: default/linux/amd64/17.1/no-multilib/hardened
-snapshot: @TIMESTAMP@
-compression_mode: pixz_x
-source_subpath: hardened/stage3-amd64-hardened+nomultilib-@TIMESTAMP@
-portage_confdir: @REPO_DIR@/releases/portage/isos
-
-stage4/use:
- bindist
- bzip2
- idm
- ipv6
- urandom
-
-stage4/packages:
- net-misc/dhcp
- net-misc/iputils
- sys-boot/grub
- sys-apps/gptfdisk
- sys-apps/iproute2
- sys-devel/bc
- sys-power/acpid
- app-crypt/gentoo-keys
-stage4/fsscript: @REPO_DIR@/releases/scripts/cloud-prep.sh
-stage4/rcadd:
- acpid|default
- net.lo|default
- netmount|default
- sshd|default
-
-boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/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-devel/bc
- 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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2021-12-17 12:26 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2021-12-17 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 1d44a214557ad6d8ddaf2ab1c579c51fcb57065e
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 02:42:00 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 12:26:24 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1d44a214
releases/specs/amd64/hardened/admincd-stage2: always build fresh zfs
Closes: https://bugs.gentoo.org/787872
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index a1f98997..4697ee2d 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -18,8 +18,7 @@ boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-5.10.61.config
-boot/kernel/gentoo/packages:
- sys-fs/zfs
+boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod
livecd/unmerge:
app-admin/eselect
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2022-11-20 19:42 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2022-11-20 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 718d8cda8c8e9a3fa69ac0b505bdb253e6ba3175
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 19:41:48 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 19:42:20 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=718d8cda
specs/amd64/admincd: add efibootmgr
Closes: https://bugs.gentoo.org/882043
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index f4856ba9..693f0210 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -42,6 +42,7 @@ livecd/unmerge:
sys-apps/miscfiles
sys-apps/sandbox
sys-apps/texinfo
+ sys-boot/efibootmgr
sys-devel/autoconf
sys-devel/autoconf-wrapper
sys-devel/automake
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2023-01-21 3:16 Georgy Yakovlev
0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2023-01-21 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 8ab0c2f126b7590fde963b9906ead2c062f3bbb1
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 03:14:49 2023 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 03:15:41 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8ab0c2f1
amd64/admincd: re-add efibootmgr
commit 718d8cda8c8e9a3fa69ac0b505bdb253e6ba3175 added it to the wrong
list
Bug: https://bugs.gentoo.org/882043
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage1.spec | 1 +
releases/specs/amd64/hardened/admincd-stage2.spec | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec
index b4f296f9..12a3642f 100644
--- a/releases/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/specs/amd64/hardened/admincd-stage1.spec
@@ -165,6 +165,7 @@ livecd/packages:
sys-block/parted
sys-block/partimage
sys-block/tw_cli
+ sys-boot/efibootmgr
sys-boot/grub
sys-firmware/ipw2100-firmware
sys-firmware/ipw2200-firmware
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index f226df3e..b8455299 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -43,7 +43,6 @@ livecd/unmerge:
sys-apps/miscfiles
sys-apps/sandbox
sys-apps/texinfo
- sys-boot/efibootmgr
sys-devel/autoconf
sys-devel/autoconf-wrapper
sys-devel/automake
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2024-03-31 11:24 Andreas K. Hüttel
0 siblings, 0 replies; 9+ messages in thread
From: Andreas K. Hüttel @ 2024-03-31 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 654d66c27ec53c420fde3d4a25e1b5d3a9501ab6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 11:24:34 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 11:24:34 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=654d66c2
Port amd64 Admin CD to 23.0 (first try)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage1.spec | 6 +--
releases/specs/amd64/hardened/admincd-stage2.spec | 50 +++++++++++------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage1.spec b/releases/specs/amd64/hardened/admincd-stage1.spec
index bad551db..4ae26ad8 100644
--- a/releases/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/specs/amd64/hardened/admincd-stage1.spec
@@ -1,10 +1,10 @@
subarch: amd64
version_stamp: @TIMESTAMP@
target: livecd-stage1
-rel_type: hardened
-profile: default/linux/amd64/17.1/hardened
+rel_type: 23.0-hardened
+profile: default/linux/amd64/23.0/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@
+source_subpath: 23.0-hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 6256e9e2..360844b6 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -1,10 +1,10 @@
subarch: amd64
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: hardened
-profile: default/linux/amd64/17.1/hardened
+rel_type: 23.0-hardened
+profile: default/linux/amd64/23.0/hardened
snapshot_treeish: @TREEISH@
-source_subpath: hardened/livecd-stage1-amd64-@TIMESTAMP@
+source_subpath: 23.0-hardened/livecd-stage1-amd64-@TIMESTAMP@
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -74,10 +74,10 @@ livecd/empty:
/etc/modules.autoload.d
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -156,17 +156,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -209,15 +209,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2024-08-22 18:36 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2024-08-22 18:36 UTC (permalink / raw
To: gentoo-commits
commit: dcddbe165464c0c0054e1985d8e3ee8b612960ae
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 19:10:35 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 18:36:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dcddbe16
amd64 admincd: Add dist kernel support
Enable dist kernel support on admincd
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/releng/pull/22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 35ab2021..8b6778f9 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -11,13 +11,13 @@ 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-@TIMESTAMP@
boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-6.6.30.config
-
+boot/kernel/gentoo/distkernel: yes
+boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/DK/amd64/livecd-amd64.config
boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
livecd/unmerge:
@@ -71,6 +71,7 @@ livecd/empty:
/etc/cron.hourly
/etc/cron.monthly
/etc/cron.weekly
+ /etc/kernel/config.d
/etc/logrotate.d
/etc/modules.autoload.d
/etc/runlevels/single
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/
@ 2024-09-15 23:52 Ben Kohler
0 siblings, 0 replies; 9+ messages in thread
From: Ben Kohler @ 2024-09-15 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 108b0102aae35ca794d62af57007c0d4dd6b5361
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 23:50:30 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:50:30 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=108b0102
specs/amd64: fix filename for dist-kernel kconfig for admincd
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
releases/specs/amd64/hardened/admincd-stage2.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 933b5c57..8369517b 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -17,7 +17,7 @@ boot/kernel: gentoo
boot/kernel/gentoo/distkernel: yes
boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/DK/amd64/livecd-amd64.config
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/dist-amd64-livecd.config
boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
livecd/unmerge:
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-09-15 23:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-04 13:26 [gentoo-commits] proj/releng:master commit in: releases/specs/amd64/hardened/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2024-09-15 23:52 Ben Kohler
2024-08-22 18:36 Ben Kohler
2024-03-31 11:24 Andreas K. Hüttel
2023-01-21 3:16 Georgy Yakovlev
2022-11-20 19:42 Ben Kohler
2021-12-17 12:26 Ben Kohler
2021-07-10 18:46 Andreas K. Hüttel
2020-06-04 13:26 Ben Kohler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox