Steffen Winterfeldt 2009-06-02 15:23:43 +00:00 committed by Git OBS Bridge
parent 8b78ba07c2
commit 22107e29a8
6 changed files with 17 additions and 167 deletions

View File

@ -1,68 +0,0 @@
---
data/initrd/biostest.file_list | 2 +-
data/initrd/initrd.file_list | 5 +++--
data/rescue/hal.file_list | 3 ++-
data/root/zenroot.file_list | 4 +++-
4 files changed, 9 insertions(+), 5 deletions(-)
Index: installation-images-12.4/data/initrd/biostest.file_list
===================================================================
--- installation-images-12.4.orig/data/initrd/biostest.file_list
+++ installation-images-12.4/data/initrd/biostest.file_list
@@ -35,7 +35,7 @@ dhcp-client:
/sbin/dhclient
/var/lib/dhcp
-pmtools:
+acpica:
/usr/bin/acpixtract
/usr/bin/iasl
Index: installation-images-12.4/data/initrd/initrd.file_list
===================================================================
--- installation-images-12.4.orig/data/initrd/initrd.file_list
+++ installation-images-12.4/data/initrd/initrd.file_list
@@ -364,9 +364,10 @@ hwinfo:
/usr/sbin/hwinfo
if arch eq 'ia64' || arch eq 'i386' || arch eq 'x86_64'
- pmtools:
- /usr/sbin/dmidecode
+ acpica:
/usr/sbin/acpidump
+ dmidecode:
+ /usr/sbin/dmidecode
endif
if arch eq 'i386' || arch eq 'x86_64'
Index: installation-images-12.4/data/rescue/hal.file_list
===================================================================
--- installation-images-12.4.orig/data/rescue/hal.file_list
+++ installation-images-12.4/data/rescue/hal.file_list
@@ -75,8 +75,9 @@ udev:
r /sbin/*.static
if arch eq 'ia64' || arch eq 'i386' || arch eq 'x86_64'
- pmtools:
+ dmidecode:
/usr/sbin/dmidecode
+ acpica:
/usr/sbin/acpidump
endif
Index: installation-images-12.4/data/root/zenroot.file_list
===================================================================
--- installation-images-12.4.orig/data/root/zenroot.file_list
+++ installation-images-12.4/data/root/zenroot.file_list
@@ -386,8 +386,10 @@ ntfsprogs:
/usr/sbin/ntfsresize
/usr/lib*/libntfs.so*
-pmtools:
+dmidecode:
/usr/sbin/dmidecode
+
+acpica:
/usr/sbin/acpidump
sysconfig:

View File

@ -1,83 +0,0 @@
Index: installation-images-12.4/data/initrd/initrd.file_list
===================================================================
--- installation-images-12.4.orig/data/initrd/initrd.file_list
+++ installation-images-12.4/data/initrd/initrd.file_list
@@ -658,10 +658,10 @@ if arch eq 'i386' || arch eq 'x86_64'
endif
-libstdc++43:
+libstdc++44:
/usr/<lib>/libstdc++*.so*
-libgcc43:
+libgcc44:
/lib*
gzip:
Index: installation-images-12.4/data/rescue/rescue.file_list
===================================================================
--- installation-images-12.4.orig/data/rescue/rescue.file_list
+++ installation-images-12.4/data/rescue/rescue.file_list
@@ -145,7 +145,7 @@ nscd:
tcpd:
/lib*/libwrap.so*
-libgcc43:
+libgcc44:
/lib*
glibc:
@@ -738,7 +738,7 @@ smartmontools:
/etc
/usr/sbin
-libstdc++43:
+libstdc++44:
/usr/<lib>/libstdc++*.so*
kpartx:
Index: installation-images-12.4/data/root/root.file_list
===================================================================
--- installation-images-12.4.orig/data/root/root.file_list
+++ installation-images-12.4/data/root/root.file_list
@@ -190,7 +190,7 @@ popt:
tcpd:
/lib*/libwrap.so*
-libgcc43:
+libgcc44:
/lib*
glibc:
@@ -530,7 +530,7 @@ zlib:
c 0755 0 0 /usr
-libstdc++43:
+libstdc++44:
/usr/<lib>/libstdc++*.so*
eject:
Index: installation-images-12.4/data/root/zenroot.file_list
===================================================================
--- installation-images-12.4.orig/data/root/zenroot.file_list
+++ installation-images-12.4/data/root/zenroot.file_list
@@ -164,7 +164,7 @@ popt:
tcpd:
/lib*/libwrap.so*
-libgcc43:
+libgcc44:
/lib*
glibc:
@@ -309,7 +309,7 @@ zlib:
c 0755 0 0 /usr
-libstdc++43:
+libstdc++44:
/usr/<lib>/libstdc++*.so*
eject:

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:caaa8e22e52171e4f07a885fb65b96ca18a7705f7469f7520da7e343dd6d5ced
size 175698

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c99976084487646775aa09851cf9f5b82f6b766edfb9736658a324fadcca35f4
size 171116

View File

@ -1,8 +1,9 @@
-------------------------------------------------------------------
Tue May 26 16:06:51 CEST 2009 - trenn@suse.de
Tue Jun 2 17:21:08 CEST 2009 - snwint@suse.de
- pmtools gets split into dmidecode and acpica -> adjust BuildRequires
and whatever else is needed.
and whatever else is needed
- adjust to new kernel
-------------------------------------------------------------------
Sun May 17 17:59:20 CEST 2009 - coolo@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package installation-images (Version 12.3)
# spec file for package installation-images (Version 12.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -53,7 +53,7 @@ BuildRequires: pdisk
BuildRequires: kernel-ppc64-extra powerpc-utils
%endif
%ifarch %ix86 x86_64
BuildRequires: dhcp-client elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ acpica dmidecode syslinux virtualbox-ose-kmp-default xorg-x11-driver-virtualbox-ose yast2-vm
BuildRequires: dhcp-client elilo firmwarekit grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux virtualbox-ose-kmp-default xorg-x11-driver-virtualbox-ose yast2-vm
%endif
%ifarch %ix86
BuildRequires: dos2unix ftp ncpfs tftp
@ -62,7 +62,7 @@ BuildRequires: dos2unix ftp ncpfs tftp
BuildRequires: glibc-32bit libncurses5-32bit
%endif
%ifarch ia64
BuildRequires: efibootmgr elilo fpswa ia32el acpica dmidecode
BuildRequires: efibootmgr elilo fpswa ia32el pmtools
%endif
%ifarch s390 s390x
BuildRequires: kernel-installation-tapeipl yast2-reipl
@ -99,11 +99,9 @@ Provides: y2image
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
Version: 12.4
Version: 12.5
Release: 2
Source: installation-images-12.4.tar.bz2
Patch0: installation-images-12.4.diff
Patch1: adjust_pmtools_split.patch
Source: installation-images-12.5.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@ -120,7 +118,7 @@ Recommends: install-initrd-branding
AutoReqProv: off
Summary: Create initrd for Installation
Version: 1.0
Release: 536
Release: 538
PreReq: /bin/ln
%description -n install-initrd
@ -175,9 +173,6 @@ SLES theme for install-initrd package.
%prep
%setup
%patch0 -p1
%patch1 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
@ -269,6 +264,11 @@ rm -rf %{buildroot}
%ghost /usr/lib/install-initrd/branding
%changelog
* Sun May 17 2009 coolo@suse.de
- take gcc44 libraries
* Mon May 11 2009 snwint@suse.de
- added aria2c to instsys
- some package adjustments
* Mon Apr 20 2009 dmueller@suse.de
- remove kdelibs3 buildrequires
* Fri Apr 17 2009 snwint@suse.de