From 67168d25f436f19f48d01a2ff8c4dba75c79ebf5 Mon Sep 17 00:00:00 2001 From: randomdan Date: Sun, 2 May 2010 13:03:05 +0000 Subject: Set deps right and build initrd accordingly --- virtual/miller-base/Manifest | 7 +- virtual/miller-base/files/lvmroot/initrd.list | 3 - .../miller-base/files/lvmroot/initrd.list.icefb | 1 + .../miller-base/files/lvmroot/initrd.list.icetext | 1 + virtual/miller-base/files/lvmroot/initrd.list.v86d | 1 + virtual/miller-base/miller-base-8-r4.ebuild | 119 ------------------- virtual/miller-base/miller-base-8-r5.ebuild | 131 +++++++++++++++++++++ virtual/miller-desktop/Manifest | 2 +- virtual/miller-desktop/miller-desktop-2-r6.ebuild | 1 - 9 files changed, 140 insertions(+), 126 deletions(-) create mode 100644 virtual/miller-base/files/lvmroot/initrd.list.icefb create mode 100644 virtual/miller-base/files/lvmroot/initrd.list.icetext create mode 100644 virtual/miller-base/files/lvmroot/initrd.list.v86d delete mode 100644 virtual/miller-base/miller-base-8-r4.ebuild create mode 100644 virtual/miller-base/miller-base-8-r5.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 902c50a..64fa40d 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -4,7 +4,10 @@ AUX auto-update-overlays 25 RMD160 7c8c5594cfd401e8b38b4ae4df07f17f4c4415a4 SHA1 AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a403002fce0 SHA1 f5626fcddd829d6bfa75bb132e2644162548f9d2 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6 AUX lvmroot/init 475 RMD160 5d1909b4f0993c098a51b2b1445be3ec54a551dc SHA1 7426314cb1e65e6f581a3de04a6854cb1af03750 SHA256 5d111fef9762050acd13d8b35acc53d42ae90aca39cfabb9d156ed1ad3eeb396 -AUX lvmroot/initrd.list 2098 RMD160 0b79e6302754534958e24ae5d41c01498ad439c2 SHA1 c819ef00dda878b0181472a727edcd82fa6442e1 SHA256 2f640cd00664d2aeb992e2733f36d49fa302b3edba37d58ac151f83ea6603f7c +AUX lvmroot/initrd.list 1941 RMD160 a4f208bca30368acdccd02d62954416d925f7a10 SHA1 3febf0d83fa8c86a75deb17f5a10218f1c149ff8 SHA256 fed8d53011a92e0eb772e16eceefabea8636b4ce139b05eebe595bdb4877e8c9 +AUX lvmroot/initrd.list.icefb 65 RMD160 db0adb727387428cc9692da7e7f2f5798fd1846b SHA1 bb06204c7e811130f1e5d6dbed00eb76cfd9a30b SHA256 6bca253e53621a0acc6ac27568c20b429cac6938054d947684b2d44940e7dcc1 +AUX lvmroot/initrd.list.icetext 57 RMD160 667c7999bd84c1cb64a1000dc94c74bd1bf9168f SHA1 a085a7fa4b61b8b82de6c86d39f687d3ff8bae9c SHA256 522185c1223fa71c0864ebcbb3b64592c53a353053086169daf2b8504f87247f +AUX lvmroot/initrd.list.v86d 35 RMD160 a35c77a5351bdbc6aac2cb7ab8c2eb9aa2bb4909 SHA1 45e219fbb6b37bbf4097bb940acfa3820beac4bf SHA256 90bed474cd395ae7572ffd5acd807e6a961ff97c32e99c12472afd6e72959aad AUX lvmroot/makefile 831 RMD160 74ed53a1e53aeab712b801451b451c73ed3adf1f SHA1 b8192d04eab2c305e8f490edc051e03dfa85370b SHA256 c2dac31ca3992c776f8437b9ee0aab5308c0adce7357345b157e4594d1639655 AUX lvmroot/mtab 713 RMD160 0d20da9702f47582e0b26cb81da6912a3dd008a5 SHA1 cefc750a24a4b55114c2482310ce10bb93ce2c76 SHA256 0edc5d3656174c228b8a961305a26b4cd3481ae41dc4dc55918bed3c6f8a0b5a AUX lvmroot/rebuild-initrd 64 RMD160 1e552145402fa7e3da14a6b78a237f4bd32a222e SHA1 6b9be43f578cfb283735ce91318afbea024dcc6a SHA256 0c51117369e8b65d74d3a6a4c79164e2d359d727267d6e1ca831123a847a8011 @@ -50,4 +53,4 @@ AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a8 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141 AUX write-new-updates 108 RMD160 1eccc342427d7c6523f23f8d7bd4bf2966638cb2 SHA1 8886bae7ac2c2f01c6cbd47ffcaa15ffcc210214 SHA256 b910f8d64a069e8038965c1c8af3bf05729f027e2da264cd6e0fa2ea627ec164 EBUILD miller-base-7-r2.ebuild 3018 RMD160 e25aff842a0bd512890914e2c56b038bb377e3ab SHA1 b9a9fef1092339035b546e5c8eefad9825fdae9d SHA256 6035d0bc20312ed8b941cea3a18f2917bc5144f9f822c944fcd8d0572b3d1d52 -EBUILD miller-base-8-r4.ebuild 3570 RMD160 3f5def27662e30580a82d09b298a584717d822c9 SHA1 24e6310b359e334daa13fdab9319679eb6fa6fa7 SHA256 c20f54da8c820b6fa0bd841345f5817077e10bd1b2dfb05a4f0f6a03f054e4bb +EBUILD miller-base-8-r5.ebuild 4034 RMD160 3e1a3edf033243fdd2a241c6a8ceac20b6bf0b8a SHA1 0dc9715a0cfea35b7b060a45d77edb9108fc532e SHA256 a08ab306a5c0813d32c9928066f06fa721b6e0bb9150d3c5953e6222446c3ddb diff --git a/virtual/miller-base/files/lvmroot/initrd.list b/virtual/miller-base/files/lvmroot/initrd.list index 7e0d5e7..efc7b65 100644 --- a/virtual/miller-base/files/lvmroot/initrd.list +++ b/virtual/miller-base/files/lvmroot/initrd.list @@ -49,9 +49,6 @@ nod dev/zero 0600 0 0 c 1 5 nod dev/mem 0600 0 0 c 1 1 nod dev/fb0 0660 0 0 c 29 0 nod dev/urandom 0600 0 0 c 1 9 -file sbin/tuxoniceui_fbsplash /sbin/tuxoniceui_fbsplash 0755 0 0 -file sbin/tuxoniceui_text /sbin/tuxoniceui_text 0755 0 0 -file sbin/v86d /sbin/v86d 0755 0 0 file sbin/lvm /sbin/lvm.static 0755 0 0 file bin/busybox /bin/busybox.static 0754 0 0 file init init 0755 0 0 diff --git a/virtual/miller-base/files/lvmroot/initrd.list.icefb b/virtual/miller-base/files/lvmroot/initrd.list.icefb new file mode 100644 index 0000000..80fa382 --- /dev/null +++ b/virtual/miller-base/files/lvmroot/initrd.list.icefb @@ -0,0 +1 @@ +file sbin/tuxoniceui_fbsplash /sbin/tuxoniceui_fbsplash 0755 0 0 diff --git a/virtual/miller-base/files/lvmroot/initrd.list.icetext b/virtual/miller-base/files/lvmroot/initrd.list.icetext new file mode 100644 index 0000000..46bbae4 --- /dev/null +++ b/virtual/miller-base/files/lvmroot/initrd.list.icetext @@ -0,0 +1 @@ +file sbin/tuxoniceui_text /sbin/tuxoniceui_text 0755 0 0 diff --git a/virtual/miller-base/files/lvmroot/initrd.list.v86d b/virtual/miller-base/files/lvmroot/initrd.list.v86d new file mode 100644 index 0000000..f92c50c --- /dev/null +++ b/virtual/miller-base/files/lvmroot/initrd.list.v86d @@ -0,0 +1 @@ +file sbin/v86d /sbin/v86d 0755 0 0 diff --git a/virtual/miller-base/miller-base-8-r4.ebuild b/virtual/miller-base/miller-base-8-r4.ebuild deleted file mode 100644 index 2483382..0000000 --- a/virtual/miller-base/miller-base-8-r4.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -DESCRIPTION="Virtual for Miller servers" - -EAPI="2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" -IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git -minimal autoupdate autoshutdown autoservicerestart lvmroot" - -DEPEND=" - !minimal? ( www-servers/apache ) - sys-cluster/glusterfs - sys-apps/inotail - sys-apps/ethtool - cdr? ( app-cdr/k3b ) - !nomedia? ( media-tv/mythtv media-plugins/mythvideo ) - sys-apps/hdparm - sys-apps/unscd - !minimal? ( net-dns/bind-tools ) - fuse? ( sys-fs/sshfs-fuse ) - !minimal? ( || ( - net-fs/mount-cifs - net-fs/samba-client - net-fs/samba[smbclient] ) ) - xfs? ( sys-fs/xfsdump ) - !lvmroot? ( sys-fs/lvm2 ) - lvmroot? ( - sys-fs/lvm2[static] - sys-apps/busybox[static] - sys-apps/v86d - sys-apps/tuxonice-userui[fbsplash] - ) - >=app-portage/gentoolkit-0.2.1 - sys-process/vixie-cron - !minimal? ( sys-apps/eject ) - app-admin/sudo - mail-client/mailx - sys-apps/pciutils - !minimal? ( app-dicts/myspell-en ) - net-misc/ntp - !minimal? ( net-analyzer/netcat ) - !minimal? ( net-ftp/ncftp ) - dev-util/cvs - !minimal? ( x11-apps/xauth ) - sys-process/lsof - app-portage/layman[subversion] - app-admin/syslog-ng - app-admin/logrotate - !minimal? ( app-antivirus/clamav ) - !hardened? ( sys-kernel/tuxonice-sources ) - hardened? ( sys-kernel/hardened-sources ) - !minimal? ( || - ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) - app-misc/screen - lvmroot? ( >=sys-boot/grub-1.98 ) - sys-boot/grub - app-vim/gentoo-syntax - sys-apps/kexec-tools - sys-auth/pam_ldap - sys-auth/nss_ldap - app-editors/gvim - git? ( dev-vcs/git ) - !minimal? ( dev-util/strace ) - bash-completion? ( app-shells/bash-completion ) - net-misc/wakeonlan - " - -src_install() { - exeinto /etc/cron.weekly - use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan - - exeinto /etc/cron.daily - use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update - - 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 - 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 - else - if use autoservicerestart ; then - exeinto /usr/libexec/scripts/auto-restart - for f in ${FILESDIR}/restart/* ; do - newexe ${FILESDIR}/restart/`basename $f` `basename $f` - done - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services - fi - fi - fi - if use lvmroot ; then - exeinto /usr/share/lvmroot/ - newexe ${FILESDIR}/lvmroot/init init - insinto /usr/share/lvmroot/ - doins ${FILESDIR}/lvmroot/initrd.list - doins ${FILESDIR}/lvmroot/makefile - doins ${FILESDIR}/lvmroot/mtab - exeinto /etc/portage/postsync.d/ - newexe "${FILESDIR}"/lvmroot/rebuild-initrd 80-rebuild-initrd - fi - - exeinto /sbin - newexe "${FILESDIR}"/update-install2 update-install - newexe "${FILESDIR}"/update-kernel update-kernel -} diff --git a/virtual/miller-base/miller-base-8-r5.ebuild b/virtual/miller-base/miller-base-8-r5.ebuild new file mode 100644 index 0000000..67e3ba2 --- /dev/null +++ b/virtual/miller-base/miller-base-8-r5.ebuild @@ -0,0 +1,131 @@ +DESCRIPTION="Virtual for Miller servers" + +EAPI="2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd" +IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git +minimal autoupdate autoshutdown autoservicerestart lvmroot sw-suspend +video_cards_nvidia" + +DEPEND=" + !minimal? ( www-servers/apache ) + sys-cluster/glusterfs + sys-apps/inotail + sys-apps/ethtool + cdr? ( app-cdr/k3b ) + !nomedia? ( media-tv/mythtv media-plugins/mythvideo ) + sys-apps/hdparm + sys-apps/unscd + !minimal? ( net-dns/bind-tools ) + fuse? ( sys-fs/sshfs-fuse ) + !minimal? ( || ( + net-fs/mount-cifs + net-fs/samba-client + net-fs/samba[smbclient] ) ) + xfs? ( sys-fs/xfsdump ) + !lvmroot? ( sys-fs/lvm2 ) + lvmroot? ( + sys-fs/lvm2[static] + sys-apps/busybox[static] + ) + video_cards_nvidia? ( sys-apps/v86d ) + sw-suspend? ( sys-apps/tuxonice-userui ) + >=app-portage/gentoolkit-0.2.1 + sys-process/vixie-cron + !minimal? ( sys-apps/eject ) + app-admin/sudo + mail-client/mailx + sys-apps/pciutils + !minimal? ( app-dicts/myspell-en ) + net-misc/ntp + !minimal? ( net-analyzer/netcat ) + !minimal? ( net-ftp/ncftp ) + dev-util/cvs + !minimal? ( x11-apps/xauth ) + sys-process/lsof + app-portage/layman[subversion] + app-admin/syslog-ng + app-admin/logrotate + !minimal? ( app-antivirus/clamav ) + !hardened? ( + !sw-suspend? ( sys-kernel/gentoo-sources ) + sw-suspend? ( sys-kernel/tuxonice-sources ) ) + hardened? ( sys-kernel/hardened-sources ) + !minimal? ( || + ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) + app-misc/screen + lvmroot? ( >=sys-boot/grub-1.98 ) + sys-boot/grub + app-vim/gentoo-syntax + sys-auth/pam_ldap + sys-auth/nss_ldap + app-editors/gvim + git? ( dev-vcs/git ) + !minimal? ( dev-util/strace ) + bash-completion? ( app-shells/bash-completion ) + net-misc/wakeonlan + " + +src_install() { + exeinto /etc/cron.weekly + use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan + + exeinto /etc/cron.daily + use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update + + 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 + 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 + else + if use autoservicerestart ; then + exeinto /usr/libexec/scripts/auto-restart + for f in ${FILESDIR}/restart/* ; do + newexe ${FILESDIR}/restart/`basename $f` `basename $f` + done + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services + fi + fi + fi + if use lvmroot ; then + exeinto /usr/share/lvmroot/ + newexe ${FILESDIR}/lvmroot/init init + insinto /usr/share/lvmroot/ + doins ${FILESDIR}/lvmroot/initrd.list + if use video_cards_nvidia ; then + cat ${FILESDIR}/lvmroot/initrd.list.v86d >> ${D}/usr/share/lvmroot/initrd.list + fi + if use sw-suspend ; then + if use fbsplash ; then + cat ${FILESDIR}/lvmroot/initrd.list.icefb >> ${D}/usr/share/lvmroot/initrd.list + else + cat ${FILESDIR}/lvmroot/initrd.list.icetext >> ${D}/usr/share/lvmroot/initrd.list + fi + fi + doins ${FILESDIR}/lvmroot/makefile + doins ${FILESDIR}/lvmroot/mtab + exeinto /etc/portage/postsync.d/ + newexe "${FILESDIR}"/lvmroot/rebuild-initrd 80-rebuild-initrd + fi + + exeinto /sbin + newexe "${FILESDIR}"/update-install2 update-install + newexe "${FILESDIR}"/update-kernel update-kernel +} diff --git a/virtual/miller-desktop/Manifest b/virtual/miller-desktop/Manifest index a13d6bc..aad1edd 100644 --- a/virtual/miller-desktop/Manifest +++ b/virtual/miller-desktop/Manifest @@ -1 +1 @@ -EBUILD miller-desktop-2-r6.ebuild 823 RMD160 68a9a75f3e5a936b198c046563ee0372c61e3fb8 SHA1 3943d0119dba0d92043fcd150e996a8c032aba02 SHA256 5606c3c645f677285bbcc7ba335c8d389e73b4871309adac3a5f0a3e45ab84ee +EBUILD miller-desktop-2-r6.ebuild 808 RMD160 20b78c88cda47e52e918bed01aa97da7a15c58a1 SHA1 0ef85008e4993984a37663a118795055af833436 SHA256 e3e90c6fa54ef8a390a67d12ec62ae0ace63da760913917d59d4a55e9c6f2f54 diff --git a/virtual/miller-desktop/miller-desktop-2-r6.ebuild b/virtual/miller-desktop/miller-desktop-2-r6.ebuild index 4bdaa67..11975a9 100644 --- a/virtual/miller-desktop/miller-desktop-2-r6.ebuild +++ b/virtual/miller-desktop/miller-desktop-2-r6.ebuild @@ -14,7 +14,6 @@ DEPEND=" !networkmanager? ( || ( sys-apps/netplug sys-apps/ifplugd ) ) sys-power/acpid - sys-apps/v86d x11-apps/mesa-progs net-misc/dhcp networkmanager? ( -- cgit v1.2.3