diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2013-04-02 12:22:29 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2013-04-02 12:22:29 +0000 |
commit | 95e8d4e249681ac94eae64d889b6082c6cedf5c8 (patch) | |
tree | a473e1693588313f1059b5577ab78c546372d668 /sys-kernel/dracut | |
parent | Remove old. (diff) | |
download | historical-95e8d4e249681ac94eae64d889b6082c6cedf5c8.tar.gz historical-95e8d4e249681ac94eae64d889b6082c6cedf5c8.tar.bz2 historical-95e8d4e249681ac94eae64d889b6082c6cedf5c8.zip |
Version bump.
Dracut 027 depends on virtual/udev now and no longer needs CONFIG_MODULES in
kernel.
Following changes relates to systemd module only:
- at least systemd-199 is required
- systemd-bootchart module replaces bootchart module
- selinux module is removed if systemd module is installed, because systemd
handles selinux setup; the same is for securityfs
NEWS
~~~~
(from announcement on mailing list)
dracut-027
==========
- dracut now has bash-completion
- require bash version 4
- systemd module now requires systemd >= 199
- dracut makes use of native systemd initrd units
- added hooks for new-kernel-pkg and kernel-install
- hostonly is now default for fedora
- comply with the BootLoaderSpec paths
http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
- added rescue module
- host_fs_types is now a hashmap
- new dracut argument "--regenerate-all"
- new dracut argument "--noimageifnotneeded"
- new man page dracut.bootup
- install all host filesystem drivers
- use -D_FILE_OFFSET_BITS=64 to build dracut-install
Package-Manager: portage-2.1.11.59/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 41 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 17 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-027.ebuild | 300 | ||||
-rw-r--r-- | sys-kernel/dracut/files/027-0000-fix-version-print.patch | 13 | ||||
-rw-r--r-- | sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch | 37 | ||||
-rw-r--r-- | sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 |
6 files changed, 433 insertions, 5 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 6bcf009f43b0..660ef3836e1a 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,45 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.114 2013/03/30 16:25:08 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.115 2013/04/02 12:22:23 aidecoe Exp $ + +*dracut-027 (02 Apr 2013) + + 02 Apr 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> + +files/027-0001-dracut-functions.sh-support-for-altern.patch, + +files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch, + +dracut-027.ebuild: + Version bump. + + Dracut 027 depends on virtual/udev now and no longer needs CONFIG_MODULES in + kernel. + + Following changes relates to systemd module only: + - at least systemd-199 is required + - systemd-bootchart module replaces bootchart module + - selinux module is removed if systemd module is installed, because systemd + handles selinux setup; the same is for securityfs + + NEWS + ~~~~ + (from announcement on mailing list) + + dracut-027 + ========== + - dracut now has bash-completion + - require bash version 4 + - systemd module now requires systemd >= 199 + - dracut makes use of native systemd initrd units + - added hooks for new-kernel-pkg and kernel-install + - hostonly is now default for fedora + - comply with the BootLoaderSpec paths + http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec + - added rescue module + - host_fs_types is now a hashmap + - new dracut argument "--regenerate-all" + - new dracut argument "--noimageifnotneeded" + - new man page dracut.bootup + - install all host filesystem drivers + - use -D_FILE_OFFSET_BITS=64 to build dracut-install 30 Mar 2013; Mike Gilbert <floppym@gentoo.org> dracut-026-r1.ebuild: Depend on udev or a recent version of systemd. diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index cb0e0871297e..37e3e9352865 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -43,6 +43,9 @@ AUX 026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch 1809 SHA256 2928ef9bb5 AUX 026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch 1249 SHA256 b9b29f65354120db67fa0a815def5d907f0a598367f616de86b473e16c087ddb SHA512 ef482d1f3b0bac385f4e4cbb030f4f6ef9cc7ec6143bb11773105b09a357bdb34f06b87cdd62f1f38b95e85ff4d1a6e6052c4b3e018db96ec5585c4ae74ef620 WHIRLPOOL a7c8697d380fcd876f5f10c590ecff4e74ded4f6f69bc4e1ceaa10f497c6aec45362dc9c778410ec30549f3fc54c2738a54bea27264cb8a39a71c16aee8243ca AUX 026-0005-lsinitrd.sh-removed-trailing.patch 714 SHA256 c54d8d5a8bf22e40edc82343fd20b80ffcf346a842f54af68d840c84e6ebab15 SHA512 96e5dcf866860705bb6138f82816bb1a7a6c1cc352db3803aba14af581882464a7762ea4020a0047c3081aca24b0f8c5cdf9c37dd79295b558ecd30cb72cdf70 WHIRLPOOL d371a09e6771f79be4fa27c4fe8be1094500a1d7af52900bb4b13b2a073a04e50dfa0bff49d62f5903940cc912604bc139b04276ff2da5864f221a95b245c132 AUX 026-0006-make-host_fs_types-a-hashmap.patch 12563 SHA256 59ea961e4112c64840a98cc87223cf2ee412f3aab149d35d550aeac8b1dc9d47 SHA512 1ace774c411109338479c2686e7aa98f802eb8858f864eeff4c07dd1deeace23143e83849cfb50d523bff003669423beb793a9a44d71a5d390f6062a4559a610 WHIRLPOOL c134cc7027df34a7920ec04c33f2552560ca40fd5d6cab54162f4866196b45e0e8ccb95b8370a41f315ea4df30446f3bd330de539bca464009bc728475937bf6 +AUX 027-0000-fix-version-print.patch 365 SHA256 c065b20c95b24a9fc0e8e1e20de19ec3dca7cb4bd62d7a3d26adf099c39fc57b SHA512 2f622d8bc4e483d91674cb7acaa2ef9bde613bcda7c8b5c8b79bed4919fdcf0852798ba38615f796528e8c83fc18a89322a1fbde7fc5effaa6c4c4d0a389638f WHIRLPOOL b38923d3e04e161b23b9fa510b0dc0b3ce5238f3008ef0f92a1918e38c7a9ecf6d6c99a14006b734c8c77df01213c866bdce293c684c073a6cb61691a5700102 +AUX 027-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 992e44243e87b07833154d4b2299d08df4d7c1d3b931aa22e1ad75acce21330b SHA512 d3dd82a6f976bb4aab0e70a5c483e89e6ef43f59401bbe756ea8376a758003b434610f31d2d661d749d865b6a943da01867d0223856981262dddc5f12457ccdf WHIRLPOOL eb11e2d39e18d6e2f47c34f4c9d52c90becefe71507069e333c08f96b2b3b2630e4f0d9acff265858546f63f876bd6f83227d8e9459a6732b7488c0f7e77503e +AUX 027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 e778ee1fb9179e3898b25e5ae558060d1ee75a0c63e03ad1ddb36b5275c53b35 SHA512 3ce017f58d7eea16342631b02f86330f8e86d8357928df2fb2009d3544b17f4d12a9446e83d6a47cd8fa90c2a910df34a0c680277174bf865a34f1a771f1902a WHIRLPOOL fb5cfa821abd55e6a16ec710cb418d34c1ace1be9e787310054ca5b0d08c31a26600a7ec2d8e27ee8b74773ecbc0d93810ec67f225e909e88623914eb0eb7bbc AUX dracut-014-multipath-udev-rules.patch 848 SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 SHA512 c83e2a4e8bc5d25351ce82afdd4f63d9abedbe16a3dfd8aa69f1b0828a841e5106555319f112d93af92b3c1f5e2154a7bf36c8825f1e91feeb512e7c69b5fa16 WHIRLPOOL abc1bc20c022bb040e12ef00aa0aaa5cbbdcdcea71fddb3c222dbf393f7cc1ed1a0725fa95440ba90165c222dc07c6ab530d0b02577608500224f406e66f6257 AUX dracut-014-usrmount-fsck-fix.patch 1208 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565 SHA512 71d3199a5acf81cce0527c6e95db61ae07e833e4c27147b9a339655ac01c7e32db40956f171cb9a13a97062f89c6cb5bdcb8e33a2a4b1898c86a1b700fd5c444 WHIRLPOOL 648aa6e97df18f8dd24bd5eba48e18a56ea6a10e36c4e40ec9734547750b10064393c96b31ce2e52229e80507c8333dd95a04aaa873158a220ef4cab6998f8cc AUX dracut-018-lsinitrd-support-symlinks.patch 699 SHA256 b2d422b0a026265101045b641a2b4cef20e0ca15ca3e6fce8616d721b334ea2f SHA512 6b6f83fa8e99b5160130de6ae86699e6327665d852fdc7910e751c7644f668357f83f108896ebb73130546c76f17f6d0dff50c0da4634779e8d461685529a98b WHIRLPOOL bb2e2c6b12daf8727e874e393e58380b9d49e083ebf929c48104d23d088cc455de3c039fcaa3ac74aa88516c733c2536ccd4a950ee9a8b9745d63e61dbafbb47 @@ -55,6 +58,7 @@ DIST dracut-023.tar.bz2 238823 SHA256 6899cbf0c32f0d8ec1c420a4b6b3fd348b30fe3f4d DIST dracut-024.tar.bz2 241264 SHA256 c0f5a905a838772246246b960050307211177c7d113664bba8d306b83e23c6da SHA512 2eaea3ce2d7ea777491d7798a99764278c7c2b7a70be8b7050ca264e5debeeca2c9309acf56cb497f5d806c41f992fb8b77fbb6a837c8318d9e1e9413f3af199 WHIRLPOOL a03d947e4368f1edac01628bdc8ca81c0a9aadebf493c1dc46d1d7618ecdb55307a8fb762c36e260191759eb794a4b029537b2bb9795188b158a66a4f029b3fd DIST dracut-025.tar.bz2 245979 SHA256 dff2bc61787606ce3c4a22800dce99cf620fa521e69669a61edd19a955bcd69b SHA512 4fdda789197c5da229bf3dab54eb73d085aafc220113cf3325d36fa76a9bd684741b2f9dedf67703c09e1adcd8c890183adf2f6a550a1ef6a77e174781d5d2da WHIRLPOOL 946339acc8b988ec8f8b58500f14bf45a9db01b41e7329042fb075d44c9623ca059fc6b2ed536c7d0330ed4a52af516af298f2dcabff778bdd7b0c35e4853fbc DIST dracut-026.tar.bz2 249079 SHA256 1b3b25350dbf71c9d92dd6fd0cd128db13453e200e89b649ec3753e6f92438f7 SHA512 6484645df118ce2337920f6da574e04ede8131c4f5ae2986008cba527b591fde2274c3cbf8cacf20e3dcd765adab7f6afaffd2e1cdbd5a5a021193f328a844cf WHIRLPOOL 87934eb5d7d118be61a609aebbec94a4e70df58a883f0c856f90e8e8b011c695a23d5b00a120bcd74e0644f06f54038712b1ca620d8182c1fcffb4f3f5ea8ec2 +DIST dracut-027.tar.bz2 253049 SHA256 9a8f1ad2e133b4072ff433410be5b14a01cec4f75ab72ef0296e5f49a15fad13 SHA512 1e44b1ad09bc631cc554be4917c5f56514d6f5f4f9658401a7c7e9dc20ef79029246106682146785cb63beef39061aaa944fb24acd106086f02ba1356c61e938 WHIRLPOOL ebd0e0f1c4ba6e95a320e01f98ed7e31d7f399b05c7133fff8a686750f39f29c803b02764995775fa3f2c383205bc09b35a905116d366298bd6587d8d1cac572 EBUILD dracut-014-r3.ebuild 5267 SHA256 45f044660f8dc9c82310efdd18862eff56ded57ba26deaff8e69b8d9544b669d SHA512 34475cb0fb9c9d76f06f99d35994ca9fefe0eefef6b70b166251ccc8fc6fef6de6a0ba1ac675dc4edab4ca128b8ba8d31cf4ac522f727960cfdf1e8066e15fb6 WHIRLPOOL 109cf2025d72f1f309c1bd8f9f1e1637dc64506e623945497b9f26253e3c4a8d9f893751a96f266a067f2b310ec46cf6963f5ec82f9ab040c8ba1887ccd83351 EBUILD dracut-018-r3.ebuild 6906 SHA256 dcbc673fc9eb542aa26ffac6539ba037429d8f649162a2f7fc04ae9a9705bf22 SHA512 e668e28d1bd6729ef53f4d9cfab37879699340b856cd94417561af0f3513935e010f68d9817f6a374d82492b7ac75c39f5b857ba776aff9ea1e07ff5435dcba3 WHIRLPOOL b4c67f106e2f64bf4c59c2038d76360b32c176138ae891027f9e931c2499a38ed1b36341ea739ae293b8574a7b0c745fba42568848bc112d6d32c6f2988ac2df EBUILD dracut-019-r6.ebuild 7095 SHA256 dcce1df4dae58e365a01baf0c16263ff253cc5db8c136b547c3fb4a881b36a03 SHA512 7cfe0a657903f7e177f6f1aa04090207d988936f225ee8b8672a0893456aa6bf57c93d8f83120e14043ed4048102c907618b571dbdb6f232876eb2cda5fd2642 WHIRLPOOL 76fe89adec74fd53ce254cc0664bcd47072c60568e9b2590c37c24e5e9c83b1364ed094854468e592a8203970fd73972c0c9636b8ff95d169ff6e1a28127fde2 @@ -64,12 +68,17 @@ EBUILD dracut-024-r4.ebuild 8455 SHA256 94397e70432c269ec427712e7653b77fbdbc898a EBUILD dracut-025.ebuild 8529 SHA256 723a88a08785b1a053c1be5c7b989462661864333185c5cf194e15e819590409 SHA512 da8cee5aee76d3d8e835894001690190805b1cfe0ba717a0e1f2ed70095ef7ff0f4343488d6a63ef001b70904482ce975447b2b3abd9bfef65dbe142d21f242c WHIRLPOOL e596eed84f628d2037c5af58cd95b50b862954fac7ce8c2d2bd6d7e99520a9d833549ab3cf76a19e574e9f6ba4c854f7737cd660683e566fb6979cb09a415cc0 EBUILD dracut-026-r1.ebuild 8561 SHA256 8f673bb91c8b76ff19549f0925742f6d6da40a111d25c5ba360bcd8e753fa945 SHA512 d7d3cbbf890bfb819958f82abce06248622e199eab66e41b3f20865651e46e7dd468fd709e8f8425913a527513cfce06569aa96052021cdf3a43c17ef259d348 WHIRLPOOL dd8877765aeb648d20e56580d2cfb9bb420361952e126a9ed252cbc2f3707496456f6916cf5de556674071d67f11f373de18889363422542bb7d1ae71ba0b58c EBUILD dracut-026.ebuild 8389 SHA256 0b706cee40424230aa9bc2e6af2c8a33d0f91d16f6ce90f35036bbd178972600 SHA512 d04ca35fcf72afad76484669df59d75e20f727309317cb720d58b0b8dcd37c7d4a3b09406c9c3702e4bc7cab61f109463bf00da10001d1258a80d075a4d4c753 WHIRLPOOL 4fe9d152f09613683a8be5aa635f8923c607b2dd868bb02daca352aaeb32b59a031298e2c77f62558cd327f39b4d56f87d3b40fa11af22aa0e686b510cd5148a -MISC ChangeLog 42120 SHA256 355e06e1d375335e45fef168b343eadc7d64d4db8c5975e634b26d7ffa3042f5 SHA512 4ed357f1890d37612814bf50d5363611d1fd92cbe6280c78ce59931a7eed4c08b381bc783bd26a16d44532980003af8e72e54aa2b9770f466738ab41244cb20e WHIRLPOOL f123a97ca676dc832d11b5e3af288430c15ef94c34c2cf8e9f4055b223b055e9941dd5c6d077786b046fc9c670783a8126840e58f6bac70efe81acd3d3f9e422 +EBUILD dracut-027.ebuild 8647 SHA256 0f59a8d445f8199ccd0aece245fb8ebdd361dc8c4a28334c62eb804b5fcb5309 SHA512 46adab541bcb3d59b30c6128a1dfeebf6ec25192447ec9ecb3113a210bf1835dabb1d2165d47bec4fa2b5abfa7b6752f0273b3f7cb2667b29546b19ae4f1ecbb WHIRLPOOL a50a19fd0bf98a56902c69ec5e8357708e57ae29c6689b3352ea5f33d666c17d512b20f3f92a6c8e2c0b72d21ccf378de8448559d5d6d5084a614cf004c71fef +MISC ChangeLog 43454 SHA256 cda49c7c2d4a6bad74232ddadbd467902395aae36a10df556508652e41133fce SHA512 55e21bf1584a84863bb0cb0bd5526c00da4785cd081006d90bfb2b4419dfb30a430db6ba03d10b0f3c121b8f1695c5296339a485c37169f6e50afbcbac2d56d9 WHIRLPOOL 8dc7956c8c4afcd87d6e983e5e6297d2b0fe039985b9de070919a6ebf34a09bbe9c7335bbbe67bf86ac65be717d31837c103668a32dc23c857ac109b15b43c4e MISC metadata.xml 926 SHA256 b895115d72a686208816e1042bd295abb183ea832cdda73859deb690c11b932c SHA512 e6695bc301c6b3621e1730bc8e6ecc6c317705037a3004aab36bfea0b7f6a8b235a6d61ec4e4b9bb234ea53971d6c18dfbd0d09b3f30080a07eeb9e57da98c96 WHIRLPOOL d844828523e7bb0805b4b3d64d72163702adb6d4bedf7929494208e50696e43ddddc1e4a262c663ec98e05b65037868454135c0a46f82fb6b455e692826b48dc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlFXEekACgkQC77qH+pIQ6SpRwEAr2VXzv9YeJUjMe5+oQMGakqV -UgyrO2sw4ygNEC5FkKsA/2ecwQ1QwbPdoNP8qLrei6rfdN5haOrgv4oTcyuP5Jqu -=z0YJ +iQEcBAEBCAAGBQJRWs2BAAoJEPATRTHh2/q1HmkIAIhH/4n2OW+L/5ZBxqo3yV4C +3xNqSaavIGrs8BGuB6na7aKdQpQIqLzQZPjUfkx7hk2z98AcVgftpGVzoRDzhJA5 +a09dItpofkFDdloruNCdSi8y7y9F8gqHdhGuseCd+i3EaAUATFCOlp82vKDRCzro ++x3jV19jGql/oTEBcK3dEIxtqIQ4KvhmV0sfgOeOt4Wu4GyiaPNNLL2ZjkCWa7/N +dYtpoyCuIPDmn8G1ZMN2ecCNLqmNT+TUH0CykYd3P4QK/X/nHaaLNs4qFbLXKxsT +EaWb+fYnZzR/efAq/E0JaBcwPDUzE757KC4gHBOp+95jqtpGAo/80WfdWB9B808= +=ErlP -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-027.ebuild b/sys-kernel/dracut/dracut-027.ebuild new file mode 100644 index 000000000000..b7cccdcb697a --- /dev/null +++ b/sys-kernel/dracut/dracut-027.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027.ebuild,v 1.1 2013/04/02 12:22:23 aidecoe Exp $ + +EAPI=4 + +inherit bash-completion-r1 eutils linux-info + +add_req_use_for() { + local dep="$1"; shift + local f + + for f in "$@"; do + REQUIRED_USE+="${f}? ( ${dep} ) +" + done +} + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="http://dracut.wiki.kernel.org" +SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +REQUIRED_USE=" + dracut_modules_bootchart? ( !dracut_modules_systemd ) + dracut_modules_crypt-gpg? ( dracut_modules_crypt ) + dracut_modules_crypt-loop? ( dracut_modules_crypt ) + dracut_modules_livenet? ( dracut_modules_dmsquash-live ) + " +COMMON_MODULES=" + dracut_modules_biosdevname + dracut_modules_bootchart + dracut_modules_btrfs + dracut_modules_caps + dracut_modules_crypt-gpg + dracut_modules_crypt-loop + dracut_modules_gensplash + dracut_modules_mdraid + dracut_modules_multipath + dracut_modules_plymouth + dracut_modules_syslog + dracut_modules_systemd + " +DM_MODULES=" + dracut_modules_crypt + dracut_modules_dmraid + dracut_modules_dmsquash-live + dracut_modules_livenet + dracut_modules_lvm + " +NETWORK_MODULES=" + dracut_modules_cifs + dracut_modules_iscsi + dracut_modules_livenet + dracut_modules_nbd + dracut_modules_nfs + dracut_modules_ssh-client + " +add_req_use_for device-mapper ${DM_MODULES} +add_req_use_for net ${NETWORK_MODULES} +IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}" +IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}" + +RESTRICT="test" + +CDEPEND="|| ( virtual/udev ) + dracut_modules_systemd? ( >=sys-apps/systemd-199 ) + " +RDEPEND="${CDEPEND} + app-arch/cpio + >=app-shells/bash-4.0 + >=app-shells/dash-0.5.4.11 + >=sys-apps/baselayout-1.12.14-r1 + || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + >=sys-apps/sysvinit-2.87-r3 + >=sys-apps/util-linux-2.21 + virtual/pkgconfig + + debug? ( dev-util/strace ) + device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) ) + net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 ) + selinux? ( sys-libs/libselinux sys-libs/libsepol ) + dracut_modules_biosdevname? ( sys-apps/biosdevname ) + dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep + sys-process/acct ) + dracut_modules_btrfs? ( sys-fs/btrfs-progs ) + dracut_modules_caps? ( sys-libs/libcap ) + dracut_modules_cifs? ( net-fs/cifs-utils ) + dracut_modules_crypt? ( sys-fs/cryptsetup ) + dracut_modules_crypt-gpg? ( app-crypt/gnupg ) + dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) + dracut_modules_gensplash? ( media-gfx/splashutils ) + dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) + dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) + dracut_modules_mdraid? ( sys-fs/mdadm ) + dracut_modules_multipath? ( sys-fs/multipath-tools ) + dracut_modules_nbd? ( sys-block/nbd ) + dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) + dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) + dracut_modules_ssh-client? ( dev-libs/openssl ) + dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) ) + " +DEPEND="${CDEPEND} + app-text/asciidoc + >=dev-libs/libxslt-1.1.26 + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + " + +DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules + README.testsuite TODO ) +MY_LIBDIR="/usr/lib" + +# +# Helper functions +# + +# Returns true if any of specified modules is enabled by USE flag and false +# otherwise. +# $1 = list of modules (which have corresponding USE flags of the same name) +any_module() { + local m modules=" $@ " + + for m in ${modules}; do + ! use $m && modules=${modules/ $m / } + done + + shopt -s extglob + modules=${modules%%+( )} + shopt -u extglob + + [[ ${modules} ]] +} + +# Removes module from modules.d. +# $1 = module name +# Module name can be specified without number prefix. +rm_module() { + local force m + [[ $1 = -f ]] && force=-f + + for m in $@; do + if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then + rm ${force} --interactive=never -r "${modules_dir}"/$m + else + rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m + fi + done +} + +# +# ebuild functions +# + +src_prepare() { + epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch" + epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch" + epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" + + if use dracut_modules_systemd; then + local systemdutildir="$($(tc-getPKG_CONFIG) systemd \ + --variable=systemdutildir)" + local systemdsystemunitdir="$($(tc-getPKG_CONFIG) systemd \ + --variable=systemdsystemunitdir)" + [[ ${systemdutildir} ]] || die "Couldn't detect systemdutildir" + [[ ${systemdsystemunitdir} ]] \ + || die "Couldn't detect systemdsystemunitdir" + einfo "Setting systemdutildir to ${systemdutildir} and ..." + sed -e "4asystemdutildir=\"${systemdutildir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..." + sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ + -i "${S}/dracut.conf.d/gentoo.conf.example" || die + fi +} + +src_configure() { + econf --libdir="${MY_LIBDIR}" +} + +src_compile() { + emake doc + + if use optimization; then + ewarn "Enabling experimental optimization!" + tc-export CC + emake install/dracut-install + fi +} + +src_install() { + default + + newbashcomp "${PN}-bash-completion.sh" "${PN}" + + local dracutlibdir="${MY_LIBDIR#/}/dracut" + + echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" + + insinto "${dracutlibdir}/dracut.conf.d/" + newins dracut.conf.d/gentoo.conf.example gentoo.conf + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + dodir /var/lib/dracut/overlay + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D%/}/${dracutlibdir}/modules.d" + + # Remove modules not enabled by USE flags + for module in ${IUSE_DRACUT_MODULES} ; do + ! use ${module} && rm_module -f ${module#dracut_modules_} + done + + # Those flags are specific, and even are corresponding to modules, they need + # to be declared as regular USE flags. + use debug || rm_module 95debug + use selinux || rm_module 98selinux + + # Following flags define set of helper modules which are base dependencies + # for others and as so have no practical use, so remove these modules. + use device-mapper || rm_module 90dm + use net || rm_module 40network 45ifcfg 45url-lib + + if use dracut_modules_systemd; then + # With systemd following modules do not make sense + rm_module 96securityfs 98selinux + else + # Without systemd following modules do not make sense + rm_module 00systemd-bootchart + fi + + # Remove S/390 modules which are not tested at all + rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet + + # Remove modules which won't work for sure + rm_module 95fcoe # no tools + # fips module depends on masked app-crypt/hmaccalc + rm_module 01fips 02fips-aesni + + # Remove extra modules which go to future dracut-extras + rm_module 05busybox 97masterkey 98ecryptfs 98integrity +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_src_exists; then + ewarn "" + ewarn "If the following test report contains a missing kernel" + ewarn "configuration option, you should reconfigure and rebuild your" + ewarn "kernel before booting image generated with this Dracut version." + ewarn "" + + local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" + + # Kernel configuration options descriptions: + local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" + local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ +"(initramfs/initrd) support" + + local opt desc + + # Generate ERROR_* variables for check_extra_config. + for opt in ${CONFIG_CHECK}; do + opt=${opt#\~} + desc=desc_${opt} + eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ + "is missing and REQUIRED'" + done + + check_extra_config + echo + else + ewarn "" + ewarn "Your kernel configuration couldn't be checked. Do you have" + ewarn "/usr/src/linux/.config file there? Please check manually if" + ewarn "following options are enabled:" + ewarn "" + ewarn " CONFIG_BLK_DEV_INITRD" + ewarn " CONFIG_DEVTMPFS" + ewarn "" + fi + + if use dracut_modules_crypt || use dracut_modules_dmraid || use \ + dracut_modules_mdraid || use dracut_modules_lvm; then + + if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then + ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, " + ewarn "mdraid or lvm is off for default as of >=dracut-024." + ewarn "Use rd.auto option to turn it on." + fi + fi +} diff --git a/sys-kernel/dracut/files/027-0000-fix-version-print.patch b/sys-kernel/dracut/files/027-0000-fix-version-print.patch new file mode 100644 index 000000000000..3607fb24552c --- /dev/null +++ b/sys-kernel/dracut/files/027-0000-fix-version-print.patch @@ -0,0 +1,13 @@ +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index b441a27..410201a 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -104,7 +104,7 @@ else + fi + + [ -f /etc/initrd-release ] && . /etc/initrd-release +-[ -n "$VERSION" ] && info "dracut-$VERSION" ++[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID" + + source_conf /etc/conf.d + diff --git a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch new file mode 100644 index 000000000000..ca079ad40d65 --- /dev/null +++ b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch @@ -0,0 +1,37 @@ +From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> +Date: Sun, 6 Jan 2013 13:35:01 +0100 +Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs - + udevaltdirs + +It is required for Gentoo which moves udev from / to /usr and supports +both /lib/udev and /usr/lib/udev for compatibility with other packages. + +Credits go to Alexander Tsoy <alexander@tsoy.me>. +--- + dracut-functions.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index eba7412..d888f4c 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -961,6 +961,15 @@ inst_rules() { + inst_dir "$_target" + for _rule in "$@"; do + if [ "${_rule#/}" = "$_rule" ]; then ++ for r in ${udevaltdirs}; do ++ [[ "$r" = "${udevdir}" ]] && continue ++ if [[ -f $r/rules.d/$_rule ]]; then ++ _found="$r/rules.d/$_rule" ++ inst_rule_programs "$_found" ++ inst_rule_group_owner "$_found" ++ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" ++ fi ++ done + for r in ${udevdir}/rules.d /etc/udev/rules.d; do + if [[ -f $r/$_rule ]]; then + _found="$r/$_rule" +-- +1.8.1.5 + diff --git a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch new file mode 100644 index 000000000000..d110afa83966 --- /dev/null +++ b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch @@ -0,0 +1,30 @@ +From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> +Date: Sun, 16 Dec 2012 20:02:48 +0100 +Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and + use udevaltdirs + +To avoid need of rebuild after udev update/downgrade let udevdir= be set +dynamically with pkg-config. Use udevaltdirs to search for rules both +in old and new locations. +--- + dracut.conf.d/gentoo.conf.example | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example +index 1361a30..b78e5c6 100644 +--- a/dracut.conf.d/gentoo.conf.example ++++ b/dracut.conf.d/gentoo.conf.example +@@ -1,7 +1,8 @@ + # /etc/dracut.conf.d/gentoo.conf + # dracut config file customized for Gentoo Base System release 2 + +-udevdir=/lib/udev ++udevdir= ++udevaltdirs="/lib/udev /usr/lib/udev" + ro_mnt=yes + + # +-- +1.8.1.5 + |