From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- sys-kernel/dracut/Manifest | 31 +--- sys-kernel/dracut/dracut-048-r1.ebuild | 152 ------------------ sys-kernel/dracut/dracut-049-r3.ebuild | 176 --------------------- sys-kernel/dracut/dracut-050-r1.ebuild | 166 ------------------- sys-kernel/dracut/dracut-050-r2.ebuild | 2 +- sys-kernel/dracut/dracut-050.ebuild | 165 ------------------- sys-kernel/dracut/dracut-051.ebuild | 162 +++++++++++++++++++ sys-kernel/dracut/dracut-9999.ebuild | 2 +- ...dracut-install-simplify-ldd-parsing-logic.patch | 41 ----- ...etwork-Don-t-include-40network-by-default.patch | 34 ---- ...gure-find-cflags-and-libs-for-fts-on-musl.patch | 97 ------------ ...t-create-locking-directory-run-cryptsetup.patch | 32 ---- ...all-Support-the-compressed-firmware-files.patch | 63 -------- .../049-dracut.sh-Fix-udevdir-detection.patch | 38 ----- .../dracut/files/049-fs-lib-drop-a-bashism.patch | 99 ------------ ...cut-install.c-install-module-dependencies.patch | 79 --------- ...ing_hash_func-should-not-be-fed-with-NULL.patch | 38 ----- ...g-the-systemdutildir-variable-before-it-s.patch | 55 ------- ...ager-call-the-online-hook-for-connected-d.patch | 32 ---- ...ager-fix-getting-of-ifname-from-the-sysfs.patch | 37 ----- ...rk-manager-remove-useless-use-of-basename.patch | 26 --- ...49-remove-bashism-in-various-boot-scripts.patch | 89 ----------- ...dule-running-early-during-boot-to-help-ge.patch | 88 ----------- .../dracut/files/050-gentoo-ldconfig-paths.patch | 39 ----- .../dracut/files/gentoo-ldconfig-paths.patch | 39 +++++ sys-kernel/dracut/metadata.xml | 4 - 26 files changed, 209 insertions(+), 1577 deletions(-) delete mode 100644 sys-kernel/dracut/dracut-048-r1.ebuild delete mode 100644 sys-kernel/dracut/dracut-049-r3.ebuild delete mode 100644 sys-kernel/dracut/dracut-050-r1.ebuild delete mode 100644 sys-kernel/dracut/dracut-050.ebuild create mode 100644 sys-kernel/dracut/dracut-051.ebuild delete mode 100644 sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch delete mode 100644 sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch delete mode 100644 sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch delete mode 100644 sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch delete mode 100644 sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch delete mode 100644 sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch delete mode 100644 sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch delete mode 100644 sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch delete mode 100644 sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch delete mode 100644 sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch delete mode 100644 sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch delete mode 100644 sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch delete mode 100644 sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch delete mode 100644 sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch delete mode 100644 sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch delete mode 100644 sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch create mode 100644 sys-kernel/dracut/files/gentoo-ldconfig-paths.patch (limited to 'sys-kernel/dracut') diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 51e474bdbab1..d02f15d3c717 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,35 +1,16 @@ -AUX 048-dracut-install-simplify-ldd-parsing-logic.patch 1488 BLAKE2B 3a76ff666482b17adb49e3e9fb6483f7545136df33624d5bd76d472328c7a68532fbb1bace2988b62f279b0dba7d3c53e023146711474ef8497502aee8042a41 SHA512 09992afca26026b8f77de371486c655feabb1626120a571cbf24e1a230725c7debe56c9e47eb365aa200cf7aab15798ecc57e9d764887e42cee8d3c59fb341c9 -AUX 049-40network-Don-t-include-40network-by-default.patch 967 BLAKE2B 43c3942ae5199457f0cc394cb81bef58852a42ca7a25fb198001882f52089132780bbd0d8782d8ca383e1d19be210bd5fc14730b1f56b8053c52a832f2c3fd93 SHA512 a18c5b3b28915deff97cbfa151e67c58942f3cc407b101ca3ae16e51114279c1a05475461c9748b3debd4e05b609e02f431d2dcf4ca4fcb18d4f806d42cdaade -AUX 049-configure-find-cflags-and-libs-for-fts-on-musl.patch 2432 BLAKE2B 8ee880257e72b8e6f269adc6e72cab1a8f0a4095ac4ffc48114f27cda20b0cd49584f82e64ce01a13e1d3c5bc722c978f334d1f4459c8fad8014f4fa8228d6ca SHA512 847e912965b510321340273b1d7f9a7f5cbe4c49d1e661e542fa741873643861e4fb436a83f60fafcc07ddb859121971c1c3151350d567eed89756019904671a -AUX 049-crypt-create-locking-directory-run-cryptsetup.patch 1065 BLAKE2B 928b9da93e0fa34dcf6218f5049074789ca79ebf949b28dc8fb4702ea3a1c539302258cb7e0cbdd9d814e8c6df98cc8b6486dde86376fa9d5320e3bf843badac SHA512 e98d268f533157a33528b6f075aed97b67c7e137ff1ea027414892986fc48ec0a1a691e105ca834e96ae3fdf0efe2dbfac8c977befc58645eb186e068b6408f0 -AUX 049-dracut-install-Support-the-compressed-firmware-files.patch 2706 BLAKE2B b1059e28ed7bac29570ebf4fdd6f4cd2ca09e612e7570dbd630cf00c53d6b2a3b8e9127c17ac178eec5f809d6c80635343813c7e982d500955bc72a7a6632c54 SHA512 7e5e0504a6308f98af28a9126667180fa1a9b98788b47b215edfa728d149e8653db493534ea5eed38d08a7e4fdee9a23b083895c1dfacfada8df6b6969f48389 -AUX 049-dracut.sh-Fix-udevdir-detection.patch 1209 BLAKE2B 063b6cc8e7961ffaf36bd4079bcdbdc7f33df329efcd8d2b33238d71d032cfa29c19cceacf5021b336b2cfc919e1bcf5ffe82ec67ae5667691393b23c1ec6f5a SHA512 2b399494de0c183325ab1d7ef4d29f231ac4cf1570ad7611c54097424cecb41a1684a99b3e83cdd7b1946534cb4767b5cd7d08773670bce97a33c7a95ae9dfec -AUX 049-fs-lib-drop-a-bashism.patch 2862 BLAKE2B 3dfc19f3c5cff949dad9fcd1fcdbfc3c0804f10051914977a81d9d2747c25880a664863393d029193510e3162058ce8d832011ef4323406a91e96a44d51eb3c3 SHA512 b1125bc6c5098ae5a85019ca2b6d7153b95b177312f79b711ff466093040eb0cab54a91025b4434375b3420ac8c92ab30352415ebf8d34a784eb6f76ea0d91be -AUX 049-install-dracut-install.c-install-module-dependencies.patch 2849 BLAKE2B 201367835c37b1e00c2828f0fff0fa44809b66c0fbdf4d9c1a51945cf2d44371cfa5e1f7e0b6d9b3c163484b4c294c6f93417b71f669867da2f3f1ad62fa4f48 SHA512 08332ed064e57579f121fc5dcdff15cd2eac7e0a16a4c92e97f1d2d3a3e87e8f5a0daad6401457b1877e04ffa5fba5eb5ec8ea7aecbd3e64368b3607ca1c89fa -AUX 049-install-string_hash_func-should-not-be-fed-with-NULL.patch 1368 BLAKE2B 78477ee6fab5832f2d99ff5f2cfaebd48e4adcf682f6fee7685752d33bac5335ee9f5ed78a4825c6db71084c5a7fc17f1e5b537fbab01a150d1527b2ecd5f38b SHA512 7da53e81742fd804c3fb4e5cbf71fecc08d38988153b8bba710cefcb8b8395daba3f0a7170fc79e461863756c080ba1e965b3b1a5bcd8fd3f0a666b767eedf1e -AUX 049-move-setting-the-systemdutildir-variable-before-it-s.patch 1872 BLAKE2B fe882f7a71fb7b5dd8f8de35fbc0ad37f3a028a9264533e003d16767397d3c27d2bfa1f40fbf9618e02de2ff0eab0bc1e8352785afec0c1f5d5702de6e527454 SHA512 f00c6eec2fb6a0baeb1869507507350216963a0589535ae87e8fefd890fccf81fb88dde8bd77108ddeb58d1be2189060cf3aeb89f6968f1f7c4aa4c824f06c13 -AUX 049-network-manager-call-the-online-hook-for-connected-d.patch 1211 BLAKE2B b9171820cb3f276850b13d66e546da3a95c04c233bc07c7b973bc7bd705b9082e00bed4d1b2a78e241de9b16ac2a485df7fe227edd2b55ba45b6a751c71a5a78 SHA512 05277630cdd25a7b3e13cb5818f48708ce6521f6b59f6f9d1fa8c2e3be0ec6d6bb72854e1ad4164edc3a711f309068903bce8a22a35a06fec0750b6e78d72626 -AUX 049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch 1370 BLAKE2B 8649c9a4e39136caf7bef64834836f931ce58ef5bdf37f7333b079963c2d0cd9f1b0bf900bf0bdb54cbeafb6acb5625b3b887dfb21feb69910e08143b931decf SHA512 1cf15225ac3ef7bec54ac1859a8958666e8b57e66971832478a1f66c8930d28729caf6c7188edf00a95cacd599129912058ea0f34eeb0b69e1f397a8a45340af -AUX 049-network-manager-remove-useless-use-of-basename.patch 936 BLAKE2B ef9a08db966f55fe8d39802445cbdf8df3a402cf4cdcdeaf86312ce16ee90d6937c8235b555407d05913b28fc1bcd62f9ed417491bdd4f929cc4dda62edec41b SHA512 61650c162e1b40270ba2bd0d6d9117b4e52961728e8038ba4095cd3767d869904196ac843822dbbc14c2281e63b4cee5eea81b58730898dfb7d80cbf63fd6dfe -AUX 049-remove-bashism-in-various-boot-scripts.patch 3423 BLAKE2B a2a5946b53eee63492f5e407fc18541e8ccd341c4ce607daf2bde81bf061328c7cfbdf5f9a2c9b09f3e19c23e6e746d8383a7c78dcfa1aaed78ff252fcaef520 SHA512 a381394c9aed25abe73adb58d07fd26ab19a99338fa9d60a5a4642b8f13a88d1b209ae9deffdc527beccd1bdbd93754c3e5f2687c9f9a6b6430481f08fae201f -AUX 049-rngd-new-module-running-early-during-boot-to-help-ge.patch 3009 BLAKE2B 4a259a7f742574e02322bbd78337657daea8fe5c19e63331867c1e4b48bf68890860c1b91e420fa3b13412cad7eee64dcc69cb52ad93d28320cbf988726f22ed SHA512 8652310eaa1294f819e3d1c6dc9b2ae332652586462b044088167eb3a7af9d1303c2a667b75045d9b04deb4a9e1cdfd55aec85cf5f66b36412bfbe3b67bbaae5 AUX 050-Makefile-fix-VERSION-again.patch 1057 BLAKE2B 8373a43030c02bc0273aacb3f0f286d4f98812039c459ec16607e3e5b9bd83c367420c6b67d7cc8d2f6d9469bca2e5e5770f20390348e50abdbec7f12c4f36a3 SHA512 89e5ae4cf88d65ec5f31384c334b46f8e6e74a31e0225a62523524f87f35ead8cae221d3a0f8e5f837a1e22b51833db75b2d3f3b07fa3ac4ded5dac9012a8027 AUX 050-Makefile-merge-main-version-and-git-version-earlier.patch 3071 BLAKE2B 0d20b6ca7bb92aca21b3afaaee6fffb94c23de806ebe46383074979e0afedc893aec478122391d7c6015882b7882dd3f6e4124fa1f6fa1dc0bb48beae50d4d9d SHA512 ad9219c66b0a921b2fcb9dc325d1afd4c17d447228ee3b95b7a7e799acdc9d48d1d963842643d6ee6e90f8891d5c924c707331041cde53701261cb670adbcd33 AUX 050-btrfs-force-preload-btrfs-module.patch 960 BLAKE2B 9837361b8f3559d87dc39374ca9cd8e2717f257dbb428d542e356672623c6b02d2a8aea5c0cbd2c64b01564a1ec08fc7288b993f46c7043327300ca684469168 SHA512 8fcd5579486ce2afc3164970bcd2eb23306d00bef3ce1458fd6f41664299a16c5772ed3f0d823861b698b01cf7a495412afb7f3a200e4c07e96ca3b617d8d6bf AUX 050-busybox-module-fix.patch 3468 BLAKE2B a5292669c358f46ededf184e654213298e1e2a193e27b90cdb3913149cae40c2bfb70a8a211515ea7d3109fe87676ad71f93166dce793b7033ecfc05691e822c SHA512 a85d8f157d466e642c53436276777e6caf42aa3280cfa2d635c1541919484c50cccc232802131ce6776b1059151bdcfabdd3e4f69d697012d2e4d24a4793794b AUX 050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch 3655 BLAKE2B dc48d86fa1d78622bf0a7e5714de23d046515d3ad866f321769b0c56c243bdc6d6b45c69eb09e02477a79d90a546bdfcd767551b838f647f07179c9174ff46f7 SHA512 774602605b552343b0f26bcc7311c118bbb816bae9a1d798e650b72105c7a44ada8bfe238a66619ef6ee345534ef6a6d3c6449eaad51ba0ecf483fcc4aac1fb8 AUX 050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch 2779 BLAKE2B edb10ef79fd22863aef5184ca0d7abc88602cf3e8a3cfd198047e0970d10e9aa56e1222dc44a089afb3a0f15caa87e4e3233b32980b5fd56e9975196350000f4 SHA512 a31cfceb9ab53e53ce3f69ed6388bf7cfcf40ad7b036197194f34cd973a74e28ac8bfb7bf7d79068b48fc8c5feaf26540948b8008c1fdab997587bf4b31f8b71 -AUX 050-gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a AUX 050-lvm-fix-removal-of-pvscan-from-udev-rules.patch 1270 BLAKE2B ac4b93d0ed469ca9d2ba2ad9ca83b1f0efce590758bdd824278e9409fd4706e975d3fa9a10733775cc5b0a3a4665260d8869291de5a1f89c810c01a7cf0889e4 SHA512 7466c66f570c9a097b701a91d2735469187e879d2dec2ff2d10322ad39c86f3a5c70fc778d13b42014ba9754a6d1bea6d37f3ee456cbe4ec075dd676cf09093d AUX 050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch 1627 BLAKE2B c45b8efef1612ede5021be1bfe2135586286b4ac8d501ce6cde518eefb699c143fec1ec858e4320ba473feb06e88896ab0f4b2f738c6a5a98c20a161d11f508a SHA512 e070f24f0d0e95a14ee503e0cbc62d87b32ad678c12a8054c1a0c505d9ae833cd37052d51fe8d1a2a608fd06a8894d06ea4da626aadf5e9e4dd39b2ea883aaae AUX 050-systemd-remove-obsolete-syslog-parameter.patch 8176 BLAKE2B abf1619f4010cd38d98814f8827d592394a7ed7acc4c19392751adea4a98ce4acfce12bae1c2d264c392c73081ae04a205cfccd3591de651b87301352bbbe68c SHA512 3609ea93b85f79d3451fc810164c1be61def3f8e016a1fc0963088f2a690c56680d0c49bad5f8398af80150bd07bf953de50fe8832a5b88da5c01eead5fdbe7f -DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0 -DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7 +AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850 -EBUILD dracut-048-r1.ebuild 4558 BLAKE2B 7b3803b80f7feecd61327484c46a83570150997a7cb9e6d123a03d10f09294772ae8bc30869171d785e21502c282b7a9fd4f4ad84862c8731020b7ed765e7c73 SHA512 dd3e819db605a042d721bc3bec5f1e5f45d993199994d311c15425d4d91f7bb54e63f13297c4fdb33ecc20a98ccc720fe5ca64aa2b222eb72d14a5f47c4ab66b -EBUILD dracut-049-r3.ebuild 5706 BLAKE2B 4889c5b80cc1e2b72ccf22a7ac80e685a7d39d73d3d3b0fbfef9a02e13b45cf36eaeb4c75b5daf8c093c83c45529fd8863ac9c66731b1a9a60880a798002e4af SHA512 bec9e611e86a08f2b3a8248745a46fba14fe6d31dc80dcd36c817a60fdbc4c97a760543da87728e58a14a026d6b4531babca782fabdb71ce56ce20cf78732027 -EBUILD dracut-050-r1.ebuild 4965 BLAKE2B f18e3c65ff4f19a9fd9c2ff5d29c731f74c4ee0a3bb535b8bc35e6a548b75d2a189ae55f57fb29a657c6b3f24df1068a053954a529d3c91c524adbab88e85d49 SHA512 27cb0d50ef3b500f45e8f1fdd41dae3dd3f0bc79f429883c1911be8bd16b1e1ffadb382652d4cbad1e0404177c40f2dfd82066f8ec68202128b2358e3eb0454f -EBUILD dracut-050-r2.ebuild 5305 BLAKE2B 9b624aeb49791142db8a262853d50fa6db9b4dee23f2f9c5012a61f8d1fd7c7bbdd284fc6ad65d3e54e2dc4bd84647c2b8f6b5515344dfb98cff995c3c0d3f28 SHA512 295755b4b000555ba9f4f56659acdedda73b6270ea9dadee97492a90e23b0a090c501f7e863bd1ff55a8878062961043d1ca7b3f5a34d94c085217ce1fa9bddf -EBUILD dracut-050.ebuild 4921 BLAKE2B 08c75e7037cab2e61f7b6ff382aa79c5946d10eec95d11f41eaa05b45fe4d81875252e116ceb018585bdb03cf4e4bc145a3f7378e053fc5ecce07c9d032b2f2a SHA512 e215accee829b1da127a8663857f3cab4f49dfddba624bff2f1ea15d5201394cab2990b67dd088980071b0de2da95c7435615c4b1d702d06250ec25181d32b00 -EBUILD dracut-9999.ebuild 4714 BLAKE2B 5f083768d4c4a67c7e45214ad178081fc20393e936009159a6967847a004bda42eb76d0126aad375c868729c3f492a6625c4e4a4a96e45138d8bedd852b34c53 SHA512 6af33208562023495ae279c77e08b450190abde92b8e57ece7f22bb4116adee7bde95649a5b7d509152092fd46485d948206135b5d991c1484ca9806a7f23a62 -MISC metadata.xml 584 BLAKE2B 72babd073fb003a06e5e60e8b413268fb37433a661de9dd6b0ac58e848d32d0e4f3e72b72874d78c647896859e791bea387d8c253c61d03ef49e926a2574ff12 SHA512 851bd1b589cc2038ea6bee02c452bfa3b6d14ded8532cec6b7b238146dae92e74259e917270bf3bba3d2e0d16a0ede42134cabd6588ae1f94ecf336ee644484d +DIST dracut-051.tar.xz 346500 BLAKE2B 38129b6b713b3338bbb2554fffd611f80216969eebac9fca7fb72df2db2036d4fbe66ebd54e646e562e24801e61064e54b62f066bab9e77ca88814100ebdd8ff SHA512 f3533430e479bc91c538e0a198ca97450ec449a7d661d876ecd0ad3e417e22f7e4abf0a384fc676a63a4d3479f25d717c8acdcd1bdec7d0a5714298c5c4ea6b8 +EBUILD dracut-050-r2.ebuild 5301 BLAKE2B a8a38a589a56786b5349d84157e21f1c3ad44f64554f1400362bbe15fa3ef1142c78a5ed9b8b821f3f20ff673d23005eec0d0e0489e81c8fed63d3904ff11d29 SHA512 f0c54b10b514645ad8448c220d64fac2fe2048058c3cdd04e5052ea8f9aa6992e2fa644083c1fdfd80b71167ea572fbc66cb53101b6a875a773be7c88b82b8a6 +EBUILD dracut-051.ebuild 4710 BLAKE2B 7ff2a46054af9dbd440c74b91579fe6839f18791d3d40703e441f6f12af0beac89be4bd71682ebbfff80a6722010ba89f4676b1bf317963a037d73fb58e3d375 SHA512 0643638dc799298fbfb295bcc60a48e67853bc3a192e37055654136632b47b873ef8b0559cd9d0246150ebf350d55c3c867012644aaa8267235b981562169a5d +EBUILD dracut-9999.ebuild 4710 BLAKE2B 7ff2a46054af9dbd440c74b91579fe6839f18791d3d40703e441f6f12af0beac89be4bd71682ebbfff80a6722010ba89f4676b1bf317963a037d73fb58e3d375 SHA512 0643638dc799298fbfb295bcc60a48e67853bc3a192e37055654136632b47b873ef8b0559cd9d0246150ebf350d55c3c867012644aaa8267235b981562169a5d +MISC metadata.xml 464 BLAKE2B 4d72b4c7b89341be061e590d7e5814268d9dc864e025c50d683d23c5e08e5281726e62a268271dfa67f9fb28d6f7fbd108dfcccebbb82da3c142b62fac2042b6 SHA512 7f1778968983e231b4fb6a9bbafacf19f9ae66b98c44a4df2d032978ad9e630108868fd270659f9770d0bcc1c285da83f6d2e865ac4e3e354881f1763fdfcdaf diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild deleted file mode 100644 index 937662bdf286..000000000000 --- a/sys-kernel/dracut/dracut-048-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" -SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86" -IUSE="debug selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/kmod-23[tools] - virtual/pkgconfig - virtual/udev - " -RDEPEND="${COMMON_DEPEND} - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - - debug? ( dev-util/strace ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) - " -DEPEND="${COMMON_DEPEND} - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - " - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die -} - -src_install() { - default - - local libdirs=( /$(get_libdir) /usr/$(get_libdir) ) - if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then - # Preserve lib -> lib64 symlinks in initramfs - libdirs+=( /lib /usr/lib ) - fi - - einfo "Setting libdirs to \"${libdirs[*]}\" ..." - echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die - insinto "/usr/lib/dracut/dracut.conf.d" - doins "${T}/gentoo.conf" - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_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 ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if 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 "net-misc/iputils[arping]" - 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[-static-libs]" - 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 "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-049-r3.ebuild b/sys-kernel/dracut/dracut-049-r3.ebuild deleted file mode 100644 index 97d2e729b353..000000000000 --- a/sys-kernel/dracut/dracut-049-r3.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -RDEPEND=" - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - >=sys-apps/kmod-23[tools] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/openrc[sysv-utils,selinux?] - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - virtual/pkgconfig - virtual/udev - - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) -" -DEPEND=" - >=sys-apps/kmod-23 - elibc_musl? ( sys-libs/fts-standalone ) -" - -BDEPEND=" - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - virtual/pkgconfig -" - -DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch - "${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch - "${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch - "${FILESDIR}"/049-network-manager-call-the-online-hook-for-connected-d.patch - "${FILESDIR}"/049-install-dracut-install.c-install-module-dependencies.patch - "${FILESDIR}"/049-install-string_hash_func-should-not-be-fed-with-NULL.patch - "${FILESDIR}"/049-dracut.sh-Fix-udevdir-detection.patch - "${FILESDIR}"/049-rngd-new-module-running-early-during-boot-to-help-ge.patch - "${FILESDIR}"/049-fs-lib-drop-a-bashism.patch - "${FILESDIR}"/049-network-manager-remove-useless-use-of-basename.patch - "${FILESDIR}"/049-move-setting-the-systemdutildir-variable-before-it-s.patch - "${FILESDIR}"/049-dracut-install-Support-the-compressed-firmware-files.patch - "${FILESDIR}"/049-crypt-create-locking-directory-run-cryptsetup.patch - "${FILESDIR}"/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch - "${FILESDIR}"/049-configure-find-cflags-and-libs-for-fts-on-musl.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die - - if [[ ${PV} != 9999 ]] ; then - # Source tarball from github doesn't include this file - echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die - fi -} - -src_install() { - default - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_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 ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if 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/networkmanager - optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - 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[-static-libs]" - 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 "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 rsyslog" app-admin/rsyslog - optfeature \ - "Enable rngd service to help generating entropy early during boot" \ - sys-apps/rng-tools -} diff --git a/sys-kernel/dracut/dracut-050-r1.ebuild b/sys-kernel/dracut/dracut-050-r1.ebuild deleted file mode 100644 index 50c43bc6a865..000000000000 --- a/sys-kernel/dracut/dracut-050-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" -fi - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -RDEPEND=" - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - >=sys-apps/kmod-23[tools] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/openrc[sysv-utils(-),selinux?] - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - virtual/pkgconfig - virtual/udev - - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) -" -DEPEND=" - >=sys-apps/kmod-23 - elibc_musl? ( sys-libs/fts-standalone ) -" - -BDEPEND=" - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - virtual/pkgconfig -" - -DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch - "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch - "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch - "${FILESDIR}"/050-busybox-module-fix.patch - "${FILESDIR}"/050-gentoo-ldconfig-paths.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die - - if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then - # Source tarball from github doesn't include this file - echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die - fi -} - -src_install() { - default - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_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 ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if 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/networkmanager - optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - 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[-static-libs]" - 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 "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 rsyslog" app-admin/rsyslog - optfeature \ - "Enable rngd service to help generating entropy early during boot" \ - sys-apps/rng-tools -} diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild index c5676baf3093..7f2011e1f242 100644 --- a/sys-kernel/dracut/dracut-050-r2.ebuild +++ b/sys-kernel/dracut/dracut-050-r2.ebuild @@ -73,7 +73,7 @@ PATCHES=( "${FILESDIR}"/050-busybox-module-fix.patch "${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch "${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch - "${FILESDIR}"/050-gentoo-ldconfig-paths.patch + "${FILESDIR}"/gentoo-ldconfig-paths.patch ) src_configure() { diff --git a/sys-kernel/dracut/dracut-050.ebuild b/sys-kernel/dracut/dracut-050.ebuild deleted file mode 100644 index 4c140a627893..000000000000 --- a/sys-kernel/dracut/dracut-050.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dracutdevs/dracut" -else - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" -fi - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="https://dracut.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="selinux" - -# Tests need root privileges, bug #298014 -RESTRICT="test" - -RDEPEND=" - app-arch/cpio - >=app-shells/bash-4.0:0 - sys-apps/coreutils[xattr(-)] - >=sys-apps/kmod-23[tools] - || ( - >=sys-apps/sysvinit-2.87-r3 - sys-apps/openrc[sysv-utils(-),selinux?] - sys-apps/systemd[sysv-utils] - ) - >=sys-apps/util-linux-2.21 - virtual/pkgconfig - virtual/udev - - elibc_musl? ( sys-libs/fts-standalone ) - selinux? ( - sec-policy/selinux-dracut - sys-libs/libselinux - sys-libs/libsepol - ) -" -DEPEND=" - >=sys-apps/kmod-23 - elibc_musl? ( sys-libs/fts-standalone ) -" - -BDEPEND=" - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - >=app-text/docbook-xsl-stylesheets-1.75.2 - >=dev-libs/libxslt-1.1.26 - virtual/pkgconfig -" - -DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules - README.testsuite TODO ) - -QA_MULTILIB_PATHS="usr/lib/dracut/.*" - -PATCHES=( - "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch - "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch - "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch - "${FILESDIR}"/050-gentoo-ldconfig-paths.patch -) - -src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc" - --bashcompletiondir="$(get_bashcompdir)" - --systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - tc-export CC PKG_CONFIG - - echo ./configure "${myconf[@]}" - ./configure "${myconf[@]}" || die - - if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then - # Source tarball from github doesn't include this file - echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die - fi -} - -src_install() { - default - - insinto /etc/logrotate.d - newins dracut.logrotate dracut - - docinto html - dodoc dracut.html -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_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 ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' - ERROR_DEVTMPFS+='is missing and REQUIRED' - local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' - ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' - - check_extra_config - echo - else - ewarn "" - ewarn "Your kernel configuration couldn't be checked." - ewarn "Please check manually if 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/networkmanager - optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ - sys-apps/iproute2 "net-misc/iputils[arping]" - 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[-static-libs]" - 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 "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 rsyslog" app-admin/rsyslog - optfeature \ - "Enable rngd service to help generating entropy early during boot" \ - sys-apps/rng-tools -} diff --git a/sys-kernel/dracut/dracut-051.ebuild b/sys-kernel/dracut/dracut-051.ebuild new file mode 100644 index 000000000000..69b97ddb7c4d --- /dev/null +++ b/sys-kernel/dracut/dracut-051.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dracutdevs/dracut" +else + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" +fi + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="https://dracut.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux" + +# Tests need root privileges, bug #298014 +RESTRICT="test" + +RDEPEND=" + app-arch/cpio + >=app-shells/bash-4.0:0 + sys-apps/coreutils[xattr(-)] + >=sys-apps/kmod-23[tools] + || ( + >=sys-apps/sysvinit-2.87-r3 + sys-apps/openrc[sysv-utils(-),selinux?] + sys-apps/systemd[sysv-utils] + ) + >=sys-apps/util-linux-2.21 + virtual/pkgconfig + virtual/udev + + elibc_musl? ( sys-libs/fts-standalone ) + selinux? ( + sec-policy/selinux-dracut + sys-libs/libselinux + sys-libs/libsepol + ) +" +DEPEND=" + >=sys-apps/kmod-23 + elibc_musl? ( sys-libs/fts-standalone ) +" + +BDEPEND=" + app-text/asciidoc + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + >=dev-libs/libxslt-1.1.26 + virtual/pkgconfig +" + +DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules + README.testsuite TODO ) + +QA_MULTILIB_PATHS="usr/lib/dracut/.*" + +PATCHES=( + "${FILESDIR}"/gentoo-ldconfig-paths.patch +) + +src_configure() { + local myconf=( + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc" + --bashcompletiondir="$(get_bashcompdir)" + --systemdsystemunitdir="$(systemd_get_systemunitdir)" + ) + + tc-export CC PKG_CONFIG + + echo ./configure "${myconf[@]}" + ./configure "${myconf[@]}" || die + + if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then + # Source tarball from github doesn't include this file + echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die + fi +} + +src_install() { + default + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + docinto html + dodoc dracut.html +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_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 ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' + ERROR_DEVTMPFS+='is missing and REQUIRED' + local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' + ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' + + check_extra_config + echo + else + ewarn "" + ewarn "Your kernel configuration couldn't be checked." + ewarn "Please check manually if 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/networkmanager + optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ + sys-apps/iproute2 "net-misc/iputils[arping]" + 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[-static-libs]" + 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 "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 rsyslog" app-admin/rsyslog + optfeature \ + "Enable rngd service to help generating entropy early during boot" \ + sys-apps/rng-tools +} diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 62193b227a5d..69b97ddb7c4d 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -64,7 +64,7 @@ DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.module QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( - "${FILESDIR}"/050-gentoo-ldconfig-paths.patch + "${FILESDIR}"/gentoo-ldconfig-paths.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch b/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch deleted file mode 100644 index aa9c543fdce3..000000000000 --- a/sys-kernel/dracut/files/048-dracut-install-simplify-ldd-parsing-logic.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6d886bb74d1608e4565d926aa259ea5afc9df7b9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 4 Oct 2018 16:45:47 -0400 -Subject: [PATCH] dracut-install: simplify ldd parsing logic - -The previous logic would not handle absolute paths on the left side of -the "=>" properly. For example, on Gentoo ARM64, ldd outputs this: - - /lib/ld-linux-aarch64.so.1 => /lib64/ld-linux-aarch64.so.1 - -At runtime, the kernel tries to load the file from /lib, and fails if we -only provide it in /lib64. - -Instead of looking for the first slash after the "=>", just look for the -first slash, period. This would fail if we somehow had a relative path -on the left side (foo/libbar.so), but I'm not aware of any binaries that -would contain such an entry in DT_NEEDED. - -Bug: https://bugs.gentoo.org/667752 -Signed-off-by: Mike Gilbert ---- - install/dracut-install.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/install/dracut-install.c b/install/dracut-install.c -index 88bca1d44..5f352b360 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -479,11 +479,7 @@ static int resolve_deps(const char *src) - if (strstr(buf, destrootdir)) - break; - -- p = strstr(buf, "=>"); -- if (!p) -- p = buf; -- -- p = strchr(p, '/'); -+ p = strchr(buf, '/'); - if (p) { - char *q; - diff --git a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch b/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch deleted file mode 100644 index 0d537941f1d8..000000000000 --- a/sys-kernel/dracut/files/049-40network-Don-t-include-40network-by-default.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 83cbc06ab91288e2d931b4f36935bfdb79a99b0e Mon Sep 17 00:00:00 2001 -From: Kairui Song -Date: Fri, 12 Oct 2018 13:07:13 +0800 -Subject: [PATCH] 40network: Don't include 40network by default -To: - -commit 7347391 ('network-legacy: split off from network module') -splitted network function to network-legacy and removed check() function -of 40network. This caused 40network to be included even if network is -not needed. - -Signed-off-by: Kairui Song ---- - modules.d/40network/module-setup.sh | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 57c0a45e..e8541636 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -1,5 +1,10 @@ - #!/bin/bash - -+# called by dracut -+check() { -+ return 255 -+} -+ - # called by dracut - depends() { - echo -n "kernel-network-modules " --- -2.19.2 - diff --git a/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch b/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch deleted file mode 100644 index cd74564adb54..000000000000 --- a/sys-kernel/dracut/files/049-configure-find-cflags-and-libs-for-fts-on-musl.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 62f27ee6f145b5f8ca571887602cd9b0715b9e9d Mon Sep 17 00:00:00 2001 -From: Doan Tran Cong Danh -Date: Wed, 6 Nov 2019 18:35:12 +0700 -Subject: [PATCH] configure: find cflags and libs for fts on musl -To: - -Signed-off-by: Doan Tran Cong Danh ---- - Makefile | 2 +- - configure | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 45 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 31545899..f9b42b96 100644 ---- a/Makefile -+++ b/Makefile -@@ -62,7 +62,7 @@ install/util.o: install/util.c install/util.h install/macro.h install/log.h - install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h - - install/dracut-install: $(DRACUT_INSTALL_OBJECTS) -- $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(KMOD_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS) - - logtee: logtee.c - $(CC) $(LDFLAGS) -o $@ $< -diff --git a/configure b/configure -index b55fb609..3f724ef2 100755 ---- a/configure -+++ b/configure -@@ -7,6 +7,7 @@ prefix=/usr - - enable_documentation=yes - -+CC="${CC:-cc}" - PKG_CONFIG="${PKG_CONFIG:-pkg-config}" - - # Little helper function for reading args from the commandline. -@@ -57,6 +58,48 @@ if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 23 "; then - exit 1 - fi - -+cat <conftest.c -+#include -+int main() { -+ return 0; -+} -+EOF -+ -+${CC} $CFLAGS $LDFLAGS conftest.c >/dev/null 2>&1 -+ret=$? -+rm -f conftest.c a.out -+ -+# musl doesn't have fts.h included -+if test $ret -ne 0; then -+ echo "dracut needs fts development files." >&2 -+ exit 1 -+fi -+ -+cat <conftest.c -+#include -+int main(void) { -+ fts_open(0, 0, 0); -+ return 0; -+} -+EOF -+ -+found=no -+for lib in "-lc" "-lfts"; do -+ ${CC} $CFLAGS -Wl,$lib $LDFLAGS conftest.c >/dev/null 2>&1 -+ ret=$? -+ if test $ret -eq 0; then -+ FTS_LIBS="$lib" -+ found=yes -+ break; -+ fi -+done -+rm -f conftest.c a.out -+ -+if test $found = no; then -+ echo "dracut couldn't find usable fts library" >&2 -+ exit 1 -+fi -+ - cat > Makefile.inc.$$ <= 23 ") - KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 23 ") -+FTS_LIBS ?= ${FTS_LIBS} - EOF - - { --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch b/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch deleted file mode 100644 index be964c03746f..000000000000 --- a/sys-kernel/dracut/files/049-crypt-create-locking-directory-run-cryptsetup.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f39aa529c59c533ce5e75e31be1b0cce4513b3d7 Mon Sep 17 00:00:00 2001 -From: Jonas Witschel -Date: Sat, 31 Aug 2019 17:45:11 +0200 -Subject: [PATCH] crypt: create locking directory /run/cryptsetup -To: - -For LUKS2 partitions cryptsetup needs a locking directory. If it does -not exist, cryptsetup will create it, but produce a warning - -WARNING: Locking directory /run/cryptsetup is missing! - -in the process that we do not want to see in the dracut output. ---- - modules.d/90crypt/cryptroot-ask.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modules.d/90crypt/cryptroot-ask.sh b/modules.d/90crypt/cryptroot-ask.sh -index 33a823c7..e1f17975 100755 ---- a/modules.d/90crypt/cryptroot-ask.sh -+++ b/modules.d/90crypt/cryptroot-ask.sh -@@ -8,6 +8,8 @@ NEWROOT=${NEWROOT:-"/sysroot"} - - . /lib/dracut-lib.sh - -+mkdir -m 0700 /run/cryptsetup -+ - # if device name is /dev/dm-X, convert to /dev/mapper/name - if [ "${1##/dev/dm-}" != "$1" ]; then - device="/dev/mapper/$(dmsetup info -c --noheadings -o name "$1")" --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch b/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch deleted file mode 100644 index 85c0ea099726..000000000000 --- a/sys-kernel/dracut/files/049-dracut-install-Support-the-compressed-firmware-files.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 999cfa84582ab4ce4cc602242cb71d0af0b7d4ac Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Thu, 22 Aug 2019 12:37:56 +0200 -Subject: [PATCH] dracut-install: Support the compressed firmware files - correctly -To: - -The compressed firmware support was supposed to be already -implemented, but it didn't work as expected in the end, because dracut -moved to use dracut-install binary. This patch adds the support of -XZ-compressed firmware installation to dracut-install for fixing the -missing piece. - -At best the firmware files should be uncompressed in initrd, but this -patch simply copies the compressed file as-is, as a quick workaround. - -BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1146769 -Signed-off-by: Takashi Iwai ---- - install/dracut-install.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/install/dracut-install.c b/install/dracut-install.c -index 9e415b5e..7cda499d 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -1151,6 +1151,8 @@ static int install_firmware(struct kmod_module *mod) - ret = -1; - STRV_FOREACH(q, firmwaredirs) { - _cleanup_free_ char *fwpath = NULL; -+ _cleanup_free_ char *fwpath_xz = NULL; -+ const char *fw; - struct stat sb; - int r; - -@@ -1160,12 +1162,21 @@ static int install_firmware(struct kmod_module *mod) - exit(EXIT_FAILURE); - } - -+ fw = fwpath; - if (stat(fwpath, &sb) != 0) { -- log_debug("stat(%s) != 0", fwpath); -- continue; -+ r = asprintf(&fwpath_xz, "%s.xz", fwpath); -+ if (r < 0) { -+ log_error("Out of memory!"); -+ exit(EXIT_FAILURE); -+ } -+ if (stat(fwpath_xz, &sb) != 0) { -+ log_debug("stat(%s) != 0", fwpath); -+ continue; -+ } -+ fw = fwpath_xz; - } - -- ret = dracut_install(fwpath, fwpath, false, false, true); -+ ret = dracut_install(fw, fw, false, false, true); - if (ret == 0) - log_debug("dracut_install '%s' OK", fwpath); - } --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch b/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch deleted file mode 100644 index ec7d4802370b..000000000000 --- a/sys-kernel/dracut/files/049-dracut.sh-Fix-udevdir-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dddcb809459b7a75906d4b90cf7a5ac291dc74c1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 3 Apr 2019 15:24:47 +0800 -Subject: [PATCH] dracut.sh: Fix udevdir detection -To: - -In commit [9d1b81c dracut.sh: improve udevdir and systemdutildir -fallback logic] , it checked a common binary `collect' to location -udevdir. - -But upstream systemd drop binary `collect' since systemd v240 -[https://github.com/systemd/systemd/commit/a168792c2d95695fd30c0371d4b3890a9df1eafb] - -So check binary `ata_id' to instead. - -Signed-off-by: Hongxu Jia ---- - dracut.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 9098571d..fd9903b6 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1311,8 +1311,8 @@ done - [[ -d $udevdir ]] \ - || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)" - if ! [[ -d "$udevdir" ]]; then -- [[ -e /lib/udev/collect ]] && udevdir=/lib/udev -- [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev -+ [[ -e /lib/udev/ata_id ]] && udevdir=/lib/udev -+ [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev - fi - - [[ -d $systemdutildir ]] \ --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch b/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch deleted file mode 100644 index a44b8f316517..000000000000 --- a/sys-kernel/dracut/files/049-fs-lib-drop-a-bashism.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 43c8c4ce0471abbb8c0fc4b8be2515cebc636030 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 21 Jun 2019 18:39:48 +0200 -Subject: [PATCH] fs-lib: drop a bashism -To: - -Bash 5 apparently longer propagates variable assignments to local variables -in front of function calls when in POSIX mode: - - [lkundrak@demiurge ~]$ cat feh.sh - print_VAR () { - echo "$VAR"; - } - - testfunc () { - local VAR="OLD" - VAR=NEW print_VAR - } - - testfunc - [lkundrak@demiurge ~]$ bash4 --posix feh.sh - NEW - [lkundrak@demiurge ~]$ bash5 --posix feh.sh - OLD - [lkundrak@demiurge ~]$ bash5 feh.sh - NEW - [lkundrak@demiurge ~]$ - -It works the way it did in Bash 4 in non-POSIX mode, for external programs, -or for non-local variables. Don't ask me why -- it's probably some -compatibility thing for some sad old people. - -However, this precisely happens when fsck_single() is calling into the -fsck_drv_com(), assigned to _drv by fsck_able(). That ruins the -TEST-70-BONDBRIDGETEAMVLAN test's server and probably more. - -Let's pass the fsck driver binary via the function argument instead. It's -less messy anyway. ---- - modules.d/99fs-lib/fs-lib.sh | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index d39ca1b7..11e795d9 100755 ---- a/modules.d/99fs-lib/fs-lib.sh -+++ b/modules.d/99fs-lib/fs-lib.sh -@@ -44,22 +44,22 @@ fsck_able() { - ;; - ext?) - type e2fsck >/dev/null 2>&1 && -- _drv="_drv=e2fsck fsck_drv_com" && -+ _drv="fsck_drv_com e2fsck" && - return 0 - ;; - f2fs) - type fsck.f2fs >/dev/null 2>&1 && -- _drv="_drv=fsck.f2fs fsck_drv_com" && -+ _drv="fsck_drv_com fsck.f2fs" && - return 0 - ;; - jfs) - type jfs_fsck >/dev/null 2>&1 && -- _drv="_drv=jfs_fsck fsck_drv_com" && -+ _drv="fsck_drv_com jfs_fsck" && - return 0 - ;; - reiserfs) - type reiserfsck >/dev/null 2>&1 && -- _drv="_drv=reiserfsck fsck_drv_com" && -+ _drv="fsck_drv_com reiserfsck" && - return 0 - ;; - btrfs) -@@ -70,12 +70,12 @@ fsck_able() { - ;; - nfs*) - # nfs can be a nop, returning success -- _drv="_drv=none :" && -+ _drv=":" && - return 0 - ;; - *) - type fsck >/dev/null 2>&1 && -- _drv="_drv=fsck fsck_drv_std" && -+ _drv="fsck_drv_std fsck" && - return 0 - ;; - esac -@@ -97,6 +97,7 @@ fsck_drv_btrfs() { - - # common code for checkers that follow usual subset of options and return codes - fsck_drv_com() { -+ local _drv="$1" - local _ret - local _out - --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch b/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch deleted file mode 100644 index ec3e903765a4..000000000000 --- a/sys-kernel/dracut/files/049-install-dracut-install.c-install-module-dependencies.patch +++ /dev/null @@ -1,79 +0,0 @@ -From c38f9e980c1ee03151dd1c6602907c6228b78d30 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -Date: Tue, 4 Dec 2018 10:02:45 +0100 -Subject: [PATCH] install/dracut-install.c: install module dependencies of - dependencies -To: - ---- - install/dracut-install.c | 28 +++++++++++++++++++++++++--- - 1 file changed, 25 insertions(+), 3 deletions(-) - -diff --git a/install/dracut-install.c b/install/dracut-install.c -index 5f352b36..d64de545 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -84,6 +84,11 @@ static bool arg_mod_filter_noname = false; - static int dracut_install(const char *src, const char *dst, bool isdir, bool resolvedeps, bool hashdst); - - -+static inline void kmod_module_unrefp(struct kmod_module **p) { -+ if (*p) -+ kmod_module_unref(*p); -+} -+#define _cleanup_kmod_module_unref_ _cleanup_(kmod_module_unrefp) - - static inline void kmod_module_unref_listp(struct kmod_list **p) { - if (*p) -@@ -1230,28 +1235,45 @@ static bool check_module_path(const char *path) - static int install_dependent_modules(struct kmod_list *modlist) - { - struct kmod_list *itr; -- struct kmod_module *mod; - const char *path = NULL; - const char *name = NULL; - int ret = 0; - - kmod_list_foreach(itr, modlist) { -+ _cleanup_kmod_module_unref_ struct kmod_module *mod = NULL; - mod = kmod_module_get_module(itr); - path = kmod_module_get_path(mod); - -+ if (check_hashmap(items_failed, path)) -+ return -1; -+ -+ if (check_hashmap(items, path)) { -+ continue; -+ } -+ - name = kmod_module_get_name(mod); -+ - if ((path == NULL) || (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0))) { -- kmod_module_unref(mod); - continue; - } -+ - ret = dracut_install(path, &path[kerneldirlen], false, false, true); - if (ret == 0) { -+ _cleanup_kmod_module_unref_list_ struct kmod_list *modlist = NULL; -+ _cleanup_kmod_module_unref_list_ struct kmod_list *modpre = NULL; -+ _cleanup_kmod_module_unref_list_ struct kmod_list *modpost = NULL; - log_debug("dracut_install '%s' '%s' OK", path, &path[kerneldirlen]); - install_firmware(mod); -+ modlist = kmod_module_get_dependencies(mod); -+ ret = install_dependent_modules(modlist); -+ if (ret == 0) { -+ ret = kmod_module_get_softdeps(mod, &modpre, &modpost); -+ if (ret == 0) -+ ret = install_dependent_modules(modpre); -+ } - } else { - log_error("dracut_install '%s' '%s' ERROR", path, &path[kerneldirlen]); - } -- kmod_module_unref(mod); - } - - return ret; --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch b/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch deleted file mode 100644 index 80f0c2b0186d..000000000000 --- a/sys-kernel/dracut/files/049-install-string_hash_func-should-not-be-fed-with-NULL.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fc141f22869bad2e5409d1cc555c1a42ea738343 Mon Sep 17 00:00:00 2001 -From: Lukas Nykryn -Date: Thu, 14 Feb 2019 20:18:04 +0100 -Subject: [PATCH] install: string_hash_func should not be fed with NULL -To: - -If kmod_module_get_path returns NULL, we should skip that entry, -the hash function does not like NULL pointers. ---- - install/dracut-install.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/install/dracut-install.c b/install/dracut-install.c -index d64de545..9e415b5e 100644 ---- a/install/dracut-install.c -+++ b/install/dracut-install.c -@@ -1244,6 +1244,9 @@ static int install_dependent_modules(struct kmod_list *modlist) - mod = kmod_module_get_module(itr); - path = kmod_module_get_path(mod); - -+ if (path == NULL) -+ continue; -+ - if (check_hashmap(items_failed, path)) - return -1; - -@@ -1253,7 +1256,7 @@ static int install_dependent_modules(struct kmod_list *modlist) - - name = kmod_module_get_name(mod); - -- if ((path == NULL) || (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0))) { -+ if (arg_mod_filter_noname && (regexec(&mod_filter_noname, name, 0, NULL, 0) == 0)) { - continue; - } - --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch b/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch deleted file mode 100644 index 585f47add024..000000000000 --- a/sys-kernel/dracut/files/049-move-setting-the-systemdutildir-variable-before-it-s.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c8b35bf96af1859c0c254db34a16b9cc5a2aa46b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= - =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= - -Date: Mon, 27 May 2019 18:22:14 +0200 -Subject: [PATCH] move setting the "systemdutildir" variable before it's used -To: - -on line 1086 it's used to check for the uefi_stub: -"${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub" - -so it needs to be defined before that ---- - dracut.sh | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 183b892f..a3618f89 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1009,6 +1009,16 @@ esac - - abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile" - -+ -+[[ -d $systemdutildir ]] \ -+ || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) -+ -+if ! [[ -d "$systemdutildir" ]]; then -+ [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd -+ [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd -+fi -+ -+ - if [[ $no_kernel != yes ]] && [[ -d $srcmods ]]; then - if ! [[ -f $srcmods/modules.dep ]]; then - if [[ -n "$(find "$srcmods" -name '*.ko*')" ]]; then -@@ -1325,14 +1335,6 @@ if ! [[ -d "$udevdir" ]]; then - [[ -e /usr/lib/udev/ata_id ]] && udevdir=/usr/lib/udev - fi - --[[ -d $systemdutildir ]] \ -- || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) -- --if ! [[ -d "$systemdutildir" ]]; then -- [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd -- [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd --fi -- - [[ -d $systemdsystemunitdir ]] \ - || systemdsystemunitdir=$(pkg-config systemd --variable=systemdsystemunitdir 2>/dev/null) - --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch b/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch deleted file mode 100644 index 7f5fc6a0385c..000000000000 --- a/sys-kernel/dracut/files/049-network-manager-call-the-online-hook-for-connected-d.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 79a17b0112995eb60c85c64d15070c52f213b28d Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 27 Nov 2018 15:30:48 +0100 -Subject: [PATCH] network-manager: call the online hook for connected devices -To: - -Look for "connection-uuid" instead of "managed" to determine the devices -that are actually activated with a connection and call the online hook. - -This fixes the anaconda-net root mount, which utilizes the online hook. ---- - modules.d/35network-manager/nm-run.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh -index f6defa99..0f943631 100755 ---- a/modules.d/35network-manager/nm-run.sh -+++ b/modules.d/35network-manager/nm-run.sh -@@ -9,8 +9,9 @@ fi - for _i in /sys/class/net/*/ - do - state=/run/NetworkManager/devices/$(cat $_i/ifindex) -- grep -q managed=true $state 2>/dev/null || continue -+ grep -q connection-uuid= $state 2>/dev/null || continue - ifname=$(basename $_i) - sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts -+ source_hook initqueue/online $ifname - /sbin/netroot $ifname - done --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch b/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch deleted file mode 100644 index 430b93f93de5..000000000000 --- a/sys-kernel/dracut/files/049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 687e17aa7f2f40d21717be9a04302c749e139d4a Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Wed, 30 Oct 2019 19:25:51 +0100 -Subject: [PATCH] network-manager: fix getting of ifname from the sysfs path -To: - -commit 5e0f8c8a4ced ('network-manager: remove useless use of basename') -somewhat carelessly didn't take into account that $_i has a slash at -the end which made the result of the ## substitution be just an empty -string. - -The slash was put to the end of /sys/class/net/*/ to make sure we're only -iterating directories, but it's not strictly necessary. In an unlikely case -something else than a directory appears in /sys/class/net/, we'll already deal -with it gracefully. Remove it. - -This fixes the TEST-30-ISCSI test. ---- - modules.d/35network-manager/nm-run.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh -index a539d5b2..b33e0992 100755 ---- a/modules.d/35network-manager/nm-run.sh -+++ b/modules.d/35network-manager/nm-run.sh -@@ -6,7 +6,7 @@ else - /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon - fi - --for _i in /sys/class/net/*/ -+for _i in /sys/class/net/* - do - state=/run/NetworkManager/devices/$(cat $_i/ifindex) - grep -q connection-uuid= $state 2>/dev/null || continue --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch b/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch deleted file mode 100644 index 1650c9a767e3..000000000000 --- a/sys-kernel/dracut/files/049-network-manager-remove-useless-use-of-basename.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e0f8c8a4ced36268d0077acafa1db2402776fa6 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Mon, 17 Jun 2019 10:07:38 +0200 -Subject: [PATCH] network-manager: remove useless use of basename -To: - ---- - modules.d/35network-manager/nm-run.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh -index 0f943631..5f4b38ca 100755 ---- a/modules.d/35network-manager/nm-run.sh -+++ b/modules.d/35network-manager/nm-run.sh -@@ -10,7 +10,7 @@ for _i in /sys/class/net/*/ - do - state=/run/NetworkManager/devices/$(cat $_i/ifindex) - grep -q connection-uuid= $state 2>/dev/null || continue -- ifname=$(basename $_i) -+ ifname=${_i##*/} - sed -n 's/root-path/new_root_path/p' <$state >/tmp/dhclient.$ifname.dhcpopts - source_hook initqueue/online $ifname - /sbin/netroot $ifname --- -2.24.1 - diff --git a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch b/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch deleted file mode 100644 index 93e3ed5bed87..000000000000 --- a/sys-kernel/dracut/files/049-remove-bashism-in-various-boot-scripts.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 09d2a1605b1b2663e3c25f1d9950b23a2bf4ad89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sun, 6 Jan 2019 11:48:02 +0700 -Subject: [PATCH] remove bashism in various boot scripts -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -To: - -When using dash as initramfs shell, the boot process is broken. - -Signed-off-by: Đoàn Trần Công Danh ---- - modules.d/90crypt/crypt-lib.sh | 2 +- - modules.d/90crypt/parse-keydev.sh | 2 +- - modules.d/91crypt-gpg/crypt-gpg-lib.sh | 2 +- - modules.d/95dcssblk/parse-dcssblk.sh | 2 +- - modules.d/98syslog/rsyslogd-start.sh | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh -index bbf485e0..688ea251 100755 ---- a/modules.d/90crypt/crypt-lib.sh -+++ b/modules.d/90crypt/crypt-lib.sh -@@ -191,7 +191,7 @@ readkey() { - local device="$3" - - # No mounting needed if the keyfile resides inside the initrd -- if [ "/" == "$keydev" ]; then -+ if [ "/" = "$keydev" ]; then - local mntp=/ - else - # This creates a unique single mountpoint for *, or several for explicitly -diff --git a/modules.d/90crypt/parse-keydev.sh b/modules.d/90crypt/parse-keydev.sh -index a45b2fb5..04813414 100755 ---- a/modules.d/90crypt/parse-keydev.sh -+++ b/modules.d/90crypt/parse-keydev.sh -@@ -18,7 +18,7 @@ if getargbool 1 rd.luks -n rd_NO_LUKS && \ - fi - - # A keydev of '/' is treated as the initrd itself -- if [ "/" == "$keydev" ]; then -+ if [ "/" = "$keydev" ]; then - [ -z "$luksdev" ] && luksdev='*' - echo "$luksdev:$keydev:$keypath" >> /tmp/luks.keys - continue -diff --git a/modules.d/91crypt-gpg/crypt-gpg-lib.sh b/modules.d/91crypt-gpg/crypt-gpg-lib.sh -index b85ed2b8..c051b430 100755 ---- a/modules.d/91crypt-gpg/crypt-gpg-lib.sh -+++ b/modules.d/91crypt-gpg/crypt-gpg-lib.sh -@@ -53,7 +53,7 @@ gpg_decrypt() { - --tries 3 --tty-echo-off - - # Clean up the smartcard gpg-agent -- if [ "${useSmartcard}" == "1" ]; then -+ if [ "${useSmartcard}" = "1" ]; then - GNUPGHOME="$gpghome" gpg-connect-agent 1>/dev/null killagent /bye - fi - -diff --git a/modules.d/95dcssblk/parse-dcssblk.sh b/modules.d/95dcssblk/parse-dcssblk.sh -index 8f174408..27ac1d8d 100644 ---- a/modules.d/95dcssblk/parse-dcssblk.sh -+++ b/modules.d/95dcssblk/parse-dcssblk.sh -@@ -2,7 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - dcssblk_arg=$(getarg rd.dcssblk=) --if [ $? == 0 ];then -+if [ $? = 0 ];then - info "Loading dcssblk segments=$dcssblk_arg" - modprobe dcssblk segments=$dcssblk_arg - fi -diff --git a/modules.d/98syslog/rsyslogd-start.sh b/modules.d/98syslog/rsyslogd-start.sh -index c64f2121..86ad50ea 100755 ---- a/modules.d/98syslog/rsyslogd-start.sh -+++ b/modules.d/98syslog/rsyslogd-start.sh -@@ -38,7 +38,7 @@ rsyslog_config() { - [ -f /tmp/syslog.conf ] && read conf < /tmp/syslog.conf - [ -z "$conf" ] && conf="/etc/rsyslog.conf" && echo "$conf" > /tmp/syslog.conf - --if [ $type == "rsyslogd" ]; then -+if [ $type = "rsyslogd" ]; then - template=/etc/templates/rsyslog.conf - if [ -n "$server" ]; then - rsyslog_config "$server" "$template" "$filters" > $conf --- -2.19.2 - diff --git a/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch b/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch deleted file mode 100644 index 5ea342df78a4..000000000000 --- a/sys-kernel/dracut/files/049-rngd-new-module-running-early-during-boot-to-help-ge.patch +++ /dev/null @@ -1,88 +0,0 @@ -From adee5b97bc5418b6e357342bb3be20568668aa55 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Renaud=20M=C3=A9trich?= -Date: Thu, 11 Jul 2019 10:50:40 +0200 -Subject: [PATCH] rngd: new module running early during boot to help generating - entropy when system's default entropy sources are poor (e.g. use of SSD disks - or UEFI RNG not available) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -To: - -On systems with low entropy at boot, the boot can take up to several -hours, specially when NBDE is used (e.g. clevis) which makes use of -the random number generator. - -Enabling rngd service at boot early, because dracut-initqueue runs, -enables to initialize the random number generator in a couple of seconds -instead of minutes or hours. - -Signed-off-by: Renaud Métrich ---- - modules.d/06rngd/module-setup.sh | 39 ++++++++++++++++++++++++++++++++ - modules.d/06rngd/rngd.service | 7 ++++++ - 2 files changed, 46 insertions(+) - create mode 100644 modules.d/06rngd/module-setup.sh - create mode 100644 modules.d/06rngd/rngd.service - -diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh -new file mode 100644 -index 00000000..43d5c2d3 ---- /dev/null -+++ b/modules.d/06rngd/module-setup.sh -@@ -0,0 +1,39 @@ -+#!/bin/bash -+# vim: set tabstop=8 shiftwidth=4 softtabstop=4 expandtab smarttab colorcolumn=80: -+# -+# Copyright (c) 2019 Red Hat, Inc. -+# Author: Renaud Métrich -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+# -+ -+depends() { -+ echo systemd -+ return 0 -+} -+ -+check() { -+ # if there's no rngd binary, no go. -+ require_binaries rngd || return 1 -+ -+ return 0 -+} -+ -+install() { -+ inst rngd -+ inst_simple "${moddir}/rngd.service" "${systemdsystemunitdir}/rngd.service" -+ mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants" -+ ln -rfs "${initdir}${systemdsystemunitdir}/rngd.service" \ -+ "${initdir}${systemdsystemunitdir}/sysinit.target.wants/rngd.service" -+} -diff --git a/modules.d/06rngd/rngd.service b/modules.d/06rngd/rngd.service -new file mode 100644 -index 00000000..570fbedb ---- /dev/null -+++ b/modules.d/06rngd/rngd.service -@@ -0,0 +1,7 @@ -+[Unit] -+Description=Hardware RNG Entropy Gatherer Daemon -+DefaultDependencies=no -+Before=systemd-udevd.service -+ -+[Service] -+ExecStart=/usr/sbin/rngd -f --- -2.24.1 - diff --git a/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch deleted file mode 100644 index 15522ef4fc1e..000000000000 --- a/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0674b9136831b1beb6a7ec91147fd5c280c693a3 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy -Date: Mon, 9 Mar 2020 02:47:07 +0300 -Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths() - -Bug: https://bugs.gentoo.org/705728 ---- - dracut-functions.sh | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 3cb9c7af..5337ff6c 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -76,7 +76,20 @@ find_binary() { - - ldconfig_paths() - { -- $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq -+ local gccpath -+ -+ if type -P gcc-config &>/dev/null; then -+ gccpath=$(gcc-config -c) -+ gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-} -+ fi -+ -+ while read -r line; do -+ if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then -+ echo ${line} -+ elif [[ ${line} == ${gccpath} ]]; then -+ echo ${line} -+ fi -+ done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq) - } - - # Version comparision function. Assumes Linux style version scheme. --- -2.24.1 - diff --git a/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch new file mode 100644 index 000000000000..15522ef4fc1e --- /dev/null +++ b/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch @@ -0,0 +1,39 @@ +From 0674b9136831b1beb6a7ec91147fd5c280c693a3 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Mon, 9 Mar 2020 02:47:07 +0300 +Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths() + +Bug: https://bugs.gentoo.org/705728 +--- + dracut-functions.sh | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 3cb9c7af..5337ff6c 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -76,7 +76,20 @@ find_binary() { + + ldconfig_paths() + { +- $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq ++ local gccpath ++ ++ if type -P gcc-config &>/dev/null; then ++ gccpath=$(gcc-config -c) ++ gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-} ++ fi ++ ++ while read -r line; do ++ if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then ++ echo ${line} ++ elif [[ ${line} == ${gccpath} ]]; then ++ echo ${line} ++ fi ++ done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq) + } + + # Version comparision function. Assumes Linux style version scheme. +-- +2.24.1 + diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml index a3674ec5f5e4..39e56c08ac47 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -13,8 +13,4 @@ floppym@gentoo.org Mike Gilbert - - Module installing additional tools like strace, file - editor, ssh and more - -- cgit v1.2.3