From ef799ba971e9adab5e3bba0034149a124997005f Mon Sep 17 00:00:00 2001 From: Amadeusz Żołnowski Date: Sat, 9 Mar 2013 20:06:45 +0000 Subject: Version bump. NEWS ~~~~ - do not strip signed kernel modules - add sosreport script and generate /run/initramfs/sosreport.txt - make short uuid specification for allow-discards work - turn off RateLimit for the systemd journal - fixed MAC address assignment - add systemd checkisomd5 service - splitout drm kernel modules from plymouth module - add 'swapoff' to initramfs to fix shutdown/reboot - add team device support - add pre-shutdown hook - kill all processes in shutdown and report remaining ones - "--device" changed to "--add-device" and "add_device=" added for conf files - add memory usage trace to different hook points - cope with optional field #7 in /proc/self/mountinfo - lots of small bugfixes Package-Manager: portage-2.1.11.52/cvs/Linux x86_64 Manifest-Sign-Key: 0xF0134531E1DBFAB5 --- sys-kernel/dracut/ChangeLog | 32 ++- sys-kernel/dracut/Manifest | 23 +- sys-kernel/dracut/dracut-025.ebuild | 290 +++++++++++++++++++++ ...01-dracut-functions.sh-support-for-altern.patch | 37 +++ ...02-gentoo.conf-let-udevdir-be-handled-by-.patch | 30 +++ ...03-rootfs-block-mount-root.sh-fixup-for-8.patch | 29 +++ ...04-dracut.sh-reverting-return-value-chang.patch | 41 +++ ...05-Mount-proc-before-including-dracut-lib.patch | 44 ++++ 8 files changed, 524 insertions(+), 2 deletions(-) create mode 100644 sys-kernel/dracut/dracut-025.ebuild create mode 100644 sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch create mode 100644 sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch create mode 100644 sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch create mode 100644 sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch create mode 100644 sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch (limited to 'sys-kernel') diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index ef4c1a1cb696..40aa01a8eba2 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,36 @@ # 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.109 2013/02/02 23:12:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.110 2013/03/09 20:06:40 aidecoe Exp $ + +*dracut-025 (09 Mar 2013) + + 09 Mar 2013; Amadeusz Żołnowski + +files/025-0001-dracut-functions.sh-support-for-altern.patch, + +files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch, + +files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch, + +files/025-0004-dracut.sh-reverting-return-value-chang.patch, + +files/025-0005-Mount-proc-before-including-dracut-lib.patch, + +dracut-025.ebuild: + Version bump. + + NEWS + ~~~~ + + - do not strip signed kernel modules + - add sosreport script and generate /run/initramfs/sosreport.txt + - make short uuid specification for allow-discards work + - turn off RateLimit for the systemd journal + - fixed MAC address assignment + - add systemd checkisomd5 service + - splitout drm kernel modules from plymouth module + - add 'swapoff' to initramfs to fix shutdown/reboot + - add team device support + - add pre-shutdown hook + - kill all processes in shutdown and report remaining ones + - "--device" changed to "--add-device" and "add_device=" added for conf files + - add memory usage trace to different hook points + - cope with optional field #7 in /proc/self/mountinfo + - lots of small bugfixes 02 Feb 2013; Agostino Sarubbo dracut-024-r4.ebuild: Add ~arm, wrt bug #449220 diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index f8526cf2f1f6..b452ccf36a67 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 019-0001-90multipath-added-kpartx.rules-multipa.patch 851 SHA256 8cae51ab50f991ba46247753b3890f0bc851708396f97ad15345aab49791bd98 SHA512 726a693b035e8b2d99431a3380b7a79d6153289f9e05d46be79cd458bdf49b17b603dde07ed937bc7f36dfa5870a54d446bb71bba8e6f3c5df8f82013781b2df WHIRLPOOL f65e75d9be432ead9b95e6c290f9f669319a83b1c03c2dae71313aa4d71659e61ab1d579868c67db04ab21f5045f3083993aed873f969192d3361b9835da6929 AUX 019-0002-Avoid-annonying-warnings-when-pkg-conf.patch 1737 SHA256 14353023081b2e85dcd070fe6165e9016ee79eb90147a89589a430c28e1171af SHA512 5b1fc9ae019cc2d40991ca5e22fa9188c75a5267584957aac408de2f4a0de800d8ef1f689730241bd3cc20260bfe19dcb575dc9f903710a016d593d6d391f1d7 WHIRLPOOL 17dbb11212359919ddbec6ef5b17e9495f6f8a5677f8ef37948c9be91ce3bff0392ea79ee21b665187f3c824ce3f14dc187501f0638ccf61a8664ba01c439b59 AUX 019-0003-99shutdown-remove-no-wall-argument-for.patch 1098 SHA256 45c73b034dbb5c93cf73afffe030ce1e5929994e5fad16ede0b1fab8fff55a1a SHA512 cb35b8587e6995b0d902335ac60cac2019a0dc7b3033242e843edcc8b720f2e914e58694101c497cd349616183e978c55946b33bf40aa83b55e5d6a9ee07a774 WHIRLPOOL 0652eb2100037a8419f18a93eaa731c920c2949e733a27fcaa5c2e438437505f4497ff248882e4c5625c01a08f6217b9a599343614d3b49ca7be6e8c68ac6b37 @@ -29,6 +32,11 @@ AUX 024-0001-Fallback-to-external-blkid-and-path_id.patch 4582 SHA256 77cf33b6e3 AUX 024-0002-dracut-functions.sh-fixed-inst_rules-s.patch 809 SHA256 6dcc35f5f038de9eb3e8ecdbba134f55ccb3046920fcb699b7b321296c509e83 SHA512 f55475159d31a23b5f017b784f1488e376f572e4807b0e46fa6d01a9f36d589f2a7ad51feca5c0a90cbbdbb2ba386bb0c42fd6f55193381b1e4238023577ccd1 WHIRLPOOL f78f7220a14599e845e6f592c38f107faa822508ac957e81f981ca976bac188c5aac7e5ff3a37ef5dab344f94cd09d1a00ece003eec33f7c08a697c4ea129217 AUX 024-0003-dracut-functions.sh-support-for-altern.patch 1387 SHA256 e32e6e8779a1c98f620171eb46611d72837b0516496987fee2440559cf9c1bd2 SHA512 c3cdd7ff6e7fa1ea8f4d1e5a0a87ecb20dfe4cd4f3778e745af7e3726c2061b71b922d4fc378c587e06a451e7868d0d6ad6d4e8b08f273bb63d4b20efad48dc6 WHIRLPOOL 190185a3d09d0c20f35a86630bd1d76a7d0e68a798ad4aefbffdad25bb3a0c69d1d826883e44ae46d1a880cc72e669df9bbbdff94cba295ccd44df6420a64434 AUX 024-0004-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 b7b086cb46310822080b8c74d4221159a85db9c834d9d94340716892b599cfb6 SHA512 578da34f91274b4ae7e9e62bb1ed6985f0aff5355023e98585d5afe8683475bde546f48795f1da18eeda0736b32bf8f4894db1aa5e770a3bede2a7738f67b8f2 WHIRLPOOL e74c52b71aac01d1fbd05c9316d9042080af4b035425e8c457ea0369236966d5925f151dbce730a0c9ff134aecf0fe84f08b1001d66bf03275f2f41a8b498f8e +AUX 025-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 ba139a1b36c69141a7fc6c4762fdc6823007eab86bc8d4f7b7cc3ed0af1d3246 SHA512 2c593ba69934c64be99458f79587b32bf323deb562dbbb292770fb5fd6d985b9e594ae200060c7a11628edb2094c4ba69e52e966a255964d08f511e487385966 WHIRLPOOL 4d7c2fc0790df43d9ac5f70cbb183a0c7c6afcf994a18be1bf8f22f4deca0ef0ea49167d4f6962cc29e6ebccb63f85958301c0d3c2026c53699f0845be316e4f +AUX 025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 775d000c11467384a21cdadde90dccc2bb41528d22d6c1e6056605297556fff6 SHA512 bfa2df00178a8dd3c52cc36a8e385e759cda55849846986e2af262ffd5beae64c505ece8905b2f53b625042c709965c2b7f11d58c63654b1843c76dd6585d369 WHIRLPOOL 0b6f81a5f660c0333867a6ae24bd10f697426c3654555c50f0fef1fe7cd5e112aa9d8dbf990ae093c6d836a48b211d3e28445f8664f2a5a2094d4e4924988e5d +AUX 025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch 1011 SHA256 4e4e4ccb303131f5d9c6dc51b8c510ea0e5562fbf123647fdbc451885222500a SHA512 0cd0f258aa87dfdb391b9c4e2913bdfce9e451c93e5d358aca68d7ed470667c1b8b569b25ec8b903b285b6c92d021a7b0f1e10aa342f76d79c07361fe608bc83 WHIRLPOOL ca7c278266be1c2f6ac94976b8425b336dd7f012c4e8dd4d8cfb293af9327f11f1c69b56ab669635719f5629d2d7296a0a82165db42258ea6f27dbc1a55d0113 +AUX 025-0004-dracut.sh-reverting-return-value-chang.patch 1038 SHA256 3fc32e1cacd5713d5490eee45f874c261200a4e48824376c9a66490abeb02705 SHA512 62a546263f9ce2ff92bf30f514d17f17605ece0a76beff490bbdc55f9395989d4694f50254689e2aae37e8a5c44a726e2ed8797003982ff827fd2d8d9d1cdcde WHIRLPOOL cdfde7194936a812dc87704ac47ca5cd8f005d02ac95d32479006ab3c67b24fac7b2baebdf1fd02892ce58cb0f8c781ec8f20bf3e7f4808e02fdc450ae0e5eaa +AUX 025-0005-Mount-proc-before-including-dracut-lib.patch 1168 SHA256 03049a22a1086486aab6ee1daef4c2f23695fe14ac51683f121c6953aa384c81 SHA512 6e40a0d4527ec2d0534c0c8cab9597a98568906d7394bbf214df6e8cb03e541147928885b600aaacf2fe95cd187510f9a40aadd3c54e6d33d04c3b67757fba9d WHIRLPOOL 459b654c23c135519a15ebcb48965e43daf92799d0278510b1e55e2f7915114fb645c9bbeea4ebd2ac74bd4de61a8ee9a2331a0b0b0b87ead6667269845a29da 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 @@ -39,11 +47,24 @@ DIST dracut-019.tar.bz2 199187 SHA256 a68f00f896aef1cdebc8479f522d6a10b9d20b7dfc DIST dracut-022.tar.bz2 243314 SHA256 32f574efb0a48a2ee6e1967f8b410b241f93bc9eea9bd0b90437be5e9aa028e5 SHA512 43906e147270a548ef6c98539fd36ac7e89a0ca88de600dbffe02d7b03a2acf6347ae4951557b3af0101594fab100a112cb57b7d6a1490dbaa6ddc9156c0a88a WHIRLPOOL 17d0d4dafb6c399b61845655e7b25b513f636b1ee152fe4373036dfa34c46f8d4f5016d5f74350112483b81911dfca751a15eb15a963ad2f4066840a8c9b80d2 DIST dracut-023.tar.bz2 238823 SHA256 6899cbf0c32f0d8ec1c420a4b6b3fd348b30fe3f4d557783ec40de1e8da26239 SHA512 abd5b165e67cf7298ef0ba8352de924232bdeb7390917f5fbd98a7a2a10b01fe1b3e35f8b619154ce21e5a90b3f9cb07a6fae9e4d8f017b9d7696d15ae46f11f WHIRLPOOL b50b309f4d128d785e62f21c084f4a79100aed0570127376643626e84d9d019b2c5bc32ff14aecec23fbb929456ac51d0a334a1aee275bafc6e4135e80a03789 DIST dracut-024.tar.bz2 241264 SHA256 c0f5a905a838772246246b960050307211177c7d113664bba8d306b83e23c6da SHA512 2eaea3ce2d7ea777491d7798a99764278c7c2b7a70be8b7050ca264e5debeeca2c9309acf56cb497f5d806c41f992fb8b77fbb6a837c8318d9e1e9413f3af199 WHIRLPOOL a03d947e4368f1edac01628bdc8ca81c0a9aadebf493c1dc46d1d7618ecdb55307a8fb762c36e260191759eb794a4b029537b2bb9795188b158a66a4f029b3fd +DIST dracut-025.tar.bz2 245979 SHA256 dff2bc61787606ce3c4a22800dce99cf620fa521e69669a61edd19a955bcd69b SHA512 4fdda789197c5da229bf3dab54eb73d085aafc220113cf3325d36fa76a9bd684741b2f9dedf67703c09e1adcd8c890183adf2f6a550a1ef6a77e174781d5d2da WHIRLPOOL 946339acc8b988ec8f8b58500f14bf45a9db01b41e7329042fb075d44c9623ca059fc6b2ed536c7d0330ed4a52af516af298f2dcabff778bdd7b0c35e4853fbc 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 EBUILD dracut-022-r6.ebuild 8527 SHA256 56b9122f1f47613f6b4c9dfa5fce4dcaf88fb79be529be85bc1568785da815b9 SHA512 052feb81344251daa67ffb36cdb9fa33e3f9528bed03df97d52a878bc62bb7d3859294869e2c59fe95e302642d016c1c92213da0e69b24b78c0a58641084f7b5 WHIRLPOOL 2747af58c2b52aeb0aed51ab02a0b0ab0c72218cc0a0da5bb9b05494549e5ba9bdc891b1dee03c3c23c85d9a8069bb62614ef4a9fb15108b7abaa9e1d7618226 EBUILD dracut-023-r4.ebuild 8254 SHA256 d7d65f3712ecb473ee743f38ebac6f1d1448389e36ee578e644d0fca9db89569 SHA512 49558e3836d3cdf1b3bf15b8eb6f3639ef0088ab6faa20f981b10610781f44acfd7b8b405ca0903a46c587e9ab78cfa9c3f4f499d5fa2465bf5ea7344c4a0431 WHIRLPOOL 4867c5725317ddee01e6588aee49df63f26406b7be16aac3f841d9476cf7a0c0c4cb93365f18c1453920f5b87efb2544a8922e20b9770a54c93207a33e69dba0 EBUILD dracut-024-r4.ebuild 8455 SHA256 94397e70432c269ec427712e7653b77fbdbc898a796274ee4e403698bce100df SHA512 a412ddb299249f818bdd634aa07355f41a19a6ce69819e3a9e9bcce2203bea115be65252bace5daa349c1b71db2a2c8d798f0890914d31a30447ad6acf93fecf WHIRLPOOL 67a5e9b8ade4a2117192f534676fb2a58124c750cdba5acfcd0c8a6fc2628abcfd7968f2b44352b6d42ab23a68f397eb7c92706340f301959ebc5af17ca6098e -MISC ChangeLog 38424 SHA256 1214ba8b396be5fba6da385ffe18969948979172237e07513fae82c6dfbf0f1f SHA512 82a2faf8b155796e83bc9c72c850986f4dcc144104936ba002c3f6e37d8f62315436a10d9b7414fcb558af433c8325812a2e809ddd4c5ef2dadc9b0558fa0451 WHIRLPOOL 791e02bf990be7fbd9f3e927ad99026f83b4f9cdef741cd210ee505ca30337633c07d7414fcdc561e8eeba8c77d6b9e1315c2e7e9e1351a993e2519362a14fa0 +EBUILD dracut-025.ebuild 8488 SHA256 23c0c8b5965eaf8e392c4f6aa48e96d6e50da4dc6246a92ea7b5b7939bf4a51a SHA512 a555889e0e5bd6b711ec95c15e9834521d230fd7936b8ea2bbc0f0b1096d8c7392f008da3dc675e045637ab2863de090f034dc121999f77a42fb9f5235a840ce WHIRLPOOL 1560e49ebd63dfaed3deb2154ae159af87f8c4ad6a00a153b1bc3da77125f1cdb5213ceed49dabaa7775e52f0648aa44bb6bb46057d104064811620adf9bc444 +MISC ChangeLog 39604 SHA256 4f8c54a9f85e6ebe0e26ede29bfcfbe5c4924b8577e811f88612d12bcb96224a SHA512 5a8c6501d55a22e279fcf9fc639e6199492bb5a11111952e846d25fcc577fee6851b533116725eaebc9d37bc8b2baed25e84441fbf266dec8dd272c7352a6db9 WHIRLPOOL 099bfd01f2bbf9d24f9fb8b7d40a3f16d166cf328b08ae3f1ecf0d357a3d2ba29d52f8a2af51fdc08636bb85aef0e6b77e460814762565468d5b2cd9e35e29f6 MISC metadata.xml 926 SHA256 b895115d72a686208816e1042bd295abb183ea832cdda73859deb690c11b932c SHA512 e6695bc301c6b3621e1730bc8e6ecc6c317705037a3004aab36bfea0b7f6a8b235a6d61ec4e4b9bb234ea53971d6c18dfbd0d09b3f30080a07eeb9e57da98c96 WHIRLPOOL d844828523e7bb0805b4b3d64d72163702adb6d4bedf7929494208e50696e43ddddc1e4a262c663ec98e05b65037868454135c0a46f82fb6b455e692826b48dc +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEbBAEBCAAGBQJRO5ZSAAoJEPATRTHh2/q1L70H9A8C2n2DdNYTTshOtMSxt96z +3UB1wFlAsjt/iJNImS36QGE5OGiV4I+VUL9SNUUc8j7UWgZjfc9q3z+mAZyyFlHu +/mJ06hP5tBgJ4jDr2w26pzyaqVjjIOP2VJZoG8J0DAuU0gTbvdUqbRHBLeGSGeBY +xaG8cXbzBEBETNlHNBrFejKXlbh1gHpvPF4kNo0m8azNWeSvA1YBWkvUt1mCZ6J5 +H/GCa4kbECqhn728EpyGIwcXXx/HXwL+BtQabaOhPyPk5zKm8My+5cWTwFC54HUL +/jNeJ+28Eg/kSITrkJhebFYDemcf1wVhg9ws+ll1JxolImw2ju+sHz4VQ9ce2g== +=WJoh +-----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-025.ebuild b/sys-kernel/dracut/dracut-025.ebuild new file mode 100644 index 000000000000..65c6b38420af --- /dev/null +++ b/sys-kernel/dracut/dracut-025.ebuild @@ -0,0 +1,290 @@ +# 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-025.ebuild,v 1.1 2013/03/09 20:06:40 aidecoe Exp $ + +EAPI=4 + +inherit 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_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=">sys-fs/udev-166 + dracut_modules_systemd? ( sys-apps/systemd ) + " +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 + " + +DRACUT_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}-0001-dracut-functions.sh-support-for-altern.patch" + epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" + epatch "${FILESDIR}/${PV}-0003-rootfs-block-mount-root.sh-fixup-for-8.patch" + epatch "${FILESDIR}/${PV}-0004-dracut.sh-reverting-return-value-chang.patch" + epatch "${FILESDIR}/${PV}-0005-Mount-proc-before-including-dracut-lib.patch" + chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh" + + 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="${DRACUT_LIBDIR}" +} + +src_compile() { + emake doc + + if use optimization; then + ewarn "Enabling experimental optimization!" + tc-export CC + emake install/dracut-install + fi +} + +src_install() { + local libdir="${DRACUT_LIBDIR}" + + emake DESTDIR="${D}" install + + dodir /var/lib/dracut/overlay + dodoc HACKING TODO AUTHORS NEWS README* + + insinto /etc/dracut.conf.d + newins dracut.conf.d/gentoo.conf.example gentoo.conf + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D%/}/${libdir#/}/dracut/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 + + # 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 ~MODULES" + + # 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 desc_MODULES="Enable loadable module 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 " CONFIG_MODULES" + ewarn "" + fi + + if use dracut_modules_crypt || use dracut_modules_dmraid || use \ + dracut_modules_mdraid || use dracut_modules_lvm; then + + if ! [[ $(=dracut-024." + ewarn "Use rd.auto option to turn it on." + fi + fi +} diff --git a/sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch new file mode 100644 index 000000000000..e23318cb0990 --- /dev/null +++ b/sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch @@ -0,0 +1,37 @@ +From fcb28882b1eaaa20ad9d831857ecf176dd0e3006 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 6 Jan 2013 13:35:01 +0100 +Subject: [PATCH 1/5] 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 . +--- + dracut-functions.sh | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index e23db76..812ea2b 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -941,6 +941,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.4 + diff --git a/sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch new file mode 100644 index 000000000000..3a1c8d1adb39 --- /dev/null +++ b/sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch @@ -0,0 +1,30 @@ +From 1f8ab99eca988b15e9573155dd6207cc82842aff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 16 Dec 2012 20:02:48 +0100 +Subject: [PATCH 2/5] 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.4 + diff --git a/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch b/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch new file mode 100644 index 000000000000..ed265b09d6f8 --- /dev/null +++ b/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch @@ -0,0 +1,29 @@ +From 6cf23a82629409c25d5d36ca71a02171075705ab Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Wed, 23 Jan 2013 16:23:07 +0100 +Subject: [PATCH 3/5] rootfs-block/mount-root.sh: fixup for 8b6bf0ef5 + +not only fix the warning message, but the real mount arguments, too +--- + modules.d/95rootfs-block/mount-root.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh +index 54d5012..c7626c3 100755 +--- a/modules.d/95rootfs-block/mount-root.sh ++++ b/modules.d/95rootfs-block/mount-root.sh +@@ -26,9 +26,10 @@ mount_root() { + fi + + _rflags_ro="$rflags,ro" ++ _rflags_ro="${_rflags_ro##,}" + + while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do +- warn "Failed to mount -t ${rootfs} -o ${_rflags_ro##,} ${root#block:} $NEWROOT" ++ warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT" + fsck_ask_err + done + +-- +1.8.1.4 + diff --git a/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch b/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch new file mode 100644 index 000000000000..9816ef811d14 --- /dev/null +++ b/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch @@ -0,0 +1,41 @@ +From 826b11e8adea942a7fb63fa54374d5571aab0930 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Tue, 5 Feb 2013 16:45:42 +0100 +Subject: [PATCH 4/5] dracut.sh: reverting return value change + +reverting _get_fs_type() return values of patch +c8d685c9d3860e49f39a9c85ffebbb4c4fec341f +--- + dracut.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index cfd10a1..23ffaa4 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -766,18 +766,18 @@ if [[ $hostonly ]]; then + fi + + _get_fs_type() ( +- [[ $1 ]] || return 1 ++ [[ $1 ]] || return + if [[ -b $1 ]] && get_fs_env $1; then + echo "$(readlink -f $1)|$ID_FS_TYPE" +- return 0 ++ return 1 + fi + if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then + echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE" +- return 0 ++ return 1 + fi + if fstype=$(find_dev_fstype $1); then + echo "$1|$fstype" +- return 0 ++ return 1 + fi + return 1 + ) +-- +1.8.1.4 + diff --git a/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch b/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch new file mode 100644 index 000000000000..6457b6cc1ecc --- /dev/null +++ b/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch @@ -0,0 +1,44 @@ +From 8ad40b5d5f3f036f38eb328cb35e8d0f8a1b3df2 Mon Sep 17 00:00:00 2001 +From: Colin Guthrie +Date: Sat, 26 Jan 2013 18:13:28 +0000 +Subject: [PATCH 5/5] Mount /proc before including dracut-lib.sh. + +When dracut-lib.sh is sourced it checks the command line (when not using systemd) +as part of the check_quiet() call. + +Therefore mount /proc earlier in init. + +Avoids the error: + +init: 77: /lib/dracut-lib.sh: /proc/cmdline: No such file or directory +--- + modules.d/99base/init.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh +index 0259053..37b5996 100755 +--- a/modules.d/99base/init.sh ++++ b/modules.d/99base/init.sh +@@ -17,9 +17,6 @@ OLDPATH=$PATH + PATH=/usr/sbin:/usr/bin:/sbin:/bin + export PATH + +-RD_DEBUG="" +-. /lib/dracut-lib.sh +- + # mount some important things + [ ! -d /proc/self ] && \ + mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null +@@ -37,6 +34,9 @@ if [ "$?" != "0" ]; then + exit 1 + fi + ++RD_DEBUG="" ++. /lib/dracut-lib.sh ++ + if [ -x /lib/systemd/systemd-timestamp ]; then + RD_TIMESTAMP=$(/lib/systemd/systemd-timestamp) + else +-- +1.8.1.4 + -- cgit v1.2.3-65-gdbad