Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2afd15d805ba25574bdb488fef16a786380e282e
commit 2afd15d805ba25574bdb488fef16a786380e282e Author: James Buren <[email protected]> Date: Sun Aug 19 19:35:28 2012 -0500 dracut-023-1-x86_64 * version bump * remove plymouth subpkg diff --git a/source/base-extra/dracut/FrugalBuild b/source/base-extra/dracut/FrugalBuild index 05c7025..c940c98 100644 --- a/source/base-extra/dracut/FrugalBuild +++ b/source/base-extra/dracut/FrugalBuild @@ -2,18 +2,17 @@ # Maintainer: James Buren <[email protected]> pkgname=dracut -pkgver=018 -pkgrel=2 +pkgver=023 +pkgrel=1 pkgdesc="Generic initramfs generation tool" -depends=('udev>=181' 'util-linux' 'bash' 'dash' 'kbd' 'cpio' 'multipath-tools' 'lvm2' 'popt') -makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml") +depends=('systemd' 'util-linux' 'bash' 'dash' 'kbd' 'cpio' 'multipath-tools' 'lvm2' 'popt') +makedepends=("docbook-sgml-dtd" "libxslt" "docbook-xsl" "docbook-xml" "asciidoc") groups=('base-extra') archs=('i686' 'x86_64') url="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"; up2date="Flasttar http://www.kernel.org/pub/linux/utils/boot/dracut/"; -source=(http://mirror.be.gbxs.net/pub/linux/boot/dracut/$pkgname-$pkgver.tar.xz $pkgname-xz-kernel-modules.patch) -sha1sums=('ea64a46eb1bb6e8f6b97def226a75188150017db' \ - '72eaea5158aa9776b8e9951746aedeb707fec91b') +source=(http://mirror.be.gbxs.net/pub/linux/boot/dracut/$pkgname-$pkgver.tar.xz) +signatures=(${source/.tar.xz/.tar.sign}) backup=(etc/dracut.conf) options=('scriptlet' 'force') @@ -25,14 +24,6 @@ subgroups=("${subgroups[@]}" 'base-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') suboptions=("${suboptions[@]}" '') -subpkgs=("${subpkgs[@]}" 'dracut-plymouth') -subdescs=("${subdescs[@]}" 'Dracut modules to build a dracut initramfs with plymouth support') -subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") -subdepends=("${subdepends[@]}" "plymouth") -subgroups=("${subgroups[@]}" 'base-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64') -suboptions=("${suboptions[@]}" '') - build() { Fcd Fpatchall @@ -57,8 +48,7 @@ build() { Frm usr/lib/dracut/modules.d/50gensplash # remove rpm modules Frm usr/lib/dracut/modules.d/10rpmversion - - Fsplit dracut-plymouth usr/lib/dracut/modules.d/50plymouth + Frm usr/lib/dracut/modules.d/50plymouth Fsplit dracut-network usr/lib/dracut/modules.d/40network Fsplit dracut-network usr/lib/dracut/modules.d/95iscsi diff --git a/source/base-extra/dracut/dracut-xz-kernel-modules.patch b/source/base-extra/dracut/dracut-xz-kernel-modules.patch deleted file mode 100644 index fe17af1..0000000 --- a/source/base-extra/dracut/dracut-xz-kernel-modules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh ---- a/modules.d/50plymouth/module-setup.sh 2012-02-13 20:12:29.825785878 -0600 -+++ b/modules.d/50plymouth/module-setup.sh 2012-02-13 20:15:13.444779796 -0600 -@@ -18,7 +18,7 @@ - case $_modname in - *.ko) grep -q drm_crtc_init $_modname ;; - *.ko.gz) zgrep -q drm_crtc_init $_modname ;; -- *.ko.xz) xzgrep -q drm_crtc_init $_modname ;; -+ *.ko.xz) xz -dc < $_modname | grep -q 'drm_crtc_init' ;; - esac - if test $? -eq 0; then - # if the hardware is present, include module even if it is not currently loaded, _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
