Accepting request 237255 from home:trenn:branches:Base:System

- Delete mkinitrd scripts. This is done via %rpm regenerate_initrd_* macros

OBS-URL: https://build.opensuse.org/request/show/237255
OBS-URL: https://build.opensuse.org/package/show/Base:System/ucode-intel?expand=0&rev=22
This commit is contained in:
Tomáš Chvátal 2014-06-20 12:02:46 +00:00 committed by Git OBS Bridge
parent 01c4e643df
commit a65f147fdc
4 changed files with 5 additions and 52 deletions

View File

@ -1,8 +0,0 @@
#!/bin/bash
#%stage: boot
#%depends: udev
if [ -w /sys/devices/system/cpu/microcode/reload ];then
echo 1 >/sys/devices/system/cpu/microcode/reload
fi

View File

@ -1,35 +0,0 @@
#!/bin/bash
#%stage: boot
#
# Adds Intel microcode to the initrd
#
# If processor(s) are upgraded on the system, mkinitrd has to be re-called
# manually to include a possible other needed firmware to the initrd
#
if grep -q -i intel /proc/cpuinfo; then
echo -n "Microcode: "
if [ ! -e /lib/firmware/intel-ucode ];then
echo "Intel microcode not found, ucode-intel package not installed?"
return 0
fi
# TBD: Shall we keep this check whether
# /lib/firmware/intel-ucode/$family-$model-$stepping exists to avoid
# per cpu file not found messages? Otherwise udev firmware loader rule
# complaints about not found firmware files in /var/log/messages
#
TMP=$(grep -m1 "^cpu family" /proc/cpuinfo)
# Convert cpu family from /proc/cpuinfo from decimal to a 2 digit hex
cpu_family=$(printf "%02x" ${TMP#cpu family*: })
TMP=$(grep -m1 "^model" /proc/cpuinfo)
model=$(printf "%02x" ${TMP#model*: })
TMP=$(grep -m1 "^stepping" /proc/cpuinfo)
stepping=$(printf "%02x" ${TMP#stepping*: })
if [ -e /lib/firmware/intel-ucode/${cpu_family}-${model}-${stepping} ];then
mkdir -p "$tmp_mnt"/lib/firmware/intel-ucode
cp /lib/firmware/intel-ucode/${cpu_family}-${model}-${stepping}* "$tmp_mnt"/lib/firmware/intel-ucode
echo "Adding Intel microcode ${cpu_family}-${model}-${stepping}"
else
echo "No microcode available for CPU model: ${cpu_family}-${model}-${stepping}"
fi
fi

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 13 17:15:38 UTC 2014 - trenn@suse.de
- Delete mkinitrd scripts. This is done via %rpm regenerate_initrd_* macros
-------------------------------------------------------------------
Mon May 5 15:45:49 UTC 2014 - trenn@suse.de

View File

@ -16,7 +16,6 @@
#
Name: ucode-intel
Version: 20140430
Release: 0
@ -29,8 +28,6 @@ Url: http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=2
Source0: microcode-%{version}.tgz
Source1: intel-microcode2ucode.c
Source2: LICENSE
Source3: mkinitrd_setup-intel_microcode.sh
Source4: mkinitrd_boot-intel_microcode.sh
Supplements: modalias(x86cpu:vendor%3A0000%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
@ -47,8 +44,6 @@ cp %{SOURCE2} .
./generate_microcode microcode.dat
%install
install -D -m 0755 %{SOURCE3} %{buildroot}/lib/mkinitrd/scripts/setup-intel_microcode.sh
install -D -m 0755 %{SOURCE4} %{buildroot}/lib/mkinitrd/scripts/boot-intel_microcode.sh
install -D -m 0755 generate_microcode %{buildroot}%{_bindir}/generate_microcode
for file in intel-ucode/*; do
install -D -m 0644 $file %{buildroot}/lib/firmware/$file
@ -66,9 +61,5 @@ test -f /sys/devices/system/cpu/microcode/reload && /bin/echo 1 > /sys/devices/s
%doc LICENSE
%{_bindir}/generate_microcode
/lib/firmware/intel-ucode/
%dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/setup-intel_microcode.sh
/lib/mkinitrd/scripts/boot-intel_microcode.sh
%changelog