rpms/s390utils/F-11 0023-change-default-load-address-for-ramdisk.patch, 1.1, 1.2 s390utils.spec, 1.9, 1.10

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18634

Modified Files:
	0023-change-default-load-address-for-ramdisk.patch 
	s390utils.spec 
Log Message:
* Fri Oct  2 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-8
- really changed ramdisk load address (#526339)
- change the required and optional subpackages for the meta package


0023-change-default-load-address-for-ramdisk.patch:
 zipl.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0023-change-default-load-address-for-ramdisk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/0023-change-default-load-address-for-ramdisk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0023-change-default-load-address-for-ramdisk.patch	30 Sep 2009 19:33:32 -0000	1.1
+++ 0023-change-default-load-address-for-ramdisk.patch	4 Oct 2009 15:57:10 -0000	1.2
@@ -1,27 +1,27 @@
-From bfe74e60ab6529986a7c251042d17d57a3ccf675 Mon Sep 17 00:00:00 2001
+From 10886e2ec85474a8b4646b725a240d388dcdccee Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
-Date: Wed, 30 Sep 2009 18:19:23 +0200
+Date: Sun, 4 Oct 2009 17:46:16 +0200
 Subject: [PATCH 23/25] change default load address for ramdisk
 
 The default load address for the initial ramdisk is changed from
-0x100000 to 0x200000 to allow larger kernels to be loaded.
+0x800000 to 0x2000000 to allow larger kernels to be loaded.
 ---
  zipl/include/zipl.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h
-index 1f70e48..0f04072 100644
+index 1f70e48..d2d26dd 100644
 --- a/zipl/include/zipl.h
 +++ b/zipl/include/zipl.h
-@@ -21,7 +21,7 @@
- #define ZIPL_STAGE3_ENTRY_ADDRESS	0xa028LL
+@@ -22,7 +22,7 @@
  #define DEFAULT_PARMFILE_ADDRESS	0x1000LL
  #define DEFAULT_STAGE3_ADDRESS		0xa000LL
--#define DEFAULT_IMAGE_ADDRESS		0x10000LL
-+#define DEFAULT_IMAGE_ADDRESS		0x20000LL
- #define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
+ #define DEFAULT_IMAGE_ADDRESS		0x10000LL
+-#define DEFAULT_RAMDISK_ADDRESS 	0x800000LL
++#define DEFAULT_RAMDISK_ADDRESS 	0x2000000LL
  
  #define PSW_ADDRESS_MASK		0x000000007fffffffLL
+ #define PSW_LOAD			0x0008000080000000LL
 -- 
 1.6.3.3
 


Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- s390utils.spec	30 Sep 2009 19:33:32 -0000	1.9
+++ s390utils.spec	4 Oct 2009 15:57:11 -0000	1.10
@@ -8,7 +8,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,9 +61,8 @@ Requires:       s390utils-base = %{epoch
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
+Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi = %{epoch}:%{version}-%{release}
-Requires:       s390utils-libzfcphbaapi-devel = %{epoch}:%{version}-%{release}
 Requires:       s390utils-cmsfs = %{epoch}:%{version}-%{release}
 
 
@@ -788,6 +787,10 @@ User-space development files for the s39
 
 
 %changelog
+* Fri Oct  2 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-8
+- really changed ramdisk load address (#526339)
+- change the required and optional subpackages for the meta package
+
 * Wed Sep 30 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-7
 - changed ramdisk load address (#526339)
 - updated zfcpconf.sh script to new sysfs interface (#526324)