From 9e3aed7bbb50d7c238c1e6dff8296581fb908837 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 4 Jun 2021 14:25:36 +0100 Subject: Count kernels based on the mime message not the wrong file name --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/kernels-cleaner | 2 +- virtual/miller-base/miller-base-10.10.4.ebuild | 129 ------------------------- virtual/miller-base/miller-base-10.10.5.ebuild | 129 +++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 virtual/miller-base/miller-base-10.10.4.ebuild create mode 100644 virtual/miller-base/miller-base-10.10.5.ebuild (limited to 'virtual/miller-base') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 2596444..c455c1c 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -1,6 +1,6 @@ AUX auto-download-packages 81 BLAKE2B 18de205f954967907ee4e905ea7710483a69f06e958b3d70cab0daef1945f26d85ecdf1e77c5a1ab1e4b5168a5258b3af89453125d68e0ffa30f69dc4296be21 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7 AUX hardlink-ccache 315 BLAKE2B 7aee8a9a6e458df28936562395679130c54e0703e10b67157b34f77f351ea087458a7f8169fce14d404d8f43d4e1cf02d6eeb7ba984ba3ce7b0720f7fc83ec52 SHA512 1136f49359e42a53ad8d764da6fe44494cb724cb88065ad7c8f6f97b2f0a06df822af9ff485504c53a0fc946caa660353c108849951ed8c54c70dec286cdb099 -AUX kernels-cleaner 171 BLAKE2B b6c1085e0c3813048f2199524b8a7ed5e27e720b7dd642eb5115f8eab0c7d09ac938bf71e4386f4899b6f444deb56a4db9573e031aac0faf3a08fa56339728e3 SHA512 944fe9811e652a7a42f907f229bf955583a7107ccc44d2973ca65bb785b9285b6f88f6f8811d2ce26e9faa3e6d2fb0120c96b6602f8d1234ea4bc1d4726ef15d +AUX kernels-cleaner 173 BLAKE2B 8e7c6532396882014a3bd5be53ef13467f945f5c69fe75f53213cd4fa710bfbdea39fad59ea475e00c6251e3f3934653f4d85dc2d019d64f0f699e62b57c75ce SHA512 e10e75ede5ef307e0e259615901848f369768c548e0fc88755a9aa47a4407b20875d904028812a0815bc1fd902330828b9ad0dc7ee074ad21044772000886ab9 AUX linkfiles 427 BLAKE2B 17475db2066c91e6ae0e17b14f9f967cc65be693281c13424f1413aae644ce49aa8970ab9e781473212e9ed89745059a909f521e6d2eacc270c81ef1d2410924 SHA512 f321f700d4bd88bb60b3ddf59eb7ce28e314e33b52701e8695eef4538b69459c31c0ee9bf6d193c62b7846639871eb18581cff60c14ad54166a69e5f3a89850d AUX newkernel 505 BLAKE2B a33a649045d2f0b1ea28902bde704d7ff586d8b187a8ff5070f9b3336ad5297a85f1bd5c79e5ad43c66d3725ca3b576e68979145e2b97fa8c8cc9aaf42a89f95 SHA512 bb9931e9e22679f58eba9aedb6558e2ddcf34423f48968ded6e927d98f1cae462f75330bae22235ddee848c8358477bc96455a3e3f43fcf39a6e74e8148f1229 AUX service-check.systemd 57 BLAKE2B 2cda658accd9ec3cce11a742f7ded6c26a676cba10c09830b22c933bbcfa31311ccdf1ba7e4cac31dc6779ce5c5441cfc53aa7b63965998876b85f3791dc8a7a SHA512 58d52a5623f478d2e104047c75fb89656e1cda6a7552e56f552bc075f488577dd856ec60d0e8842a07dadb700205a1dbf27baa9e8889692598d661ae26fdc114 @@ -12,4 +12,4 @@ AUX update-install2 683 BLAKE2B 22d9b0ee5bf4af8f0ababf8228d1d0b72f52d63eb9c513fa AUX update.portage.cron-2 48 BLAKE2B 3dfc6ccfc76500300af4c08eab46f309817fe1b50d0aceaad14e05f73fec23146eb9dcedb53c3db78b222f80530fde7533052253fad80eca0f9c6831ad939955 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 AUX weekly-av-scan.cron 1682 BLAKE2B a981abccc76a0a4c67cf68698c5aeda7843fab549fee343f8fcde5576fb0c2c726410ed90094e4fc651f74095a20263dbd44e936bf90981bbd5d5b718db4a670 SHA512 4f1416c2aa40757cf622e54c6b89ecb90cd80eb294d62ff06dc1262540a28d62f0df230b83b4e8e70c688628d537ffa8e2198a5e9e58f738d75ac039dbc3719f AUX write-new-updates 479 BLAKE2B f5ae0a84219a9d60ba3af43000c0ed1489d26868c51893a40fe0a40da80fcf721bdc540d07c17021cc06a216908b7ddac7736dfab9783853de7a75315705cf62 SHA512 b84f0bc0259c0986f136282475462165eb69c6bb766640089f64027233f9bb4faf4ae91b2aa0227791e0df542b75a5c50ab9a3bc33d8162a3ed53273cb24e182 -EBUILD miller-base-10.10.4.ebuild 3751 BLAKE2B 60a4bc95aff4a002b2977f6a370fe3c0153da46c23f9cde5fdacfbb78ec0f5c30b27de0e3bb06baf2cbc8c696278c6f7588c58a4fff87910064110f5183cef15 SHA512 f860023fc265cee6df3f4b4ecf5075f1c973425816957bba56f4b4c99a7d53c27d05b4e85df473bceda41cd3ea3967e83d7174a4f34a4245983bfb6191edfeba +EBUILD miller-base-10.10.5.ebuild 3751 BLAKE2B 60a4bc95aff4a002b2977f6a370fe3c0153da46c23f9cde5fdacfbb78ec0f5c30b27de0e3bb06baf2cbc8c696278c6f7588c58a4fff87910064110f5183cef15 SHA512 f860023fc265cee6df3f4b4ecf5075f1c973425816957bba56f4b4c99a7d53c27d05b4e85df473bceda41cd3ea3967e83d7174a4f34a4245983bfb6191edfeba diff --git a/virtual/miller-base/files/kernels-cleaner b/virtual/miller-base/files/kernels-cleaner index deaad40..2339724 100755 --- a/virtual/miller-base/files/kernels-cleaner +++ b/virtual/miller-base/files/kernels-cleaner @@ -1,6 +1,6 @@ #!/bin/bash -if [ $(find /boot/ -name kernel* -type f | wc -w) -gt 2 ] ; then +if [ $(file /boot/* | grep -i linux.kernel | wc -l) -gt 2 ] ; then echo "Cleaning old kernels..." eclean-kernel -n2 grub-mkconfig -o /boot/grub/grub.cfg diff --git a/virtual/miller-base/miller-base-10.10.4.ebuild b/virtual/miller-base/miller-base-10.10.4.ebuild deleted file mode 100644 index 2cd3fd2..0000000 --- a/virtual/miller-base/miller-base-10.10.4.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -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 mdadm ssd -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 ) - !ssd? ( - sys-apps/systemd-readahead - ) - xfs? ( sys-fs/xfsdump ) - btrfs? ( - sys-fs/btrfs-progs - sys-fs/btrfsmaintenance - ) - sys-fs/lvm2 - >=sys-boot/grub-2 - sys-apps/busybox - 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 ) - app-antivirus/clamav - sys-kernel/gentoo-kernel - ) - 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 - ) - 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 - ) - app-portage/cpuid2cpuflags - app-text/ansifilter - " - -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 -} diff --git a/virtual/miller-base/miller-base-10.10.5.ebuild b/virtual/miller-base/miller-base-10.10.5.ebuild new file mode 100644 index 0000000..2cd3fd2 --- /dev/null +++ b/virtual/miller-base/miller-base-10.10.5.ebuild @@ -0,0 +1,129 @@ +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 mdadm ssd +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 ) + !ssd? ( + sys-apps/systemd-readahead + ) + xfs? ( sys-fs/xfsdump ) + btrfs? ( + sys-fs/btrfs-progs + sys-fs/btrfsmaintenance + ) + sys-fs/lvm2 + >=sys-boot/grub-2 + sys-apps/busybox + 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 ) + app-antivirus/clamav + sys-kernel/gentoo-kernel + ) + 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 + ) + 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 + ) + app-portage/cpuid2cpuflags + app-text/ansifilter + " + +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 +} -- cgit v1.2.3