commit installation-images for openSUSE:Factory
Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2012-11-05 15:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images", Maintainer is "snwint@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2012-10-16 21:32:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2012-11-05 15:34:45.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 5 10:10:00 UTC 2012 - coolo@suse.com + +- more adoption to sysvinit drop and systemd 195 + +------------------------------------------------------------------- +Sat Oct 27 17:30:54 UTC 2012 - coolo@suse.com + +- adjust to package changes - add installation-images-13.56.diff + +------------------------------------------------------------------- New: ---- installation-images-13.56.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.N7kNoa/_old 2012-11-05 15:34:47.000000000 +0100 +++ /var/tmp/diff_new_pack.N7kNoa/_new 2012-11-05 15:34:47.000000000 +0100 @@ -90,6 +90,7 @@ BuildRequires: kernel-firmware BuildRequires: kexec-tools BuildRequires: krb5-devel +BuildRequires: less BuildRequires: libXi6 BuildRequires: libcares2 BuildRequires: libexpat1 @@ -102,6 +103,7 @@ BuildRequires: libpng-devel BuildRequires: libreiserfs BuildRequires: libreiserfs-devel +BuildRequires: libudev1 BuildRequires: libyui-ncurses-pkg4 BuildRequires: libyui-qt-graph4 BuildRequires: libyui-qt-pkg4 @@ -146,6 +148,8 @@ BuildRequires: perl-XML-NamespaceSupport BuildRequires: perl-XML-Parser BuildRequires: perl-XML-Simple +BuildRequires: systemd +BuildRequires: udev %if %with_plymouth BuildRequires: libkms1 BuildRequires: plymouth @@ -182,8 +186,8 @@ BuildRequires: strace BuildRequires: sysconfig BuildRequires: syslogd +BuildRequires: systemd-sysvinit BuildRequires: sysvinit -BuildRequires: sysvinit-init BuildRequires: tcpd-devel BuildRequires: telnet BuildRequires: telnet-server @@ -368,6 +372,7 @@ Version: 13.56 Release: 0 Source: installation-images-13.56.tar.bz2 +Patch0: installation-images-13.56.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -430,6 +435,7 @@ %prep %setup +%patch0 -p1 rm -f /usr/lib/build/checks/04-check-filelist %build ++++++ installation-images-13.56.diff ++++++ Index: installation-images-13.56/data/base/base.file_list =================================================================== --- installation-images-13.56.orig/data/base/base.file_list +++ installation-images-13.56/data/base/base.file_list @@ -137,6 +137,12 @@ rpm: r /usr/lib/rpm/rpm{get,put}text r /usr/bin/rpmqpack +libmagic*: + / + +libmagic-data: + / + libpopt*: / @@ -146,9 +152,6 @@ libelf*: liblua5_1: / -file: - /usr/lib*/libmagic.so.* - libncurses5: / @@ -157,8 +160,8 @@ terminfo-base: /usr/share/terminfo/l /usr/share/terminfo/v/vt10[02] -zlib: - /lib*/libz.so* +libz*: + / if arch eq 'i386' || arch eq 'x86_64' syslinux: @@ -216,6 +219,7 @@ e prein r /etc/{csh*,default*,mailcap,mime.types,permissions*} r /etc/{rc.d.README,runlevel.fallback,zshrc,cron.daily} /sbin + /usr/sbin r /etc/init.d/rc?.d/*kerneld r /etc/init.d/rc?.d/*cron r /etc/init.d/rc?.d/*pcnfsd @@ -224,8 +228,8 @@ r /etc/init.d/rc?.d/*nfs r /etc/init.d/rc?.d/*xdm /usr/bin r /usr/bin/ChangeSymlinks - /lib/YaST/SuSEconfig.functions /var/adm/fillup-templates + # /root/.gnupg/suse_build_key e postin r /var/adm/fillup-templates Index: installation-images-13.56/data/initrd/initrd.file_list =================================================================== --- installation-images-13.56.orig/data/initrd/initrd.file_list +++ installation-images-13.56/data/initrd/initrd.file_list @@ -236,7 +236,7 @@ krb5: libkeyutils*: / -zlib: +libz*: / coreutils: @@ -437,10 +437,10 @@ unscd: /etc/udev/rules.d ?xf86-input-vmmouse: - /lib/udev/rules.d + /usr/lib/udev/rules.d ?xf86-input-wacom: - /lib/udev/rules.d + /usr/lib/udev/rules.d ?xorg-x11-server: /etc/modprobe.d @@ -558,28 +558,27 @@ openssh: prein udev: /etc - /lib/udev - /sbin + /usr/lib/udev + /usr/bin E groupadd -r tape - # add some md devices statically - b 9 0 /lib/udev/devices/md0 - b 9 1 /lib/udev/devices/md1 - b 9 2 /lib/udev/devices/md2 - b 9 3 /lib/udev/devices/md3 - b 9 4 /lib/udev/devices/md4 - b 9 5 /lib/udev/devices/md5 - b 9 6 /lib/udev/devices/md6 - b 9 7 /lib/udev/devices/md7 - b 9 8 /lib/udev/devices/md8 - b 9 9 /lib/udev/devices/md9 - b 9 10 /lib/udev/devices/md10 - b 9 11 /lib/udev/devices/md11 - b 9 12 /lib/udev/devices/md12 - b 9 13 /lib/udev/devices/md13 - b 9 14 /lib/udev/devices/md14 - b 9 15 /lib/udev/devices/md15 - +# # add some md devices statically +# b 9 0 /usr/lib/udev/devices/md0 +# b 9 1 /usr/lib/udev/devices/md1 +# b 9 2 /usr/lib/udev/devices/md2 +# b 9 3 /usr/lib/udev/devices/md3 +# b 9 4 /usr/lib/udev/devices/md4 +# b 9 5 /usr/lib/udev/devices/md5 +# b 9 6 /usr/lib/udev/devices/md6 +# b 9 7 /usr/lib/udev/devices/md7 +# b 9 8 /usr/lib/udev/devices/md8 +# b 9 9 /usr/lib/udev/devices/md9 +# b 9 10 /usr/lib/udev/devices/md10 +# b 9 11 /usr/lib/udev/devices/md11 +# b 9 12 /usr/lib/udev/devices/md12 +# b 9 13 /usr/lib/udev/devices/md13 +# b 9 14 /usr/lib/udev/devices/md14 +# b 9 15 /usr/lib/udev/devices/md15 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -686,7 +685,7 @@ r /etc/mtab s /proc/self/mounts /etc/mtab # our own rules file which loads only pnp subsystem mods -x etc/80-drivers.rules /lib/udev/80-drivers.rules.no_modprobe +x etc/80-drivers.rules /usr/lib/udev/80-drivers.rules.no_modprobe # our own udevd start script x etc/myudevstart /bin Index: installation-images-13.56/data/rescue/hal.file_list =================================================================== --- installation-images-13.56.orig/data/rescue/hal.file_list +++ installation-images-13.56/data/rescue/hal.file_list @@ -34,8 +34,8 @@ pciutils: usbutils: /usr/share/usb.ids -zlib: - /lib*/libz.so* +libz*: + / libxml2: /usr/lib*/libxml2.so.* Index: installation-images-13.56/data/rescue/rescue.file_list =================================================================== --- installation-images-13.56.orig/data/rescue/rescue.file_list +++ installation-images-13.56/data/rescue/rescue.file_list @@ -54,12 +54,16 @@ aaa_base-extras: fillup: / -file: +libmagic*: + / + +libmagic-data: /etc - /usr/bin - /usr/lib*/libmagic.so.* /usr/share/misc +file: + /usr/bin + iproute2: / @@ -202,7 +206,7 @@ r /usr/bin/lessclose.sh t /usr/bin/lessclose.sh c 0755 0 0 /usr/bin/lessclose.sh -zlib: +libz*: / bzip2: @@ -437,10 +441,28 @@ klogd: systemd: / -sysvinit: +libqrencode*: + / + +libmicrohttpd*: + / + +libgnutls*: + / + +libhogweed*: + / + +libnettle*: + / + +libp11-kit*: + / + +libtasn1-*: / -sysvinit-init: +systemd-sysvinit: / libmount*: @@ -818,8 +840,8 @@ e touch etc/sysconfig/kernel # our own dhcp6c config x etc/dhcp6c.conf etc -e insserv -f -r etc/init.d/boot.rootfsck -r etc/init.d/boot.rootfsck +#e insserv -f -r etc/init.d/boot.rootfsck +#r etc/init.d/boot.rootfsck # stripped down kbd init (linuxrc does most) x etc/init.d/kbd_simple /etc/init.d/kbd_simple @@ -832,9 +854,9 @@ if arch eq 's390' || arch eq 's390x' endif # bnc #509181 -p umount.diff +#p umount.diff -e echo "cons:1235:respawn:/sbin/smart_agetty -L 42 console" >>etc/inittab +#e echo "cons:1235:respawn:/usr/sbin/smart_agetty -L 42 console" >>etc/inittab e echo console >>etc/securetty Index: installation-images-13.56/data/root/root.file_list =================================================================== --- installation-images-13.56.orig/data/root/root.file_list +++ installation-images-13.56/data/root/root.file_list @@ -47,6 +47,27 @@ libkmod*: systemd: / +libqrencode*: + / + +libmicrohttpd*: + / + +libgnutls*: + / + +libhogweed*: + / + +libnettle*: + / + +libp11-kit*: + / + +libtasn1-*: + / + libdb-*: / @@ -154,6 +175,12 @@ rpm: /usr/lib* r /usr/lib*/rpm-plugins/sepolicy.so +libmagic*: + / + +libmagic-data: + m /usr/share/misc/magic /etc/magic + libelf*: / @@ -237,8 +264,6 @@ libblkid*: / file: - m /usr/share/misc/magic /etc/magic - /usr/lib*/libmagic.so* /usr/bin/file ?efibootmgr: @@ -478,7 +503,7 @@ limal-perl: libblocxx*: / -zlib: +libz*: / libstdc++*: @@ -558,7 +583,7 @@ sysvinit-tools: / c 755 0 0 /sbin/showconsole -sysvinit-init: +systemd-sysvinit: / sysvinit: Index: installation-images-13.56/data/root/zenroot.file_list =================================================================== --- installation-images-13.56.orig/data/root/zenroot.file_list +++ installation-images-13.56/data/root/zenroot.file_list @@ -326,8 +326,8 @@ c 0755 0 0 /usr/share x /etc/ld.so.conf /etc -zlib: - /lib*/libz.so.1* +libz*: + / c 0755 0 0 /usr Index: installation-images-13.56/data/initrd/etc/myudevstart =================================================================== --- installation-images-13.56.orig/data/initrd/etc/myudevstart +++ installation-images-13.56/data/initrd/etc/myudevstart @@ -23,8 +23,8 @@ mkdir /dev/.udev mkdir /dev/.udev/queue # create devices -/sbin/udevadm trigger +/usr/bin/udevadm trigger # 10 min - just long enough -/sbin/udevadm settle --timeout=100 +/usr/bin/udevadm settle --timeout=100 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de