diff --git a/correct-paths-for-opensuse.patch b/correct-paths-for-opensuse.patch index a13c43b..3a6870b 100644 --- a/correct-paths-for-opensuse.patch +++ b/correct-paths-for-opensuse.patch @@ -1,6 +1,6 @@ ---- dracut-027_git201305310800.orig/dracut.sh -+++ dracut-027_git201305310800/dracut.sh -@@ -627,7 +627,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l +--- dracut-029_git201307171236.orig/dracut.sh ++++ dracut-029_git201307171236/dracut.sh +@@ -643,7 +643,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -9,9 +9,9 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $compress_l ]] && compress=$compress_l ---- dracut-027_git201305310800.orig/modules.d/10i18n/module-setup.sh -+++ dracut-027_git201305310800/modules.d/10i18n/module-setup.sh -@@ -85,6 +85,8 @@ install() { +--- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh ++++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh +@@ -94,6 +94,8 @@ install() { install_base() { dracut_install setfont loadkeys kbd_mode stty @@ -20,8 +20,8 @@ if ! dracut_module_included "systemd"; then inst ${moddir}/console_init.sh /lib/udev/console_init ---- dracut-027_git201305310800.orig/modules.d/50plymouth/module-setup.sh -+++ dracut-027_git201305310800/modules.d/50plymouth/module-setup.sh +--- dracut-029_git201307171236.orig/modules.d/50plymouth/module-setup.sh ++++ dracut-029_git201307171236/modules.d/50plymouth/module-setup.sh @@ -12,12 +12,12 @@ depends() { } @@ -38,8 +38,8 @@ fi inst_hook emergency 50 "$moddir"/plymouth-emergency.sh ---- dracut-027_git201305310800.orig/modules.d/90kernel-modules/module-setup.sh -+++ dracut-027_git201305310800/modules.d/90kernel-modules/module-setup.sh +--- dracut-029_git201307171236.orig/modules.d/90kernel-modules/module-setup.sh ++++ dracut-029_git201307171236/modules.d/90kernel-modules/module-setup.sh @@ -74,7 +74,7 @@ installkernel() { } @@ -49,8 +49,8 @@ [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf if ! dracut_module_included "systemd"; then inst_hook cmdline 01 "$moddir/parse-kernel.sh" ---- dracut-027_git201305310800.orig/modules.d/95udev-rules/module-setup.sh -+++ dracut-027_git201305310800/modules.d/95udev-rules/module-setup.sh +--- dracut-029_git201307171236.orig/modules.d/95udev-rules/module-setup.sh ++++ dracut-029_git201307171236/modules.d/95udev-rules/module-setup.sh @@ -11,6 +11,8 @@ install() { dracut_install udevadm cat uname blkid \ /etc/udev/udev.conf @@ -60,8 +60,8 @@ [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do [ -x "$_i" ] || continue ---- dracut-027_git201305310800.orig/modules.d/98systemd/rescue.service -+++ dracut-027_git201305310800/modules.d/98systemd/rescue.service +--- dracut-029_git201307171236.orig/modules.d/98systemd/rescue.service ++++ dracut-029_git201307171236/modules.d/98systemd/rescue.service @@ -16,7 +16,7 @@ Environment=HOME=/ Environment=DRACUT_SYSTEMD=1 Environment=NEWROOT=/sysroot @@ -69,5 +69,5 @@ -ExecStartPre=-/bin/plymouth quit +ExecStartPre=-/usr/bin/plymouth quit ExecStart=-/bin/sh -i -l - ExecStopPost=-/bin/rm -f /.console_lock + ExecStopPost=-/bin/rm -f -- /.console_lock ExecStopPost=-/usr/bin/systemctl --fail --no-block default diff --git a/dracut-029.tar.xz b/dracut-029.tar.xz deleted file mode 100644 index a627ddb..0000000 --- a/dracut-029.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5623e4fbcb14737ae76baf97736e4b2a0b4bc037dfb572de6021ffbd37928c59 -size 228272 diff --git a/dracut-029_git201307171236.tar.xz b/dracut-029_git201307171236.tar.xz new file mode 100644 index 0000000..78f79d2 --- /dev/null +++ b/dracut-029_git201307171236.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01f1bd815e2c6b3622140b62631aedc4751469f0342b4c8aa10078d3a9048797 +size 207144 diff --git a/dracut.changes b/dracut.changes index c72c1ff..2d0e8f2 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 21 17:17:58 UTC 2013 - tittiatcoke@gmail.com + +- Remove the http link for the Source0. Git snapshots can + not be obtained that way. + +------------------------------------------------------------------- +Wed Jul 17 20:25:58 UTC 2013 - crrodriguez@opensuse.org + +- Version 029_git201307171236 +* support early microcode loading in x86 + ------------------------------------------------------------------- Thu Jun 27 19:41:46 UTC 2013 - crrodriguez@opensuse.org diff --git a/dracut.spec b/dracut.spec index b70384b..2b8fdd2 100644 --- a/dracut.spec +++ b/dracut.spec @@ -21,7 +21,7 @@ %define replace_mkinitrd 0 Name: dracut -Version: 029 +Version: 029_git201307171236 Release: 0 Summary: Initramfs generator using udev @@ -30,7 +30,7 @@ Group: System/Base Url: https://dracut.wiki.kernel.org/ # Source can be generated by # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz -Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz +Source0: dracut-%{version}.tar.xz # openSUSE / SLE module to convert initrd command line parameters to dracut one # (not to be upstreamed) Source1: module-setup-initrd.sh @@ -74,6 +74,9 @@ Requires: util-linux >= 2.21 Requires: xz Recommends: binutils Requires: pigz +%ifarch %ix86 x86_64 +Requires: microcode_ctl +%endif %{?systemd_requires} %description @@ -160,7 +163,9 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log #mkdir -p %{buildroot}%{_localstatedir}/initramfs install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf - +%ifarch %ix86 x86_64 +echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf +%endif %if !%{replace_mkinitrd} rm %{buildroot}/etc/bash_completion.d/lsinitrd rm %{buildroot}%{_bindir}/mkinitrd @@ -198,6 +203,9 @@ rm -rf %{buildroot} %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %config %{_sysconfdir}/dracut.conf.d/01-dist.conf %endif +%ifarch %ix86 x86_64 +%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf +%endif %dir %{_sysconfdir}/dracut.conf.d %{_mandir}/man8/dracut.8* %if %{replace_mkinitrd} diff --git a/use_all_paths_udev.patch b/use_all_paths_udev.patch index dca6a15..667255a 100644 --- a/use_all_paths_udev.patch +++ b/use_all_paths_udev.patch @@ -1,8 +1,6 @@ -Index: dracut-027_git201304121327/dracut-functions.sh -=================================================================== ---- dracut-027_git201304121327.orig/dracut-functions.sh -+++ dracut-027_git201304121327/dracut-functions.sh -@@ -926,7 +926,7 @@ inst_rules() { +--- dracut-029_git201307171236.orig/dracut-functions.sh ++++ dracut-029_git201307171236/dracut-functions.sh +@@ -955,7 +955,7 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then diff --git a/use_initrd_insteadof_initramfs.patch b/use_initrd_insteadof_initramfs.patch index c951de8..78019e2 100644 --- a/use_initrd_insteadof_initramfs.patch +++ b/use_initrd_insteadof_initramfs.patch @@ -1,5 +1,5 @@ ---- dracut-027_git201305310800.orig/dracut.8.asc -+++ dracut-027_git201305310800/dracut.8.asc +--- dracut-029_git201307171236.orig/dracut.8.asc ++++ dracut-029_git201307171236/dracut.8.asc @@ -18,7 +18,7 @@ DESCRIPTION Create an initramfs for the kernel with the version . If is omitted, then the version of the actual running @@ -18,8 +18,8 @@ contains the kernel modules of the currently active kernel with version _++++_. ---- dracut-027_git201305310800.orig/dracut.asc -+++ dracut-027_git201305310800/dracut.asc +--- dracut-029_git201307171236.orig/dracut.asc ++++ dracut-029_git201307171236/dracut.asc @@ -153,7 +153,7 @@ To create a initramfs image, the most si This will generate a general purpose initramfs image, with all possible @@ -107,8 +107,8 @@ ---- This will reduce the size of the initramfs image significantly. ---- dracut-027_git201305310800.orig/dracut-initramfs-restore.sh -+++ dracut-027_git201305310800/dracut-initramfs-restore.sh +--- dracut-029_git201307171236.orig/dracut-initramfs-restore.sh ++++ dracut-029_git201307171236/dracut-initramfs-restore.sh @@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)" if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -118,9 +118,9 @@ cd /run/initramfs ---- dracut-027_git201305310800.orig/dracut.sh -+++ dracut-027_git201305310800/dracut.sh -@@ -484,7 +484,7 @@ if ! [[ $outfile ]]; then +--- dracut-029_git201307171236.orig/dracut.sh ++++ dracut-029_git201307171236/dracut.sh +@@ -490,7 +490,7 @@ if ! [[ $outfile ]]; then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" else @@ -129,8 +129,8 @@ fi fi ---- dracut-027_git201305310800.orig/mkinitrd-dracut.sh -+++ dracut-027_git201305310800/mkinitrd-dracut.sh +--- dracut-029_git201307171236.orig/mkinitrd-dracut.sh ++++ dracut-029_git201307171236/mkinitrd-dracut.sh @@ -11,7 +11,7 @@ usage () { $cmd " [--nocompress]" $cmd " " @@ -140,8 +140,8 @@ [[ $1 = '-n' ]] && exit 0 exit 1 ---- dracut-027_git201305310800.orig/lsinitrd.1.asc -+++ dracut-027_git201305310800/lsinitrd.1.asc +--- dracut-029_git201307171236.orig/lsinitrd.1.asc ++++ dracut-029_git201307171236/lsinitrd.1.asc @@ -18,7 +18,7 @@ DESCRIPTION ----------- lsinitrd shows the contents of an initramfs image. if is omitted, then @@ -151,8 +151,8 @@ OPTIONS ------- ---- dracut-027_git201305310800.orig/lsinitrd.sh -+++ dracut-027_git201305310800/lsinitrd.sh +--- dracut-029_git201307171236.orig/lsinitrd.sh ++++ dracut-029_git201307171236/lsinitrd.sh @@ -84,7 +84,7 @@ else && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" @@ -162,8 +162,8 @@ fi fi ---- dracut-027_git201305310800.orig/51-dracut-rescue-postinst.sh -+++ dracut-027_git201305310800/51-dracut-rescue-postinst.sh +--- dracut-029_git201307171236.orig/51-dracut-rescue-postinst.sh ++++ dracut-029_git201307171236/51-dracut-rescue-postinst.sh @@ -18,7 +18,7 @@ fi [[ $MACHINE_ID ]] || exit 1 [[ -f $KERNEL_IMAGE ]] || exit 1 diff --git a/use_sysconfig_values_correctly.patch b/use_sysconfig_values_correctly.patch index b4976ac..6866050 100644 --- a/use_sysconfig_values_correctly.patch +++ b/use_sysconfig_values_correctly.patch @@ -1,8 +1,6 @@ -Index: dracut-027_git201304121327/modules.d/10i18n/module-setup.sh -=================================================================== ---- dracut-027_git201304121327.orig/modules.d/10i18n/module-setup.sh -+++ dracut-027_git201304121327/modules.d/10i18n/module-setup.sh -@@ -146,6 +146,9 @@ install() { +--- dracut-029_git201307171236.orig/modules.d/10i18n/module-setup.sh ++++ dracut-029_git201307171236/modules.d/10i18n/module-setup.sh +@@ -155,6 +155,9 @@ install() { # Gentoo user may have KEYMAP set to something like "-u pl2", KEYMAP=${KEYMAP#-* }