Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-02-16 14:56:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-02-09 16:20:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-02-16 14:57:02.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Feb 16 13:28:14 CET 2012 - [email protected] + +- adjust to package changes + +------------------------------------------------------------------- +Wed Feb 15 14:03:56 CET 2012 - [email protected] + +- adjust to package changes +- use xen kmps +- module config cleanup +- added cd1 dir +- add make target to prepare an iso image + +------------------------------------------------------------------- +Wed Feb 15 14:03:33 CET 2012 - [email protected] + +- added xen-kmp + +------------------------------------------------------------------- +Mon Feb 13 14:17:37 CET 2012 - [email protected] + +- adjust to package changes +- drop glibc locale archive + +------------------------------------------------------------------- Old: ---- installation-images-13.26.tar.bz2 New: ---- installation-images-13.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.0LPeVr/_old 2012-02-16 14:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.0LPeVr/_new 2012-02-16 14:57:03.000000000 +0100 @@ -244,6 +244,7 @@ BuildRequires: tftp %if %{build_xen} BuildRequires: kernel-xen +BuildRequires: xen-kmp-default %else ##BuildIgnore: kernel-xen %endif @@ -348,9 +349,9 @@ Summary: Installation Image Files License: GPL-2.0+ Group: Metapackages -Version: 13.26 +Version: 13.29 Release: 0 -Source: installation-images-13.26.tar.bz2 +Source: installation-images-13.29.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-13.26.tar.bz2 -> installation-images-13.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/Makefile new/installation-images-13.29/Makefile --- old/installation-images-13.26/Makefile 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.29/Makefile 2012-02-13 15:32:32.000000000 +0100 @@ -51,7 +51,7 @@ .PHONY: all dirs base biostest initrd \ boot boot-efi root rescue root+rescue gdb bind clean \ boot-themes initrd-themes root-themes install \ - install-initrd mini-iso-rmlist debuginfo + install-initrd mini-iso-rmlist debuginfo cd1 all: $(ALL_TARGETS) VERSION changelog @rm images/*.log @@ -187,6 +187,17 @@ libdeps=zenroot image=Zen/root tmpdir=zenroot src=root filelist=zenroot fs=squashfs bin/mk_image endif +cd1: base + mkdir -p data/cd1/gen + rm -f data/cd1/gen/rpm.file_list + for i in `cat images/rpmlist` ; do \ + echo -e "$$i:\n X <rpm_file> CD1/boot/<arch>\n" >> data/cd1/gen/rpm.file_list; \ + done + nostrip=1 image=cd1 fs=none sw 0 bin/mk_image + cp -a images/instsys/CD1 tmp/cd1 + rm -f tmp/cd1/CD1/boot/*/rpmlist + cp -a images/instsys/branding/openSUSE/CD1 tmp/cd1 + mini-iso-rmlist: base rm -f images/$@ for i in \ @@ -210,7 +221,7 @@ -@rm -rf images tmp -@rm -f `find -name '*~'` -@rm -rf /tmp/mk_initrd_* /tmp/mk_image_* - -@rm -rf data/initrd/gen data/boot/gen data/base/gen data/demo/gen + -@rm -rf data/initrd/gen data/boot/gen data/base/gen data/cd1/gen -@rm -f gpg/trustdb.gpg gpg/random_seed install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/VERSION new/installation-images-13.29/VERSION --- old/installation-images-13.26/VERSION 2012-02-09 15:55:42.000000000 +0100 +++ new/installation-images-13.29/VERSION 2012-02-16 13:28:09.000000000 +0100 @@ -1 +1 @@ -13.26 +13.29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/changelog new/installation-images-13.29/changelog --- old/installation-images-13.26/changelog 2012-02-09 15:55:46.000000000 +0100 +++ new/installation-images-13.29/changelog 2012-02-16 13:28:12.000000000 +0100 @@ -1,4 +1,19 @@ -2012-02-09: HEAD +2012-02-16: HEAD + - adjust to package changes + +2012-02-15: 13.28 + - adjust to package changes + - ex hyper-v + - use xen & hyper-v kmps + - module config cleanup + - added cd1 dir + - add make target to prepare an iso image + +2012-02-13: 13.27 + - adjust to package changes + - drop glibc locale archive + +2012-02-09: 13.26 - fix symlink check - adjust to latest package changes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/base/base.file_list new/installation-images-13.29/data/base/base.file_list --- old/installation-images-13.26/data/base/base.file_list 2012-02-09 15:05:28.000000000 +0100 +++ new/installation-images-13.29/data/base/base.file_list 2012-02-16 12:43:01.000000000 +0100 @@ -84,7 +84,7 @@ libattr*: / -libpcre0: +libpcre*: / findutils: @@ -131,10 +131,10 @@ r /usr/lib/rpm/rpm{get,put}text r /usr/bin/rpmqpack -libpopt0: - /lib* +libpopt*: + / -libelf1: +libelf*: / liblua5_1: @@ -183,8 +183,7 @@ /usr/bin/fc-cache gawk: - /bin - /usr/bin + / if arch eq 'i386' || arch eq 'x86_64' bootsplash: @@ -192,14 +191,14 @@ r /sbin/fbtruetype endif -liblcms1: - /usr/lib*/liblcms.so* +liblcms*: + / libmng*: - /usr/lib*/libmng.so* + / libjpeg62: - /usr/lib*/libjpeg.so* + / insserv: /etc @@ -238,15 +237,14 @@ libdb-*: / -gdbm: - /usr/lib*/libgdbm.so.* - /usr/lib*/libgdbm_compat.so.* +libgdbm*: + / gzip: - /bin + / -libbz2-1: - /lib*/libbz2.so.* +libbz2-*: + / cpio: / @@ -258,33 +256,37 @@ / pwdutils: - /etc - /usr/bin - /usr/sbin - /usr/lib* + / pam: - /{etc,lib*,sbin} + / libaudit*: / -libldap-2_4-2: +libldap-*-*: / libopenssl*: / cyrus-sasl: - /usr/lib*/libsasl2.so.* + / + +libkeyutils*: + / + +libcom_err*: + / + +krb5: + / libnscd: - /lib*/libnscd.so* + / openslp: - /etc - /usr/bin - /usr/lib* + / libxcrypt: / @@ -293,12 +295,10 @@ / cracklib: - /usr/sbin - /usr/lib* - /usr/share/cracklib + / strace: - /usr/bin/strace + / util-linux: /bin/mount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/base/create_locale new/installation-images-13.29/data/base/create_locale --- old/installation-images-13.26/data/base/create_locale 2011-02-21 15:47:04.000000000 +0100 +++ new/installation-images-13.29/data/base/create_locale 2012-02-13 09:48:43.000000000 +0100 @@ -1,89 +1,20 @@ #! /usr/bin/perl -sub build_archive; +# link everything to en_US.utf8 -# make all locales links to en_US, cs_CZ or ru_RU -# according to the needed iso... +$tmp_locale = "tmp/locale"; -@real_locales = qw ( - en_US/ISO-8859-1 - en_US.UTF-8/UTF-8 - cs_CZ/ISO-8859-2 - ru_RU.KOI8-R/KOI8-R -); - -if(-f "/usr/lib/locale/locale-archive") { - print "using locale archive\n"; -} -elsif(-d "/usr/lib/locale/en_US") { - print "using locale directories\n"; -} -else { - die "no locale found\n"; -} - -build_archive 0; - -chomp(@l = `localedef --prefix=/tmp --list-archive`); -@real_locales{@l} = (); - -if(-f "/usr/lib/locale/locale-archive") { - chomp(@l = `localedef --list-archive`); -} -else { - chomp(@l = `ls /usr/lib/locale/`); -} - -push @l, ( 'km_KH.utf8' ); - -@all_locales{@l} = (); - -for (sort keys %real_locales) { - print "$_\n"; -} - -for (sort keys %all_locales) { - if(!exists($real_locales{$_})) { - if(/\.utf8$/) { - push @aliases, "$_\ten_US.utf8\n"; - } - else { - if(/^(hr_HR|hu_HU|ro_RO|sk_SK|sl_SI|pl_PL)/) { - push @aliases, "$_\tcs_CZ\n"; - } - else { - push @aliases, "$_\ten_US\n"; - } - } - } -} - -open F, ">/tmp/locale.alias"; -print F @aliases; -close F; - -build_archive 1; - - -sub build_archive -{ - my ($with_aliases, $localedef); - - $with_aliases = shift; - - $localedef = "localedef --archive"; - $localedef .= " --alias-file=/tmp/locale.alias" if $with_aliases; - - system "mkdir -p /tmp/usr/lib/locale"; - system "rm -f /tmp/usr/lib/locale/locale-archive"; - - for (@real_locales) { - @l = split /\//; - die "oops, wrong locale data" unless @l == 2; - $l = $l[0]; - $l =~ s/\..*$//; - print "$localedef --prefix=/tmp -c -i $l -f $l[1] $l[0]\n"; - die "oops, locale build failed" if system "$localedef --prefix=/tmp -c -i $l -f $l[1] $l[0]"; +system "rm -rf $tmp_locale"; +mkdir $tmp_locale, 0755; +system "cp -a usr/lib/locale/en_US.utf8 $tmp_locale"; + +for (<usr/lib/locale/*>) { + s#^.*/##; + symlink "en_US.utf8", "$tmp_locale/$_"; + if(!/@/) { + s#\..*$##; + $_ .= ".utf8"; + symlink "en_US.utf8", "$tmp_locale/$_"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/cd1/cd1.file_list new/installation-images-13.29/data/cd1/cd1.file_list --- old/installation-images-13.26/data/cd1/cd1.file_list 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-13.29/data/cd1/cd1.file_list 2012-02-13 15:27:42.000000000 +0100 @@ -0,0 +1,10 @@ +skelcd-openSUSE: + / + +skelcd-control-openSUSE: + / + +d CD1/boot/<arch> + +include gen/rpm.file_list + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/initrd/biostest.file_list new/installation-images-13.29/data/initrd/biostest.file_list --- old/installation-images-13.26/data/initrd/biostest.file_list 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.29/data/initrd/biostest.file_list 2012-02-13 12:12:48.000000000 +0100 @@ -6,8 +6,8 @@ /var/log/firmwarekit x run_biostest /bin -libpcre0: - /lib* +libpcre*: + / libnewt0_52: /usr/lib*/libnewt.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/initrd/initrd.file_list new/installation-images-13.29/data/initrd/initrd.file_list --- old/installation-images-13.26/data/initrd/initrd.file_list 2012-02-09 14:41:28.000000000 +0100 +++ new/installation-images-13.29/data/initrd/initrd.file_list 2012-02-16 12:48:55.000000000 +0100 @@ -325,17 +325,17 @@ /usr/bin/gpg{,2} d root/.gnupg -libbz2-1: - /lib*/libbz2.so* +libbz2-*: + / -libgcrypt11: - /lib*/libgcrypt.so* +libgcrypt*: + / -libgpg-error0: - /lib*/libgpg-error.so* +libgpg-error*: + / -libassuan0: - /usr/lib* +libassuan*: + / if exists(suse-build-key) suse-build-key: @@ -390,7 +390,7 @@ / libpopt*: - /lib* + / libelf*: / @@ -407,6 +407,9 @@ libcap*: / +libcap-ng*: + / + strace: /usr/bin/strace @@ -638,7 +641,7 @@ : # remove, ehm, things... -r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates +r /usr/share/doc /usr/share/info /usr/share/man /usr/share/locale /var/adm/fillup-templates # historical static device nodes x devz /devz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/rescue/rescue.file_list new/installation-images-13.29/data/rescue/rescue.file_list --- old/installation-images-13.26/data/rescue/rescue.file_list 2012-02-09 14:13:05.000000000 +0100 +++ new/installation-images-13.29/data/rescue/rescue.file_list 2012-02-16 12:52:33.000000000 +0100 @@ -29,7 +29,7 @@ / fillup: - /bin + / file: /etc @@ -54,8 +54,8 @@ /etc /sbin -libpcre0: - /lib* +libpcre*: + / mkinitrd: / @@ -142,10 +142,10 @@ / libacl*: - /lib* + / libpopt*: - /lib* + / unscd: /etc @@ -200,13 +200,13 @@ c 0755 0 0 /usr/bin/lessclose.sh zlib: - /lib*/libz.so* + / bzip2: - /usr/bin + / -libbz2-1: - /lib*/libbz2.so* +libbz2-*: + / if exists(lilo) lilo: @@ -422,7 +422,7 @@ / libnscd: - /lib*/libnscd.so* + / pwdutils: /etc @@ -469,6 +469,9 @@ klogd: / +systemd: + / + sysvinit: / @@ -511,8 +514,8 @@ vim-base: /usr/bin/xxd -gdbm: - /usr/lib*/libgdbm.so* +libgdbm*: + / hwinfo: /usr/lib* @@ -651,8 +654,8 @@ /usr/lib*/gconv/gconv-modules* # built in base system - d usr/lib/locale - e cp /tmp/usr/lib/locale/locale-archive usr/lib/locale + d usr/lib + e cp -a /tmp/locale usr/lib libmodman*: / @@ -753,6 +756,11 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +dbus-1: prein,postin + / +E prein +E postin + aaa_base: prein,postin E prein / @@ -805,11 +813,6 @@ / E postin -dbus-1: prein,postin - / -E prein -E postin - dmraid: postin / E postin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/root/machbunt.file_list new/installation-images-13.29/data/root/machbunt.file_list --- old/installation-images-13.26/data/root/machbunt.file_list 2012-02-09 14:30:27.000000000 +0100 +++ new/installation-images-13.29/data/root/machbunt.file_list 2012-02-16 12:55:41.000000000 +0100 @@ -248,11 +248,11 @@ /usr/lib* /usr/bin - libgcrypt11: - /lib*/libgcrypt.so* + libgcrypt*: + / - libgpg-error0: - /lib*/libgpg-error.so* + libgpg-error*: + / fvwm2: /usr/bin/fvwm{,2} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/root/root.file_list new/installation-images-13.29/data/root/root.file_list --- old/installation-images-13.26/data/root/root.file_list 2012-02-09 14:20:56.000000000 +0100 +++ new/installation-images-13.29/data/root/root.file_list 2012-02-16 12:53:42.000000000 +0100 @@ -41,10 +41,13 @@ # # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +systemd: + /usr/<lib> + libdb-*: / -gdbm: +libgdbm*: / libffi*: @@ -57,7 +60,7 @@ / fillup: - /bin + / insserv: /etc @@ -206,7 +209,7 @@ /usr/share/terminfo/i/ibm3151 libpopt*: - /lib* + / tcpd: /lib*/libwrap.so* @@ -692,22 +695,22 @@ / libopenssl*: - /lib* + / openssl: /usr/share/ssl hex: - /usr/bin/hex + / bzip2: - /usr/bin/b{,un}zip2 + / libbz2-*: / xz: - /usr/bin/xzdec + / liblzma*: / @@ -716,7 +719,7 @@ /sbin/ip libnscd: - /lib*/libnscd.so* + / unscd: /etc @@ -947,7 +950,8 @@ / sed: - /bin/sed + /bin + /usr/bin libcap-ng*: / diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/root/rooti18n.file_list new/installation-images-13.29/data/root/rooti18n.file_list --- old/installation-images-13.26/data/root/rooti18n.file_list 2012-02-09 14:26:01.000000000 +0100 +++ new/installation-images-13.29/data/root/rooti18n.file_list 2012-02-13 10:04:42.000000000 +0100 @@ -8,8 +8,8 @@ /usr/lib*/gconv/gconv-modules* # built in base system - d usr/lib/locale - e cp /tmp/usr/lib/locale/locale-archive usr/lib/locale + d usr/lib + e cp -a /tmp/locale usr/lib timezone: /usr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/data/root/zenroot.file_list new/installation-images-13.29/data/root/zenroot.file_list --- old/installation-images-13.26/data/root/zenroot.file_list 2012-02-09 14:32:07.000000000 +0100 +++ new/installation-images-13.29/data/root/zenroot.file_list 2012-02-16 12:54:31.000000000 +0100 @@ -44,7 +44,7 @@ /lib* fillup: - /bin + / insserv: /etc @@ -63,8 +63,8 @@ e postin r /var/adm/fillup-templates -libpcre0: - /lib* +libpcre*: + / tar: /bin/tar @@ -179,8 +179,8 @@ /usr/bin/reset /usr/bin/tset -libpopt0: - /lib* +libpopt*: + / tcpd: /lib*/libwrap.so* @@ -390,13 +390,13 @@ /lib*/libssl.so.* hex: - /usr/bin/hex + / bzip2: - /usr/bin/b{,un}zip2 + / -libbz2-1: - /lib*/libbz2.so* +libbz2-*: + / unzip: /usr/bin/unzip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/etc/config new/installation-images-13.29/etc/config --- old/installation-images-13.26/etc/config 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.29/etc/config 2012-02-15 13:04:50.000000000 +0100 @@ -34,8 +34,8 @@ ; extra kmps we need (',' separated list) [KMP] default = -i386 = virtualbox-guest -x86_64 = virtualbox-guest +i386 = virtualbox-guest,xen +x86_64 = virtualbox-guest,xen ; extra firmware packages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/etc/module.config new/installation-images-13.29/etc/module.config --- old/installation-images-13.26/etc/module.config 2012-02-09 14:44:15.000000000 +0100 +++ new/installation-images-13.29/etc/module.config 2012-02-15 11:28:16.000000000 +0100 @@ -49,7 +49,6 @@ blkcipher,-,- bonding,"Ethernet Bonding driver" chainiv,-,- -cicada,-Cicadia PHY driver configfs,-,- cpu_debug,-,- crc-t10dif,-,- @@ -59,7 +58,6 @@ crypto_wq,-,- cryptoloop cryptomgr,-,- -davicom,-Davicom PHY driver efficeon-agp,-,- eseqiv,-,- fscache,-,- @@ -69,7 +67,6 @@ i2c-algo-bit,-,- i2c-core,-,- i460-agp,-,- -icplus,-ICPlus IP175C PHY driver,- ide-scsi,-,-,,,1 input-polldev,,- intel-agp,-,- @@ -83,8 +80,6 @@ loop_fish2 lp lvm-mod -lxt,-Intel LXT PHY driver -marvell,-Marvell PHY driver mc13783-core mfd-core ncpfs @@ -96,7 +91,6 @@ pcf50633-core,-,- pci_hotplug pcompress,-,- -qsemi,-Quality Semiconductor PHY driver rbd,-,- rng,-,- scsi_dh,-,- @@ -113,6 +107,7 @@ snd soundcore sparse-keymap +ssb st,-SCSI Tape Driver,- sunrpc,-,- sworks-agp,-,- @@ -123,9 +118,11 @@ usbserial,-,- vboxguest,-,- vboxvideo,-,- +vboxsf,-,- via-agp,-,- vmwgfx wm8350,-,- +xen-balloon,-,- xen-platform-pci,-,- xenbus,-,- lis3lv02d,-,- @@ -174,7 +171,7 @@ [autoload] nvram,"-CMOS/NV-RAM driver",- --af_packet,"-Raw Packet Sockets",- +af_packet,"-Raw Packet Sockets",- ipv6 zlib_inflate nls_cp437,"-Codepage 437",- @@ -202,253 +199,58 @@ [IDE/RAID/SCSI] MoreModules=scsi-modules -ali14xx,"ALI 14XX IDE",,,,1 -alim15x3,"ALi 15x3 IDE",,,,1 -amd74xx,"AMD PCI and nVidia nForce IDE",,,,1 -atiixp,"ATI IXP IDE",,,,1 -cb710,ENE CB710 memory card reader cdrom,"-Uniform CD-ROM driver interface",-,,,1 -cmd64x,"CMD64x IDE",,,,1 -cs5520,"Cyrix 5510/5520 IDE",,,,1 -cs5530,"Cyrix/NS 5530 IDE",,,,1 -cs5535,"AMD/NS CS5535 IDE",,,,1 -cs5536,"CS5536 IDE",,,,1 -cy82c693,"Cypress CY82C693 IDE",,,,1 -dtc2278,"DTC-2278 VLB IDE",,,,1 generic,"Generic PCI IDE",,,,1 -hpt34x,"Highpoint 34x IDE",,,,1 -hpt366,"Highpoint HPT366 IDE",,,,1 -ht6560b,"HT-6560B EIDE",,,,1 i2o_block,"Intelligent I/O Block",,i2o_core i2o_config,,1 i2o_config,,,,,,0 i2o_core,,,,,,0 i2o_scsi,"Intelligent I/O SCSI",,i2o_core i2o_config,,1 -ibmvstgt,IBM Virtual SCSI Target,,,,1 -ide-4drives,Generic IDE with 4 drives/port,,,,1 -ide-cd,"ATAPI CD-ROM Driver",- -ide-cd_mod,"ATAPI CD-ROM Driver",- -ide-core,,- -ide-disk,"ATA Disk Driver",- -ide-floppy,"ATAPI floppy driver",,,,,0 -ide-gd_mod,"generic ATA/ATAPI disk driver",- -ide-generic,"Generic IDE Host Driver",,,,1 -ide-pci-generic,"Generic IDE Host Driver",,,,1 -ide-scsi,"SCSI emulation for IDE ATAPI",-,,,1 -ide_platform,"Platform IDE driver",,,,1 -ioc4,,-,,,1 -it8172,"ITE 8172 IDE",,,,1 -it821x,"ITE 821x IDE",,,,1 -mac53c94,"mac53c94 SCSI driver, old PowerMacs",,,,,0 -mesh,"MESH SCSI driver, old PowerMacs",,,,,0 -mptbase -mptfc,"Fusion MPT FC Host driver",,,,1,0 -mptsas,"Fusion MPT SAS Host driver",,,,1,0 -mptscsih,"Fusion MPT SCSI Host driver",,,,1,0 -mptspi,"Fusion MPT SPI Host driver",,,,1,0 mtd mtd_blkdevs mtdblock -ns87415,"NS87415 IDE",,,,1 -opti621,"Opti621 IDE",,,,1 -pdc202xx_new,"Promise PDC20268+ IDE",,,,1 -pdc202xx_old,"Promise (Older Controllers) IDE",,,,1 -piix,"Intel PIIX IDE",,,,1 -psi240i,"PSI-240i",,,,1 -qd65xx,"QDI QD65XX VLB IDE",,,,1 -ricoh_mmc,"Ricoh MMC Controller disabling driver" -rz1000,"RZ1000 IDE",,,,1 -sc1200,"NS SC1200 IDE",,,,1 -serverworks,"Serverworks OSB4/CSB5/CSB6 IDE",,,,1 -sgiioc4,"SGI IOC4 Base-IO",,,,1 -siimage,"SiI IDE",,,,1 -slc90e66,"SLC90E66 IDE",,,,1 -tc86c001,"TC86C001 IDE",,,,1 -tifm_core -triflex,"Compaq Triflex IDE",,,,1 -trm290,"Tekram TRM290 IDE",,,,1 -umc8672,"UMC 8672 IDE",,,,1 -via82cxxx,"VIA IDE",,,,1 +xen-scsi,"Xen SCSI frontend driver",,,,1 xen-vbd,"Xen Blockdevice Driver",,,,1 + kernel/drivers/ata/.*,,,,,1 -kernel/drivers/scsi/.*,,,,,1 kernel/drivers/block/.*,,,,,1 +kernel/drivers/ide/.*,,,,,1 +kernel/drivers/message/fusion/.*,,,,,1 +kernel/drivers/misc/.*,,,,,1 kernel/drivers/mmc/.*,,,,,1 +kernel/drivers/scsi/.*,,,,,1 [network] MoreModules=net-modules -pch_gbe,OKI semiconductor PCH Gigabit Ethernet -bna,Brocade 10G PCIe Ethernet -qlcnic,"QLogic 10 GbE Converged Ethernet" -ksz884x,"KSZ8841/2 PCI network" -atl1c,"Atheros 1000M Ethernet" -ethoc,"OpenCores Ethernet MAC Driver" -igbvf,"Intel 82576 Virtual Function Network Driver" -ixgbevf,"Intel(R) 82599 Virtual Function Driver" -be2net,"ServerEngines BladeEngine2 10Gb" -dnet,"Dave DNET Ethernet" -jme,"JMicron JMC2x0 PCI Express Ethernet" -et1011c,"LSI ET1011C PHY driver" -national,"NatSemi PHY driver" -ste10Xp,"STMicroelectronics STe10Xp PHY driver" -qlge,"QLogic 10 Gb PCI-E" -smsc9420 -3c359,"3Com 3c359 Tokenlink Velocity XL" -3c501,"3Com 3c501","io=0x280",,,,0 -3c503,"3Com 3c503","io=0x280",,8390 -3c505,"3Com 3c505","io=0x300" -3c507,"3Com 3c507","io=0x300" -3c509,"3Com 3c509/3c579" -3c515,"3Com 3c515" -3c59x,"3Com 3c59x/3c90x (592/595/597)" -typhoon,"3Com 3CR990 Gigabit Ethernet" -starfire,"Adaptec Starfire" -acenic,"Alteon AceNIC/3C985/NetGear GA620" -lance,"AMD LANCE and PCnet (AT1500/NE2100)" -pcnet32,"AMD PCI PCnet32 (PCI bus NE2100)" -amd8111e,"AMD8111 based 10/100 Ethernet" -ac3200,"Ansel Communications EISA 3200","io=0x300 irq=10 mem=0xd0000",8390,,,0 -bmac,"Apple bmac (PowerMacs with Mach64)" -mace,"Apple mace (old PowerMacs)" -arcnet,"ARCnet","io=0x300" -atp,"AT-LAN-TEC/RealTek pocket adaptor" -atl2,"Atheros Fast Ethernet" -at1700,"AT1700","io=0x260" -atl1,"Attansic 1000M Ethernet" -atl1e,"Atheros 1000M Ethernet" -b44,"Broadcom 4400 10/100 Ethernet" -bnx2,"Broadcom NetXtreme II BCM5706" -bnx2x,"Broadcom NetXtreme II BCM57710" -tg3,"Broadcom Tigon3 Ethernet" -e2100,"Cabletron E21xx","io=0x300",8390,,,0 -cxgb,"Chelsio T1 10Gb Ethernet" -cxgb3,"Chelsio T3 10Gb Ethernet" -cxgb3i,"Chelsio S3xx iSCSI" -cxgb3i_ddp,,- -cxgb4,"Chelsio T4" -tlan,"Compaq Netelligent 10/100/NetFlex 3",,,,,0 -cs89x0,"CS89x0" -de600,"D-Link DE600 pocket adaptor",,,,,0 -de620,"D-Link DE620 pocket adaptor","io=0x378 irq=7 bnc=1",,,,0 -dl2k,"D-Link DL2000 Gigabit Ethernet" -de4x5,"DE425, DE434, DE435, DE450, DE500" -tulip,"DEC Tulip (DC21x4x) PCI" -de2104x,"Intel/Digital 21040/1 series PCI Ethernet" -depca,"DEPCA,DE10x,DE200,DE201,DE202,DE422","io=0x200" -dgrs,"Digi Intl. RightSwitch SE-X" -dmfe,"DM9102 PCI Fast Ethernet",,,,,0 -rrunner,"Essential RoadRunner HIPPI" -enic,"Cisco 10G Ethernet" -ewrk3,"EtherWORKS 3 (DE203, DE204, DE205)","io=0x300" -hp100,"HP 10/100VG PCLAN (ISA, EISA, PCI)","hp100_port=0x380" -hp,"HP PCLAN (27245 / 27xxx)","io=0x300",8390 -hp-plus,"HP PCLAN+ (27247B and 27252A)","io=0x300",8390 -82596,"i82596 Ethernet Driver" -lanstreamer,"IBM Auto LANStreamer PCI Adapter" -olympic,"IBM Olympic chipset PCI Token Ring" -ibmtr,"IBM Tropic chipset token ring","io=0xa20" -eth16i,"ICL EtherTeam 16i/32","io=0x2a0" -eexpress,"Intel EtherExpress 16","io=0x300" -eepro100,"Intel EtherExpress Pro 100",,,,,0 -eepro,"Intel EtherExpressPro","io=0x260",,,,0 -e100,"Intel PRO/100 / EtherExpr. PRO/100" -e1000,"Intel PRO/1000 Gigabit" -e1000e,"Intel PRO/1000 PCI-E Gigabit" -ibm_emac,IBM EMAC -ixgb,"Intel(R) PRO/10GbE" -igb,"Intel Gigabit Ethernet" -ixgbe,"Intel(R) 10 Gigabit PCI Express" -ipg,"IC Plus IP1000 Gigabit" -abyss,"Madge Smart 16/4 PCI Mk2 Token Ring" -sky2,"Marvell Yukon 2 Gigabit Ethernet" -mlx4_en,"Mellanox ConnectX HCA Ethernet" -myri10ge,"Myricom 10G Ethernet" -fealnx,"Myson MTD-8xx PCI Ethernet" -mcs7830,"USB MCS7830" -ns83820,"National Semiconductor DP83820" -natsemi,"NatSemi DP8381x Ethernet" -ne2k-pci,"NE 2000 (PCI)",,8390 -ne,"NE 2000 / NE 1000 (ISA)","io=0x300",8390 -netxen_nic,"NetXen Multi port (1/10) Gigabit" -forcedeth,"nForce Ethernet" -ni5010,"NI5010" -ni52,"NI5210","io=0x360 irq=9 memstart=0xd0000 memend=0xd4000" -ni65,"ni6510 (am7990 \"lance\" chip)","io=0x360 irq=9 dma=0" -niu,"NIU Ethernet" -hamachi,"Packet Engines GNIC-II (Hamachi)" -yellowfin,"Packet Engines Yellowfin Gigabit" -lp486e,"Panther i82596 Ethernet" -plip,"PLIP (IP via parallel port)",,parport parport_pc,,,0 -qla3xxx,"QLogic ISP3XXX" -8139cp,"RealTek RTL8139 C+" -8139too,"RealTek RTL8139" -r8169,"RealTek RTL8169 Gigabit Ethernet" -r6040,"RDC R6040 NAPI PCI FastEthernet" -s2io,"S2IO 10GbE Server" -seeq8005,"SEEQ 8005 Ethernet" -xpnet,"SGI Cross Partition Network",,xpc -xp,--,- -xpc,--,- -sc92031,""Silan SC92031" -sis900,"SiS 900 PCI Fast Ethernet" -sis190,"SiS 190 Gigabit Ethernet" -epic100,"SMC 83c170 EPIC/100" -smc9194,"SMC 9194","io=0x200" -smctr,"SMC Token Ring Adapter" -smc-ultra,"SMC Ultra","io=0x200",8390 -sfc,"Solarflare Communications network" -cassini,"Sun Cassini(+) Ethernet" -sungem,"Sun GEM" -spidernet,"Spider Southbridge Gigabit Ethernet" -sunhme,"Sun Happy Meal 10/100baseT" -sundance,"Sundance ST201 \"Alta\" Ethernet" -skge,"SysKonnect Gigabit Ethernet" -skfp,"SysKonnect FDDI (SK-55xx/SK-58xx)" -tehuti,"Tehuti Networks(R)" -tmspci,"TMS380-based PCI Token Ring",,tms380tr,,,0 -proteon,"Proteon ISA Token Ring" -skisa,"SK-NET TMS380-based ISA Token Ring" -uli526x,"ULi M5261/M5263 Fast Ethernet" -via-velocity,"Velocity Gigabit Ethernet" -via-rhine,"VIA VT86c100A Rhine-II" -wd,"Western Digital WD80x3" -winbond-840,"Winbond W89c840 Ethernet" -mii,"-MII interface library",-,,,,1 -tms380tr,"-Network Driver Library for TMS380-based Token Ring Adapters" -sungem_phy,-,-,,,,1 -af_packet,-- -xircom_cb,"Xircom Ethernet CardBus Card" -xircom_tulip_cb,"Xircom CardBus Card (old driver)" -crc-ccitt,"CRC-CCITT calculations",- -libphy,-,- -xen-vnif,"Xen Network" -mlx4_core,"Mellanox ConnectX HCA low-level driver" -ssb,-,- -virtio_net,"Virtio network" -ipv6,-,- dca,-,- -fcoe -libfcoe -vxge,"Neterion's X3100 Series 10GbE PCIe I/O Virtualized Server Adapter" -tr,-,- +arcnet,"ARCnet","io=0x300" +bmac,"Apple bmac (PowerMacs with Mach64)" fddi,-,- +libphy,-,- +mace,"Apple mace (old PowerMacs)" +macvlan +macvtap mdio,-,- -ks8842,Timberdale KS8842 ethernet -ks8851,KS8851 Network driver -ks8851_mll,KS8851 Network driver -cnic,Broadcom NetXtreme II CNIC -vmxnet3,VMware vmxnet3 virtual NIC -cxgb4vf -bcm63xx -stmmac +plip,"PLIP (IP via parallel port)",,parport parport_pc,,,0 +ppp_generic,"Generic PPP layer" +pppox,"Linux PPP over X/Ethernet" pptp rionet -kernel/net/ipv4/.* +rrunner,"Essential RoadRunner HIPPI" slhc,"compress and uncompress tcp packets" -ppp_generic,"Generic PPP layer" -pppox,"Linux PPP over X/Ethernet" +spidernet,"Spider Southbridge Gigabit Ethernet" +virtio_net,"Virtio network" +vmxnet3,VMware vmxnet3 virtual NIC +xen-vnif,"Xen Network" + +kernel/drivers/net/ethernet/.* +kernel/drivers/net/fddi/.* +kernel/drivers/net/tokenring/.* kernel/drivers/net/can/.* +kernel/drivers/net/phy/.* +kernel/drivers/misc/sgi-xp/.* +kernel/net/ipv4/.* [WLAN] @@ -464,116 +266,40 @@ [PCMCIA] MoreModules=pcmcia-modules -pcmcia_core,PCMCIA Core Module -pcmcia,PCMCIA Core Module i82092,"I82092AA PCI-PCMCIA bridge",,,pcmcia i82365,Intel 82365 PC Card Controller,,,pcmcia -yenta_socket,Intel 82365 PC Card Controller,,,pcmcia -tcic,Databook TCIC-2 PCMCIA Controller,,,pcmcia +pcmcia,PCMCIA Core Module +pcmcia_core,PCMCIA Core Module +pcmcia_rsrc pd6729,Cirrus PD6729 PCI-PCMCIA bridge,,,pcmcia -rsrc_nonstatic,,- -3c574_cs,"3Com 3c574 \"RoadRunner\" Ethernet PCMCIA" -3c589_cs,"3Com 3c589 Ethernet PCMCIA" -aha152x_cs,"Adaptec AHA152X SCSI PCMCIA" -axnet_cs,"Asix AX88190-based Ethernet PCMCIA" -fdomain_cs,"Future Domain PCMCIA SCSI" -fmvj18x_cs,"fmvj18x Ethernet PCMCIA" -ibmtr_cs,"IBM Token Ring PCMCIA" -ide-cs,"IDE/ATA Disk PCMCIA" -nmclan_cs,"New Media Ethernet PCMCIA" -pcnet_cs,"NS8390-based Ethernet PCMCIA" -qlogic_cs,"Qlogic SCSI PCMCIA" -smc91c92_cs,"SMC91c92-based Ethernet PCMCIA" -sym53c500_cs,"SYM53C500 SCSI PCMCIA" -xirc2ps_cs,"Xircom Ethernet PCMCIA" -xircom_cb,"Xircom Ethernet CardBus" -nsp_cs,"NinjaSCSI-3 / NinjaSCSI-32Bi PCMCIA" sl811_cs,"REX-CFU1U PCMCIA" -pata_pcmcia,low-level driver for PCMCIA ATA,,,,1 -af_packet,-- -sdricoh_cs,"Ricoh PCMCIA Secure Digital Interface driver" -pcmcia_rsrc +tcic,Databook TCIC-2 PCMCIA Controller,,,pcmcia +yenta_socket,Intel 82365 PC Card Controller,,,pcmcia + +kernel/drivers/net/pcmcia/.* +kernel/drivers/scsi/pcmcia/.* [USB] MoreModules=usb-modules -usbcore,"-USB Core" -uhci-hcd,UHCI Host Controller Driver,,,usbhid -ohci-hcd,OHCI Host Controller Driver,,,usbhid -ehci-hcd,EHCI Host Controller Driver,,,usbhid -isp116x-hcd,ISP116x Host Controller Driver,,,usbhid -sl811-hcd,SL811HS Host Controller Driver,,,usbhid -r8a66597-hcd,R8A66597 USB Host Controller Driver,,,usbhid -isp1362-hcd,ISP1362 USB Host Controller Driver,,,usbhid -isp1760,ISP1760 USB-controller from NXP,,,usbhid -whci-hcd,"WHCI Wireless USB Host Controller Driver",,,usbhid -oxu210hp-hcd,"Oxford OXU210HP HCD driver",,,usbhid -u132-hcd,"U132 USB Host Controller Driver",,,usbhid -xhci,"'eXtensible' Host Controller (xHC) Driver" -xhci-hcd,"'eXtensible' Host Controller (xHC) Driver" -hwa-hc,"Host Wired Adapter USB Host Control" -kernel/drivers/hid/.* +ems_usb ff-memless -usb-storage,"USB Mass Storage Device Driver" -ub,"Low Performance USB Storage Driver" -sg,-- -mii,"-MII interface library",-,,,,1 -belkin_sa,"Belkin USB to Serial Adaptor" -cypress_m8,"Cypress USB to Serial Adaptor" -digi_acceleport,"Digi AccelePort USB to Serial Adaptor" -io_edgeport,"Edgeport USB to Serial Adaptor (1)" -io_ti,"Edgeport USB to Serial Adaptor (2)" -ftdi_sio,"FTDI USB to Serial Adaptor" -keyspan,"Keyspan USB to Serial Adaptor" -kl5kusb105,"KLSI KL5KUSB105 USB to Serial Adaptor" -mct_u232,"Magic Control Technology USB to Serial Adaptor" -option,"Option Card USB to Serial Adaptor" -oti6858,"OTi-6858 USB to Serial Adaptor" -pl2303,"Prolific PL2303 USB to Serial Adaptor" -qcserial,"Qualcomm USB Serial Driver" -cp2101,"Silicon Labs CP2101/CP2102 USB to Serial Adaptor" -cp210x,"Silicon Labs CP2101/CP2102 RS232 serial" -ti_usb_3410_5052,"TI 3410/5052 USB to Serial Adaptor" -ark3116,"ARK Micro 3116 USB Serial Driver" -sierra,"Sierra Wireless USB Serial driver" -spcp8x5,"SPCP8x5 USB to Serial Adaptor" -iuu_phoenix,"Infinity USB Unlimited Phoenix Driver" -opticon -siemens_mpi,"Siemens USB/MPI adapter" -ch341 -usbserial,--,- -wusbcore,,- -whci,,- +ftdi-elan umc,,- +usbcore,"-USB Core" uwb,,- -wusb-wa,,- +whci,,- wusb-cbaf,"Wireless USB Cable Based Association" -symbolserial -ums-alauda,Driver for Alauda-based card readers -ums-cypress,SAT support for Cypress USB/ATA bridges with ATACB -ums-datafab,Driver for Datafab USB Compact Flash reader -ums-freecom,Driver for Freecom USB/IDE adaptor -ums-isd200,Driver for In-System Design, Inc. ISD200 ASIC -ums-jumpshot,Driver for Lexar "Jumpshot" Compact Flash reader -ums-karma,Driver for Rio Karma -ums-onetouch,Maxtor USB OneTouch hard drive button driver -ums-sddr09,Driver for SanDisk SDDR-09 SmartMedia reader -ums-sddr55,Driver for SanDisk SDDR-55 SmartMedia reader -ums-usbat,Driver for SCM Microsystems (a.k.a. Shuttle) USB-ATAPI cable -ftdi-elan -ems_usb -qcaux -vivopay-serial,"ViVOpay USB Serial Driver" -usb_wwan -ssu100 -zio -ushc -uas -sam-ba +wusb-wa,,- +wusbcore,,- + +kernel/drivers/hid/.* kernel/drivers/net/usb/.* -ums-eneub6250 -ums-realtek +kernel/drivers/usb/host/.*,,,,usbhid +kernel/drivers/usb/serial/.* +kernel/drivers/usb/storage/.* + [FireWire] MoreModules=firewire-modules @@ -618,7 +344,6 @@ [ppc] rtas_flash,"rtas_flash" mii,"-MII interface library",- -af_packet,-- ; 3c59x,"3Com 3c59x/3c90x (592/595/597)" acenic,"Alteon AceNIC/3C985/NetGear GA620" @@ -805,7 +530,6 @@ fs3270 raw3270 tty3270 -ipv6 vmcp claw monwriter @@ -813,142 +537,45 @@ ; modules we do _not_ need [notuseful] -ide_cs,"PCMCIA IDE/ATA disk cards" -delkin_cb,"Delkin/ASKA/Workbit Cardbus IDE" -ide-tape,"IDE ATAPI streaming tape driver" -bpck6,"low-level protocol driver for the Micro Solutions \"BACKPACK\" parport IDE adapter" -pd,"high-level driver for parallel port IDE hard drives" -pf,"high-level driver for parallel port ATAPI disk drives" -pg,"paride: character device interface for sending ATAPI commands" -pt,"high-level driver for parallel port ATAPI tape drives" -raw1394,"Raw IEEE 1394 I/O support" -video1394,"OHCI-1394 Video support" -isense,"Fusion MPT: provide english readable strings in SCSI Error Report logging" -mptctl,"Fusion MPT misc device (ioctl) driver" -mptlan,"IP Over Fibre Channel device driver" -i2o_lan,"I2O LAN CLASS OSM" -i2o_proc,"procfs handler for Linux I2O subsystem" -i2o_bus,"I2O Bus Adapter OSM" -epsa2,"Shuttle Technologies EPSA2 ppSCSI Adapter" -epst,"Shuttle Technologies EPST ppSCSI Adapter" -onscsi,"OnSpec 90c26 ppSCSI Adapter" -ppscsi,"Common code for parport SCSI adapters" -sparcsi,"WBS-11A ppSCSI Adapter" -t348,"Trantor T348 ppSCSI Adapter" -t358,"Trantor T358 ppSCSI Adapter" -vpi0,"ppSCSI protocol module for the Iomega VPI0 adapter" -vpi2,"ppSCSI protocol module for the Iomega VPI2 adapter" -arlan,"Aironet Arlan 655 & IC2200 DS" -arlan-proc,"proc things for Aironet Arlan 655 card" -bsd_comp,"BSD compression code (PPP)" -defxx,"Digital DEFEA and DEFPA adapter (FDDI)" -dummy,"Dummy network driver" -eql,"Equalizer Load-balancer for serial network interfaces" -ethertap,"Ethertap network tap" -ppp_async,"PPP async serial channel driver" -ppp_deflate,"interface the zlib procedures for Deflate compression" -ppp_mppe,"MPPE \"compressor/decompressor\" module" -ppp_synctty,"PPP synchronous tty channel driver" -pppoe,"Linux PPP over Ethernet" -rcpci,"Red Creek Hardware VPN" -sb1000,"General Instruments SB1000 driver" -shaper,"Simple traffic shaper for Linux NET3" -slip,"SLIP protocol for kernel-based devices like TTY" -strip,"Starmode Radio IP (STRIP) for kernel-based devices like TTY" -tun,"Universal TUN/TAP device driver" -iflash2+_mtd,"Intel Series 2+ Flash devices" -iflash2_mtd,"Intel Series 2 and Series 100 Flash devices" -memory_cb,"memory interface driver for CardBus cards" -memory_cs,"general driver for accessing PCMCIA card memory via Bulk Memory Services" -netwave_cs,"Netwave AirSurfer Wireless LAN PC Card driver" -parport_cs,"PCMCIA parallel port adapters" -serial_cb,"CardBus serial devices" -serial_cs,"PCMCIA serial devices" -sram_mtd,"MTD for accessing static RAM" -ss5136dn_cs,"S.S Technologies 5136-DN-PCM PCMCIA CAN-Network interface card" -eth1394 -dv1394 -amdtp,"Audio and Music Data Transmission Protocol Driver (IEEE1394)" -cmp,"Connection Management Procedures (IEEE1394)" -pcifvnet,"some atm driver" -znet -iscsi_trgt -xfsidbg -ifb,"Intermediate Functional Block support" -; pmac floppy -monreader -vmlogrdr -parport_ax88796 -; various usb serial devs -airprime -cyberjack -empeg -garmin_gps -hp4x -ipaq -ipw -ir-usb -keyspan_pda -kobil_sct -omninet -safe_serial -visor -whiteheat -anydata +bpck6 +bsd_comp +caif_serial +cfspi_slave cm4000_cs cm4040_cs -smsc -vitesse -aircable -mos7720 -mos7840 -usb_debug -; -navman -ioc3 -scsi_dump -; -tape_3590 -vmwatchdog -ctcmpc -zfcp_hbaapi -funsoft +cuse +dummy +eql fixed -; -; use libata instead -jmicron -it8213 -; -broadcom -corgi_bl -; -macvlan,Driver for MAC address based VLANs -pppol2tp,PPP over L2TP over UDP -veth,"Virtual Ethernet Tunnel" -mdio-bitbang +hyper-v.suse_kmp_dummy +i2o_bus +i2o_proc +ifb +ioc3 ipwireless -ide-pnp -cmd640 -realtek -enc28j60 -p4-clockmod -sk98lin,"SysKonnect SK-98xx Gigabit Ethernet" -moto_modem -; +iscsi_trgt +joydev +kvm +monreader msdos -mdio-gpio -sfc_resource -; -cuse -; -vboxvfs -vboxsf -; -macvtap -micrel -; -caif_serial -cfspi_slave -; -ll_temac +parport_ax88796 +parport_cs +parport_serial +pd +pf +pg +ppp_async +ppp_deflate +ppp_mppe +ppp_synctty +pppoe +prism2_usb +pt +serial_cs +slip +tape_3590 +tun +veth +vmlogrdr +vmwatchdog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-13.26/lib/AddFiles.pm new/installation-images-13.29/lib/AddFiles.pm --- old/installation-images-13.26/lib/AddFiles.pm 2012-02-09 10:24:01.000000000 +0100 +++ new/installation-images-13.29/lib/AddFiles.pm 2012-02-13 15:26:48.000000000 +0100 @@ -69,7 +69,7 @@ my ($inc_file, $inc_it, $debug, $ifmsg, $ignore); my ($old_warn, $ver, $i); my (@scripts, $s, @s, %script); - my (@packs, $sl, $rpm_dir); + my (@packs, $sl, $rpm_dir, $rpm_file); my (@plog, $current_pack, %acc_all_files, %acc_pack_files, $account); my ($su, @requires); @@ -156,6 +156,7 @@ $ifmsg = sprintf " [%x|%x] %s\n", $if_val, $if_taken, $_; + s/<rpm_file>/$rpm_file/g; s/<(kernel_ver|kernel_mods|kernel_rpm|kernel_img|(suse|sles|sled)_release|theme|splash_theme|yast_theme|product|product_name|update_dir|load_image|min_memory|instsys_build_id|instsys_complain|instsys_complain_root|arch|lib)>/$ConfigData{$1}/g; for $i (qw( linuxrc lang extramod items )) { s/<$i>/$ENV{$i}/g if exists $ENV{$i}; @@ -247,6 +248,9 @@ next unless $rpm_dir; + $rpm_file = $rpm_dir; + $rpm_file =~ s#(/[^/]+)$#/.rpms$1.rpm#; + $current_pack = RealRPM($p)->{name}; $ver = ReadFile "$rpm_dir/version"; @@ -390,7 +394,7 @@ warn "$Script: failed to move $1 to $2"; } elsif(/^X\s+(\S+)\s+(\S+)$/) { - SUSystem "cp -dR $1 $dir/$2 2>/dev/null" and + SUSystem "cp -Lpr $1 $dir/$2 2>/dev/null" and print "$Script: $1 not copied to $2 (ignored)\n"; } elsif(/^g\s+(\S+)\s+(\S+)$/) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
