![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package installation-images
checked in at Sat Aug 23 00:38:12 CEST 2008.
--------
--- installation-images/installation-images.changes 2008-08-18 16:14:07.000000000 +0200
+++ installation-images/installation-images.changes 2008-08-22 16:13:34.624130000 +0200
@@ -2 +2,7 @@
-Mon Aug 18 16:13:44 CEST 2008 - snwint@suse.de
+Fri Aug 22 14:15:27 CEST 2008 - snwint@suse.de
+
+- merged Adrians OBS hack
+- assume no SLE branding in OBS
+
+-------------------------------------------------------------------
+Wed Aug 20 13:15:06 CEST 2008 - snwint@suse.de
@@ -11 +17 @@
-Wed Aug 13 16:28:49 CEST 2008 - adrian@suse.de
+Thu Jul 31 15:06:39 CEST 2008 - snwint@suse.de
@@ -13,5 +19,3 @@
-- fix package build in openSUSE:Factory
- -> firmware packages gets moved in
- -> font packages are not needed anymore, since they get loaded
- -> temporary disable virtualbox driver until virtualbox get fixed build
- -> temporary disable wlan-ng and at76_usb until build fix (needs uname hack)
+- reworked instsys scripts
+- added sax2 & gdb image
+- added branding images
Old:
----
installation-images-10.51.tar.bz2
New:
----
installation-images-11.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.q15997/_old 2008-08-23 00:34:48.000000000 +0200
+++ /var/tmp/diff_new_pack.q15997/_new 2008-08-23 00:34:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 10.51)
+# spec file for package installation-images (Version 11.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,25 +19,28 @@
Name: installation-images
+%if %(echo "%distribution" | grep -Ec '^openSUSE:Factory')
+%define has_SLES 0
+%else
+%define has_SLES 1
+%endif
%define build_xen 1
-BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme bootsplash cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-config 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 popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump
+BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-config gdb glibc-i18ndata hex icmpinfo 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 popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump
BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users
BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite3 util-linux
BuildRequires: gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare suse-build-key yast2-iscsi-client yast2-ncurses
BuildRequires: Mesa 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 cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace unfonts vim xntp yast2-devtools
-BuildRequires: bind-libs bind-utils lsscsi openldap2-client python sdparm smp_utils yast2-multipath
+BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace vim xntp yast2-devtools
+BuildRequires: bind-libs bind-utils lsscsi openldap2-client python sdparm smp_utils uuid-runtime yast2-multipath
# kmps
-BuildRequires: adaptec-firmware
%ifarch %ix86 x86_64
BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode ralink-firmware wireless-tools wpa_supplicant
-# FIXME: This needs the uname hack. We are in good progress to open source this via the post build checks.
-#BuildRequires: at76_usb-kmp-default wlan-ng-kmp-default
-#%if %{build_xen}
-#BuildRequires: at76_usb-kmp-xen wlan-ng-kmp-xen
-#%else
+BuildRequires: at76_usb-kmp-default wlan-ng-kmp-default
+%if %{build_xen}
+BuildRequires: at76_usb-kmp-xen wlan-ng-kmp-xen
+%else
#!BuildIgnore: kernel-xen
-#%endif
+%endif
%endif
BuildRequires: ltrace
%ifnarch s390 s390x
@@ -47,10 +50,8 @@
BuildRequires: librtas lilo pdisk powerpc-utils
BuildRequires: petitboot
%endif
-# FIXME: needs to be fixed with current gcc
-# BuildRequires: xorg-x11-driver-virtualbox-ose
%ifarch %ix86 x86_64
-BuildRequires: dhcp-client firmwarekit gfxboot-branding-openSUSE grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux yast2-vm
+BuildRequires: dhcp-client firmwarekit grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux xorg-x11-driver-virtualbox-ose yast2-vm
%endif
%ifarch %ix86
BuildRequires: dos2unix ftp ncpfs tftp
@@ -67,80 +68,30 @@
%ifarch s390x
BuildRequires: glibc-32bit
%endif
-%if %sles_version > 0
-BuildRequires: desktop-data-NLD yast2-theme-NLD
-BuildRequires: bootsplash-branding-SLED
-BuildRequires: bootsplash-branding-SLES
-%else
-BuildRequires: desktop-data-SuSE yast2-theme-openSUSE
+%ifarch %ix86 x86_64
+BuildRequires: bootsplash gfxboot-branding-openSUSE
BuildRequires: bootsplash-branding-openSUSE
+%if %has_sles
+BuildRequires: bootsplash-branding-SLED bootsplash-branding-SLES
%endif
-#
+%endif
+%if %has_sles
+BuildRequires: yast2-theme-SLED
+%endif
+BuildRequires: desktop-data-openSUSE yast2-theme-openSUSE
%ifnarch s390
-BuildRequires: blocxx-debuginfo blocxx-debugsource
-BuildRequires: boost-debuginfo boost-debugsource
-BuildRequires: bzip2-debuginfo bzip2-debugsource
-BuildRequires: curl-debuginfo curl-debugsource
-BuildRequires: dbus-1-debuginfo dbus-1-debugsource
-BuildRequires: dbus-1-glib-debuginfo dbus-1-glib-debugsource
-BuildRequires: e2fsprogs-debuginfo e2fsprogs-debugsource
-BuildRequires: expat-debuginfo expat-debugsource
-BuildRequires: fontconfig-debuginfo fontconfig-debugsource
-BuildRequires: freetype2-debuginfo freetype2-debugsource
-BuildRequires: gcc43-debuginfo gcc43-debugsource
-BuildRequires: glib2-debuginfo glib2-debugsource
-BuildRequires: glibc-debuginfo glibc-debugsource
-BuildRequires: hal-debuginfo hal-debugsource
-BuildRequires: hwinfo-debuginfo hwinfo-debugsource
-BuildRequires: icu-debuginfo icu-debugsource
-BuildRequires: jpeg-debuginfo jpeg-debugsource
-BuildRequires: kdelibs3-debuginfo kdelibs3-debugsource
-BuildRequires: libidn-debuginfo libidn-debugsource
-BuildRequires: libpng12-0-debuginfo libpng12-0-debugsource
-BuildRequires: libqt4-debuginfo libqt4-debugsource
-BuildRequires: libxcrypt-debuginfo libxcrypt-debugsource
-BuildRequires: libxml2-debuginfo libxml2-debugsource
-BuildRequires: libzypp-debuginfo libzypp-debugsource
-BuildRequires: openssl-debuginfo openssl-debugsource
-BuildRequires: pcre-debuginfo pcre-debugsource
-BuildRequires: perl-debuginfo perl-debugsource
-BuildRequires: perl-gettext-debuginfo perl-gettext-debugsource
-BuildRequires: qt3-debuginfo qt3-debugsource
-BuildRequires: rpm-debuginfo rpm-debugsource
-BuildRequires: sysfsutils-debuginfo sysfsutils-debugsource
-BuildRequires: wireless-tools-debuginfo wireless-tools-debugsource
-BuildRequires: xorg-x11-libICE-debuginfo xorg-x11-libICE-debugsource
-BuildRequires: xorg-x11-libSM-debuginfo xorg-x11-libSM-debugsource
-BuildRequires: xorg-x11-libX11-debuginfo xorg-x11-libX11-debugsource
-BuildRequires: xorg-x11-libXau-debuginfo xorg-x11-libXau-debugsource
-BuildRequires: xorg-x11-libXdmcp-debuginfo xorg-x11-libXdmcp-debugsource
-BuildRequires: xorg-x11-libXext-debuginfo xorg-x11-libXext-debugsource
-BuildRequires: xorg-x11-libXfixes-debuginfo xorg-x11-libXfixes-debugsource
-BuildRequires: xorg-x11-libXmu-debuginfo xorg-x11-libXmu-debugsource
-BuildRequires: xorg-x11-libXrender-debuginfo xorg-x11-libXrender-debugsource
-BuildRequires: xorg-x11-libfontenc-debuginfo xorg-x11-libfontenc-debugsource
-BuildRequires: xorg-x11-libs-debuginfo xorg-x11-libs-debugsource
-BuildRequires: xorg-x11-libxcb-debuginfo xorg-x11-libxcb-debugsource
-BuildRequires: xorg-x11-server-debuginfo xorg-x11-server-debugsource
-BuildRequires: yast2-core-debuginfo yast2-core-debugsource
-BuildRequires: yast2-hardware-detection-debuginfo yast2-hardware-detection-debugsource
-BuildRequires: yast2-perl-bindings-debuginfo yast2-perl-bindings-debugsource
-BuildRequires: yast2-pkg-bindings-debuginfo yast2-pkg-bindings-debugsource
-BuildRequires: yast2-qt-debuginfo yast2-qt-debugsource
-BuildRequires: yast2-xml-debuginfo yast2-xml-debugsource
-BuildRequires: zlib-debuginfo zlib-debugsource
+# BuildRequires: blocxx-debuginfo boost-debuginfo bzip2-debuginfo curl-debuginfo dbus-1-debuginfo dbus-1-glib-debuginfo e2fsprogs-debuginfo expat-debuginfo fontconfig-debuginfo freetype2-debuginfo gcc43-debuginfo glib2-debuginfo glibc-debuginfo hal-debuginfo hwinfo-debuginfo icu-debuginfo jpeg-debuginfo kdelibs3-debuginfo libidn-debuginfo libpng12-0-debuginfo libqt4-debuginfo libxcrypt-debuginfo libxml2-debuginfo libzypp-debuginfo openssl-debuginfo pcre-debuginfo perl-debuginfo perl-gettext-debuginfo qt3-debuginfo rpm-debuginfo sysfsutils-debuginfo wireless-tools-debuginfo xorg-x11-libICE-debuginfo xorg-x11-libSM-debuginfo xorg-x11-libX11-debuginfo xorg-x11-libXau-debuginfo xorg-x11-libXdmcp-debuginfo xorg-x11-libXext-debuginfo xorg-x11-libXfixes-debuginfo xorg-x11-libXmu-debuginfo xorg-x11-libXrender-debuginfo xorg-x11-libfontenc-debuginfo xorg-x11-libs-debuginfo xorg-x11-libxcb-debuginfo xorg-x11-server-debuginfo yast2-core-debuginfo yast2-hardware-detection-debuginfo yast2-perl-bindings-debuginfo yast2-pkg-bindings-debuginfo yast2-qt-debuginfo yast2-xml-debuginfo zlib-debuginfo
%endif
#
-#!BuildIgnore: grass
License: GPL v2 or later
Group: Metapackages
Provides: y2image
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 10.51
-Release: 2
-Source: installation-images-10.51.tar.bz2
+Version: 11.0
+Release: 1
+Source: installation-images-11.0.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -150,36 +101,25 @@
+%package -n install-initrd
+License: GPL v2 or later
+Group: System/Kernel
+AutoReqProv: off
+Summary: Create initrd for Installation
+Version: 1.0
+Release: 430
+
+%description -n install-initrd
+You can create an initrd for installation. Useful, for example, to set
+up a UML or XEN environment.
+
+
+
%prep
%setup
+rm -f /usr/lib/build/checks/04-check-filelist
%build
-# files go to CD1/boot/$boot_arch/
-%ifarch %ix86 x86_64 ppc ppc64 s390 s390x ia64
-boot_arch=%_arch
-%endif
-%ifarch s390
-export kernel=kernel-s390
-%endif
-export theme themes firsttheme
-themes="SuSE"
-%if %sles_version > 0
-themes="SLES NLD"
-%endif
-firsttheme=${themes/ */}
-function save_initrd_base {
- if [ "$theme" = "$firsttheme" -a -d tmp/initrd -a \! -f images/initrd-base.gz ] ; then
- ( cd tmp/initrd ; find . \! -wholename './modules' \! -wholename './lib/modules/*' | cpio --quiet -o -H newc | gzip -9c ) > images/initrd-base.gz
- fi
-}
-function save_initrd_config {
- [ "$1" = "" ] && exit 1
- if [ "$theme" = "$firsttheme" ] ; then
- mkdir "images/$1"
- ls -I module.config tmp/initrd/modules/ | sed -e 's#.*/##' >"images/$1/module.list"
- cp tmp/initrd/modules/module.config "images/$1/"
- fi
-}
# build id (for linuxrc to start the correct instsys)
export instsys_build_id=`bin/build_id`
# beta only: warn testers about wrong instsys
@@ -188,256 +128,54 @@
# export instsys_complain_root=2
# beta only: ignore non-critical errors
export debug=ignore
-# uncomment next line to get individual language parts
-export roottrans=0
-# uncomment next line to split off common part of root/rescue images
-export commonroot=1
-for theme in $themes ; do
-#
-# Because we really need the initrds for x86, we have to build them per
-# theme. For other archs, theme does not matter.
-#
-%ifarch %ix86 x86_64
-# cleanup from last theme
-rm -rf tmp/base
-# we need real xen initrd & kernel
-for flavor in xen ; do
- if rpm --quiet -q kernel-$flavor ; then
- kernel=kernel-$flavor make bootcd
- mv images/initrd images/initrd-$flavor-$theme
- mv images/boot.isolinux/linux images/vmlinuz-$flavor-$theme
- if [ "$theme" = "$firsttheme" ] ; then
- save_initrd_config $flavor
- fi
- rm -rf tmp/base
- fi
-done
-%else
-if [ "$theme" = "$firsttheme" ] ; then
- # save module config for specific kernels
- for flavor in xen ; do
- if rpm --quiet -q kernel-$flavor ; then
- kernel=kernel-$flavor kernel_img=System.map make initrd
- mv images/initrd images/initrd-$flavor
- save_initrd_config $flavor
- rm -rf tmp/base
- fi
- done
-fi
-%endif
-%ifarch %ix86
-# build special 1.44MB boot image for CD2
-make dirs
-make bootcd2
-%endif
-%ifarch %ix86 x86_64
-# build large boot images
-with_floppy=1 make bootcd
-rm -rf images/boot images/floppy
-mv images/boot.isolinux images/boot
-mv images/boot.isolinux.floppy images/floppy
-recode utf8..ibmpc
participants (1)
-
root@Hilbert.suse.de