From bc4b24517aaead667055988004e7e617cd445df3 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 6 Dec 2017 23:09:22 +0000 Subject: Improve kernel counting in cleaner script --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/kernels-cleaner | 2 +- virtual/miller-base/miller-base-10.5.1.ebuild | 136 -------------------------- virtual/miller-base/miller-base-10.5.2.ebuild | 136 ++++++++++++++++++++++++++ 4 files changed, 139 insertions(+), 139 deletions(-) delete mode 100644 virtual/miller-base/miller-base-10.5.1.ebuild create mode 100644 virtual/miller-base/miller-base-10.5.2.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 0ae6a35..ef43ab2 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -1,6 +1,6 @@ AUX auto-download-packages 81 SHA256 0ec31222dc2d7b7dac658faffed8b971d9ee6710811c6eefe0145e4ed4c95792 SHA512 ce5a4d320fa33cceaacd6f446340026d14da04a91b57cfe1bc78d026487748b6644d04d30a3d904af416e8914dd69f0dcfb89267011da59e7084f78f74f8a1b7 WHIRLPOOL 550f0108b061b0ca35a7513e5f85a969308b1eae7741282e8362542fb9eee0b3faa87b774e5b59a40fea10c99def8112b75a9cfb8b614fc1944887b2b7f35d3b AUX auto-update-overlays 25 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd SHA512 70e69f299817b93debbffd0ea7d05cb8fe00be21d8103bf70024fd07443fb3abe3cebe32003128e9d241463b6eb954c98d335d8040a35a0035f05f93b99678d1 WHIRLPOOL 4140a9ffd1ff024260bded5ad5edc7bbb90a755be1b2b4703769d18e83000c8834deaa60aa10e8aebc5b5d03353bfb1a4065c830d481778c46314949ae60363f -AUX kernels-cleaner 154 SHA256 e28d4d2a9aaee4f6ced223f92fc7ee1d4dd37ba7bc310c2173403e34d0d0db69 SHA512 bb0c5b35aa12fe195c87dab0ec868abdc193a0d3191a379c233e6ca0a08111955a74b51be855daf27009df93dbf627842d8180de3f06de0ed819c09958f8453c WHIRLPOOL d54774f8f0891fba8cbe6dc6454baa5d555b92d211eb32cf6c91e6777fb09ff7ccac78fb6af16330b2474e6b2f62e9a66ea705a7d6594cb4f34b6c8ba3299457 +AUX kernels-cleaner 171 SHA256 e6beaee48340672ed6bdfd1ab4377b44cc4a8a2d559cb1f29627b368dc9ad669 SHA512 944fe9811e652a7a42f907f229bf955583a7107ccc44d2973ca65bb785b9285b6f88f6f8811d2ce26e9faa3e6d2fb0120c96b6602f8d1234ea4bc1d4726ef15d WHIRLPOOL e434436e9d138df86649d0231b45efa2d0b3135cce5c0457994e21b89e7bb72647e6473e9138d7efa83aaae23f33d74dcaa2a82aac8b09757f4e3dff7ed05d5d AUX newkernel 301 SHA256 869ebc9260b81e07a57d3bc7a2997c9252fa3e8de830bc593f7b15b74c6db7a0 SHA512 d338d1604c6ff6ad963187da6bf63d2c25c3286f60bc61301d4f516bcdc4becae99234f663aab171c582804792133d7c4ece755db8967b70a2e85d23ba91bc48 WHIRLPOOL 43ff64d037114b2e60f789fd8444e33a130f78795f64516eabcdddda028b5a47b02617c8ada03f848b159141f5c4bcb226cfd84257d7b0b525c93a19112f0ca2 AUX service-check.openrc 28 SHA256 c15c00ba79267a7b47c73a361226f263c852f94ba3096582bb3879f82f4fcdef SHA512 486e527013f694dd543d4ac877058a3f4c45a2879c2fb82519223a4aef52446e5c370892aae2d7a75766a77e47024086ec15573d1aee131b91437ad2acf4433f WHIRLPOOL c1b4806deb1ad4963089b5fb7bc14a202e206616b9eac645f1603813f60e745cfeb2370128dbd7904f75f821262f215eae61adc729d9014c979768429e15c289 AUX service-check.systemd 54 SHA256 0b30767a9ae16c85275ce88861c8528f11f65ad52bdbb50c87e52adc41a4a888 SHA512 89bd6a5acbc99c4a6fa958dcdbd0dda09128d1ac0e50b5e312283b3dc396154fe1b5a18092994817153b80fd4a7df9ab4e86d5f958aa5ad5f2fab26303c44dc6 WHIRLPOOL 332e6780cf2b7daf2c524574c389131c7f5a889950315703da093d226a1fbec70112e70895c207c5c8f8dfe1797334dc3b129e8391a6741e464dcbb5c23a1569 @@ -12,4 +12,4 @@ AUX update-install2 683 SHA256 632be90dea05414607e7be7be72f4546b831b719deedb2068 AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244 AUX weekly-av-scan.cron 1215 SHA256 86cfd030137a08d82c3d678196db9b582e93a5ece138ac97939a0efb4a3be3b0 SHA512 3da4781490a1703c0a00884e0a3a053b4a65207a5cb1320418cce02a10fd2c8802d6516cd22080b32d2a36212adbf4b5e471623019997dfddfe6cc1c15bf64a6 WHIRLPOOL 77f02904e7aa53179fedffe849f0dd1a0f9e4b5ac9bd97e5b1b3543da3310d176c19b398ccd261b8d75f6873a1860a6434e2587d5ecd2cf5a904ec32790db5de AUX write-new-updates 409 SHA256 e4c05e38082914bd9d367c69a7d1fe44fb459d8526c9e407f0b73784878640cc SHA512 5f6b852ec563f764617d747c3024a89044e409345b599e5476963573f4ef639fcf67c7eadc0cc12857c7e3c0be59a2b912d1d06a10c647c5af61cefd182ff1a5 WHIRLPOOL a42d0115ad685f28a3da51e2593ee9ae90a4021797655aef7e6083ee59572507f2a105ed32fbc019fe535783b73ce14739478cda9c707840b7c0cca3b667542a -EBUILD miller-base-10.5.1.ebuild 4095 SHA256 170d9a3f31f0a8a5a351202c0a08b6b8246f93f7228ebcc20b8462501a001b88 SHA512 c16d64823707a673fce0bd923a194115202fd9ba5520e0b59bca885fe53fe76a6357134c9a9ae0a927c874a8de5ddb56f4217c0de53a95c741497aef6143607f WHIRLPOOL 360b96328c706d2c9cfc1258503b55ec98f027e7602b1d500c93cc633a3e03fd39a27a00ddd04c149af9d22543066aaabecf9978cd4cdf3f7b7f0d0545d61e26 +EBUILD miller-base-10.5.2.ebuild 4095 SHA256 170d9a3f31f0a8a5a351202c0a08b6b8246f93f7228ebcc20b8462501a001b88 SHA512 c16d64823707a673fce0bd923a194115202fd9ba5520e0b59bca885fe53fe76a6357134c9a9ae0a927c874a8de5ddb56f4217c0de53a95c741497aef6143607f WHIRLPOOL 360b96328c706d2c9cfc1258503b55ec98f027e7602b1d500c93cc633a3e03fd39a27a00ddd04c149af9d22543066aaabecf9978cd4cdf3f7b7f0d0545d61e26 diff --git a/virtual/miller-base/files/kernels-cleaner b/virtual/miller-base/files/kernels-cleaner index b16ed31..deaad40 100755 --- a/virtual/miller-base/files/kernels-cleaner +++ b/virtual/miller-base/files/kernels-cleaner @@ -1,6 +1,6 @@ #!/bin/bash -if [ $(ls /boot/kernel* | wc -w) -gt 2 ] ; then +if [ $(find /boot/ -name kernel* -type f | wc -w) -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.5.1.ebuild b/virtual/miller-base/miller-base-10.5.1.ebuild deleted file mode 100644 index a54aa76..0000000 --- a/virtual/miller-base/miller-base-10.5.1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -EAPI="6" -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="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba -minimal autoupdate autoshutdown autoservicerestart sw-suspend raid -video_cards_nvidia video_cards_nouveau firmware ischroot systemd" - -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 - raid? ( sys-fs/mdadm ) - cdr? ( kde-apps/k3b ) - sys-apps/hdparm - xfs? ( sys-fs/xfsdump ) - btrfs? ( sys-fs/btrfs-progs ) - sys-fs/lvm2 - >=sys-boot/grub-2 - sys-apps/busybox - sys-kernel/genkernel-next - sys-process/vixie-cron - sys-apps/pciutils - sys-apps/usbutils - || ( net-misc/openntpd net-misc/ntp ) - samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) - firmware? ( sys-kernel/linux-firmware ) - app-admin/syslog-ng - app-admin/logrotate - video_cards_nvidia? ( sys-apps/v86d ) - video_cards_nouveau? ( sys-firmware/nvidia-firmware ) - ) - >=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 - !ischroot? ( - www-servers/apache - app-antivirus/clamav - ) - ) - sys-process/lsof - app-portage/layman[git] - !hardened? ( - sys-devel/prelink - ) - !ischroot? ( - !sw-suspend? ( sys-kernel/gentoo-sources ) - sw-suspend? ( sys-apps/tuxonice-userui - || ( sys-kernel/tuxonice-sources - sys-kernel/pf-sources ) ) ) - app-misc/screen - app-vim/gentoo-syntax - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/gvim - git? ( dev-vcs/git ) - bash-completion? ( app-shells/bash-completion ) - autoservicerestart? ( - systemd? ( - sys-apps/autorestart - ) - ) - " - -src_unpack() { - mkdir ${S} -} - -src_install() { - exeinto /etc/cron.hourly - if use systemd ; then - newexe "${FILESDIR}"/service-check.systemd service-check - systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" - dodir /etc/systemd/system/multi-user.target.wants - dosym /usr/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 - dosym /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service - dosym /usr/lib/systemd/system/syslog-ng.service /etc/systemd/system/multi-user.target.wants/syslog-ng.service - dosym /usr/lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service - else - newexe "${FILESDIR}"/service-check.openrc service-check - fi - - exeinto /etc/cron.weekly - use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner - - - if [ -n "${UPDATETIME}" ]; then - mkdir -p ${D}/etc/cron.d - echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update - exeinto /sbin - 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}"/auto-update-overlays 10-auto-update-overlays - newexe "${FILESDIR}"/write-new-updates 50-write-new-updates - newexe "${FILESDIR}"/newkernel 80-newkernel - newexe "${FILESDIR}"/systemd-reload 90-systemd-reload - 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.5.2.ebuild b/virtual/miller-base/miller-base-10.5.2.ebuild new file mode 100644 index 0000000..a54aa76 --- /dev/null +++ b/virtual/miller-base/miller-base-10.5.2.ebuild @@ -0,0 +1,136 @@ +EAPI="6" +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="cdr hardened nohourlyupdate fuse xfs btrfs bash-completion git samba +minimal autoupdate autoshutdown autoservicerestart sw-suspend raid +video_cards_nvidia video_cards_nouveau firmware ischroot systemd" + +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 + raid? ( sys-fs/mdadm ) + cdr? ( kde-apps/k3b ) + sys-apps/hdparm + xfs? ( sys-fs/xfsdump ) + btrfs? ( sys-fs/btrfs-progs ) + sys-fs/lvm2 + >=sys-boot/grub-2 + sys-apps/busybox + sys-kernel/genkernel-next + sys-process/vixie-cron + sys-apps/pciutils + sys-apps/usbutils + || ( net-misc/openntpd net-misc/ntp ) + samba? ( || ( net-fs/cifs-utils net-fs/samba[client] ) ) + firmware? ( sys-kernel/linux-firmware ) + app-admin/syslog-ng + app-admin/logrotate + video_cards_nvidia? ( sys-apps/v86d ) + video_cards_nouveau? ( sys-firmware/nvidia-firmware ) + ) + >=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 + !ischroot? ( + www-servers/apache + app-antivirus/clamav + ) + ) + sys-process/lsof + app-portage/layman[git] + !hardened? ( + sys-devel/prelink + ) + !ischroot? ( + !sw-suspend? ( sys-kernel/gentoo-sources ) + sw-suspend? ( sys-apps/tuxonice-userui + || ( sys-kernel/tuxonice-sources + sys-kernel/pf-sources ) ) ) + app-misc/screen + app-vim/gentoo-syntax + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/gvim + git? ( dev-vcs/git ) + bash-completion? ( app-shells/bash-completion ) + autoservicerestart? ( + systemd? ( + sys-apps/autorestart + ) + ) + " + +src_unpack() { + mkdir ${S} +} + +src_install() { + exeinto /etc/cron.hourly + if use systemd ; then + newexe "${FILESDIR}"/service-check.systemd service-check + systemd_newtmpfilesd "${FILESDIR}/tmpfiles-d-portage.conf" "portage.conf" + dodir /etc/systemd/system/multi-user.target.wants + dosym /usr/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 + dosym /usr/lib/systemd/system/sshd.service /etc/systemd/system/multi-user.target.wants/sshd.service + dosym /usr/lib/systemd/system/syslog-ng.service /etc/systemd/system/multi-user.target.wants/syslog-ng.service + dosym /usr/lib/systemd/system/vixie-cron.service /etc/systemd/system/multi-user.target.wants/vixie-cron.service + else + newexe "${FILESDIR}"/service-check.openrc service-check + fi + + exeinto /etc/cron.weekly + use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + use !minimal && newexe "${FILESDIR}"/kernels-cleaner kernels-cleaner + + + if [ -n "${UPDATETIME}" ]; then + mkdir -p ${D}/etc/cron.d + echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update + exeinto /sbin + 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}"/auto-update-overlays 10-auto-update-overlays + newexe "${FILESDIR}"/write-new-updates 50-write-new-updates + newexe "${FILESDIR}"/newkernel 80-newkernel + newexe "${FILESDIR}"/systemd-reload 90-systemd-reload + 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