summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2011-09-06 14:23:20 +0000
committerrandomdan <randomdan@localhost>2011-09-06 14:23:20 +0000
commitb00d48c9c525fb56d25e1ef1dbed700b0eb3ac65 (patch)
tree65391baaac1780f1c41e6013b981092962302c53
parentPrefer libreoffice binary due to build size requirements (diff)
downloadportage-b00d48c9c525fb56d25e1ef1dbed700b0eb3ac65.tar.bz2
portage-b00d48c9c525fb56d25e1ef1dbed700b0eb3ac65.tar.xz
portage-b00d48c9c525fb56d25e1ef1dbed700b0eb3ac65.zip
Build initrd in os-prober compatible location
-rw-r--r--virtual/miller-base/Manifest4
-rwxr-xr-xvirtual/miller-base/files/update-kernel6
-rw-r--r--virtual/miller-base/miller-base-9-r3.ebuild (renamed from virtual/miller-base/miller-base-9-r2.ebuild)0
3 files changed, 7 insertions, 3 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index b083e3a..8c66eab 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -45,11 +45,11 @@ AUX restart/vsftpd 27 RMD160 91be22938c872d12b96c8c695f9cba1c2767ed45 SHA1 016b4
AUX sync-distclean-exec.cron 60 RMD160 b012f4963ffa84869ce9e9593f64e5e26e09cf8c SHA1 c0389c2e1e947e75910a5ff3b9b0a7a122754c76 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e
AUX update-autoshutdown 88 RMD160 f029249c1e727d4feaa06bbdc8bac1a9e84ba178 SHA1 2f55e2283efae01ae9fa30d5ae136989257563c2 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6
AUX update-install2 457 RMD160 b73bac2c53533fcb0f4c931ed34548421cf72cca SHA1 e6088eb347d43d1f48968a249eb55a4cd4cb6730 SHA256 40fcd47ac532d65e0ea54712df2fc0e0ae1685cb2afd8827082d0ee5575815c7
-AUX update-kernel 571 RMD160 9d75e8fcdbfa50587eaf4d6bdcf3310d536b642e SHA1 44fa0e577347bb2787796290bf0d63c00a5f9ca1 SHA256 268d735670fc18fbfaa1a3de49583f6ecc4061e04a62775add1673f0396efd0f
+AUX update-kernel 582 RMD160 f75e32f0c885e24ccb078d76de96c37b392f99dc SHA1 b7a280236b11f1653a9ea65347ea041254f1b22f SHA256 07803c756715311b957a557de7fb650a59d247b8099823fc07f9808c0536f844
AUX update.portage.cron 171 RMD160 c388289e78342b65d48077868f4acbe9b3b00849 SHA1 d7430ff8e906ad8d66918750c29722bfa6030c73 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03
AUX update.portage.cron-2 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f SHA1 4be58a5f236829928865c800585cc9c811a6aad3 SHA256 a910ae7e18b6e759380f1d9e30bffa100912b3a6f1c60c69f33b9cd186d0e92c
AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1 d39efdf4398a679b8a87603c51e92f01ce1e9362 SHA256 1b1e3751560d72c0e146046149084e213f8bc8f878e8cb24446be8ee45b6da28
AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38
AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
AUX write-new-updates 123 RMD160 bd8177f3baf9287676389a8c24d3419a995400bb SHA1 2812937b3a746c919fe5bea90b3b6c9930d203f0 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84
-EBUILD miller-base-9-r2.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
+EBUILD miller-base-9-r3.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
index 0f4dbce..2c6399e 100755
--- a/virtual/miller-base/files/update-kernel
+++ b/virtual/miller-base/files/update-kernel
@@ -7,4 +7,8 @@ make modules -j2 || ( echo "Make modules failed" ; exit 1 )
make modules_install -j2 || ( echo "Make modules install failed" ; exit 1 )
qfile /lib/modules && emerge -q1 /lib/modules || exit 1
make install -j2 || ( echo "Make install failed" ; exit 1 )
-[ -x /usr/sbin/dracut ] && /usr/sbin/dracut -H -f --lzma /boot/dracut.initrd.cpio.lzma $(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
+if [ -x /usr/sbin/dracut ] ; then
+ KV=$(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
+ /usr/sbin/dracut -H -f --lzma /boot/initrd-$KV.img $KV
+fi
+
diff --git a/virtual/miller-base/miller-base-9-r2.ebuild b/virtual/miller-base/miller-base-9-r3.ebuild
index 09d4b93..09d4b93 100644
--- a/virtual/miller-base/miller-base-9-r2.ebuild
+++ b/virtual/miller-base/miller-base-9-r3.ebuild