Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bf027d052e5685304b1006973b7bc587daa547e8
commit bf027d052e5685304b1006973b7bc587daa547e8 Author: crazy <[email protected]> Date: Fri Oct 20 18:51:07 2017 +0200 dracut-045-5-x86_64 * fix ldconfig_paths() for us * well we do not want /lib32 , /usr/lib32 or any * /usr/lib/<foo> to be included in the image.. * on frugalware these are not system libs but things like chromium , ghc , firefox etc diff --git a/source/base/dracut/FrugalBuild b/source/base/dracut/FrugalBuild index a6fb7a9..a7af0af 100644 --- a/source/base/dracut/FrugalBuild +++ b/source/base/dracut/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dracut pkgver=045 -pkgrel=4 +pkgrel=5 pkgdesc="Generic initramfs generationtool" rodepends=('systemd>=227-15' 'util-linux>=2.27.1-4' 'bash>=4.4' \ 'dash>=0.5.8' 'kbd>=2.0.3-3' 'cpio>=2.12-3' 'multipath-tools>=0.5.0-4' \ @@ -17,11 +17,13 @@ up2date="Flasttar http://www.kernel.org/pub/linux/utils/boot/dracut/"; source=(http://kernel.org/pub/linux/utils/boot/dracut/$pkgname-$pkgver.tar.xz \ fix_fakeroot.patch \ fw-match-initrd-naming-by-default.patch \ - https://github.com/dracutdevs/dracut/commit/ea765c0ee17178fe74c73873505f7c86f40f9ec7.diff) + https://github.com/dracutdevs/dracut/commit/ea765c0ee17178fe74c73873505f7c86f40f9ec7.diff \ + frugalware-fix-ldconfig_paths.patch) sha1sums=('755eb079ca1a75b26153dd4043083f2c23ac596d' \ 'dae13497054785f9a004177d809337a4c37335fa' \ 'e0f4c056ed784184d0dc6f08e95eeafccde97b3d' \ - '833acc7934b2d2fa6c9a5f4e33c721453facfd08') + '833acc7934b2d2fa6c9a5f4e33c721453facfd08' \ + '8d718795b7a1cc039ebbc5d5f26ce8cad16ec3d2') backup=(etc/dracut.conf) options=('scriptlet' 'force') diff --git a/source/base/dracut/frugalware-fix-ldconfig_paths.patch b/source/base/dracut/frugalware-fix-ldconfig_paths.patch new file mode 100644 index 0000000..349e05b --- /dev/null +++ b/source/base/dracut/frugalware-fix-ldconfig_paths.patch @@ -0,0 +1,14 @@ +diff -Naur dracut-045/dracut-functions.sh dracut-045-p/dracut-functions.sh +--- dracut-045/dracut-functions.sh 2017-04-03 10:26:25.000000000 +0200 ++++ dracut-045-p/dracut-functions.sh 2017-10-20 18:25:00.066161598 +0200 +@@ -52,7 +52,9 @@ + + ldconfig_paths() + { +- ldconfig -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq ++ ## well we don't want ghc , java , firefox! and so on to be even considered to be added ++ ## also for sure we do NOT want lib32 stuff in initramfs .. So we just grep -v all ^/usr/lib/<something> too .. -- crazy -- ++ ldconfig -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64|usr/lib32|lib32)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | grep -v '^/usr/lib' | sort | uniq + } + + # Version comparision function. Assumes Linux style version scheme. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
