Hello community,
here is the log from the commit of package installation-images
checked in at Mon Aug 6 21:51:00 CEST 2007.
--------
--- installation-images/installation-images.changes 2007-08-05 18:18:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2007-08-06 18:44:13.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Aug 6 18:44:10 CEST 2007 - snwint@suse.de
+
+- added gpg to initrd (feat. 302195)
+
+-------------------------------------------------------------------
+Mon Aug 6 12:39:46 CEST 2007 - snwint@suse.de
+
+- getcfg gone
+- use squashfs for images
+- cleaned up Makefile a bit
+- added yast2-ntp-client (#296469)
+- readline renamed to libreadline5
+- added xset (#294292)
+
+-------------------------------------------------------------------
Old:
----
installation-images-9.92.tar.bz2
readline.diff
New:
----
installation-images-9.94.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.vl6848/_old 2007-08-06 21:49:42.000000000 +0200
+++ /var/tmp/diff_new_pack.vl6848/_new 2007-08-06 21:49:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 9.92)
+# spec file for package installation-images (Version 9.94)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,11 +12,12 @@
Name: installation-images
BuildRequires: IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-theme-SuSE bootsplash-theme-SuSE-SLES cifs-mount cron cups-libs ddrescue dhcpcd dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel perl-Compress-Zlib popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen scsi setserial smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo ttf-founder-simplified usbutils wget xfsdump
-BuildRequires: e2fsprogs yast2-add-on yast2-mouse yast2-network yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update
+BuildRequires: e2fsprogs yast2-add-on yast2-mouse yast2-network yast2-ntp-client yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update
BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 hfsutils kernel-binary-packages libelf0 libicu libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite util-linux
BuildRequires: bootsplash-theme-SuSE-NLD gpg2 jfsutils limal limal-perl perl-XML-Bare sax2-tools suse-build-key yast2-iscsi-client yast2-ncurses
BuildRequires: tightvnc xkeyboard-config xmset xorg-x11 xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-fonts xorg-x11-fonts-core xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXrender xorg-x11-libXt xorg-x11-libfontenc xorg-x11-libxcb xorg-x11-libxkbfile xorg-x11-server xterm
-BuildRequires: bzip2 cracklib curl fuse libexpat1 libreiserfs libreiserfs-devel module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc strace unfonts vim
+BuildRequires: bzip2 cracklib curl fuse libexpat1 libreiserfs libreiserfs-devel module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc squashfs strace unfonts vim
+BuildRequires: squashfs-kmp-default
%ifnarch ia64
BuildRequires: ltrace
%endif
@@ -67,10 +68,9 @@
Obsoletes: y2image
Autoreqprov: off
Summary: Installation Image Files
-Version: 9.92
-Release: 10
-Source: installation-images-9.92.tar.bz2
-Patch: readline.diff
+Version: 9.94
+Release: 1
+Source: installation-images-9.94.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -82,7 +82,6 @@
%prep
%setup
-%patch
%build
# files go to CD1/boot/$boot_arch/
@@ -182,9 +181,7 @@
# build rescue image, but only once
if [ ! -f %{buildroot}/CD1/boot/$boot_arch/rescue ] ; then
-# cramfs vesion
-use_cramfs=1 make rescue
-mv images/rescue.cramfs images/rescue
+make rescue
fi
%ifnarch %ix86 x86_64 ia64 ppc ppc64
@@ -214,7 +211,7 @@
make root
%ifarch sparc
-/sbin/mkfs.cramfs -b 8192 tmp/root images/root64.cramfs
+/sbin/mkfs.cramfs -b 8192 tmp/root images/root64
%endif
mkdir -p %{buildroot}/SuSE/$theme/CD1/boot
@@ -302,11 +299,11 @@
install -m 644 data/initrd/s390/suse.ins.parmfile.cd %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/parmfile.cd
%endif
-install -m 644 images/root.cramfs %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/root
+install -m 644 images/root %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/root
install -m 644 images/root.fonts %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/root.fonts
%ifarch sparc
-install -m 644 images/root64.cramfs %{buildroot}/SuSE/$theme/CD1/boot/root64
+install -m 644 images/root64 %{buildroot}/SuSE/$theme/CD1/boot/root64
%endif
# build rescue image only once, it's not theme dependent
@@ -351,6 +348,15 @@
/CD1
%changelog
+* Mon Aug 06 2007 - snwint@suse.de
+- added gpg to initrd (feat. 302195)
+* Mon Aug 06 2007 - snwint@suse.de
+- getcfg gone
+- use squashfs for images
+- cleaned up Makefile a bit
+- added yast2-ntp-client (#296469)
+- readline renamed to libreadline5
+- added xset (#294292)
* Sun Aug 05 2007 - aj@suse.de
- Follow readline rename to libreadline5.
* Tue Jul 31 2007 - snwint@suse.de
++++++ installation-images-9.92.tar.bz2 -> installation-images-9.94.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/bin/mk_rescue new/installation-images-9.94/bin/mk_rescue
--- old/installation-images-9.92/bin/mk_rescue 2007-03-26 15:48:08.000000000 +0200
+++ new/installation-images-9.94/bin/mk_rescue 2007-08-03 14:16:08.000000000 +0200
@@ -32,7 +32,9 @@
# now we really start...
$debug = exists($ENV{'debug'}) ? $ENV{'debug'} : "";
-$use_cramfs = exists($ENV{'use_cramfs'}) ? $ENV{'use_cramfs'} : 1;
+$imagetype = $ENV{imagetype};
+$imagetype = "cramfs" unless $imagetype;
+$use_gzip = 1 if $imagetype =~ s/\.gz$//;
if($ENV{'keeprescue'} != 1) {
# clean up
@@ -70,15 +72,12 @@
}
}
-if($use_cramfs) {
- Conv2Image $image, $tmpdir, 'cramfs';
- die "$Script: $!" unless rename $image, "$image.cramfs";
- $i = -s "$image.cramfs";
- print "$Script: created \"$image.cramfs\" ($i bytes)\n";
-}
-else {
- Conv2Image $image, $tmpdir, 'ext2', $start_size, $start_inodes, $extra_size, $extra_inodes;
+Conv2Image $image, $tmpdir, $imagetype, $start_size, $start_inodes, $extra_size, $extra_inodes;
+$i = -s $image;
+print "$Script: created \"$image\" ($i bytes)\n";
+
+if($use_gzip) {
$i = CompressImage $image;
- print "$Script: compressed rescue to \"$image\" ($i bytes)\n";
+ print "$Script: compressed \"$image\" ($i bytes)\n";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/bin/mk_root new/installation-images-9.94/bin/mk_root
--- old/installation-images-9.92/bin/mk_root 2007-07-16 13:00:33.000000000 +0200
+++ new/installation-images-9.94/bin/mk_root 2007-08-03 14:16:03.000000000 +0200
@@ -54,8 +54,9 @@
# now we really start...
$debug = exists($ENV{'debug'}) ? $ENV{'debug'} : "";
-$use_cramfs = exists($ENV{'use_cramfs'}) ? $ENV{'use_cramfs'} : 1;
-$uncompressed_root = exists($ENV{'uncompressed_root'}) ? $ENV{'uncompressed_root'} : "";
+$imagetype = $ENV{imagetype};
+$imagetype = "cramfs" unless $imagetype;
+$use_gzip = 1 if $imagetype =~ s/\.gz$//;
if($ENV{theme} eq 'Zen') {
$extra_size = 20000; # kbyte
@@ -119,18 +120,12 @@
}
-if($use_cramfs) {
- Conv2Image $image, $tmpdir, 'cramfs';
- die "$Script: $!" unless rename $image, "$image.cramfs";
- $i = -s "$image.cramfs";
- print "$Script: created \"$image.cramfs\" ($i bytes)\n";
-}
-
-if($uncompressed_root || !$use_cramfs) {
- Conv2Image $image, $tmpdir, 'ext2', $start_size, $start_inodes, $extra_size, $extra_inodes;
- if(!$uncompressed_root) {
- $i = CompressImage $image;
- print "$Script: created \"$image\" ($i bytes)\n";
- }
+Conv2Image $image, $tmpdir, $imagetype, $start_size, $start_inodes, $extra_size, $extra_inodes;
+$i = -s $image;
+print "$Script: created \"$image\" ($i bytes)\n";
+
+if($use_gzip) {
+ $i = CompressImage $image;
+ print "$Script: compressed \"$image\" ($i bytes)\n";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/Changelog new/installation-images-9.94/Changelog
--- old/installation-images-9.92/Changelog 2007-07-30 11:48:20.000000000 +0200
+++ new/installation-images-9.94/Changelog 2007-08-06 18:43:29.000000000 +0200
@@ -1,3 +1,14 @@
+6/8/2007: v9.94
+ - added gpg to initrd (feat. 302195)
+
+3/8/2007: v9.93
+ - getcfg gone
+ - use squashfs for images
+ - cleaned up Makefile a bit
+ - added yast2-ntp-client (#296469)
+ - readline renamed to libreadline5
+ - added xset (#294292)
+
30/7/2007: v9.92
- added ps3 modules (#153268)
- added rpc.statd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/base/base.file_list new/installation-images-9.94/data/base/base.file_list
--- old/installation-images-9.92/data/base/base.file_list 2007-07-30 11:11:26.000000000 +0200
+++ new/installation-images-9.94/data/base/base.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -40,7 +40,7 @@
bash:
/bin
-readline:
+libreadline5:
/lib*
coreutils:
@@ -50,7 +50,7 @@
r /bin/su
libexpat1:
- lib*/libexpat.so.*
+ /lib*/libexpat.so.*
libacl:
/lib*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/initrd/initrd_base.file_list new/installation-images-9.94/data/initrd/initrd_base.file_list
--- old/installation-images-9.92/data/initrd/initrd_base.file_list 2007-07-30 11:15:23.000000000 +0200
+++ new/installation-images-9.94/data/initrd/initrd_base.file_list 2007-08-06 18:35:52.000000000 +0200
@@ -262,7 +262,7 @@
gdb:
m /usr/bin/gdb /bin/gdb
- readline:
+ libreadline5:
/lib*/libreadline.so*
/lib*/libhistory.so*
@@ -385,41 +385,43 @@
endif
if arch eq 'ia32' || arch eq 'x86_64'
+ bootsplash:
+ /sbin/splash
- bootsplash:
- /sbin/splash
+ d /etc/bootsplash/themes/
+ e cp -a /<theme>/animations etc/bootsplash/themes/
+ e cp -a /<theme>/images etc/bootsplash/themes/
- d /etc/bootsplash/themes/
- e cp -a /<theme>/animations etc/bootsplash/themes/
- e cp -a /<theme>/images etc/bootsplash/themes/
+ # wlan
+ ipw-firmware:
+ /lib/firmware
-# wlan
-ipw-firmware:
- /lib/firmware
+ iwl3945-ucode:
+ /lib/firmware/iwlwifi-*
-iwl3945-ucode:
- /lib/firmware/iwlwifi-*
+ iwl4965-ucode:
+ /lib/firmware/iwlwifi-*
-iwl4965-ucode:
- /lib/firmware/iwlwifi-*
+ atmel-firmware:
+ /lib/firmware
-atmel-firmware:
- /lib/firmware
+ wpa_supplicant:
+ /usr/sbin
-wpa_supplicant:
- /usr/sbin
+ wireless-tools:
+ /usr/sbin
+ /usr/lib*/libiw.so.*
+ /etc
+ r /usr/sbin/switch_prism_driver
+ r /usr/sbin/install_acx100_firmware
+ r /usr/sbin/install_intersil_firmware
+
+ libopenssl0_9_8:
+ /usr/lib*/libcrypto.so.*
+ /usr/lib*/libssl.so.*
-wireless-tools:
- /usr/sbin
- /usr/lib*/libiw.so.*
- /etc
- r /usr/sbin/switch_prism_driver
- r /usr/sbin/install_acx100_firmware
- r /usr/sbin/install_intersil_firmware
-
-libopenssl0_9_8:
- /usr/lib*/libcrypto.so.*
- /usr/lib*/libssl.so.*
+endif
+# i386/x86_64
curl:
/usr/bin/curl
@@ -430,9 +432,6 @@
libidn:
/usr/lib*/libidn.so.*
-endif
-# i386/x86_64
-
zlib:
/lib*/libz.so.1*
@@ -450,7 +449,7 @@
/bin/{sh,bash}
s bash /bin/lsh
-readline:
+libreadline5:
/lib*/libreadline.so*
/lib*/libhistory.so*
@@ -503,6 +502,19 @@
nfs-client:
/var/lib/nfs
+gpg2:
+ /usr/bin/gpg{,2}
+d root/.gnupg
+
+libbz2-1:
+ /lib*/libbz2.so*
+
+libgcrypt:
+ /lib*/libgcrypt.so*
+
+libgpg-error:
+ /lib*/libgpg-error.so*
+
suse-build-key:
m /usr/lib/rpm/gnupg/suse-build-key.gpg /installkey.gpg
@@ -656,13 +668,3 @@
e echo "InitrdID: " >>linuxrc.config
endif
-if arch eq 'ia32'
-e echo "InstallDir: /boot/i386/inst-sys" >>linuxrc.config
-e echo "RescueImage: /boot/i386/rescue" >>linuxrc.config
-e echo "RootImage: /boot/i386/root" >>linuxrc.config
-else
-e echo "InstallDir: /boot/<arch>/inst-sys" >>linuxrc.config
-e echo "RescueImage: /boot/<arch>/rescue" >>linuxrc.config
-e echo "RootImage: /boot/<arch>/root" >>linuxrc.config
-endif
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/initrd/zeninitrd_base.file_list new/installation-images-9.94/data/initrd/zeninitrd_base.file_list
--- old/installation-images-9.92/data/initrd/zeninitrd_base.file_list 2006-07-04 14:09:49.000000000 +0200
+++ new/installation-images-9.94/data/initrd/zeninitrd_base.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -171,7 +171,7 @@
#! gdb:
#! m /usr/bin/gdb /bin/gdb
- readline:
+ libreadline5:
/lib*/libreadline.so*
/lib*/libhistory.so*
@@ -274,7 +274,7 @@
s bash /bin/lsh
s bash /bin/ash
-readline:
+libreadline5:
/lib*/libreadline.so*
/lib*/libhistory.so*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/rescue/hal.file_list new/installation-images-9.94/data/rescue/hal.file_list
--- old/installation-images-9.92/data/rescue/hal.file_list 2007-05-02 11:26:00.000000000 +0200
+++ new/installation-images-9.94/data/rescue/hal.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -11,7 +11,7 @@
bash:
/bin
-readline:
+libreadline5:
/lib*
glibc:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/rescue/rescue.file_list new/installation-images-9.94/data/rescue/rescue.file_list
--- old/installation-images-9.92/data/rescue/rescue.file_list 2007-07-30 11:24:48.000000000 +0200
+++ new/installation-images-9.94/data/rescue/rescue.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -64,7 +64,7 @@
bash:
/bin
-readline:
+libreadline5:
/lib*
cpio:
@@ -570,7 +570,6 @@
/etc
/sbin
/var
- /lib*
/var
E postin
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/root/machbunt.file_list new/installation-images-9.94/data/root/machbunt.file_list
--- old/installation-images-9.92/data/root/machbunt.file_list 2007-07-26 13:22:36.000000000 +0200
+++ new/installation-images-9.94/data/root/machbunt.file_list 2007-08-06 12:05:04.000000000 +0200
@@ -145,6 +145,7 @@
xorg-x11-libs:
/usr/lib*/libXaw*.so.*
/usr/lib*/libXcursor.so.*
+ /usr/lib*/libXfontcache.so.*
/usr/lib*/libXft.so.*
/usr/lib*/libXinerama.so.*
/usr/lib*/libXi.so.*
@@ -182,6 +183,7 @@
/usr/bin/xkbcomp
/usr/bin/xmodmap
/usr/bin/xrefresh
+ /usr/bin/xset
xorg-x11-fonts-core:
# 'fixed' font
@@ -301,7 +303,7 @@
endif
/usr/share/desktop-data/qtrc
- kdelibs3:
+ kdelibs3-default-style:
/opt/kde3/lib*/kde3/plugins/styles/plastik.so
/opt/kde3/lib*/libkdefx.so.*
d /usr/lib/qt3/plugins/styles
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/root/root.file_list new/installation-images-9.94/data/root/root.file_list
--- old/installation-images-9.92/data/root/root.file_list 2007-07-30 11:27:25.000000000 +0200
+++ new/installation-images-9.94/data/root/root.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -48,7 +48,7 @@
/bin/bash
s bash /bin/sh
-readline:
+libreadline5:
/lib*/libreadline.so.*
/lib*/libhistory.so.*
@@ -385,8 +385,8 @@
yast2-ncurses:
/
yast2-network:
- # /usr/share/YaST2/include/network/install.ycp
- # /usr/share/YaST2/modules/NetworkStorage.*
+ /
+ yast2-ntp-client:
/
yast2-packager:
/
@@ -707,8 +707,6 @@
endif
sysconfig:
- /sbin/getcfg*
- /lib*/libgetconfig.so*
# for modify_resolvconf
d etc/sysconfig/network
e echo MODIFY_RESOLV_CONF_DYNAMICALLY=\"yes\" >etc/sysconfig/network/config
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/data/root/zenroot.file_list new/installation-images-9.94/data/root/zenroot.file_list
--- old/installation-images-9.92/data/root/zenroot.file_list 2007-05-02 11:26:00.000000000 +0200
+++ new/installation-images-9.94/data/root/zenroot.file_list 2007-08-06 11:28:45.000000000 +0200
@@ -55,7 +55,7 @@
s bash /bin/sh
s bash /bin/ash
-readline:
+libreadline5:
/lib*/libreadline.so.*
/lib*/libhistory.so.*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/etc/config new/installation-images-9.94/etc/config
--- old/installation-images-9.92/etc/config 2007-07-27 15:07:42.000000000 +0200
+++ new/installation-images-9.94/etc/config 2007-08-03 16:11:44.000000000 +0200
@@ -35,9 +35,9 @@
; extra kmps we need (',' separated list)
[KMP]
-default =
-i386 = iwlwifi,at76_usb,adm8211,rt2x00,wlan-ng
-x86_64 = iwlwifi,at76_usb,adm8211,rt2x00,wlan-ng
+default = squashfs
+i386 = squashfs,iwlwifi,at76_usb,adm8211,rt2x00,wlan-ng
+x86_64 = squashfs,iwlwifi,at76_usb,adm8211,rt2x00,wlan-ng
; lib directory
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/etc/module.config new/installation-images-9.94/etc/module.config
--- old/installation-images-9.92/etc/module.config 2007-07-27 17:07:21.000000000 +0200
+++ new/installation-images-9.94/etc/module.config 2007-08-06 11:37:43.000000000 +0200
@@ -47,6 +47,10 @@
dm-zero
dm-hp-sw
dm-rdac
+dm-log
+dm-mem-cache
+dm-raid4-5
+dm-region_hash
dmapi,-,-
edd,-BIOS EDD information,-
faulty
@@ -168,10 +172,6 @@
zlib_inflate
nls_cp437,"-Codepage 437",-
nls_iso8859-1,"-Charset iso8859-1",-
-fat,"-low-level FAT-based fs support",-
-vfat,VFAT,-
-isofs,ISOFS,-
-cramfs,CRAMFS,-
nfs,NFS Client,-
psmouse,"PS/2 Mouse",-
loop,,-
@@ -647,6 +647,7 @@
ext2,Ext2,-
ext3,Ext3,-
ext4dev,Ext4,-
+fat,"-low-level FAT-based fs support",-
fuse,,-
hfs,HFS,-
hfsplus,HFS+,-
@@ -659,6 +660,7 @@
ntfs,NTFS (read only),-
reiserfs,ReiserFS,-
smbfs,SMB,-
+squashfs,SquashFS,-
udf,UDF,-
vfat,VFAT,-
xfs,XFS,-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/etc/module.list new/installation-images-9.94/etc/module.list
--- old/installation-images-9.92/etc/module.list 2007-07-27 17:07:55.000000000 +0200
+++ new/installation-images-9.94/etc/module.list 2007-08-03 16:18:45.000000000 +0200
@@ -61,6 +61,7 @@
kernel/fs/reiserfs/
kernel/fs/reiser4/
kernel/fs/smbfs/
+kernel/fs/squashfs.ko
kernel/fs/cifs/
kernel/fs/vfat/
kernel/fs/xfs/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/lib/Conv2Image.pm new/installation-images-9.94/lib/Conv2Image.pm
--- old/installation-images-9.92/lib/Conv2Image.pm 2005-02-18 12:23:45.000000000 +0100
+++ new/installation-images-9.94/lib/Conv2Image.pm 2007-08-03 14:21:16.000000000 +0200
@@ -24,7 +24,8 @@
{
my (
$image, $dir, $fs, $x_k, $x_inodes, $c_k, $c_inodes, $blk_size, $blks,
- $ublks, $inds, $uinds, $tmp_k, $tmp_inodes, $cnt, $size, $name, $mkcramfs
+ $ublks, $inds, $uinds, $tmp_k, $tmp_inodes, $cnt, $size, $name, $mkcramfs,
+ $mksquashfs
);
($image, $dir, $fs, $c_k, $c_inodes, $x_k, $x_inodes) = @_;
@@ -36,12 +37,10 @@
if($fs eq 'cramfs') {
$mkcramfs = "/usr/bin/mkcramfs" if -x "/usr/bin/mkcramfs";
$mkcramfs = "/sbin/mkfs.cramfs" if -x "/sbin/mkfs.cramfs";
-
die "$Script: no mkfs.cramfs\n" unless $mkcramfs;
-
SUSystem "rm -f $image";
- system "touch $image"; # just to ensure the image gets the correct owner
- SUSystem "sh -c '$mkcramfs $dir $image >$image.cramfs.log'" and die "$Script: mkfs.cramfs failed";
+ system "touch $image $image.log"; # just to ensure the image gets the correct owner
+ SUSystem "sh -c '$mkcramfs $dir $image >$image.log'" and die "$Script: mkfs.cramfs failed";
$size = -s $image;
die "$Script: no image?" if $size == 0;
$name = $image;
@@ -51,17 +50,24 @@
SUSystem "pcramfs '$name' $image" and die "$Script: pcramfs failed";
return;
}
-
- if($fs eq 'cpio') {
+ if($fs eq 'squashfs') {
+ $mksquashfs = "/usr/bin/mksquashfs" if -x "/usr/bin/mksquashfs";
+ die "$Script: no mksquashfs\n" unless $mksquashfs;
+ SUSystem "rm -f $image";
+ system "touch $image $image.log"; # just to ensure the image gets the correct owner
+ SUSystem "sh -c '$mksquashfs $dir $image -noappend >$image.log'" and die "$Script: mksquashfs failed";
+ $size = -s $image;
+ die "$Script: no image?" if $size == 0;
+ return;
+ }
+ elsif($fs eq 'cpio') {
SUSystem "rm -f $image";
system "touch $image"; # just to ensure the image gets the correct owner
SUSystem "sh -c '( cd $dir ; find . | cpio --quiet -o -H newc ) >$image'" and die "$Script: cpio failed";
return;
}
-
- if($fs eq 'minix' && !-x('/sbin/mkfs.minix')) {
- $fs = 'ext2';
- print STDERR "WARNING: no support for minix fs; using ext2!\n"
+ elsif($fs ne 'ext2' && $fs ne 'minix') {
+ die "ERRROR: no support for \"$fs\"!\n"
}
while($cnt <= 2) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/Makefile new/installation-images-9.94/Makefile
--- old/installation-images-9.92/Makefile 2006-10-19 17:49:48.000000000 +0200
+++ new/installation-images-9.94/Makefile 2007-08-03 16:22:27.000000000 +0200
@@ -4,8 +4,8 @@
PBINS = initrd_test mk_boot mk_initrd mk_initrd_test mk_root
.PHONY: all dirs initrd initrd_test boot boot_axp rescue \
- root liveeval html clean distdir install install_xx rdemo brescue \
- rescue_cd mboot base bootcd2 bootdisk bootcd rootcd rootfonts hal \
+ root liveeval html clean distdir install install_xx \
+ mboot base bootcd2 bootdisk bootcd rootfonts hal \
biostest gkv
all: bootdvd bootcd2 rescue root
@@ -42,7 +42,7 @@
theme=Zen initrd=large boot=isolinux memtest=no bin/mk_boot
zenroot: dirs base
- YAST_IS_RUNNING=1 theme=Zen use_cramfs= uncompressed_root=1 filelist=zenroot bin/mk_root
+ YAST_IS_RUNNING=1 theme=Zen imagetype=$${imagetype:-ext2} filelist=zenroot bin/mk_root
plain_initrd: dirs
YAST_IS_RUNNING=1 bin/mk_initrd
@@ -68,9 +68,6 @@
# with_smb=1
initramfs=$${initramfs:-1} initrd=large boot=isolinux make boot
-rootcd:
- use_cramfs=1 make root
-
boot_axp: initrd
bin/mk_boot_axp
@@ -80,29 +77,17 @@
root: dirs base
# just for now
root_i18n=1 root_gfx=1 \
- YAST_IS_RUNNING=1 bin/mk_root
+ imagetype=$${imagetype:-squashfs} YAST_IS_RUNNING=1 bin/mk_root
rootfonts: dirs base
- use_cramfs=0 nolibs=1 filelist=fonts image_name=root.fonts bin/mk_root
-
-liveeval: dirs base
- bin/mk_liveeval
-
-rdemo: dirs base
- bin/mk_rdemo
+ imagetype=$${imagetype:-squashfs} nolibs=1 filelist=fonts image_name=root.fonts bin/mk_root
rescue: dirs base
- YAST_IS_RUNNING=1 bin/mk_rescue
+ imagetype=$${imagetype:-squashfs} YAST_IS_RUNNING=1 bin/mk_rescue
hal: dirs base
YAST_IS_RUNNING=1 filelist=hal bin/mk_rescue
-brescue: dirs base
- bin/mk_brescue
-
-rescue_cd: boot brescue rdemo
- bin/mk_rescue_cd
-
mboot:
make -C src/mboot
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/README.configoptions new/installation-images-9.94/README.configoptions
--- old/installation-images-9.92/README.configoptions 2006-07-04 15:34:35.000000000 +0200
+++ new/installation-images-9.94/README.configoptions 2007-08-03 14:14:44.000000000 +0200
@@ -49,6 +49,10 @@
image_name=foo
- name the image 'foo'
+ imagetype=foo
+ imagetype=foo.gz
+ - use foo as filesystem for image (.gz: and compress with gzip)
+
o rescue
@@ -62,6 +66,10 @@
filelist=foo
- build using foo.file_list
+ imagetype=foo
+ imagetype=foo.gz
+ - use foo as filesystem for image (.gz: and compress with gzip)
+
o base
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-9.92/VERSION new/installation-images-9.94/VERSION
--- old/installation-images-9.92/VERSION 2007-07-27 14:03:52.000000000 +0200
+++ new/installation-images-9.94/VERSION 2007-08-06 18:42:56.000000000 +0200
@@ -1 +1 @@
-9.92
+9.94
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org