Hello community, here is the log from the commit of package microcode_ctl for openSUSE:Factory checked in at Mon May 31 01:00:16 CEST 2010. -------- --- microcode_ctl/microcode_ctl.changes 2010-05-17 20:08:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/microcode_ctl/microcode_ctl.changes 2010-05-29 22:00:55.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 29 19:54:49 UTC 2010 - cristian.rodriguez@opensuse.org + +- merge both Fedora and Debian improvements, most notably: + * microcode.dat is now considered firmware, and installed in /lib/firmware + * package no longer includes an init script microcode is loaded + using udev rules. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- microcode-select.diff microcode.init microcode_ctl-1.17-rpmlintrc New: ---- microcode.ctl_1.17-13.diff.gz microcode_ctl-1.17-suse_rh_paths.patch microcode_ctl.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ microcode_ctl.spec ++++++ --- /var/tmp/diff_new_pack.CzdazG/_old 2010-05-31 00:59:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CzdazG/_new 2010-05-31 00:59:55.000000000 +0200 @@ -26,12 +26,12 @@ Group: Hardware/Other Summary: Microcode Updates for Intel CPUs Version: 1.17 -Release: 105 +Release: 106 Source0: microcode_ctl-%{version}.tar.bz2 -Source1: microcode.init +Source1: microcode_ctl.rules Source2: microcode-%{data_version}.dat.bz2 -Source3: microcode_ctl-1.17-rpmlintrc -Patch0: microcode-select.diff +Patch0: microcode.ctl_1.17-13.diff.gz +Patch1: microcode_ctl-1.17-suse_rh_paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %insserv_prereq @@ -42,44 +42,26 @@ %prep %setup -q %patch0 -p1 +%patch1 %build -#%ifarch x86_64 -#ln -s /usr/include/asm-i386 asm -#%endif make CFLAGS="$RPM_OPT_FLAGS -I." %install -make DESTDIR=${RPM_BUILD_ROOT} \ - PREFIX=/ \ - MANDIR=%{_mandir}/man8 \ - install -mkdir -p ${RPM_BUILD_ROOT}/etc/init.d -rm -f $RPM_BUILD_ROOT/etc/init.d/microcode_ctl -install -m 0755 $RPM_SOURCE_DIR/microcode.init \ - ${RPM_BUILD_ROOT}/etc/init.d/microcode.ctl -bunzip2 -dc %SOURCE2 > $RPM_BUILD_ROOT/etc/microcode.dat - -%post -if grep Intel /proc/cpuinfo > /dev/null ; then - %{fillup_and_insserv -fy microcode.ctl} -fi - -%preun -%stop_on_removal - -%postun -%{insserv_cleanup} +%makeinstall +bunzip2 -dc %SOURCE2 > %{buildroot}/lib/firmware/microcode.dat +mkdir -p %{buildroot}/lib/udev/rules.d +install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/89-microcode.rules %clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT; %files %defattr(-,root,root) -%config(noreplace) /etc/microcode.dat -/etc/init.d/microcode.ctl +/lib/udev/rules.d/89-microcode.rules +/lib/firmware/microcode.dat /sbin/microcode_ctl -%doc %{_mandir}/man8/microcode_ctl.8.gz +%{_mandir}/man8/microcode_ctl.8.gz %doc README Changelog %changelog ++++++ microcode.ctl_1.17-13.diff.gz ++++++ ++++ 1927 lines (skipped) ++++++ microcode_ctl-1.17-suse_rh_paths.patch ++++++ Index: Makefile =================================================================== --- Makefile.orig 2010-05-29 17:38:49.000000000 +0200 +++ Makefile 2010-05-29 21:42:56.932967000 +0200 @@ -24,34 +24,22 @@ endif DESTDIR = PREFIX = /usr -INSDIR = $(PREFIX)/sbin +INSDIR = /sbin MANDIR = $(PREFIX)/share/man/man8 -MICDIR = /usr/share/misc - -RCFILE = microcode_ctl.start -RCFILEFINAL = microcode_ctl -# this is a bit nasty... -RCDIR = $(shell if [ -d /etc/init.d ]; then echo "/etc"; else echo "/etc/rc.d"; fi) -RCHOMEDIR = init.d -RCFILETO = $(RCDIR)/$(RCHOMEDIR) +MICDIR = /lib/firmware all: microcode_ctl microcode_ctl: microcode_ctl.c $(CC) $(CFLAGS) -o $(PROGRAM) microcode_ctl.c - echo "$(RCDIR)/$(RCHOMEDIR)/microcode_ctl" > microcode-filelist clean: rm -f $(PROGRAM) microcode_ctl.o microcode-filelist install: - $(INS) -s -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR) - -ifndef DESTDIR - chkconfig --add $(RCFILEFINAL) -else - echo "MAKE: Skipping chkconfig operation (rpm build?)" -endif + mkdir -p $(DESTDIR){$(MICDIR),$(INSDIR),$(MANDIR)} + $(INS) -m 644 microcode_ctl.8 $(DESTDIR)$(MANDIR) + $(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR) device: mkdir -p $(DESTDIR)/dev/cpu Index: microcode_ctl.c =================================================================== --- microcode_ctl.c.orig 2010-05-29 17:38:49.000000000 +0200 +++ microcode_ctl.c 2010-05-29 17:44:47.376445000 +0200 @@ -26,7 +26,7 @@ static int print_error_messages=1; #define FILENAME_MAXLEN 2048 #define MICROCODE_DEVICE_DEFAULT "/dev/cpu/microcode" -#define MICROCODE_FILE_DEFAULT "/usr/share/misc/intel-microcode.dat" +#define MICROCODE_FILE_DEFAULT "/lib/firmware/microcode.dat" static void usage(FILE *file) ++++++ microcode_ctl.rules ++++++ KERNEL=="cpu[0-9]*", ACTION=="add", RUN+="/sbin/modprobe microcode" KERNEL=="microcode", ACTION=="add", RUN+="/sbin/microcode_ctl -Qu" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org