Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=f113d888344ebc04205597e4fc972951e756d6aa
commit f113d888344ebc04205597e4fc972951e756d6aa Author: DeX77 <de...@frugalware.org> Date: Thu Jul 13 14:12:18 2017 +0200 kernel-initrd-4.12.1-2-x86_64 * Change initrd generation: we generate now on install diff --git a/source/base/kernel-initrd/00-frugalware.conf b/source/base/kernel-initrd/00-frugalware.conf new file mode 100644 index 0000000..10dfa28 --- /dev/null +++ b/source/base/kernel-initrd/00-frugalware.conf @@ -0,0 +1,6 @@ +omit_dracutmodules+="multipath systemd-bootchart" +add_dracutmodules+="dmsquash-live pollcdrom" +compress=xz +do_strip=no +fw_dir+="/lib/firmware" +early_microcode=yes diff --git a/source/base/kernel-initrd/FrugalBuild b/source/base/kernel-initrd/FrugalBuild index fd775dc..2762420 100644 --- a/source/base/kernel-initrd/FrugalBuild +++ b/source/base/kernel-initrd/FrugalBuild @@ -1,55 +1,31 @@ # Compiling Time: 0 SBU # Maintainer: James Buren <r...@frugalware.org> -Finclude kernel-version - -# WARNING: DO NOT BUMP THIS DIRECTLY. -# Various buildservers have bugged their chroots repeatedly -# and produce a bad initrd. Proper checks should be done -# before merging any initrd rebuild. - pkgname=kernel-initrd +_F_kernelmod_scriptlet="$Fincdir/$pkgname.install" +_F_cd_path="/" +Finclude kernel-module pkgver=$_F_kernelver_ver -pkgrel=1 +pkgrel=2 pkgdesc="The initrd for the Frugalware Linux Kernel." url="http://www.frugalware.org"; -rodepends=('scriptlet-core') +makedepends=('') depends=("kernel=$_F_kernelver_ver-$_F_kernelver_rel") -makedepends=('dracut>=045-3' 'linux-firmware>=20170703' 'xz' 'less' 'xfsprogs>=4.9.0' \ - 'jfsutils>=1.1.15-7' 'reiserfsprogs>=3.6.25-2' 'mdadm>=4.0' 'lvm2>=2.02.170' 'systemd>=231-14' \ - 'kmod>=24' 'btrfs-progs>=4.10.1' 'terminus-font-console' 'cryptsetup-luks>=1.7.4' \ - 'keyutils>=1.5.9-5' 'coreutils>=8.26' 'e2fsprogs>=1.43.4' 'intel-ucode>=20161104' 'frugalware>=2.1') +rodepends=('dracut>=045-3' 'scriptlet-core') groups=('base') archs=('x86_64') up2date="$_F_kernelver_ver" - -options+=('nofakeroot') +source=("00-frugalware.conf") +sha1sums=('11ae82ada67fbbfb0c082b0f6c4738140bd6c7a7') replaces=('kernel-initrd-modules' 'kernel-initrd-tools') conflicts=("${replaces[@]}") -OMITTED_MODULES="multipath systemd-bootchart" -ADDED_MODULES="dmsquash-live pollcdrom" - build() { - _UNAME="$_F_kernelver_ver-fw$_F_kernelver_rel" - _INITRD="initrd-$_UNAME" Fmkdir /boot - Fexec /usr/bin/dracut -N \ - --xz \ - --no-hostonly-i18n \ - --force \ - --nostrip \ - -o "$OMITTED_MODULES" \ - -a "$ADDED_MODULES" \ - --fwdir /lib/firmware \ - --early-microcode \ - -i /usr/lib/sysusers.d/ /usr/lib/sysusers.d/ \ - $Fdestdir/boot/$_INITRD \ - $_UNAME || Fdie - Ffileschmod /boot 0644 - Fln $_INITRD /boot/initrd + Finstall 644 /etc/dracut.conf.d/00-frugalware.conf + Fgenscriptlet } # optimization OK diff --git a/source/base/kernel-initrd/kernel-initrd.install b/source/base/kernel-initrd/kernel-initrd.install deleted file mode 100644 index 61ad974..0000000 --- a/source/base/kernel-initrd/kernel-initrd.install +++ /dev/null @@ -1,27 +0,0 @@ -post_install() -{ - #TODO Migration fix. Remove later - if [ -S /run/systemd/journal/dev-log ] && [ ! -L /dev/log ]; then - ln -sf /run/systemd/journal/dev-log /dev/log - fi - - if [ -f /boot/grub/grub.cfg ]; then - /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg - fi -} - -post_upgrade() -{ - post_install -} - -post_remove() -{ - post_install -} - -op=$1 -shift -$op $* - -# vim: ft=sh _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
