diff options
author | 2012-07-25 17:34:47 +0000 | |
---|---|---|
committer | 2012-07-25 17:34:47 +0000 | |
commit | e2b12d6855f4fc2f979c9a3f8d9398a90c1b5ffc (patch) | |
tree | d249f9e9044c347574f65bfdecafe3f1385e796a /sys-kernel | |
parent | dev-util/netbeans: version 6.8 has been moved to java-overlay (diff) | |
download | historical-e2b12d6855f4fc2f979c9a3f8d9398a90c1b5ffc.tar.gz historical-e2b12d6855f4fc2f979c9a3f8d9398a90c1b5ffc.tar.bz2 historical-e2b12d6855f4fc2f979c9a3f8d9398a90c1b5ffc.zip |
Make virtual/pkgconfig optional. Fixes bug #420585 in better way than
previous commit.
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 9 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 18 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-019-r2.ebuild | 266 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch | 46 |
4 files changed, 330 insertions, 9 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index beba8a095008..53a018dce4ea 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.64 2012/07/25 16:48:06 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.65 2012/07/25 17:34:47 aidecoe Exp $ + +*dracut-019-r2 (25 Jul 2012) + + 25 Jul 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-019-r2.ebuild, + +files/dracut-019-no-pkg-config-warnings.patch: + Make virtual/pkgconfig optional. Fixes bug #420585 in better way than + previous commit. *dracut-019-r1 (25 Jul 2012) *dracut-018-r2 (25 Jul 2012) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 38a2ade6d590..fd4e8c6c4675 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -6,6 +6,7 @@ AUX dracut-014-usrmount-fsck-fix.patch 1208 SHA256 192ed24457c07d282cbdc75576d6b AUX dracut-018-lsinitrd-support-symlinks.patch 699 SHA256 b2d422b0a026265101045b641a2b4cef20e0ca15ca3e6fce8616d721b334ea2f SHA512 6b6f83fa8e99b5160130de6ae86699e6327665d852fdc7910e751c7644f668357f83f108896ebb73130546c76f17f6d0dff50c0da4634779e8d461685529a98b WHIRLPOOL bb2e2c6b12daf8727e874e393e58380b9d49e083ebf929c48104d23d088cc455de3c039fcaa3ac74aa88516c733c2536ccd4a950ee9a8b9745d63e61dbafbb47 AUX dracut-018-multipath-udev-rules.patch 848 SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 SHA512 c83e2a4e8bc5d25351ce82afdd4f63d9abedbe16a3dfd8aa69f1b0828a841e5106555319f112d93af92b3c1f5e2154a7bf36c8825f1e91feeb512e7c69b5fa16 WHIRLPOOL abc1bc20c022bb040e12ef00aa0aaa5cbbdcdcea71fddb3c222dbf393f7cc1ed1a0725fa95440ba90165c222dc07c6ab530d0b02577608500224f406e66f6257 AUX dracut-019-multipath-udev-rules.patch 846 SHA256 bea1932312f071e30b7887fa281ab5cd524c446f2e45c8a62432c7db5da5e1e1 SHA512 75c457c5fe37f2e0a40b1fa6dd588b6b601caea61a262c648571abbaf5f301520e41443701cdf278acb3513a508ab5c85e01882a92937e83535de2573c9a2c01 WHIRLPOOL c3594e87cd1cfdb60d3998665d796b6daa0c212c779926dd04c3c66244ed0576201baee6df391d0a63128a3deebead7374c9993edb02f4b0a287e527370f7368 +AUX dracut-019-no-pkg-config-warnings.patch 1732 SHA256 7788ca45214c68e42491dcc148a4c687c0b388a5bf8ec5f15afda5460f5a6916 SHA512 e73d1aa844e344504ebb83dff96a6c11995be8a83565f099a02be708ec6ae9eb3f427840b3f6b6db066a9b3658f0731acf6b59623aaf85dd04f7af2509e82bb7 WHIRLPOOL 60cbe17a33d6cc557823759f6549787cb1d447cad2f38023feaf2063a47ca9f6b43e092407c4c9e6c29c8e0d1aab29682ef06946ba81926fbbc04b7f07a474b3 DIST dracut-014.tar.bz2 155914 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3 DIST dracut-018.tar.bz2 189067 SHA256 3ebc0e9c9df24802dd4061aea6907670453fc865257885abfd9166af5caccb42 DIST dracut-019.tar.bz2 199187 SHA256 a68f00f896aef1cdebc8479f522d6a10b9d20b7dfcdaca85168d54dcf3891da7 SHA512 543cfb1c2079d6a5525d28c2738933aa5ad046a184ba80cf6c82f8aebac031d1f6e3c0f489ce94bc013f707b4dcd756228b03f4e6f7a8752d438a043b18bbbb0 WHIRLPOOL 627d972a31cda9d36d7a577aa10802d7ddf9e95e5ac7128e306a3b487241cdbbfaf3771a63b70810577f41dc776d9a6a698215af37a038095bc0b10aea9e6970 @@ -15,17 +16,18 @@ EBUILD dracut-018-r1.ebuild 7308 SHA256 07206d0f0ff41cf6286c576e32a59a5c5c4c093a EBUILD dracut-018-r2.ebuild 7328 SHA256 b878948c1792afb70f0ae4c0497db3054aa25cfcaa3aea1673db547e3ed5a279 SHA512 16f7f3cbb042b2fef6f81bac0a93882d4ae005ed1fedc5e3788a2194f838003ca172d93d990aa146eca05f711cdd15e1318e282795a5b703a5127c4880db6af0 WHIRLPOOL 092bb7e869b17fd53b3fc31e5ea260fa9d92b647036979d9be1476c41fbe992c67c3638ebcd471dbea3caf65625f3c13b6ec2e2efea773f5ff5d5614a63842e4 EBUILD dracut-018.ebuild 7175 SHA256 b4f1aaf03b6f83bc9b0d0ee04014f0b25f622e3482d578db6cc380f7b421dc03 SHA512 5a91d8341b6140d54bf4c8a0bfab4b6980752a411689afef5944aa32dce48f042636b9f1631db070f2f0fc153c428a08e41e6f80e04a2273acc2a935b8a81df7 WHIRLPOOL 58f8785a6664642a033e143fe7f2b5e37cad3c4c068444dafbf043f48b7d38ea36893ddd9c5f8d31f26424f232a56abeca05c8eeb717e3af4bdb241348501fa4 EBUILD dracut-019-r1.ebuild 7181 SHA256 572e4e0c801a84e1c39f81d88ce37a23738d1af5b326670a13f2ecd2171ced91 SHA512 c70d8f89812cd369f05af0329bfccdb0b17160316610076e1715a44caee44b67a6e42dbcbc818475be96babbfedc9bd428f13630d7fb0ea21bb0b2281bfaf746 WHIRLPOOL 989d0cb1b904047be3d73fcd1e941a188a9bc31103b3ee9958ee4165a5159a0a5c47712412aa974d80b63346ecd58635cfefbb41514b821d05e7779b0f6f13f7 +EBUILD dracut-019-r2.ebuild 7342 SHA256 f73c9f908da592f4bbda89fa0cccf77b907aef70040662fb3034653be1f8179d SHA512 22c902df9837ed1fe8618281a3f5ed911fa7ee9c57cc344a3bf33be081df4ae6b6218c98939ec95d0e3a4df90b9e22d2048b08000ace7026f1888609bc64408e WHIRLPOOL 08b5171f95ecfa83d50f3b424f7872146afbb2b24c56ff4632f82c0256598dd8ccde5dca65de897a55fe7e7702365217aa234aa5d92c9f71905d82c963304cdd EBUILD dracut-019.ebuild 7159 SHA256 29d900e018434150d68a26ed75c3d36cbd69ba3b4035b5eabe6e3fb170a6def6 SHA512 4dcc15f613c140553238f3b4c86699731f1edae928066cd82712c9c4a13798652b56c7298cc1f29fb6e98618f866a823f19b5741263ce5de2b1183ef8738623e WHIRLPOOL 0848f29c87cf634420c319d227f1d636e46335fc78f86b9a681487bd827deacf9bd7aa929f0889816445f326eee0822190dcf96d57dd403f7f6b15f9eb549a93 -MISC ChangeLog 22980 SHA256 b5fc99cbe9829755f8fc07414780e08f7d879a4acf9daebb87911e80d148e52b SHA512 b8d2fd989184b0c2d9976ae22e663c8db15629325a2eca17f353881109bdc22e861a2a78736fc61491b645237f40b1075ed18420b1a5f8e7f6f5077facba621c WHIRLPOOL ffe5ac22063aeb8b19e9530ce3ea6574162fff67fd3fbf547dec6a012f54b6766652626de2bbdaa846163e31081f46dbb166f37902f59f04a4a1784e137607d2 +MISC ChangeLog 23233 SHA256 e0f6abeecff9d99fec48805e7d87ff0437c04272e4bbfa32d424c61b2eba8902 SHA512 14ee559bc486a8bbd22f811598fed0571019bdb58026e8b3d176e646764e63191372f34e4bfbe49d7b2327b0d6b50b02d77ba7d51ce927b3bf96368d00da650d WHIRLPOOL 3d0d41ba9375fad6918d856e202488c5f6129591bd4e441db1c03fab6474b2acb1c94da8be0daab88dfd9ed27df5f9977ac452da72aad7b12a1965dc45faa419 MISC metadata.xml 780 SHA256 ec8bfdca230f0f9f4b33b7e08c9f3978ac812396f4e6b07c1e96e3320e9d03fd SHA512 970674260d3c66e6f38acf869f797131748946db0217555c8b091493bd1a00dc0fc8ceba95d97374fe536a0beb1881ab99346dd947779ac4e928ec8b6fc10e39 WHIRLPOOL 5368d785fea5cb1ef2769b85e69fd839b95305fd7be43f50e3dd33f390ad102f91f43e34106e7329262c663f61445e10171cc0cd9ec8f209cfcb2f34c0c9b447 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQECNOAAoJEPATRTHh2/q1dvsH/0sOzOm2wqZxQp3grWqnFLch -JQGyNbe8a7V23R4h3CHiUNPGLZLsrlKWLnS2hyXY+Ra3uNzKSBw3YD5yKw5iOos3 -Nojvzb7q7qIzbxEAvkdFXz+oq2mnKYLV6M1q2PyR8mkFELJTLWvxTVepL8T9lgWw -ZEIAjVu1C5/N8aI0t2w9pDGuRt3d6c4sSWhkAaAdf2kZ9AGgmX+VedD1s5JM1UzE -II6q2zO8gxFdMR9l55Hta9mlFpkqc6rCZ6JFeM14ZDXmcyfhgvyJhk5UXJIMWYBH -u3qIMoK5aqXkzYHocKL0gWPhfG3FCEhQBmpUyxw4KMQSnye/QEtQQvCpuPnyjsI= -=Q0Oq +iQEcBAEBCAAGBQJQEC49AAoJEPATRTHh2/q15cYH/ReJSFUKd0OxNeG366Q6ZZee +fL/2Dvv1HQbVLKcrQacQ/ccZU56jdj1HTyYN7rcQubvFSeY5EtRr2NIdVGEh+oxQ ++eEhOTBEV2UIYevP8NsP9QPqI1p0h6n7ogwzeKvu0JPS+iAyJRQ6Cl8VcqbhAcFi +0TSW6n+D1Tr8tBAZhdix/1eWaUC+KEQtZR5TpVoF2kQXt2/JL2nvcCC3HkEkFWrj +9Uo1EyTSVP3cgBJ5M4jQX1lKRlGFRM3UUFoZ9tUw/K5AnQlNlMRY/v9iyW2TfXqk +fCReRVN9olYHlTCQ+epIVP6A+aBOe7r9SPciFywiba9oqpI4+UAYg9NCcz/yb1Y= +=FCFW -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-019-r2.ebuild b/sys-kernel/dracut/dracut-019-r2.ebuild new file mode 100644 index 000000000000..217421fa5bee --- /dev/null +++ b/sys-kernel/dracut/dracut-019-r2.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r2.ebuild,v 1.1 2012/07/25 17:34:47 aidecoe Exp $ + +EAPI=4 + +inherit eutils linux-info + +add_req_use_for() { + local dep="$1"; shift + local f + + for f in "$@"; do + REQUIRED_USE+="${f}? ( ${dep} ) +" + done +} + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="http://dracut.wiki.kernel.org" +SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt ) + dracut_modules_livenet? ( dracut_modules_dmsquash-live ) + " +COMMON_MODULES=" + dracut_modules_biosdevname + dracut_modules_bootchart + dracut_modules_btrfs + dracut_modules_caps + dracut_modules_crypt-gpg + dracut_modules_gensplash + dracut_modules_mdraid + dracut_modules_multipath + dracut_modules_plymouth + dracut_modules_syslog + " +DM_MODULES=" + dracut_modules_crypt + dracut_modules_dmraid + dracut_modules_dmsquash-live + dracut_modules_livenet + dracut_modules_lvm + " +NETWORK_MODULES=" + dracut_modules_iscsi + dracut_modules_livenet + dracut_modules_nbd + dracut_modules_nfs + dracut_modules_ssh-client + " +add_req_use_for device-mapper ${DM_MODULES} +add_req_use_for net ${NETWORK_MODULES} +IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}" +IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}" + +RESTRICT="test" + +RDEPEND=" + app-arch/cpio + >=app-shells/bash-4.0 + >=app-shells/dash-0.5.4.11 + >=sys-apps/baselayout-1.12.14-r1 + || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + >=sys-apps/sysvinit-2.87-r3 + >=sys-apps/util-linux-2.20 + >=sys-fs/udev-166 + + debug? ( dev-util/strace ) + device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) ) + net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 ) + selinux? ( sys-libs/libselinux sys-libs/libsepol ) + dracut_modules_biosdevname? ( sys-apps/biosdevname ) + dracut_modules_bootchart? ( app-benchmarks/bootchart2 ) + dracut_modules_btrfs? ( sys-fs/btrfs-progs ) + dracut_modules_caps? ( sys-libs/libcap ) + dracut_modules_crypt? ( sys-fs/cryptsetup ) + dracut_modules_crypt-gpg? ( app-crypt/gnupg ) + dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) + dracut_modules_gensplash? ( media-gfx/splashutils ) + dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ) + dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) + dracut_modules_mdraid? ( sys-fs/mdadm ) + dracut_modules_multipath? ( sys-fs/multipath-tools ) + dracut_modules_nbd? ( sys-block/nbd ) + dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ) + dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) + dracut_modules_ssh-client? ( dev-libs/openssl ) + dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) ) + " +DEPEND="" + +# +# Helper functions +# + +# Returns true if any of specified modules is enabled by USE flag and false +# otherwise. +# $1 = list of modules (which have corresponding USE flags of the same name) +any_module() { + local m modules=" $@ " + + for m in ${modules}; do + ! use $m && modules=${modules/ $m / } + done + + shopt -s extglob + modules=${modules%%+( )} + shopt -u extglob + + [[ ${modules} ]] +} + +# Removes module from modules.d. +# $1 = module name +# Module name can be specified without number prefix. +rm_module() { + local force m + [[ $1 = -f ]] && force=-f + + for m in $@; do + if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then + rm ${force} --interactive=never -r "${modules_dir}"/$m + else + rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m + fi + done +} + +# Displays Gentoo Base System major release number +base_sys_maj_ver() { + local line + + read line < /etc/gentoo-release + line=${line##* } + echo "${line%%.*}" +} + +# +# ebuild functions +# + +src_prepare() { + epatch "${FILESDIR}/${P}-multipath-udev-rules.patch" + epatch "${FILESDIR}/${P}-no-pkg-config-warnings.patch" +} + +src_compile() { + return +} + +src_install() { + emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install + + local gen2conf + + dodir /var/lib/dracut/overlay + dodoc HACKING TODO AUTHORS NEWS README* + + case "$(base_sys_maj_ver)" in + 1) gen2conf=gentoo.conf ;; + 2) gen2conf=gentoo-openrc.conf ;; + *) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)." + esac + + insinto /etc/dracut.conf.d + newins dracut.conf.d/${gen2conf}.example ${gen2conf} + + insinto /etc/logrotate.d + newins dracut.logrotate dracut + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D}/usr/lib/dracut/modules.d" + + # Remove modules not enabled by USE flags + for module in ${IUSE_DRACUT_MODULES} ; do + ! use ${module} && rm_module -f ${module#dracut_modules_} + done + + # Those flags are specific, and even are corresponding to modules, they need + # to be declared as regular USE flags. + use debug || rm_module 95debug + use selinux || rm_module 98selinux + + # Following flags define set of helper modules which are base dependencies + # for others and as so have no practical use, so remove these modules. + use device-mapper || rm_module 90dm + use net || rm_module 40network 45ifcfg 45url-lib + + # Remove S/390 modules which are not tested at all + rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet + + # Remove modules which won't work for sure + rm_module 95fcoe # no tools + # fips module depends on masked app-crypt/hmaccalc + rm_module 01fips 02fips-aesni + + # Remove extra modules which go to future dracut-extras + rm_module 05busybox 97masterkey 98ecryptfs 98integrity 98systemd +} + +pkg_postinst() { + if linux-info_get_any_version && linux_config_src_exists; then + echo + 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." + echo + + local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES" + + # Kernel configuration options descriptions: + local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" + local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ +"(initramfs/initrd) support" + local desc_MODULES="Enable loadable module support" + + local opt desc + + # Generate ERROR_* variables for check_extra_config. + for opt in ${CONFIG_CHECK}; do + opt=${opt#\~} + desc=desc_${opt} + eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ + "is missing and REQUIRED'" + done + + check_extra_config + echo + else + echo + ewarn "Your kernel configuration couldn't be checked. Do you have" + ewarn "/usr/src/linux/.config file there? Please check manually if" + ewarn "following options are enabled:" + ewarn "" + ewarn " CONFIG_BLK_DEV_INITRD" + ewarn " CONFIG_DEVTMPFS" + ewarn " CONFIG_MODULES" + echo + fi + + elog 'To generate the initramfs:' + elog ' # mount /boot (if necessary)' + elog ' # dracut "" <kernel-version>' + elog '' + elog 'For command line documentation see dracut.kernel(7).' + elog '' + elog 'Simple example to select root and resume partition:' + elog ' root=/dev/sda1 resume=/dev/sda2' + elog '' + elog 'To include only dracut modules and kernel drivers for this system,' + elog 'use the "-H" option. Some modules need to be explicitly added with' + elog '"-a" option even if required tools are installed.' + elog '' + if ! has_version virtual/pkgconfig; then + ewarn 'virtual/pkgconfig is not installed, but it is recommended.' + fi +} diff --git a/sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch b/sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch new file mode 100644 index 000000000000..56199512b54b --- /dev/null +++ b/sys-kernel/dracut/files/dracut-019-no-pkg-config-warnings.patch @@ -0,0 +1,46 @@ +From c84a602b412cbd3ac5a21a608046bf18b880f565 Mon Sep 17 00:00:00 2001 +From: Juan RP <xtraeme@gmail.com> +Date: Wed, 6 Jun 2012 14:19:59 +0200 +Subject: [PATCH] Avoid annonying warnings when pkg-config is not installed. + +--- + dracut-functions.sh | 2 +- + modules.d/95udev-rules/module-setup.sh | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index f788878..4180f03 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -531,7 +531,7 @@ inst_symlink() { + ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target" + } + +-udevdir=$(pkg-config udev --variable=udevdir) ++udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) + if ! [[ -d "$udevdir" ]]; then + [[ -d /lib/udev ]] && udevdir=/lib/udev + [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev +diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh +index e8c1c04..ff47021 100755 +--- a/modules.d/95udev-rules/module-setup.sh ++++ b/modules.d/95udev-rules/module-setup.sh +@@ -5,13 +5,13 @@ + install() { + local _i + +- systemdutildir=$(pkg-config systemd --variable=systemdutildir) ++ systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null) + if ! [[ -d "$systemdutildir" ]]; then + [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd + [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd + fi + +- udevdir=$(pkg-config udev --variable=udevdir) ++ udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null) + if ! [[ -d "$udevdir" ]]; then + [[ -d /lib/udev ]] && udevdir=/lib/udev + [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev +-- +1.7.8.6 + |