Hello community, here is the log from the commit of package installation-images checked in at Mon Oct 6 18:54:35 CEST 2008. -------- --- installation-images/installation-images.changes 2008-10-02 15:13:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-10-06 15:41:29.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Oct 6 15:41:18 CEST 2008 - snwint@suse.de + +- add libsqlite3-0 to rescue image +- md5sum is in /bin now (bnc #431887) +- get efi image size right (bnc #431678) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-11.22.dif installation-images-11.22.tar.bz2 New: ---- installation-images-11.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.w12740/_old 2008-10-06 18:52:56.000000000 +0200 +++ /var/tmp/diff_new_pack.w12740/_new 2008-10-06 18:52:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.22) +# spec file for package installation-images (Version 11.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -91,10 +91,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.22 -Release: 3 -Source: installation-images-11.22.tar.bz2 -Patch: installation-images-11.22.dif +Version: 11.24 +Release: 1 +Source: installation-images-11.24.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -110,7 +109,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 468 +Release: 469 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -120,7 +119,6 @@ %prep %setup -%patch rm -f /usr/lib/build/checks/04-check-filelist %build @@ -175,6 +173,10 @@ /usr/sbin/mkinstallinitrd %changelog +* Mon Oct 06 2008 snwint@suse.de +- add libsqlite3-0 to rescue image +- md5sum is in /bin now (bnc #431887) +- get efi image size right (bnc #431678) * Thu Oct 02 2008 ro@suse.de - no ofed on ia64 for the moment * Thu Oct 02 2008 ro@suse.de ++++++ installation-images-11.22.tar.bz2 -> installation-images-11.24.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/bin/hdimage new/installation-images-11.24/bin/hdimage --- old/installation-images-11.22/bin/hdimage 2008-08-01 16:04:58.000000000 +0200 +++ new/installation-images-11.24/bin/hdimage 2008-10-06 15:21:00.000000000 +0200 @@ -1,7 +1,7 @@ #! /usr/bin/perl # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# package HDImage version 1.5 +# package HDImage version 1.6 # # Create disk image with partition table and a single partition. # @@ -143,6 +143,13 @@ $self->{type} = shift; } + sub fit_size + { + my $self = shift; + + $self->{fit_size} = shift; + } + sub label { my $self = shift; @@ -160,11 +167,18 @@ sub add_files { my $self = shift; + my $s; local $_; for (@_) { if(-f || -d) { push @{$self->{files}}, $_; + if($self->{fit_size}) { + $s = `du --apparent-size -k -s $_ 2>/dev/null`; + $s =~ s/\s.*$//; + $s <<= 1; + $self->size($self->{size} + $s); + } } else { print STDERR "$_: no such file or directory\n"; @@ -398,6 +412,7 @@ 'boot-fat12=s' => \$opt_boot_fat12, 'boot-fat16=s' => \$opt_boot_fat16, 'add-files=s{1,}' => \@opt_files, + 'fit-size' => \$opt_fit_size, ) || usage 1; usage 1 if @ARGV != 1; @@ -411,6 +426,7 @@ $size = $hdimage->chs(@opt_chs) if (@opt_chs); $size = $hdimage->size($opt_size) if defined $opt_size; die "sorry, no disk size\n" unless defined $size; +$hdimage->fit_size($opt_fit_size); $hdimage->type($opt_type); $hdimage->partition_ofs($opt_partition_ofs) if defined $opt_partition_ofs; $hdimage->label($opt_label); @@ -441,6 +457,7 @@ --boot-fat12 FILE For FAT12 filesystem: add bootloader from FILE to FAT boot block. --boot-fat16 FILE For FAT16 filesystem: add bootloader from FILE to FAT boot block. --add-files FILE1 FILE2 ... Copy files to FAT partition. + --fit-size Increase file system size by size of added files. --verbose Be more verbose. SIZE may include a unit (b, k, M, G, T, P, E). Default is b (512 bytes). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/bin/mk_image new/installation-images-11.24/bin/mk_image --- old/installation-images-11.22/bin/mk_image 2008-09-16 15:20:11.000000000 +0200 +++ new/installation-images-11.24/bin/mk_image 2008-10-06 13:03:46.000000000 +0200 @@ -10,6 +10,8 @@ use Conv2Image; use CompressImage; +sub check_link; + die "usage: $Script\n" if @ARGV; # env vars: @@ -86,6 +88,18 @@ SUSystem "strip_dir $tmpdir"; } + if(!$ENV{nolinkcheck}) { + print "checking for dangling symlinks...\n"; + if(check_link $tmpdir) { + if(1 || $debug =~ /\bignore\b/) { + warn "$Script: please fix symlinks\n"; + } + else { + die "$Script: please fix symlinks\n"; + } + } + } + @libdeps = split ',', $ENV{libdeps}; if(@libdeps) { $ldirs .= " ${BasePath}tmp/$_" for @libdeps; @@ -147,3 +161,21 @@ } } + +sub check_link +{ + my $dir = shift; + my ($x, $err); + local $_; + + for (`find $dir -xtype l`) { + chomp; + $x = readlink; + next if $x =~ /^\// && (-e("$dir$x") || $x =~ /\/lbin\//); + print STDERR "$_ -> $x\n"; + $err = 1; + } + + return $err; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/Changelog new/installation-images-11.24/Changelog --- old/installation-images-11.22/Changelog 2008-10-01 11:17:13.000000000 +0200 +++ new/installation-images-11.24/Changelog 2008-10-06 15:40:57.000000000 +0200 @@ -1,3 +1,11 @@ +6/10/2008: v11.24 + - no ofed on ia64 for the moment + +6/10/2008: v11.23 + - add libsqlite3-0 to rescue image + - md5sum is in /bin now (bnc #431887) + - get efi image size right (bnc #431678) + 1/10/2008: v11.22 - really use SLE themes for bootsplash - add libservicelog-1_0-1 to rescue image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/data/rescue/rescue.file_list new/installation-images-11.24/data/rescue/rescue.file_list --- old/installation-images-11.22/data/rescue/rescue.file_list 2008-10-01 11:16:31.000000000 +0200 +++ new/installation-images-11.24/data/rescue/rescue.file_list 2008-10-06 13:01:55.000000000 +0200 @@ -19,7 +19,7 @@ /etc/init.d /usr/tmp /var -r /var/{spool,squid,lib/YaST} +r /var/{squid,lib/YaST} iproute2: /sbin/ip @@ -553,6 +553,8 @@ /usr/lib* libservicelog-1_0-1: /usr/lib*/libservicelog-*.so.* +libsqlite3-0: + /usr/lib*/libsqlite3*.so.* powerpc-utils: /sbin /usr/sbin diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/data/root/root.file_list new/installation-images-11.24/data/root/root.file_list --- old/installation-images-11.22/data/root/root.file_list 2008-09-30 16:56:28.000000000 +0200 +++ new/installation-images-11.24/data/root/root.file_list 2008-10-06 14:12:25.000000000 +0200 @@ -61,9 +61,11 @@ /usr/bin/{expr,tee,dirname,chroot,test,tty} /bin/cat /usr/bin/{cut,head,md5sum,tail,tr,uniq,wc,od} + /bin/md5sum /bin/sort /bin/kill /usr/bin/readlink + /bin/readlink /usr/bin/mkfifo /usr/bin/sha1sum /usr/bin/nice @@ -926,6 +928,7 @@ open-iscsi: /sbin /etc/iscsi/iscsid.conf + /etc/init.d/open-iscsi gpg2: /usr/bin/gpg{,2} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/etc/config new/installation-images-11.24/etc/config --- old/installation-images-11.22/etc/config 2008-09-26 18:06:42.000000000 +0200 +++ new/installation-images-11.24/etc/config 2008-10-06 15:32:56.000000000 +0200 @@ -43,7 +43,6 @@ default = i386 = at76_usb,wlan-ng,ofed x86_64 = at76_usb,wlan-ng,ofed -ia64 = ofed ppc = ofed ppc64 = ofed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/Makefile new/installation-images-11.24/Makefile --- old/installation-images-11.22/Makefile 2008-10-01 11:13:45.000000000 +0200 +++ new/installation-images-11.24/Makefile 2008-10-06 15:26:20.000000000 +0200 @@ -96,7 +96,7 @@ boot-efi: base image=boot-efi src=boot filelist=efi fs=dir bin/mk_image ln images/initrd tmp/boot-efi/efi/boot/initrd - bin/hdimage --size=65520 --chs 0 4 63 --part-ofs 0 --mkfs fat --add-files tmp/boot-efi/* tmp/boot-efi/.p* -- images/boot-efi.img + bin/hdimage --size 500k --fit-size --chs 0 4 63 --part-ofs 0 --mkfs fat --add-files tmp/boot-efi/* tmp/boot-efi/.p* -- images/boot-efi.img rm -rf tmp/boot-efi/efi/boot/initrd images/boot-efi mv images/boot-efi.img images/boot-efi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.22/VERSION new/installation-images-11.24/VERSION --- old/installation-images-11.22/VERSION 2008-10-01 11:15:58.000000000 +0200 +++ new/installation-images-11.24/VERSION 2008-10-06 15:40:38.000000000 +0200 @@ -1 +1 @@ -11.22 +11.24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org