Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting5.git;a=commitdiff;h=21b3b8c3a84977dd3aec62dd15c4dc11ad2987b6
commit 21b3b8c3a84977dd3aec62dd15c4dc11ad2987b6 Merge: 9dcfcab 8dec1a4 Author: James Buren <[email protected]> Date: Sun Sep 2 22:09:32 2012 -0500 Merge branch 'master' of ../current Conflicts: source/base/grub2/FrugalBuild source/base/kernel-initrd/FrugalBuild diff --cc source/base/grub2/FrugalBuild index 9679689,f9192c2..e5b89e8 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@@ -11,9 -11,8 +11,9 @@@ conflicts=('grub' replaces=('grub') provides=('grub') rodepends=('grub-theme-frugalware') - depends=('xz' 'bzip2' 'mktemp' 'ncurses' 'lvm2>=2.02.97') + depends=('xz' 'bzip2' 'mktemp' 'ncurses' 'lvm2>=2.02.96') -makedepends=('unifont') +makedepends=('unifont' 'dejavu-ttf') +options=('nostrip') backup=('etc/default/grub' 'etc/grub.d/40_custom') if [ "$CARCH" == "x86_64" ]; then depends=(${depends[@]} 'efibootmgr') diff --cc source/base/kernel-initrd/FrugalBuild index 953c194,8767f3f..cf14aa9 --- a/source/base/kernel-initrd/FrugalBuild +++ b/source/base/kernel-initrd/FrugalBuild @@@ -14,9 -14,9 +14,9 @@@ pkgrel= pkgdesc="The initrd for the Frugalware Linux Kernel." url="http://www.frugalware.org"; depends=("kernel=$_F_kernelver_ver-$_F_kernelver_rel") -makedepends=('dracut>=023' 'linux-firmware>=20120719' 'xz' 'eject' 'sysvinit-tools' \ - 'less' 'xfsprogs>=3.1.8' 'jfsutils' 'reiserfsprogs' 'mdadm' 'lvm2>=2.02.96' 'systemd>=188-5' \ - 'kmod>=9' 'btrfs-progs') +makedepends=('dracut>=023' 'linux-firmware>=20120803' 'xz' 'eject' 'sysvinit-tools' \ - 'less' 'xfsprogs>=3.1.8' 'jfsutils' 'reiserfsprogs' 'mdadm' 'lvm2>=2.02.97' 'systemd>=189-2' \ ++ 'less' 'xfsprogs>=3.1.8' 'jfsutils' 'reiserfsprogs' 'mdadm' 'lvm2>=2.02.96' 'systemd>=189-2' \ + 'kmod>=9' 'btrfs-progs>=20120809') groups=('base') archs=('i686' 'x86_64') up2date="$_F_kernelver_ver" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
