summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-06-30 22:54:03 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-06-30 22:54:03 +0100
commit4f344eb5940284c68b204262e321cc7694123df5 (patch)
tree469d5bb828b2938b3bf7bf944087305d47c201c3
parentBump GentooBrowse API (diff)
downloadportage-4f344eb5940284c68b204262e321cc7694123df5.tar.bz2
portage-4f344eb5940284c68b204262e321cc7694123df5.tar.xz
portage-4f344eb5940284c68b204262e321cc7694123df5.zip
Swap out dracut and homemade script for genkernel-next
-rw-r--r--virtual/miller-base/Manifest3
-rwxr-xr-xvirtual/miller-base/files/update-kernel25
-rw-r--r--virtual/miller-base/miller-base-10.2.ebuild (renamed from virtual/miller-base/miller-base-10.1-r2.ebuild)3
3 files changed, 2 insertions, 29 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index e0194b3..0261d0c 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -7,8 +7,7 @@ AUX sync-distclean-exec.cron 60 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47
AUX tmpfiles-d-portage.conf 78 SHA256 6b6f63b38702a86782d1048e0cf54a097a6850ab74567385d4be46f04a2f9f44 SHA512 c27a474228d2aa89194ea9d9b80ec239ff45ea343e608d06d67834f853e561f1ad643a54515f8ffd70d14f27a06a94706af464a09891e0e51a7c8386107d77eb WHIRLPOOL d3b12cf9ac91c945927547ccf2addc3ff54e52630f1eae6b017c0ca88f88ebb1d79146577ea73b8580de79821cbd4895982cc1aa03c729ea327e0a4d999fac0d
AUX update-autoshutdown 94 SHA256 bd42a7125c4cf5cfb013178f9562f21e8827a9879be85f3fd5445b6c50579023 SHA512 8d131120646ff1aef8403c2decb92bb9150aef9d57cb36438a42438f4573a4d52fe390d2644c423a76997fdbcdb94a7b72c1a56ecebc81937a71d7181ac71ddf WHIRLPOOL a11b2e8c0eaaea890f3aa2ecf4efc61b16e53848ffd67c9e502c4b6516c20f257e685b299b880dc0ee449ca72e26f4cf08aea75ca9da6b75c3cc0e74024403d9
AUX update-install2 626 SHA256 c1b5efaf9028e1c5d95a78fc9d7974de0d3c339ba3a0c19658ac7e92b025f8c8 SHA512 a67ca5bed3094e75c0f5a2007d63a682cbf7fbac96c07fc657f6ac55b823802cd9af56d3d94d838754ae22e04da895c26ce83a65a1f24be4e1b4b11c75aad822 WHIRLPOOL 2fb8174ac6b58a46a80fe2e3af043a79ae8e10cd72e0b71e1b0dc0eaeb4957679c8e2e0a265962fcc730502123734ff0a074299f15031ff9da4c3e3d78155bf5
-AUX update-kernel 945 SHA256 ace829e22a62e60b523e729b240b92e2e39af0ccaf870b97974aefa530ce058d SHA512 094896b4c1ea73b1277d45a2ead16801fb036fe0a3355d93a4fac5ef88c8ab9018f64b1be0031229d0e5a67c3ec4e7b49ab0e53d6b5bb86c3ba54a6c9f5e55ed WHIRLPOOL 39f7d6afcf59ba3f75cc90d20672c94fe63e69084e9ce7595222dda5d69cacdd00e45ae820d9e7ad49015d61374882a06ce914eedba0699449ef7b1b52ce7138
AUX update.portage.cron-2 48 SHA256 db1c43c1d9aa7b906e39dd397499a1a33fc36103a1bc06c21eea36156be895a9 SHA512 431d8ed50c2fc6d4b0e9e3550e4ba5d8320595961c6dab14820ae7b5abd39bf63cb6afb99724f2b4aebb2c0cf14b46927d2abecb6d9509db158000b8ea6a97b8 WHIRLPOOL 8cd7b3a90dbaa55f7dacb22f9408a75a121abea37392328f749cf27c3f82ba81379c4de7a1e0db3352de0cfd1697fe89f866eeb002a5c159c481e22e5243b244
AUX weekly-av-scan.cron 272 SHA256 002866cd461b9452df5aa6cf22ca76a12b4be1d918aeb379a84a09267d84a481 SHA512 725d1813222819fa3b455bb3eeee16fe22106e252138d49f83003e5ec3fdbbe9529df47a9c0d36959ad30a0e8a23e087aa7834dd3724cb9b728203e21a6de4d9 WHIRLPOOL a1c2433dfbf5aa70e9cf3f358379d6ff9776dc31582409b6f0dea98defb1d072fbc071586070330239c3be9a0d630b97f9073cf13be8cea10fce15de1c916c5f
AUX write-new-updates 246 SHA256 9edd236f58b30b26de7a3791b2481446d6f5e8245763478a23a9fe3a4e5aff88 SHA512 98093601121bcabd0ca6348660a1c4c2bf0eb175a6c57b6b851c1398a5d5a4ab8d7bcd0308f9ac594ed3c1f6467a6539528a305f78fbc6c06ee5079b209174eb WHIRLPOOL 84186d65556aa9978f82460355b00cf94062d64f57ff476924cf66d619bbf9f084d560f9df3f810ac1f52e5bff000b55ffb05b21dc3cecb331b379ca8b721ada
-EBUILD miller-base-10.1-r2.ebuild 3363 SHA256 99cd8cfd971b327906f7934b9f3d8e85196968d2ec4b23ef3677e4935577e5cf SHA512 8009719f9c4414bfe40ee97e955ab758b60e45411c3960a27a15b9a22c411553713fc04a12297f5a2747354d0ec8f040a379915cd7f23b6ffba5014e317f1978 WHIRLPOOL ba1f2f7a07f573b7f2565fdae28e71486a5b042b1c96c74ce56ab2555ea3513ec5e85d2665472bcdaf6a037640a243af677f92b24a280df97178bc2cf5cb64e1
+EBUILD miller-base-10.2.ebuild 3315 SHA256 45db7ad886bce57079e7c6ee34ca78393c40dc917a07dea69dafac14a5e9244b SHA512 d9e110a844150ba2336880796ca6f78df6baee64fc47f16472df95c0862a3a26bab6425d0b3cfbfcc027baf1ac98be267689d5edc3441acc721eb7ad02295606 WHIRLPOOL 55cc75b1c5abcc3d723014d2642f41abf353cdc8ed7d16c386899839e0077ec87cd6a1a47bd79bdd2ed0ebcbd592c7798d1ce043710d8b8a94e1352434e01c45
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
deleted file mode 100755
index cd6b7ba..0000000
--- a/virtual/miller-base/files/update-kernel
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-CORES=$(grep core\ id /proc/cpuinfo | sort -u | wc -l)
-PATH="/usr/lib/ccache/bin:$PATH"
-
-cd /usr/src/linux || ( echo "No kernel directory"; exit 1 )
-[ -f .config ] || ( echo "No kernel configuration"; exit 1 )
-make -j$CORES || ( echo "Make failed" ; exit 1 )
-make modules -j$CORES || ( echo "Make modules failed" ; exit 1 )
-make modules_install -j$CORES || ( echo "Make modules install failed" ; exit 1 )
-emerge -q1 @module-rebuild || exit 1
-make install -j$CORES || ( echo "Make install failed" ; exit 1 )
-
-KV=$(head $(ls -1t /boot/config-* | head -n1) -n3 | tail -n1 | cut -d ' ' -f 3)
-if [ -x /usr/bin/dracut ] ; then
- /usr/bin/dracut -H -f --lzma /boot/initramfs-$KV.img $KV
-fi
-if [ -x /usr/sbin/kexec ] ; then
- if [ -x /run/openrc/started/kexec ] ; then
- /run/openrc/started/kexec stop
- fi
- kexec -l "/boot/vmlinuz-$KV" --append="`cat /proc/cmdline`" --initrd=/boot/initramfs-$KV.img
-fi
-grub2-mkconfig -o /boot/grub/grub.cfg
-
diff --git a/virtual/miller-base/miller-base-10.1-r2.ebuild b/virtual/miller-base/miller-base-10.2.ebuild
index e5a0c40..cf8e5e8 100644
--- a/virtual/miller-base/miller-base-10.1-r2.ebuild
+++ b/virtual/miller-base/miller-base-10.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
sys-fs/lvm2
>=sys-boot/grub-2
sys-apps/busybox
- >=sys-kernel/dracut-040
+ sys-kernel/genkernel-next
sys-process/vixie-cron
sys-apps/pciutils
sys-apps/usbutils
@@ -119,5 +119,4 @@ src_install() {
exeinto /sbin
newexe "${FILESDIR}"/update-install2 update-install
- newexe "${FILESDIR}"/update-kernel update-kernel
}