Hello community, here is the log from the commit of package FirmwareUpdateKit for openSUSE:Factory checked in at 2012-03-27 08:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FirmwareUpdateKit (Old) and /work/SRC/openSUSE:Factory/.FirmwareUpdateKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FirmwareUpdateKit", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/FirmwareUpdateKit/FirmwareUpdateKit.changes 2011-09-23 01:50:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.FirmwareUpdateKit.new/FirmwareUpdateKit.changes 2012-03-27 08:56:34.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Mar 6 16:06:00 CET 2012 - [email protected] + +- added himem driver +- updated to freedos 1.1 + +------------------------------------------------------------------- +Fri Feb 17 13:48:50 CET 2012 - [email protected] + +- specify image geometry explicitly + +------------------------------------------------------------------- +Fri Feb 17 12:04:03 CET 2012 - [email protected] + +- fix grub & lilo for small images (bnc#727974) +- added 'free' option to specify extra disk space +- added VERSION & changelog files +- removed dependency on master-boot-code + +------------------------------------------------------------------- +Tue Oct 25 17:35:34 CEST 2011 - [email protected] + +- fix iso creation for small firmware files + +------------------------------------------------------------------- Old: ---- FirmwareUpdateKit-1.1.tar.bz2 New: ---- FirmwareUpdateKit-1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FirmwareUpdateKit.spec ++++++ --- /var/tmp/diff_new_pack.aLtDHK/_old 2012-03-27 08:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.aLtDHK/_new 2012-03-27 08:56:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package FirmwareUpdateKit # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 Steffen Winterfeldt # # All modifications and additions to the file contributed by third parties @@ -17,17 +17,16 @@ # - Name: FirmwareUpdateKit +Requires: syslinux genisoimage dosfstools mtools +Summary: Assist with DOS-based firmware updates License: GPL-3.0+ Group: System/Boot -Requires: syslinux master-boot-code genisoimage dosfstools mtools -Summary: Assist with DOS-based firmware updates -Version: 1.1 -Release: 3 +Version: 1.5 +Release: 0 Obsoletes: dosbootdisk Provides: dosbootdisk -Source: %{name}-%{version}.tar.bz2 +Source: FirmwareUpdateKit-1.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -41,10 +40,7 @@ %build %install - install -d -m 755 %{buildroot}/usr/share/FirmwareUpdateKit - install -m 644 dosfiles/* %{buildroot}/usr/share/FirmwareUpdateKit - install -d -m 755 %{buildroot}/usr/bin - install -m 755 fuk %{buildroot}/usr/bin + make install DESTDIR=%{buildroot} %files %defattr(-,root,root) ++++++ FirmwareUpdateKit-1.1.tar.bz2 -> FirmwareUpdateKit-1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FirmwareUpdateKit-1.1/Makefile new/FirmwareUpdateKit-1.5/Makefile --- old/FirmwareUpdateKit-1.1/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/FirmwareUpdateKit-1.5/Makefile 2012-02-17 11:58:52.000000000 +0100 @@ -0,0 +1,22 @@ +GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) +GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) + +VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) + +.PHONY: all clean install + +all: changelog + +changelog: $(GITDEPS) + $(GIT2LOG) --changelog changelog + +install: all + install -d -m 755 $(DESTDIR)/usr/share/FirmwareUpdateKit + install -m 644 dosfiles/* $(DESTDIR)/usr/share/FirmwareUpdateKit + install -d -m 755 $(DESTDIR)/usr/bin + install -m 755 fuk $(DESTDIR)/usr/bin + perl -pi -e 's/<VERSION>/$(VERSION)/' $(DESTDIR)/usr/bin/fuk + +clean: + @rm -f *~ */*~ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FirmwareUpdateKit-1.1/VERSION new/FirmwareUpdateKit-1.5/VERSION --- old/FirmwareUpdateKit-1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 +++ new/FirmwareUpdateKit-1.5/VERSION 2012-03-26 15:28:41.000000000 +0200 @@ -0,0 +1 @@ +1.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FirmwareUpdateKit-1.1/changelog new/FirmwareUpdateKit-1.5/changelog --- old/FirmwareUpdateKit-1.1/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/FirmwareUpdateKit-1.5/changelog 2012-03-26 15:28:41.000000000 +0200 @@ -0,0 +1,12 @@ +2012-03-06: HEAD + - added himem driver + - updated to freedos 1.1 + +2012-02-17: 1.4 + - specify image geometry explicitly + +2012-02-17: 1.3 + - fix grub & lilo for small images + - added 'free' option to specify extra disk space + - added VERSION & changelog files + Files old/FirmwareUpdateKit-1.1/dosfiles/himemx.exe and new/FirmwareUpdateKit-1.5/dosfiles/himemx.exe differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FirmwareUpdateKit-1.1/dosfiles/isolinux.cfg new/FirmwareUpdateKit-1.5/dosfiles/isolinux.cfg --- old/FirmwareUpdateKit-1.1/dosfiles/isolinux.cfg 2008-06-12 10:57:44.000000000 +0200 +++ new/FirmwareUpdateKit-1.5/dosfiles/isolinux.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -default fwupdate - -label fwupdate - kernel memdisk - append initrd=fwupdate.img - -implicit 1 -prompt 0 -timeout 0 Files old/FirmwareUpdateKit-1.1/dosfiles/kernel.sys and new/FirmwareUpdateKit-1.5/dosfiles/kernel.sys differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FirmwareUpdateKit-1.1/fuk new/FirmwareUpdateKit-1.5/fuk --- old/FirmwareUpdateKit-1.1/fuk 2008-10-06 17:53:30.000000000 +0200 +++ new/FirmwareUpdateKit-1.5/fuk 2012-03-06 16:03:51.000000000 +0100 @@ -415,6 +415,9 @@ $opt_title = "Firmware Update"; +# leave some free space +$opt_free = "100k"; + GetOptions( 'help' => sub { usage 0 }, 'verbose+' => \$opt_verbose, @@ -425,6 +428,7 @@ 'grub' => \$opt_grub, 'title=s' => \$opt_title, 'run=s' => \$opt_run, + 'free=s' => \$opt_free, ) || usage 1; usage 1 if !@ARGV; @@ -437,6 +441,8 @@ $fuk_dir = tmp_dir; open F, ">$fuk_dir/config.sys"; +print F "switches=/f\n"; +print F "device=c:\himemx.exe\n"; close F; open F, ">$fuk_dir/autoexec.bat"; print F "$opt_run\n" if $opt_run; @@ -445,23 +451,25 @@ $hdimage = HDImage::new; $hdimage->verbose($opt_verbose); +$hdimage->size($opt_free); + if($opt_floppy) { $hdimage->chs(80, 2, 18); $hdimage->partition_ofs(0); } else { $hdimage->chs(0, 4, 16); - $hdimage->size(200); # leave some free space (in sectors) $hdimage->fit_size(1); } $hdimage->type(1); $hdimage->label('FWUPDATE'); $hdimage->fs('fat'); -$hdimage->mbr('/usr/lib/boot/master-boot-code'); +$hdimage->mbr('/usr/share/syslinux/mbr.bin'); $hdimage->boot_fat12('/usr/share/FirmwareUpdateKit/freedos_boot.fat12'); $hdimage->boot_fat16('/usr/share/FirmwareUpdateKit/freedos_boot.fat16'); $hdimage->add_files(('/usr/share/FirmwareUpdateKit/kernel.sys')); +$hdimage->add_files(('/usr/share/FirmwareUpdateKit/himemx.exe')); $hdimage->add_files(('/usr/share/FirmwareUpdateKit/command.com')); $hdimage->add_files(("$fuk_dir/config.sys", "$fuk_dir/autoexec.bat")); $hdimage->add_files(@files); @@ -480,6 +488,8 @@ $hdimage->write("$fuk_dir/fwupdate.img"); } +$memdisk_option = "harddisk c=$hdimage->{c} h=$hdimage->{h} s=$hdimage->{s}"; + if(!-f "/usr/share/syslinux/memdisk") { die "/usr/share/syslinux/memdisk: no such file\nPlease install package 'syslinux'.\n"; } @@ -494,7 +504,22 @@ mkdir "$fuk_dir/cd", 0755; link "$fuk_dir/fwupdate.img", "$fuk_dir/cd/fwupdate.img"; - system "cp /usr/share/FirmwareUpdateKit/isolinux.cfg $fuk_dir/cd"; + $_ = <<" isolinux"; +default fwupdate + +label fwupdate + kernel memdisk + append initrd=fwupdate.img $memdisk_option + +implicit 1 +prompt 0 +timeout 0 + isolinux + + open F, ">$fuk_dir/cd/isolinux.cfg"; + print F; + close F; + system "cp /usr/share/syslinux/memdisk $fuk_dir/cd"; system "cp /usr/share/syslinux/isolinux.bin $fuk_dir/cd"; system "genisoimage" . ($opt_verbose ? "" : " --quiet") . @@ -516,7 +541,7 @@ } else { $cfg .= "\n" if substr($cfg, -2) ne "\n\n"; - $cfg .= "title $opt_title\n kernel /boot/memdisk\n initrd /boot/fwupdate.img\n\n"; + $cfg .= "title $opt_title\n kernel /boot/memdisk $memdisk_option\n initrd /boot/fwupdate.img\n\n"; die "$opt_grub: $!\n" unless rename $opt_grub, "$opt_grub.fwupdate_backup"; die "$opt_grub: $!\n" unless open F, ">$opt_grub"; @@ -543,7 +568,7 @@ } else { $cfg .= "\n" if substr($cfg, -2) ne "\n\n"; - $cfg .= "image = /boot/memdisk\nlabel = \"$title\"\ninitrd = /boot/fwupdate.img\n\n"; + $cfg .= "image = /boot/memdisk\nlabel = \"$title\"\nappend = \"$memdisk_option\"\ninitrd = /boot/fwupdate.img\n\n"; die "$opt_lilo: $!\n" unless rename $opt_lilo, "$opt_lilo.fwupdate_backup"; die "$opt_lilo: $!\n" unless open F, ">$opt_lilo"; @@ -563,7 +588,7 @@ { print <<" usage"; Usage: fuk [OPTIONS] FILES -FirmwareUpdateKit version 1.1. +FirmwareUpdateKit version <VERSION>. Create bootable DOS system and add FILES to it. The main purpose is to assist with DOS-based firmware updates. @@ -576,8 +601,11 @@ --floppy FILE Create bootable (1440 kB) floppy disk. --image FILE Create bootable harddisk. --run COMMAND Run COMMAND after booting DOS. + --free SIZE Add SIZE free space to disk image. --verbose Be more verbose. +SIZE may include a unit (b, k, M, G, T, P, E). Default is b (512 bytes). + usage exit shift; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
