diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2015-01-11 14:28:36 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2015-01-11 14:28:36 +0000 |
commit | 0cfdd64b8c5fdb585f7a6e9ce660206df8478c43 (patch) | |
tree | c2d39946e961bbacec38b0c3f89b54e2912d5fa1 /sys-kernel | |
parent | Version bumps, remove older unsupported upstream (diff) | |
download | historical-0cfdd64b8c5fdb585f7a6e9ce660206df8478c43.tar.gz historical-0cfdd64b8c5fdb585f7a6e9ce660206df8478c43.tar.bz2 historical-0cfdd64b8c5fdb585f7a6e9ce660206df8478c43.zip |
Remove old versions.
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5
Diffstat (limited to 'sys-kernel')
26 files changed, 34 insertions, 1839 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 0fa8f901bcf1..8513c5e4ab31 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,31 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.183 2015/01/11 14:20:14 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.184 2015/01/11 14:28:33 aidecoe Exp $ + + 11 Jan 2015; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-036-r4.ebuild, + -dracut-037-r3.ebuild, -dracut-038-r2.ebuild, + -files/036-0001-NEWS-update-for-version-036.patch, + -files/037-0001-dracut-functions.sh-support-for-altern.patch, + -files/038-0001-dracut-functions.sh-support-for-altern.patch, + -files/036-0002-dracut-functions.sh-support-for-altern.patch, + -files/037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch, + -files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch, + -files/037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch, + -files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch, + -files/036-0003-gentoo.conf-let-udevdir-be-handled-by-.patch, + -files/037-0004-Install-dracut-install-into-libexec-di.patch, + -files/038-0004-Install-dracut-install-into-libexec-di.patch, + -files/036-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch, + -files/036-0005-Install-dracut-install-into-libexec-di.patch, + -files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch, + -files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch, + -files/037-0006-98systemd-fixup-rootfs-generator-insta.patch, + -files/036-0006-dracut.sh-Fix-variable-name-typo.patch, + -files/036-0007-Added-missing-quotes.patch, + -files/037-0007-udev-rules-add-uaccess-rules.patch, + -files/036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch, + -files/038-0008-dracut-functions.sh-fix-inst-functions.patch: + Remove old versions. *dracut-040-r3 (11 Jan 2015) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 45210a43f381..4fd85fef5f3f 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -14,27 +14,6 @@ AUX 034-0011-lvm-fix-thin-recognition.patch 1373 SHA256 5218cfaf55b50cfd128a64b3 AUX 034-0012-lvm-always-install-thin-utils-for-lvm.patch 2264 SHA256 f322a4ef7a308839b77a9fe2d16d3d4fc043b5e089d55145b51877e9b5dc3d1c SHA512 708d43d9d04b191656d35b9a3594ba23620445d5eeebb9f598068765a2b8833987dd422a7760d4ead1792ce6607b18505f29868c23e0721e3af7c5c851586e0c WHIRLPOOL 47360e4523c0bd5112065c32e011e2a8dc190e6699d287b8d1c5c3b6d59b27bd689cf9daf76fd77beba132dec5c58144eda78e61565e408784cf7ff575551a2e AUX 034-0013-usrmount-always-install.patch 827 SHA256 5049b63e1095eb81d68d165f188cb512ce29468ace7abbcff8b469e63a8f6f2f SHA512 88abe8ea6ee70fd62d9b225e74063e1c3c31262084b2593df7e52000b0a0efea6c60eac275f7a9416c98d24b7bd548f1db2556a655f8a29706457adbc20b6aea WHIRLPOOL 3c7ce176250777031d7c38df79bfbcba3aa7a752151080fd1fe11ceb2df8e5aa50c1835fe135ce061c92f99de205b077ad3de6a8749e685c288ada512bea7a29 AUX 034-0014-udev-rules-add-eudev-rules.patch 967 SHA256 20867f20970846434ffc82ca7c33f6aa63407aa316abc4a261d20f9955725d42 SHA512 4199e65459d33d2d99556bb2c753b143f1e2e71cb6150b83d7513f4887a2bbc3299ed1da33d9c8438a1d9e2231353ce7e39f9cacdd3fe346083eea2905d2f903 WHIRLPOOL 59f691a3663fa35329eb3aff776e1f637518b6fce36ec3d4f09a62c2b5ff11c4c67eb78ae73e57db8c4ad97de6b758d82705445639788bb819899a63a9f17318 -AUX 036-0001-NEWS-update-for-version-036.patch 489 SHA256 849dfc77bccabb4147f4079be8f86983d3cb16d4be2e645a77414350b9e46707 SHA512 87e566fb742045c4b3cc69da1ae4b14be05a33d4264a2ed08d5fd60db60ec244697d507bffa18e71e11f0e6607a88c3ff6721277f7becb7fe5e4ad534e3a9171 WHIRLPOOL 08487cd7c2672c9166b7f0a34cdc97c253108b7006c86009294ce46af1ee9a072f071b03a389426cc407060f4a8ee0a339b3a84d2a9c50693988660a82202c9a -AUX 036-0002-dracut-functions.sh-support-for-altern.patch 1487 SHA256 8de2b229368d8957b315a3df5107a73216578cab8a16c9241f9239f12c8f0b8a SHA512 f9ce9a8025ca73dbb6b782c5b8a32ceed6c5b94d5a871e88677c98f282c2b5a8ff249af11f5ba7eaba8997b211fb9fb61ef93f86aaaa5b04d0718e39c9f84f5a WHIRLPOOL 366f564c4dc0c379ecb694a970d01a1e36278721768f68e67b07174cf9b0a085cbab8b7db06e498695b7ab83a8a734f39a8187fa37cc57906bdd9cbf16d3dc3d -AUX 036-0003-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 24c62302bffc30ecc5414c50efff3d7f34ca5e90b1ee824def7f465cabb6a4d4 SHA512 b0e71ee9df7d9880dc42b97c0b339e4f9e49b513095bd586fc4ee745a694a1cb472e400ce2535e3fc70bc06d76107cc21a4333421be97b396e74e8a5d1c42639 WHIRLPOOL 1764a1c9707a2747b33f9ad46fe4ddc04bf05769c9f1ba505f2bc92babeffe96f4859600fffcc30af44367ae3b8605b6e2720589b9c3b1d4d45d9d900f90bd9e -AUX 036-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch 2412 SHA256 07520bf44145b6fcde8bdd6c2e9f0b00bce5d95ed7a297d5feacbbd0151b2960 SHA512 c9837d1bb8adf01e0e89aa3dab880ec73c721a8e0de4ec86e44e97485d22eed3aa4f2537df7891ff31cf9fa174b1a9eb138620a9c4bc68569641008cf558c387 WHIRLPOOL 04f3fa193ceb0888dd361dc3004dcd3cca9507f32cc8ce4a254c1da1a00f5bae98a60a1085b7b8001fb01ffb560878a9e85b60ce196bd3a9e7224e33979540d9 -AUX 036-0005-Install-dracut-install-into-libexec-di.patch 2583 SHA256 615d263e814aece64c37af729103049ca85fd32768e649549f26d24daecbcbd8 SHA512 4c7d752be0ed76617f44c723abcce56224de804ea0b0070f3a5513859ce899e45904fcd8520352fa333504a21e8ba744e664bada1bd5d6d82e4e916ea6691b31 WHIRLPOOL 5aa5705e8bcc104d3d3c355ffcc25d4880e1a9c50707c85ff7903ed1e12849c39dd15fbf857f11e291184ccb89c2fd889787bbce6cdd48dfd5c6f0e283de148e -AUX 036-0006-dracut.sh-Fix-variable-name-typo.patch 1159 SHA256 11268d492da82ad9153ae798f2c3860876057bd804400426d26fc1c3f45a49e3 SHA512 8a62ade167c517e20da17eccbac07ea16a363fdecb5556cd04a5b5ec3e516963df52823eac30bbe6d1ab6b3135b45606e74d05dc2bba23fb4ba3f5029d2b8467 WHIRLPOOL 74674a5b646ea9335adf1a67971e1931e3ebc31cc93b66a4035135e41194a359571fd1f2d964d2b2ab2354d64ad083025e31b7ce47009e362379b4432e45a239 -AUX 036-0007-Added-missing-quotes.patch 740 SHA256 a557c5de158730173d0b8819785806fab1fa0025e63a3981a56b2ac127b8acc5 SHA512 627ad35d6f12d5a11fb56a12699167827ca4d218419a700f06172653e7dbae73e469d99c65b3dead2df5230f4fe14c97b30783d5764c30656954cca84957f469 WHIRLPOOL 7371b303cb02272b43bed583414f41f285fbaee0e532ba8ab82f0f84268bd9ae39963751c79184fda6a9425a5802cda56fcff732ea769e45ced0ce2cefa5e181 -AUX 036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch 1186 SHA256 630ff9fd0c4b2690e1bdc9f396bdb84346745f0a40c7eef90e5652ff3d97f297 SHA512 8a3221b46b9f51972952b64fc337bca6b866f07d176c1eae8624c21ec22cc67c01655306afd2c118116debd5c2418c443a4d07ed2cf139db2ed6e99258b07c43 WHIRLPOOL fbb7273baeeb080d28232ae8ae424e4a52e178713d51cebaf3dfc0c66ceb7c6ed5ae62e5a2bbdc77706cea5353b15a540ad7cdd2f1f4703c86570a79a7fbf5ce -AUX 037-0001-dracut-functions.sh-support-for-altern.patch 1485 SHA256 dda6a7a87f27a02fa0661ea398bdc143f663171d884eee044a22e38cd4f8e1e4 SHA512 d91fb5816746b82e3d3a6d50f3d04320e601373efed29fc9b3f90f1cdbd4963c23af0ce3e168d90d40faf3d861cf99b93c8af63f1aa1971524f02005edd946b1 WHIRLPOOL 03ade689345fad5b6894533d822b4b1ad7879e90121d8033e06ab3794bcf2e8b2a173af5b73d2edc6215d33df372b772e177cdf55114ee54ca018790d9d96bb9 -AUX 037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 b3bf73620278a99a3f416d60ce285da1052bee432c47dbbb9fdefd6b8831f454 SHA512 b2e864ec8a338b9bee65cb13c4d891f2e31b51d46a640ada597c30dce7cf80726f69b2cc4de58a94dad688a8ac9b153a146ef7ffbfb9c86aa038eb9efd36b8cf WHIRLPOOL 3eaf73c45ee33a9b673245e0ae4ef56042a8b77de916105ac77e55d78cb374a74fdf1006370caf6f2d7935ba717466a3de058af5986862080a1418b092f25eb2 -AUX 037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 9e23c100a0acde74f043a81b743aeda3e9a74cb154d6f298e23626bb7a80c967 SHA512 3104c377d519df9755600f33b1c8be872202cfbb95a76fdcc05e69fd9e04da617dff7e7e2ced11543e8a1ba138275897ab8d40923180c9d9b10d3bc52c86e138 WHIRLPOOL 7d0b9d68a5e50e3d98ffd0db4ee237de0d2f140ba0ecf03a822189964deaf28b6aa898ddb8cbe9ac22c91eb7ecaf65fc8346a6a6b5bed07725f12faea28da8ff -AUX 037-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 bb83cfecd54a18b630b9dd08cae8a36778f75fae0bc28faa6f484d2a4f687274 SHA512 ea2cba205179023f7a55405b5a8baf740e5495db4210f63c3be32ba333a2b0a633915f2cf51865f248c2142c290fcdd675f77ceca3247d66965d207d40e60a30 WHIRLPOOL 5d14552a0d62e5231c7983949d720064ba56a0a6a10e659e884b11e8719afba53dde36659e632d60816af1aad585d5adce946fafd7392e48d029149c0ea02f29 -AUX 037-0005-modsign-do-not-hardcode-path-to-keyctl.patch 784 SHA256 47184c81bd1ae0be7cee4829d1ef454478a7092ed8c1826dda2ca16445f19e8a SHA512 747cf9a092dfba948367086fb028b84444971f1e843f7b9bf99d592da726e78f3ab204604958c41e21fe38eda885ab52670c223402d18b62f933e72156df5822 WHIRLPOOL 70fb43941d47fb0e1c376374d9b27c4a8f29a823df0ab57e679ec04ea6da59d551c6a9d1a23b90c16dca7ba9c9f9232ce4db6466c0b911af8c25243621a9235f -AUX 037-0006-98systemd-fixup-rootfs-generator-insta.patch 1134 SHA256 dbccdce8b458bb40a1535fcc054d1f0c323be18d14a8c0b850614952c0228e0f SHA512 fa7a728949fbdd13774ebe6f3698ed9a4c4011de589b08c680b3a5f1d0407ef2642f5cb3a6a113eec5c0b74afc2f47b698840f2fdeed06f3307e19276adf3045 WHIRLPOOL b8382be867dbec0601b5124c3bb5243a8b368ee87e2e7e560b355fa5e96294ffa3cf56648be75394f9b304bf4fcaddab74af38e68a17853947c52403be8e92fe -AUX 037-0007-udev-rules-add-uaccess-rules.patch 976 SHA256 bc6fb918b773391b7a6eccf5d14a6fd49ae224fa944c2ae3f95363f1e31e36e5 SHA512 36afc6346934769bea18bc761fffd95cfc84866614286f3f0ef84732b0de10ed0dac1c262b5615a6574c367f40ab74e191a9d04f5fdbf300bb24e45e2fe18794 WHIRLPOOL c04eed2ad312e392e0df60b59084334ad139a12356bf0507228d469cec643daf87c4ef6dd191b9b5c50e0fbd5a16c87545c01526d3ab84c9ce3afc915044e39b -AUX 038-0001-dracut-functions.sh-support-for-altern.patch 1485 SHA256 fdc63435b24f492daa2548264aa677112483be4e9b9c934739ad76f9d0e1f36d SHA512 c776122fc893a63397e38d1a196521b8ea69f970f39b1018421eb17c84adfc945e014ce07c92f9ffb16dde099757a51d3a69edbf249359336cf4afd084b6e744 WHIRLPOOL cd758dcfe92d9158da58a352b2ac118f077713b63e7b190054b6a3dca77badd15352e083f93aebb29fe73433e275e182aab246e773c04719fa5bdf8f58205169 -AUX 038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 8ca9d11d063b2d748755bf052fa938104fa2955f15127d1bce3c97833378fe69 SHA512 41306f7b326be58a8ee6fa29cb50a94dfe161165e240c947acbb746a6f4bf21e961803eadcab066038e524c69bd696fa504d26895dc713b075b5f677c4ab55ab WHIRLPOOL f53e39d37806113abf8b9cb56d72c6299b814aada670dfd466a0e28dea4bfaeebaa846ec213297ad54afb4eace9a3adde781b3f94fa4016a7b532deb4db6cbc5 -AUX 038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 ddb9df60e10a454a54322bb85153edf819c5d1df6a66517008ac57cc0be543fd SHA512 ed02a712da984f8c0b7bc036d2a6f281714e4679a93195c8ee90a4202d9a514c468c5de26dd31683ea5194357b6abe7182e3d722beaca280c2dd8bdc402a8630 WHIRLPOOL 9c36a1d665c7c217f78715d58b2b87f36cc6143f5d6f226d73b7d2fe941670d0684b5aa3282e76ee831edc53a64385e631218acc7136474e99b0248a2825bd24 -AUX 038-0004-Install-dracut-install-into-libexec-di.patch 2581 SHA256 837b4ed184742b592eb6bd156890d9cbba4b6b9e3e36c0f943c89509e5e1e405 SHA512 f2303b1c57c8ab4e39bf759151cc44fcfe9aaccb8aa123704078c49bceff6aef7b2eb2f567f7295fe0db89ccfa78f087422d6e65433dd25347e82945a391a689 WHIRLPOOL 0b03b7569df09884660b415370d6085062f53a7ee7f673423ddb797c73d9bc5ffbfa1503374b1c0aa428cda3715b50a12a8e932d9e30ed5a299bd13d090837eb -AUX 038-0005-modsign-do-not-hardcode-path-to-keyctl.patch 784 SHA256 85867e0aa30d6137ed4585cf88e5a7816b338a8d37d27f716593f2ccfd9cc751 SHA512 fb20595b531373b9d481b5ece1dc2abac7eec2633891507974051d95c79b55fcd6ef9931fd5e924c7ace52cfc50b62a8ee0516980d69766cdd5a1bfaac2733c2 WHIRLPOOL 4778ceefd135680c58ae14a7350eb886dcecb9133607d66ec12ce314d3ffef68972b7e6fa7b3ffbacd76825ecd75f83926a001df713210c5abcbb4f4ae115f3c -AUX 038-0008-dracut-functions.sh-fix-inst-functions.patch 4194 SHA256 b9f041148c5530454f387ab4c95fe92042883b30a0b0016a7775932143750d68 SHA512 219c5878898740de83cb522079bc9cfcd61e0252e955cafb3804d54143f3db6415eac37ff5f45583c4e40abcded9b09d9461715bef9c5ecf79db38ebfa1fa982 WHIRLPOOL fe0df29324e413dce16036323bc072ff5c310b432c5d9191cc5e0e695fdc774615acd0485141c606713504588ca8efd1aa8ccf41043feb941466339fedd9e838 AUX 040-0001-dracut-functions.sh-support-for-altern.patch 1485 SHA256 77032e034fb7fcfafac2baf3635339488f6a77e12e065e9a37a3ae5461aa5460 SHA512 db28659fb6c3df4880b50412959cd9596e4fa77f08d76687fd720d39c432a0adb80b72719ac1d7dd9adf8a721d9502caa0ede1eee7c0237d4486782a390803f3 WHIRLPOOL 3bc9e31282161275366ac9c7ae5ba63dbda92d6ed23cc93d814cefc40e4ce0850d3752db9957f9de7cbd2a175e93c0550868a81b73afcb4fbd58927cf16cf2f1 AUX 040-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 948 SHA256 c20ccfd9a3ed2b90461cd191d95d91131f7e707fca3d046b4f84998795d92852 SHA512 4fad54a8ef919a43dfb6c493779f88856a5194421672cb0abb9754ca7a652371c8f50c8586b2a43bfa010625bdf26e7be491b22a869c2fb2b7dde89eb69c9f85 WHIRLPOOL 6168d29356f89d9f40cc3c2da6993ff54ef9fd514cbb9435e067f6b5b598d2687a5ed77bb1fa41dd2a8dd1bc91f1ec93ff712c2eac78847337716eb50e174456 AUX 040-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 1db2096f0a3664cd7bf2128f826c140f0574c7ce56c4085415657059009f9598 SHA512 b4f481548895cfe24360e26b9218d333bd3d827333f5ca9a0fa94d8a8952da45d769bdf60c84aabb8582e1b97f08afb74346c5335e8104e566734bd7c5887c40 WHIRLPOOL cb7ab314f3384f731ac060431965a2fd1928382e1819a51ff8d8807273aa6de088b053d07ddd4b4ab652487efc37a7c9ad1c0f8a067c0eee8e33a4bf7e6d25cd @@ -44,28 +23,22 @@ AUX 040-0006-Don-t-pass-rsyncable-option-to-gzip-Ge.patch 913 SHA256 7aec938b001 AUX 040-0007-Take-into-account-lib64-dirs-when-dete.patch 1877 SHA256 df68184338dd092f01a42064ed7fcdb78e46f348027ff55cb15169c88d0e94f2 SHA512 5f2669addca7b70566213a066a12ba101273611244c3b190c8efca184a0fc50a3afc05bb08bedb998aa387e68abb034cd8fcf914013b2cb99efc9aab6924aed0 WHIRLPOOL b5475357f89e142519db4dd1d3fc8dc2f5a526926e58609a54b9358983a02ce2d04086468f0aca8ae3a930ecef5187c39b8fa0ea9443803e555fa46693173861 DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362cc93a78c5be28ffd7c794a331f992498e451d69c1830f054fa SHA512 e5e41b8696716c5284ea981ae85dbe688c5c31330e400c79f4ba46890939dffdd7744e4a85d27d074987a8db65114332171af0a5471338e3e4bed19d54edc6fd WHIRLPOOL c5d29ef2f20aa752e57180be35a2014c214a25e4e49d3f623d05cd6ef1debd2cec38d24453ecb0c004cdbb52239f0d541ddc9df065ab84fb7d62c30594704347 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13 -DIST dracut-036.tar.xz 255192 SHA256 6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b3528793ef117820049b6fcd3 SHA512 e55448701ef4b0c8969d4d64239a2a7df3d7b06f4457838d2b2139e58b754822654a1b8cfc7d6dbcd7a79dbc14e75366a39e21104b4aeda20c7bf34734668344 WHIRLPOOL ddbe88cb6b333586a71eeed98871066bc79208d2ba8d88dfb42245aca6bd15d6c0c436948569fc8c18703f9d66ad9918bb1e73e050ce6c807fae833148ead218 -DIST dracut-037.tar.xz 256964 SHA256 9c4c365c8dabc19b66da2972bbed7b983df520481325b8a37d3f620218620d76 SHA512 db6d5b064bb24a0fe5a09b0fe8915247f6b3028c0182faa7a533624f98fce45f7ad449d1814ec79fc039ee82c1be0afc7ae8987fee7c5a7f8f16480a6a3b0f39 WHIRLPOOL d904b7d8cd1753df20630db1056853a17a020389ff4da8f14b5d2f207d76046911993eed3522a11fe7d78a5770d496430bbfaf4a3ac3fef83c54a817639094aa -DIST dracut-038.tar.xz 259128 SHA256 3b0d4466ff5bb627fcc783f02a757187195567b97bdbf46203dfa4cf52ed6b70 SHA512 a16c66c91fc66d573ea566901037ee50c4552f262f7904ccea6628fefdeb14b55441a4d92b24fb016bdddde053dccdf9d6e9ed50400dfb9f39a7fb8a649eb417 WHIRLPOOL 55c2b70f28fbbcb1c753f21a610f4abb1ba05cc59eb970fa0bee6c41eebe3ac2640688699b6c1e6acea27df2582322872e3d664a55001e43baf98a3c373416a5 DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba EBUILD dracut-034-r4.ebuild 10446 SHA256 80ab338aeeadb2fbd62f2ecfd61b35ea79acabbda0f927af1e28523e166ba092 SHA512 c8a0190f302d986f808886e5e2846f094c62a3c6d8073559237b54d1f3e70334db3f0b6eace31e6b57825dab3a261a2e6c23fad542a54a04fd7938dade3f2c4b WHIRLPOOL 3ea152d45dad874279424f38c67eafb4c30f9d61fdc23a9256178aea6268ad4be68ebac193839e0c6f9f66ca47305f6d1eb637862bc710dbb2ee3403aac0dbb5 -EBUILD dracut-036-r4.ebuild 7753 SHA256 0316a58a771f605dc810ab6a6e3b4772a129c21bd658f01999225be9aaadd4ce SHA512 fe967a37b141e93089cb44ccd70782f7ca23fab7afcc5ad92b26afd298256afda5d477fbcebe8e30e7a13c51cae2afff8118a2f06f1d47f65a874a8f28516d51 WHIRLPOOL 5871f63d2588b5ff7a928e5df21ae802e757e9ca8b1dc60e252e1814f3a6cf9afd4178991bac6d848b45e167720634d12d2c35033d6159f02d330f27e0341f01 -EBUILD dracut-037-r3.ebuild 7987 SHA256 7d724cd7d3927a43246316414a65b440af711ba4a8694c34039809816b19acd3 SHA512 0827aab0678a33dbec73733718b94479bd75c0e81c516e40522234705405a04fc69da155dbdd213aaa937b3761d7e5f5a3645f9d730c18f0794e8a940a7c865b WHIRLPOOL d4acaad2e1211db272455612b20eaa75e24474d2d3b434ec7d92a971e023b8ff66841699cced497de9fd77c7b6d7fb0582bc636a85911ca559e2057ab414ce2e -EBUILD dracut-038-r2.ebuild 7926 SHA256 6e4ad5ac958f722a6484f36a2bbd33359bf4f055d5c81c1dad16e575102b7974 SHA512 988688cd14946e719bbf3677abb7782c79a36edbc707a3f2c56e902b102da9840e13ed2d2a52b02d4ecff2cceb88b84f58d4c69633c249665dca9898babbfca2 WHIRLPOOL 8050c36b85d4705d19bac482a403924a1fff99eed85ad10f32a89e8b7cb1ba7db1a8acfdae4bb7b2834925a88d95601f376d60b8ff67237b54f1d64ddde0952a EBUILD dracut-040-r1.ebuild 7917 SHA256 d6efb3a4fc5d31a05791ca00692515f4ccde57d76213ddc478afa10a9ba8f037 SHA512 c0a9500d3388bb2ee34825850978cd3354e8318ff999182c14875e8732ca97157b5eb0b36b56c611d28501784074f6ef48b1cf8903600fcb90b56873377b44f2 WHIRLPOOL 41321feb577b8ca75034989a2b3345e21ece7972c859537699be22a56295780c5c7474c8921c1d55f0a9164eb5a8c9402ec942a88b442b234c783dc0807a6c01 EBUILD dracut-040-r2.ebuild 7925 SHA256 70525b9785a16f408f41e35c8e1bd544fb0a6002b72878fc87f8ab10a6bb9418 SHA512 b6b9aac944574fefd3609c36abf382478981136c855bdc46be5eb1ac08ca450e8404cf81dc2c214be41c2deacf8b5bdf54281e2538baee4485adfc603e3de907 WHIRLPOOL c238ab3f7197efc19fbc7a77308f19d91df104ce8b46805cdfb8244ec731e0fa3a179d4f9aeec1922b1612bc00315bafca7bf2d4a41a3894fb5b59da382cbe06 EBUILD dracut-040-r3.ebuild 7998 SHA256 b9201824939326f805e9be6257b48ccf4d3d896364d4084a07f2d978c74d9255 SHA512 eaf85f05d3f63e50ab4e5d4ca7140dd96cb029ff789dbec5fca6ff557713be7bd187c445543cca53b7ba2bf15f12d808c5390f8dd8c1c199cbcbd6b065b7e887 WHIRLPOOL 854a55cb81b5b5f33573fe14fd32c0ef4fbe189bf4339bf9155824ffcd726f0aad74d3071dcb9a11fbe863ed7435b448870bd0b13b2f06e6c2575b387156836e EBUILD dracut-040.ebuild 7896 SHA256 59c0b78bd5038178e49ab16be4cd0fd3cb6306551916a3cb91570c9c89aafdd7 SHA512 f85a7767dbbbaeae743c79a78646396d2ec45414ba3b24a2bb1db6e9847da3dcd6e7ac725e92e78f005916f3473ce475df769ac9ed19df69992984eb32ade608 WHIRLPOOL 221b2bcc73a5fecfa88181b9a89db604145ce4ab5e1d04d843a10367667a1435b23c3def9af2088d174eb202e548101537a4ec4cd3a5f4afa441d63b05511c27 -MISC ChangeLog 77628 SHA256 c8c8054fa760cc5d8c85cead6d8470856b0329184771b394a90352dd924ef2de SHA512 2f7df00fd3c0b0db773e6e7ec6d1774ec671c38d1bcebc7c07908c61c8707af1fa2168a9ded809d6c6d935ad3b4135f6d879dfcb7fe50b3574cbf39680b8df61 WHIRLPOOL 90e32c4255fc3b8d5a9ddba112c329d90de27ab6f9dab00e24fa42997c4746ed0ef4cf3f019e45ac74650f0aa2fd788ef3f731e92a3cf16521af51166c9f4d71 +MISC ChangeLog 79079 SHA256 8d964273989a6d3180c14006187d147771bb0b52e04af73211101a442e717716 SHA512 2402a25e2012c83a187934779d8522053c316e2a7c9160acbcfbe859418ea95b125c8bb30dfb7d873d3b7170939dfe5abde0d70500f7031766c161bc2bc99ac9 WHIRLPOOL ccc917b4d850663eb4369983ca48ee00e20ccfdb94c5888bb1c06834f3c5168fdf8f8fd1a543703faf65dc42cb88b32438ef14a8d42b036dfdf344ca82bef375 MISC metadata.xml 906 SHA256 5f19b725d0669877fdd7814634b7aa7dd73331459bace52de02908417b833c3f SHA512 c5838d36080528d541b67cb38de17cc2351f7e5e17ab060c58f037792225ea223ade6b7e69376f4a9256b0bb3dcf4de578dcd50ee1c7d04a3f3288ca3c1ada43 WHIRLPOOL 532ea421fab965094820d5c0961a00ca38c858461f572a0cd4a145aa90340a569ee942062338ae03773c2709a08e4882f3176333aa5383b7e3c467cb01c0874d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUsoafAAoJEPATRTHh2/q1OM0H/2lcR4Pmm2PkRseTd2nuNAIG -xfbDLvvYg8qd7eucK821Qssbbhr3Xgpiz5jTA8i6QlMpKG0XQ6vItsukgmoyZyOt -DjI7eU3xablinX+29SVmDZrICK49CsIJBo9g/A/TLettrkK7bqRlXsSQ7RMHMOUz -KhjqMQh002guUqaoDITAXug9ZI+BCxHTpM+aOxPsN0cN7DKypmflmdESHC5270B5 -1z8VfUBHeiMj0YP9uOPlN0IN3OTZ0CFmGLp1kGEtr9Wz+8/jYwDhUkexBV3A7N8/ -E1duklpHYuZJOgPdlHggJVvzfm4WKYcyCsVMZn3oT1oEEQPKv5R6mhh+n5ea4Jc= -=9Qtd +iQEcBAEBCAAGBQJUsoiSAAoJEPATRTHh2/q1jj8H/AkofEK6LzxNwkOSaY4ZT4bk +N9wDjbVSF+q3CQ+X5AOH0yAZFgyYHvqt8txHQJHdTbl8RhRaoddTmNlG31AnzUi4 +KPES8cRReFKUKiOuXtmw8ljxp0wGZqesJSvkIEGICuRMgcTlsOf3ErFHcPeWttZc +OLnoJvrlTFm7WByDvDdPnM+mFT53ApjSM/JnnjtH3x8/xFE7q0kp3JIhcLOGO6ka +VgEKc9aHw6SQEKCPsGHaH0+hJJ4SKt3cfh0+mdgU6YtefYMn/Wy0tpIJAWehR28u +rV4VA822Skg5ScUuVOyF4jLzIbuEdr3pPGdj7WEdFQ53vgtG9+OAWz/9rTc/WpE= +=O6bY -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-036-r4.ebuild b/sys-kernel/dracut/dracut-036-r4.ebuild deleted file mode 100644 index 2f210542d779..000000000000 --- a/sys-kernel/dracut/dracut-036-r4.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-036-r4.ebuild,v 1.8 2014/12/19 17:31:07 pacho Exp $ - -EAPI=4 - -inherit bash-completion-r1 eutils linux-info multilib systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug selinux systemd" - -RESTRICT="test" - -CDEPEND="virtual/udev - !>=sys-fs/udev-210 - !>=sys-apps/systemd-210 - systemd? ( >=sys-apps/systemd-199 ) - selinux? ( sec-policy/selinux-dracut ) - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0 - >sys-apps/kmod-5[tools] - || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( sys-libs/libselinux sys-libs/libsepol ) - " -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 - virtual/pkgconfig - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) -MY_LIBDIR=/usr/lib -PATCHES=( - "${FILESDIR}/${PV}-0001-NEWS-update-for-version-036.patch" - "${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch" - "${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch" - "${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch" - "${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch" - "${FILESDIR}/${PV}-0006-dracut.sh-Fix-variable-name-typo.patch" - "${FILESDIR}/${PV}-0007-Added-missing-quotes.patch" - "${FILESDIR}/${PV}-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch" - ) - -# -# Helper functions -# - -# 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 -} - -# Grabbed from net-misc/netctl ebuild. -optfeature() { - local desc=$1 - shift - while (( $# )); do - if has_version "$1"; then - elog " [I] $1 to ${desc}" - else - elog " [ ] $1 to ${desc}" - fi - shift - done -} - -# -# ebuild functions -# - -src_prepare() { - epatch "${PATCHES[@]}" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - einfo "Setting libdirs to \"${libdirs}\" ..." - sed -e "3alibdirs=\"${libdirs}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" - einfo "Setting udevdir to ${udevdir}..." - sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - if use systemd; then - local systemdutildir="$(systemd_get_utildir)" - local systemdsystemunitdir="$(systemd_get_unitdir)" - local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ - --variable=systemdsystemconfdir)" - [[ ${systemdsystemconfdir} ]] \ - || systemdsystemconfdir=/etc/systemd/system - einfo "Setting systemdutildir to ${systemdutildir} and ..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." - sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." - sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - fi - - epatch_user -} - -src_configure() { - local myconf="--libdir=${MY_LIBDIR}" - myconf+=" --bashcompletiondir=$(get_bashcompdir)" - - if use systemd; then - myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - emake doc install/dracut-install -} - -src_install() { - default - - local my_libdir="${MY_LIBDIR}" - 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" - - use debug || rm_module 95debug - use selinux || rm_module 98selinux - - if use systemd; then - # With systemd following modules do not make sense - rm_module 96securityfs 97masterkey 98integrity - else - rm_module 98systemd - # Without systemd following modules do not make sense - rm_module 00systemd-bootchart - fi - - # 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 -} - -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 - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs - optfeature "Load kernel modules and drop this privilege for real init" \ - sys-libs/libcap - optfeature "Support CIFS" net-fs/cifs-utils - optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ - sys-fs/cryptsetup - optfeature "Support for GPG-encrypted keys for crypt module" \ - app-crypt/gnupg - optfeature \ - "Allows use of dash instead of default bash (on your own risk)" \ - app-shells/dash - optfeature "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools - optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' - optfeature "Support network block devices" sys-block/nbd - optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind - optfeature \ - "Install ssh and scp along with config files and specified keys" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-037-r3.ebuild b/sys-kernel/dracut/dracut-037-r3.ebuild deleted file mode 100644 index a2cfd96d94b6..000000000000 --- a/sys-kernel/dracut/dracut-037-r3.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-037-r3.ebuild,v 1.4 2014/12/19 17:31:07 pacho Exp $ - -EAPI=4 - -inherit bash-completion-r1 eutils linux-info multilib systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug selinux systemd" - -RESTRICT="test" - -CDEPEND="virtual/udev - systemd? ( >=sys-apps/systemd-199 ) - selinux? ( sec-policy/selinux-dracut ) - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0 - >sys-apps/kmod-5[tools] - || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( sys-libs/libselinux sys-libs/libsepol ) - " -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 - virtual/pkgconfig - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) -MY_LIBDIR=/usr/lib -PATCHES=( - "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch" - "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" - "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch" - "${FILESDIR}/${PV}-0004-Install-dracut-install-into-libexec-di.patch" - "${FILESDIR}/${PV}-0005-modsign-do-not-hardcode-path-to-keyctl.patch" - "${FILESDIR}/${PV}-0006-98systemd-fixup-rootfs-generator-insta.patch" - "${FILESDIR}/${PV}-0007-udev-rules-add-uaccess-rules.patch" - ) - -# -# Helper functions -# - -# 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 -} - -# Grabbed from net-misc/netctl ebuild. -optfeature() { - local desc=$1 - shift - while (( $# )); do - if has_version "$1"; then - elog " [I] $1 to ${desc}" - else - elog " [ ] $1 to ${desc}" - fi - shift - done -} - -# -# ebuild functions -# - -src_prepare() { - epatch "${PATCHES[@]}" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then - # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - fi - einfo "Setting libdirs to \"${libdirs}\" ..." - sed -e "3alibdirs=\"${libdirs}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" - einfo "Setting udevdir to ${udevdir}..." - sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - if use systemd; then - local systemdutildir="$(systemd_get_utildir)" - local systemdsystemunitdir="$(systemd_get_unitdir)" - local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ - --variable=systemdsystemconfdir)" - [[ ${systemdsystemconfdir} ]] \ - || systemdsystemconfdir=/etc/systemd/system - einfo "Setting systemdutildir to ${systemdutildir} and ..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." - sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." - sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - else - local systemdutildir="/lib/systemd" - einfo "Setting systemdutildir for standalone udev to" \ - "${systemdutildir}..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - fi - - epatch_user -} - -src_configure() { - local myconf="--libdir=${MY_LIBDIR}" - myconf+=" --bashcompletiondir=$(get_bashcompdir)" - - if use systemd; then - myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - emake doc install/dracut-install -} - -src_install() { - default - - local my_libdir="${MY_LIBDIR}" - 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" - - use debug || rm_module 95debug - use selinux || rm_module 98selinux - - if use systemd; then - # With systemd following modules do not make sense - rm_module 96securityfs 97masterkey 98integrity - else - rm_module 98systemd - # Without systemd following modules do not make sense - rm_module 00systemd-bootchart - fi - - # 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 -} - -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 - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs - optfeature "Load kernel modules and drop this privilege for real init" \ - sys-libs/libcap - optfeature "Support CIFS" net-fs/cifs-utils - optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ - sys-fs/cryptsetup - optfeature "Support for GPG-encrypted keys for crypt module" \ - app-crypt/gnupg - optfeature \ - "Allows use of dash instead of default bash (on your own risk)" \ - app-shells/dash - optfeature "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools - optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' - optfeature "Support network block devices" sys-block/nbd - optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind - optfeature \ - "Install ssh and scp along with config files and specified keys" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/dracut-038-r2.ebuild b/sys-kernel/dracut/dracut-038-r2.ebuild deleted file mode 100644 index e3c1d1237c90..000000000000 --- a/sys-kernel/dracut/dracut-038-r2.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-038-r2.ebuild,v 1.4 2014/12/19 17:31:07 pacho Exp $ - -EAPI=4 - -inherit bash-completion-r1 eutils linux-info multilib systemd - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug selinux systemd" - -RESTRICT="test" - -CDEPEND="virtual/udev - systemd? ( >=sys-apps/systemd-199 ) - selinux? ( sec-policy/selinux-dracut ) - " -RDEPEND="${CDEPEND} - app-arch/cpio - >=app-shells/bash-4.0 - >sys-apps/kmod-5[tools] - || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( sys-libs/libselinux sys-libs/libsepol ) - " -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 - virtual/pkgconfig - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) -MY_LIBDIR=/usr/lib -PATCHES=( - "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch" - "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch" - "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch" - "${FILESDIR}/${PV}-0004-Install-dracut-install-into-libexec-di.patch" - "${FILESDIR}/${PV}-0005-modsign-do-not-hardcode-path-to-keyctl.patch" - "${FILESDIR}/${PV}-0008-dracut-functions.sh-fix-inst-functions.patch" - ) - -# -# Helper functions -# - -# 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 -} - -# Grabbed from net-misc/netctl ebuild. -optfeature() { - local desc=$1 - shift - while (( $# )); do - if has_version "$1"; then - elog " [I] $1 to ${desc}" - else - elog " [ ] $1 to ${desc}" - fi - shift - done -} - -# -# ebuild functions -# - -src_prepare() { - epatch "${PATCHES[@]}" - - local libdirs="/$(get_libdir) /usr/$(get_libdir)" - if [[ ${SYMLINK_LIB} = yes ]]; then - # Preserve lib -> lib64 symlinks in initramfs - [[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" - fi - einfo "Setting libdirs to \"${libdirs}\" ..." - sed -e "3alibdirs=\"${libdirs}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" - einfo "Setting udevdir to ${udevdir}..." - sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - - if use systemd; then - local systemdutildir="$(systemd_get_utildir)" - local systemdsystemunitdir="$(systemd_get_unitdir)" - local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ - --variable=systemdsystemconfdir)" - [[ ${systemdsystemconfdir} ]] \ - || systemdsystemconfdir=/etc/systemd/system - einfo "Setting systemdutildir to ${systemdutildir} and ..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." - sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." - sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - else - local systemdutildir="/lib/systemd" - einfo "Setting systemdutildir for standalone udev to" \ - "${systemdutildir}..." - sed -e "5asystemdutildir=\"${systemdutildir}\"" \ - -i "${S}/dracut.conf.d/gentoo.conf.example" || die - fi - - epatch_user -} - -src_configure() { - local myconf="--libdir=${MY_LIBDIR}" - myconf+=" --bashcompletiondir=$(get_bashcompdir)" - - if use systemd; then - myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - emake doc install/dracut-install -} - -src_install() { - default - - local my_libdir="${MY_LIBDIR}" - 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" - - use debug || rm_module 95debug - use selinux || rm_module 98selinux - - if use systemd; then - # With systemd following modules do not make sense - rm_module 96securityfs 97masterkey 98integrity - else - rm_module 98systemd - # Without systemd following modules do not make sense - rm_module 00systemd-bootchart - fi - - # 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 -} - -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 - - elog "To get additional features, a number of optional runtime" - elog "dependencies may be installed:" - elog "" - optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 - optfeature \ - "Measure performance of the boot process for later visualisation" \ - app-benchmarks/bootchart2 app-admin/killproc sys-process/acct - optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs - optfeature "Load kernel modules and drop this privilege for real init" \ - sys-libs/libcap - optfeature "Support CIFS" net-fs/cifs-utils - optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ - sys-fs/cryptsetup - optfeature "Support for GPG-encrypted keys for crypt module" \ - app-crypt/gnupg - optfeature \ - "Allows use of dash instead of default bash (on your own risk)" \ - app-shells/dash - optfeature "Framebuffer splash (media-gfx/splashutils)" \ - media-gfx/splashutils - optfeature "Support iSCSI" sys-block/open-iscsi - optfeature "Support Logical Volume Manager" sys-fs/lvm2 - optfeature "Support MD devices, also known as software RAID devices" \ - sys-fs/mdadm - optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools - optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' - optfeature "Support network block devices" sys-block/nbd - optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind - optfeature \ - "Install ssh and scp along with config files and specified keys" \ - net-misc/openssh - optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ - app-admin/rsyslog -} diff --git a/sys-kernel/dracut/files/036-0001-NEWS-update-for-version-036.patch b/sys-kernel/dracut/files/036-0001-NEWS-update-for-version-036.patch deleted file mode 100644 index 3da1cf08671b..000000000000 --- a/sys-kernel/dracut/files/036-0001-NEWS-update-for-version-036.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 315bd22374c4cf8a472d9f59b783f4bc2e5aa646 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Wed, 29 Jan 2014 08:37:43 +0100 -Subject: [PATCH 1/5] NEWS: update for version 036 - ---- - NEWS | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/NEWS b/NEWS -index 5b88600..ccf279f 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,7 @@ -+dracut-036 -+========== -+- fixed skipcpio signature checking -+ - dracut-035 - ========== - - changed dracut tarball compression to xz --- -1.8.5.5 - diff --git a/sys-kernel/dracut/files/036-0002-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/036-0002-dracut-functions.sh-support-for-altern.patch deleted file mode 100644 index 84ce0387eb16..000000000000 --- a/sys-kernel/dracut/files/036-0002-dracut-functions.sh-support-for-altern.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 232637ff5074b45913b0a358434779bd1317648e 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 2/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 <alexander@tsoy.me>. - -Conflicts: - dracut-functions.sh ---- - dracut-functions.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 7cfa097..86a69a8 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -873,6 +873,16 @@ inst_rules() { - inst_dir "$_target" - for _rule in "$@"; do - if [ "${_rule#/}" = "$_rule" ]; then -+ for r in ${udevaltdirs}; do -+ [[ "$r" = "${udevdir}" ]] && continue -+ if [[ -e $r/rules.d/$_rule ]]; then -+ _found="$r/rules.d/$_rule" -+ inst_rule_programs "$_found" -+ inst_rule_group_owner "$_found" -+ inst_rule_initqueue "$_found" -+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" -+ fi -+ done - for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do - if [[ -e $r/$_rule ]]; then - _found="$r/$_rule" --- -1.8.5.5 - diff --git a/sys-kernel/dracut/files/036-0003-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/036-0003-gentoo.conf-let-udevdir-be-handled-by-.patch deleted file mode 100644 index 439e3f353885..000000000000 --- a/sys-kernel/dracut/files/036-0003-gentoo.conf-let-udevdir-be-handled-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 95d74e267e6f61b877f4c5c7f126096bc289891c 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 3/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 26e7314..f9617f0 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.5.5 - diff --git a/sys-kernel/dracut/files/036-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/036-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch deleted file mode 100644 index 967563b73cd0..000000000000 --- a/sys-kernel/dracut/files/036-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch +++ /dev/null @@ -1,74 +0,0 @@ -From de737d15dcb38beefa617387bf9de583f6d212de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:37:09 +0200 -Subject: [PATCH 4/5] Use the same paths in dracut.sh as those set with - configure script - -Makefile alters destination main dracut script and sets dracutbasedir to -the value of pkglibdir set in configure. ---- - Makefile | 3 +++ - dracut.sh | 9 ++++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index ceb7096..cab7755 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,6 +103,9 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(pkglibdir)/modules.d - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut -+ sed -r \ -+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ -+ -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages - install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd - install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd -diff --git a/dracut.sh b/dracut.sh -index 9b715ab..9657230 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -26,10 +26,13 @@ - # store for logging - dracut_args=( "$@" ) - -+# base dirs -+pkglibdir=/usr/lib/dracut -+dracutbasedir="$pkglibdir" -+ - set -o pipefail - - usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -54,7 +57,6 @@ EOF - } - - long_usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -639,8 +641,6 @@ export DRACUT_LOG_LEVEL=warning - debug=yes - } - --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut -- - # if we were not passed a config file, try the default one - if [[ ! -f $conffile ]]; then - if [[ $allowlocal ]]; then -@@ -759,7 +759,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $use_fstab_l ]] && use_fstab=$use_fstab_l - [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l - [[ $lvmconf_l ]] && lvmconf=$lvmconf_l --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp --- -1.8.5.5 - diff --git a/sys-kernel/dracut/files/036-0005-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/036-0005-Install-dracut-install-into-libexec-di.patch deleted file mode 100644 index 2a39fab80230..000000000000 --- a/sys-kernel/dracut/files/036-0005-Install-dracut-install-into-libexec-di.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bf3d75a2ebf4ad80313d7ced8478f21d9a96f87b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:40:43 +0200 -Subject: [PATCH 5/5] Install dracut-install into libexec dir instead of lib - dir - -dracut-install script is the only thing ABI specific atm. - -See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the -problem. ---- - Makefile | 4 +++- - configure | 1 + - dracut-functions.sh | 4 ++++ - dracut.sh | 1 + - 4 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index cab7755..fd936f2 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,6 +104,7 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut - sed -r \ -+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ - -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ - -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages -@@ -147,7 +148,8 @@ endif - done \ - fi - if [ -f install/dracut-install ]; then \ -- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ -+ mkdir -p $(DESTDIR)$(libexecdir); \ -+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ - fi - if [ -f skipcpio/skipcpio ]; then \ - install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ -diff --git a/configure b/configure -index 19b5e1f..d2ffc2c 100755 ---- a/configure -+++ b/configure -@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} - mandir ?= ${mandir:-${prefix}/share/man} - enable_documentation ?= ${enable_documentation:-yes} - bindir ?= ${bindir:-${prefix}/bin} -+libexecdir ?= ${libexecdir:-${prefix}/libexec} - EOF - - { -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 86a69a8..e8ec335 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -695,6 +695,10 @@ if ! [[ $DRACUT_INSTALL ]]; then - DRACUT_INSTALL=$(find_binary dracut-install) - fi - -+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then -+ DRACUT_INSTALL=$libexecdir/dracut-install -+fi -+ - if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then - DRACUT_INSTALL=$dracutbasedir/dracut-install - fi -diff --git a/dracut.sh b/dracut.sh -index 9657230..08335d0 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -27,6 +27,7 @@ - dracut_args=( "$@" ) - - # base dirs -+libexecdir=/usr/libexec - pkglibdir=/usr/lib/dracut - dracutbasedir="$pkglibdir" - --- -1.8.5.5 - diff --git a/sys-kernel/dracut/files/036-0006-dracut.sh-Fix-variable-name-typo.patch b/sys-kernel/dracut/files/036-0006-dracut.sh-Fix-variable-name-typo.patch deleted file mode 100644 index c0b6301ddf55..000000000000 --- a/sys-kernel/dracut/files/036-0006-dracut.sh-Fix-variable-name-typo.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e01e3d9c8f89b1ef98053a64bde9beed9714029 Mon Sep 17 00:00:00 2001 -From: Colin Guthrie <colin@mageia.org> -Date: Wed, 5 Feb 2014 10:06:51 +0000 -Subject: [PATCH 6/6] dracut.sh: Fix variable name typo. - -This caused the root_dev variable not to be set which in turn meant that -the root device was not whitelisted in 99base/module-setup.sh when injecting -compile-time devexists hooks in hostonly initrds. This ties the generated -initrd to the root fs device (typically the UUID) rather than relying solely -only the root= kernel command line. - -While it is hostonly, not hardcoding e.g. UUIDs is still desirable. Any -swap partition on the host device is still added however. ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index 08335d0..d693d58 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1005,7 +1005,7 @@ if [[ $hostonly ]]; then - _bdev=$(readlink -f "/dev/block/$_dev") - [[ -b $_bdev ]] && _dev=$_bdev - push host_devs $_dev -- [[ "$_mp" == "/" ]] && root_dev="$_dev" -+ [[ "$mp" == "/" ]] && root_dev="$_dev" - push host_devs "$_dev" - done - --- -1.8.5.5 - diff --git a/sys-kernel/dracut/files/036-0007-Added-missing-quotes.patch b/sys-kernel/dracut/files/036-0007-Added-missing-quotes.patch deleted file mode 100644 index 29aedefa686a..000000000000 --- a/sys-kernel/dracut/files/036-0007-Added-missing-quotes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 13294581f82c2e51754ba3dacd7ec304350244c0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sun, 23 Feb 2014 17:43:57 +0100 -Subject: [PATCH 7/7] Added missing quotes - -See bug report at https://bugs.gentoo.org/show_bug.cgi?id=502064 ---- - dracut.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dracut.sh b/dracut.sh -index d693d58..5508050 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -554,7 +554,7 @@ done - # the old fashioned way - - while (($# > 0)); do -- if [ ${1%%=*} == "++include" ]; then -+ if [ "${1%%=*}" == "++include" ]; then - push include_src "$2" - push include_target "$3" - PARMS_TO_STORE+=" --include '$2' '$3'" --- -1.9.0 - diff --git a/sys-kernel/dracut/files/036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch b/sys-kernel/dracut/files/036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch deleted file mode 100644 index 06ad1095a334..000000000000 --- a/sys-kernel/dracut/files/036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 791ecb805237a28a038bb317b9894113654f080e Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Wed, 26 Feb 2014 15:50:17 +0400 -Subject: [PATCH 8/8] Add legacy flag (-l) to lz4 and update magic number - -Linux kernel does not support the new default lz4 format. - -https://bugs.gentoo.org/show_bug.cgi?id=502102 ---- - dracut.sh | 2 +- - lsinitrd.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 5508050..91e05e3 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -782,7 +782,7 @@ case $compress in - xz) compress="xz --check=crc32 --lzma2=dict=1MiB -T0";; - gzip) compress="gzip -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9";; - lzo) compress="lzop -9";; -- lz4) compress="lz4 -9";; -+ lz4) compress="lz4 -l -9";; - esac - if [[ $_no_compress_l = "cat" ]]; then - compress="cat" -diff --git a/lsinitrd.sh b/lsinitrd.sh -index 2c58f84..8dc9032 100755 ---- a/lsinitrd.sh -+++ b/lsinitrd.sh -@@ -172,7 +172,7 @@ case $bin in - $'\x71\xc7'*|070701) - CAT="cat --" - ;; -- $'\x04\x22'*) -+ $'\x02\x21'*) - CAT="lz4 -d -c";; - *) - CAT="xzcat --"; --- -1.9.0 - diff --git a/sys-kernel/dracut/files/037-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/037-0001-dracut-functions.sh-support-for-altern.patch deleted file mode 100644 index 73e85a8089ba..000000000000 --- a/sys-kernel/dracut/files/037-0001-dracut-functions.sh-support-for-altern.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9cdda4d50eddf8a14c57f986c6c4f86bc9619269 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/4] 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>. - -Conflicts: - dracut-functions.sh ---- - dracut-functions.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 391b549..6281fa0 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -918,6 +918,16 @@ inst_rules() { - inst_dir "$_target" - for _rule in "$@"; do - if [ "${_rule#/}" = "$_rule" ]; then -+ for r in ${udevaltdirs}; do -+ [[ "$r" = "${udevdir}" ]] && continue -+ if [[ -e $r/rules.d/$_rule ]]; then -+ _found="$r/rules.d/$_rule" -+ inst_rule_programs "$_found" -+ inst_rule_group_owner "$_found" -+ inst_rule_initqueue "$_found" -+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" -+ fi -+ done - for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do - if [[ -e $r/$_rule ]]; then - _found="$r/$_rule" --- -1.9.0 - diff --git a/sys-kernel/dracut/files/037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch deleted file mode 100644 index b6be275a8363..000000000000 --- a/sys-kernel/dracut/files/037-0002-gentoo.conf-let-udevdir-be-handled-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 48b6551c95897a89be2510b268b8d89bfd6dc851 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/4] 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 26e7314..f9617f0 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.9.0 - diff --git a/sys-kernel/dracut/files/037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch deleted file mode 100644 index 2a877981f414..000000000000 --- a/sys-kernel/dracut/files/037-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch +++ /dev/null @@ -1,74 +0,0 @@ -From e40f005daf74f6b6b62ea2e7fc352f097caf5f13 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:37:09 +0200 -Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with - configure script - -Makefile alters destination main dracut script and sets dracutbasedir to -the value of pkglibdir set in configure. ---- - Makefile | 3 +++ - dracut.sh | 9 ++++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index ceb7096..cab7755 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,6 +103,9 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(pkglibdir)/modules.d - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut -+ sed -r \ -+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ -+ -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages - install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd - install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd -diff --git a/dracut.sh b/dracut.sh -index c1ef474..b1141de 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -26,10 +26,13 @@ - # store for logging - dracut_args=( "$@" ) - -+# base dirs -+pkglibdir=/usr/lib/dracut -+dracutbasedir="$pkglibdir" -+ - set -o pipefail - - usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -54,7 +57,6 @@ EOF - } - - long_usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -652,8 +654,6 @@ export DRACUT_LOG_LEVEL=warning - debug=yes - } - --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut -- - # if we were not passed a config file, try the default one - if [[ ! -f $conffile ]]; then - if [[ $allowlocal ]]; then -@@ -773,7 +773,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $use_fstab_l ]] && use_fstab=$use_fstab_l - [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l - [[ $lvmconf_l ]] && lvmconf=$lvmconf_l --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp --- -1.9.0 - diff --git a/sys-kernel/dracut/files/037-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/037-0004-Install-dracut-install-into-libexec-di.patch deleted file mode 100644 index 5789e9c094cb..000000000000 --- a/sys-kernel/dracut/files/037-0004-Install-dracut-install-into-libexec-di.patch +++ /dev/null @@ -1,81 +0,0 @@ -From c379589cc5cdd0c4e9e559b9edde44410416d2fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:40:43 +0200 -Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib - dir - -dracut-install script is the only thing ABI specific atm. - -See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the -problem. ---- - Makefile | 4 +++- - configure | 1 + - dracut-functions.sh | 4 ++++ - dracut.sh | 1 + - 4 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index cab7755..fd936f2 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,6 +104,7 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut - sed -r \ -+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ - -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ - -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages -@@ -147,7 +148,8 @@ endif - done \ - fi - if [ -f install/dracut-install ]; then \ -- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ -+ mkdir -p $(DESTDIR)$(libexecdir); \ -+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ - fi - if [ -f skipcpio/skipcpio ]; then \ - install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ -diff --git a/configure b/configure -index 19b5e1f..d2ffc2c 100755 ---- a/configure -+++ b/configure -@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} - mandir ?= ${mandir:-${prefix}/share/man} - enable_documentation ?= ${enable_documentation:-yes} - bindir ?= ${bindir:-${prefix}/bin} -+libexecdir ?= ${libexecdir:-${prefix}/libexec} - EOF - - { -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 6281fa0..e2b1a7a 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -740,6 +740,10 @@ if ! [[ $DRACUT_INSTALL ]]; then - DRACUT_INSTALL=$(find_binary dracut-install) - fi - -+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then -+ DRACUT_INSTALL=$libexecdir/dracut-install -+fi -+ - if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then - DRACUT_INSTALL=$dracutbasedir/dracut-install - fi -diff --git a/dracut.sh b/dracut.sh -index b1141de..6cf80b4 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -27,6 +27,7 @@ - dracut_args=( "$@" ) - - # base dirs -+libexecdir=/usr/libexec - pkglibdir=/usr/lib/dracut - dracutbasedir="$pkglibdir" - --- -1.9.0 - diff --git a/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch b/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch deleted file mode 100644 index 78ce946839aa..000000000000 --- a/sys-kernel/dracut/files/037-0005-modsign-do-not-hardcode-path-to-keyctl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 99f913857dd38facd8f2af16a8b591fa6d7f2d45 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Mon, 31 Mar 2014 17:56:13 +0400 -Subject: [PATCH 5/5] modsign: do not hardcode path to keyctl - -https://bugs.gentoo.org/show_bug.cgi?id=506094 ---- - modules.d/03modsign/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh -index 09285d3..cc0e241 100755 ---- a/modules.d/03modsign/module-setup.sh -+++ b/modules.d/03modsign/module-setup.sh -@@ -29,7 +29,7 @@ depends() { - # called by dracut - install() { - inst_dir /lib/modules/keys -- inst_binary /usr/bin/keyctl -+ inst_binary keyctl - - inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh" - --- -1.9.3 - diff --git a/sys-kernel/dracut/files/037-0006-98systemd-fixup-rootfs-generator-insta.patch b/sys-kernel/dracut/files/037-0006-98systemd-fixup-rootfs-generator-insta.patch deleted file mode 100644 index 2a66e476a874..000000000000 --- a/sys-kernel/dracut/files/037-0006-98systemd-fixup-rootfs-generator-insta.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 37e2811681ed6772c90f8f89432ac1629894a314 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke <hare@suse.de> -Date: Tue, 20 May 2014 11:20:10 +0200 -Subject: [PATCH 6/6] 98systemd: fixup rootfs-generator installation path - -The rootfs-generator was installed in the wrong path -in the initrd, cause it never to be run. - -References: bnc#878714 - -Signed-off-by: Hannes Reinecke <hare@suse.de> ---- - modules.d/98systemd/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh -index c72aad4..25ca605 100755 ---- a/modules.d/98systemd/module-setup.sh -+++ b/modules.d/98systemd/module-setup.sh -@@ -191,7 +191,7 @@ install() { - inst_script "$moddir/dracut-mount.sh" /bin/dracut-mount - inst_script "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot - -- inst_script "$moddir/rootfs-generator.sh" /lib/systemd/system-generators/dracut-rootfs-generator -+ inst_script "$moddir/rootfs-generator.sh" $systemdutildir/system-generators/dracut-rootfs-generator - - inst_binary true - ln_r $(type -P true) "/usr/bin/loginctl" --- -1.9.3 - diff --git a/sys-kernel/dracut/files/037-0007-udev-rules-add-uaccess-rules.patch b/sys-kernel/dracut/files/037-0007-udev-rules-add-uaccess-rules.patch deleted file mode 100644 index 725255a4aa5b..000000000000 --- a/sys-kernel/dracut/files/037-0007-udev-rules-add-uaccess-rules.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ad526fcec919146653b57889d60e0eec83ad7a0a Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Thu, 5 Jun 2014 12:30:22 +0200 -Subject: [PATCH 7/7] udev-rules: add uaccess rules - -plymouth needs the seat rules, also without systemd - -Conflicts: - modules.d/95udev-rules/module-setup.sh ---- - modules.d/95udev-rules/module-setup.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh -index 2d36712..4e75c0b 100755 ---- a/modules.d/95udev-rules/module-setup.sh -+++ b/modules.d/95udev-rules/module-setup.sh -@@ -32,6 +32,8 @@ install() { - 60-pcmcia.rules \ - 50-udev.rules 95-late.rules \ - 50-firmware.rules \ -+ 59-scsi-sg3_utils.rules \ -+ 70-uaccess.rules 71-seat.rules 73-seat-late.rules \ - 75-net-description.rules \ - 80-net-name-slot.rules 80-net-setup-link.rules \ - "$moddir/59-persistent-storage.rules" \ --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch deleted file mode 100644 index 04ba6dcee10a..000000000000 --- a/sys-kernel/dracut/files/038-0001-dracut-functions.sh-support-for-altern.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5ade0eafee011a55c408ab315c33e7fb76220ce7 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/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 <alexander@tsoy.me>. - -Conflicts: - dracut-functions.sh ---- - dracut-functions.sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index d30e835..70444b8 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -928,6 +928,16 @@ inst_rules() { - inst_dir "$_target" - for _rule in "$@"; do - if [ "${_rule#/}" = "$_rule" ]; then -+ for r in ${udevaltdirs}; do -+ [[ "$r" = "${udevdir}" ]] && continue -+ if [[ -e $r/rules.d/$_rule ]]; then -+ _found="$r/rules.d/$_rule" -+ inst_rule_programs "$_found" -+ inst_rule_group_owner "$_found" -+ inst_rule_initqueue "$_found" -+ inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}" -+ fi -+ done - for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do - if [[ -e $r/$_rule ]]; then - _found="$r/$_rule" --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch deleted file mode 100644 index 5b5e7a8720a9..000000000000 --- a/sys-kernel/dracut/files/038-0002-gentoo.conf-let-udevdir-be-handled-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0c135381d80a391bc57e07b60204ef4699287891 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/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 26e7314..f9617f0 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 - - # --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch deleted file mode 100644 index 9ea5d414b6d2..000000000000 --- a/sys-kernel/dracut/files/038-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5825d40138f3738a8b70559af6f6f16927068959 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:37:09 +0200 -Subject: [PATCH 3/5] Use the same paths in dracut.sh as those set with - configure script - -Makefile alters destination main dracut script and sets dracutbasedir to -the value of pkglibdir set in configure. ---- - Makefile | 3 +++ - dracut.sh | 9 ++++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 7383309..842f6b1 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,6 +103,9 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(pkglibdir)/modules.d - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut -+ sed -r \ -+ -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ -+ -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages - install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd - install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd -diff --git a/dracut.sh b/dracut.sh -index c6da411..3764d3d 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -26,10 +26,13 @@ - # store for logging - dracut_args=( "$@" ) - -+# base dirs -+pkglibdir=/usr/lib/dracut -+dracutbasedir="$pkglibdir" -+ - set -o pipefail - - usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -54,7 +57,6 @@ EOF - } - - long_usage() { -- [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - if [[ -f $dracutbasedir/dracut-version.sh ]]; then - . $dracutbasedir/dracut-version.sh - fi -@@ -652,8 +654,6 @@ export DRACUT_LOG_LEVEL=warning - debug=yes - } - --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut -- - # if we were not passed a config file, try the default one - if [[ ! -f $conffile ]]; then - if [[ $allowlocal ]]; then -@@ -774,7 +774,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) - [[ $use_fstab_l ]] && use_fstab=$use_fstab_l - [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l - [[ $lvmconf_l ]] && lvmconf=$lvmconf_l --[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut - [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware" - [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" - [[ $tmpdir ]] || tmpdir=/var/tmp --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch deleted file mode 100644 index 64f730fb6fea..000000000000 --- a/sys-kernel/dracut/files/038-0004-Install-dracut-install-into-libexec-di.patch +++ /dev/null @@ -1,81 +0,0 @@ -From bd2d9c293c93701944b164da6a616febc35a5db7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Wed, 2 Oct 2013 22:40:43 +0200 -Subject: [PATCH 4/5] Install dracut-install into libexec dir instead of lib - dir - -dracut-install script is the only thing ABI specific atm. - -See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the -problem. ---- - Makefile | 4 +++- - configure | 1 + - dracut-functions.sh | 4 ++++ - dracut.sh | 1 + - 4 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 842f6b1..1872896 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,6 +104,7 @@ install: dracut-version.sh - mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8 - install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut - sed -r \ -+ -e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \ - -e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \ - -i $(DESTDIR)$(bindir)/dracut - install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages -@@ -147,7 +148,8 @@ endif - done \ - fi - if [ -f install/dracut-install ]; then \ -- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \ -+ mkdir -p $(DESTDIR)$(libexecdir); \ -+ install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \ - fi - if [ -f skipcpio/skipcpio ]; then \ - install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \ -diff --git a/configure b/configure -index 19b5e1f..d2ffc2c 100755 ---- a/configure -+++ b/configure -@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin} - mandir ?= ${mandir:-${prefix}/share/man} - enable_documentation ?= ${enable_documentation:-yes} - bindir ?= ${bindir:-${prefix}/bin} -+libexecdir ?= ${libexecdir:-${prefix}/libexec} - EOF - - { -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 70444b8..aa0949d 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -744,6 +744,10 @@ if ! [[ $DRACUT_INSTALL ]]; then - DRACUT_INSTALL=$(find_binary dracut-install) - fi - -+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then -+ DRACUT_INSTALL=$libexecdir/dracut-install -+fi -+ - if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then - DRACUT_INSTALL=$dracutbasedir/dracut-install - fi -diff --git a/dracut.sh b/dracut.sh -index 3764d3d..cfb2c33 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -27,6 +27,7 @@ - dracut_args=( "$@" ) - - # base dirs -+libexecdir=/usr/libexec - pkglibdir=/usr/lib/dracut - dracutbasedir="$pkglibdir" - --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch b/sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch deleted file mode 100644 index b5e1a49a3e26..000000000000 --- a/sys-kernel/dracut/files/038-0005-modsign-do-not-hardcode-path-to-keyctl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 461a523086f2077908bebda6467e6b6d20caba78 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy <alexander@tsoy.me> -Date: Mon, 31 Mar 2014 17:56:13 +0400 -Subject: [PATCH 5/5] modsign: do not hardcode path to keyctl - -https://bugs.gentoo.org/show_bug.cgi?id=506094 ---- - modules.d/03modsign/module-setup.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh -index 09285d3..cc0e241 100755 ---- a/modules.d/03modsign/module-setup.sh -+++ b/modules.d/03modsign/module-setup.sh -@@ -29,7 +29,7 @@ depends() { - # called by dracut - install() { - inst_dir /lib/modules/keys -- inst_binary /usr/bin/keyctl -+ inst_binary keyctl - - inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh" - --- -2.0.0 - diff --git a/sys-kernel/dracut/files/038-0008-dracut-functions.sh-fix-inst-functions.patch b/sys-kernel/dracut/files/038-0008-dracut-functions.sh-fix-inst-functions.patch deleted file mode 100644 index 7e0665d54fe2..000000000000 --- a/sys-kernel/dracut/files/038-0008-dracut-functions.sh-fix-inst-functions.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0791f69f870f66dcbec30d64bca4c0cd9c70e7a8 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 21 Jul 2014 16:58:15 +0200 -Subject: [PATCH 8/8] dracut-functions.sh: fix inst*() functions for "-H" - handling - -because some inst*() functions check the existance of the source files -and do not know about the "-H" option, some failed to install the -hostonly files. ---- - dracut-functions.sh | 46 ++++++++++++++++++++++++++++++++-------------- - 1 file changed, 32 insertions(+), 14 deletions(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index aa0949d..f241016 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -765,33 +765,46 @@ inst_dir() { - } - - inst() { -+ local _hostonly_install -+ if [[ "$1" == "-H" ]]; then -+ _hostonly_install="-H" -+ shift -+ fi - [[ -e ${initdir}/"${2:-$1}" ]] && return 0 # already there -- #dinfo "$DRACUT_INSTALL -l $@" -- $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" -- (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" || : -+ $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" -+ (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" || : - } - - inst_simple() { -+ local _hostonly_install -+ if [[ "$1" == "-H" ]]; then -+ _hostonly_install="-H" -+ shift -+ fi - [[ -e ${initdir}/"${2:-$1}" ]] && return 0 # already there - [[ -e $1 ]] || return 1 # no source -- $DRACUT_INSTALL ${initdir:+-D "$initdir"} "$@" -- (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} "$@" || : -+ $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${_hostonly_install:+-H} "$@" -+ (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${_hostonly_install:+-H} "$@" || : - } - - inst_symlink() { -+ local _hostonly_install -+ if [[ "$1" == "-H" ]]; then -+ _hostonly_install="-H" -+ shift -+ fi - [[ -e ${initdir}/"${2:-$1}" ]] && return 0 # already there - [[ -L $1 ]] || return 1 -- $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" -- (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" || : -+ $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" -+ (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" || : - } - - inst_multiple() { -- local ret -- #dinfo "initdir=$initdir $DRACUT_INSTALL -l $@" -+ local _ret - $DRACUT_INSTALL ${initdir:+-D "$initdir"} -a ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" -- ret=$? -- (($ret != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} -a ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" || : -- return $ret -+ _ret=$? -+ (($_ret != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} -a ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" || : -+ return $_ret - } - - dracut_install() { -@@ -799,10 +812,15 @@ dracut_install() { - } - - inst_library() { -+ local _hostonly_install -+ if [[ "$1" == "-H" ]]; then -+ _hostonly_install="-H" -+ shift -+ fi - [[ -e ${initdir}/"${2:-$1}" ]] && return 0 # already there - [[ -e $1 ]] || return 1 # no source -- $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" -- (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} "$@" || : -+ $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" -+ (($? != 0)) && derror $DRACUT_INSTALL ${initdir:+-D "$initdir"} ${DRACUT_RESOLVE_DEPS:+-l} ${DRACUT_FIPS_MODE:+-f} ${_hostonly_install:+-H} "$@" || : - } - - inst_binary() { --- -2.0.2 - |