bzImage instead of newkernel script

3 files changed, 134 insertions, 2 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 90f4912..96d9aa4 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -12,4 +12,5 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa
 AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8
 AUX weekly-av-scan.cron 1591 BLAKE2B 8262ff9f7c8aadf503b8fbf0c283f87d619f1ee174bd52762cd421064e3ef6ad301dbfbfdf557334e76c11adc963976417c3275e8c1167d7c609cbdda201ead9 SHA512 6d5ca06bfdb020d1435b51837b4f2f8676cab808e7ffdf39be40e822858f0b7150d16d5fce991fab026c236fd3a32e1ff9a0f7eca62a679e77d1799ed15e2366
 AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182
-EBUILD miller-base-10.9.1.ebuild 3913 BLAKE2B 292afba9743a1c3f3fddf1276d224d22dce88e216910573bdaacc82a1f306b3efc7602fa86b14faefc625d2c920addf577368d4fb4edfece2e2fdf8ac6a464b2 SHA512 acbf175ba094c788bc42cb9feaeb07c3788b857c02b5fdac19bf0313732e61577da9c02af7e432445a47b8b3e8032a79e74e4b66d3a97b89301fcfeb236f0d00
+EBUILD miller-base-10.9.1.ebuild 3872 BLAKE2B e2617490dd5dda8a4b10d106ee0b844877cd3ce148d19cf4eddfb25994e31dbf2c5f9f8383b9d909133690295c5e592fd8e23436927a0ce6375271760a4587e4 SHA512 63f30f75b9599d233bdfd3fe9835aeb8623629a599579257d332a30d9a67aa8ba2abfb508d59ebb7b11719912dc94be0f8226a9c4f2fbce89b73fef00fd9db32
+EBUILD miller-base-10.9.2.ebuild 3872 BLAKE2B e2617490dd5dda8a4b10d106ee0b844877cd3ce148d19cf4eddfb25994e31dbf2c5f9f8383b9d909133690295c5e592fd8e23436927a0ce6375271760a4587e4 SHA512 63f30f75b9599d233bdfd3fe9835aeb8623629a599579257d332a30d9a67aa8ba2abfb508d59ebb7b11719912dc94be0f8226a9c4f2fbce89b73fef00fd9db32
diff --git a/virtual/miller-base/miller-base-10.9.1.ebuild b/virtual/miller-base/miller-base-10.9.1.ebuild
index fd2f972..7b1e7cb 100644
--- a/virtual/miller-base/miller-base-10.9.1.ebuild
+++ b/virtual/miller-base/miller-base-10.9.1.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
 		sw-suspend? ( sys-apps/tuxonice-userui
 			|| ( sys-kernel/tuxonice-sources
 				sys-kernel/pf-sources ) ) )
+		sys-kernel/bzImage
 	app-misc/screen
 	app-vim/gentoo-syntax
 	sys-auth/pam_ldap
@@ -116,7 +117,6 @@ src_install() {
 	newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec
 	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package
 	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	use !ischroot && newexe "${FILESDIR}"/newkernel 80-newkernel
 	newexe "${FILESDIR}"/systemd-reload 90-systemd-reload
 	newexe "${FILESDIR}"/linkfiles 98-linkfiles
 	if use autoupdate ; then
diff --git a/virtual/miller-base/miller-base-10.9.2.ebuild b/virtual/miller-base/miller-base-10.9.2.ebuild
new file mode 100644
index 0000000..7b1e7cb
--- /dev/null
+++ b/virtual/miller-base/miller-base-10.9.2.ebuild
@@ -0,0 +1,131 @@
+EAPI="7"
+inherit systemd
+DESCRIPTION="Virtual for base systems"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="hardened nohourlyupdate fuse xfs btrfs bash-completion git samba
+minimal autoupdate autoshutdown autoservicerestart sw-suspend mdadm
+video_cards_nvidia video_cards_nouveau firmware ischroot"
+
+RDEPEND="
+	app-misc/simplify
+	app-arch/hardlink
+	sys-process/htop
+	sys-process/iotop
+	sys-apps/less
+	fuse? ( net-fs/sshfs )
+	!ischroot? (
+		sys-kernel/kergen
+		sys-apps/ethtool
+		sys-cluster/netfs
+		sys-apps/kexec-tools
+		>=app-admin/eclean-kernel-1.99
+		mdadm? ( sys-fs/mdadm )
+		sys-apps/hdparm
+		xfs? ( sys-fs/xfsdump )
+		btrfs? (
+			sys-fs/btrfs-progs
+			sys-fs/btrfsmaintenance
+			)
+		sys-fs/lvm2
+		>=sys-boot/grub-2
+		sys-apps/busybox
+		sys-kernel/genkernel-next
+		sys-apps/pciutils
+		sys-apps/usbutils
+		samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) )
+		firmware? ( sys-kernel/linux-firmware )
+		app-admin/logrotate
+		video_cards_nouveau? ( sys-firmware/nvidia-firmware )
+	)
+	sys-process/cronie
+	>=app-portage/gentoolkit-0.2.1
+	app-admin/sudo
+	mail-client/mailx
+	!minimal? (
+			app-shells/thefuck
+			app-shells/hstr
+			x11-apps/xauth
+			sys-apps/moreutils
+			dev-util/strace
+			net-analyzer/netcat
+			net-ftp/ncftp
+			app-text/dos2unix
+			net-dns/bind-tools
+			)
+	sys-process/lsof
+	app-portage/layman[git]
+	!hardened? (
+		sys-devel/prelink
+	)
+	!ischroot? (
+		app-antivirus/clamav
+		!sw-suspend? ( sys-kernel/gentoo-sources )
+		sw-suspend? ( sys-apps/tuxonice-userui
+			|| ( sys-kernel/tuxonice-sources
+				sys-kernel/pf-sources ) ) )
+		sys-kernel/bzImage
+	app-misc/screen
+	app-vim/gentoo-syntax
+	sys-auth/pam_ldap
+	sys-auth/nss_ldap
+	app-editors/vim
+	app-editors/gvim
+	git? ( dev-vcs/git )
+	bash-completion? ( app-shells/bash-completion )
+	sys-apps/systemd
+	autoservicerestart? (
+			sys-apps/autorestart
+		)
+	"
+
+src_unpack() {
+	mkdir ${S}
+}
+
+src_install() {
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}"/service-check.systemd service-check
+	systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf"
+	dodir /etc/systemd/system/multi-user.target.wants
+	use !ischroot && dosym /lib/systemd/system/freshclamd.service /etc/systemd/system/multi-user.target.wants/freshclamd.service
+	dosym /lib/systemd/system/nscd.service /etc/systemd/system/multi-user.target.wants/nscd.service
+	use !ischroot && dosym /lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service
+	dosym /lib/systemd/system/cronie.service /etc/systemd/system/multi-user.target.wants/cronie.service
+
+	exeinto /etc/cron.weekly
+	use !ischroot && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
+	use !ischroot && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner
+	use !minimal && newexe "${FILESDIR}"/hardlink-ccache hardlink-ccache
+
+	if [[ -n ${UPDATETIME} ]]; then
+		if [[ ${UPDATETIME} = @* ]]; then
+			exeinto /etc/cron.${UPDATETIME#"@"}
+		else
+			mkdir -p ${D}/etc/cron.d
+			echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
+			exeinto /sbin
+		fi
+	else
+		use nohourlyupdate && exeinto /etc/cron.daily
+		use !nohourlyupdate && exeinto /etc/cron.hourly
+	fi
+	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
+
+	exeinto /etc/portage/postsync.d/
+	newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec
+	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package
+	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
+	newexe "${FILESDIR}"/systemd-reload 90-systemd-reload
+	newexe "${FILESDIR}"/linkfiles 98-linkfiles
+	if use autoupdate ; then
+		dosym /sbin/update-install /etc/portage/postsync.d/75-update-install
+		if use autoshutdown ; then
+			newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown
+		fi
+	fi
+
+	exeinto /sbin
+	newexe "${FILESDIR}"/update-install2 update-install
+}