Generate correct initrd.addrsize file for System z (#647827)
On 11/29/2010 11:46 PM, Martin Gracik wrote:
Well, I can't say I know precisely what s390 needs, but I don't see
anything wrong with the patch.
I just have one question, the generic.ins file can be overriden or
changed to have some other values? Or why isn't the 0x00010408 address
as a constant in geninitrdsz.c if we only grep and pass it?
They are mostly constant. Based on previous releases, we have to change
these values in generic.ins from time to time. Ideally we won't have to
modify geninitrdsz.c anymore, but we might have to change generic.ins
one or more times. generic.ins has to exist in order to boot the
system, so since we need the value somewhere, I just kept it where it's
always been located.
This isn't a very elegant system and I would prefer that we generate
generic.ins entirely at image building time. This patch needs to go in
for 5.6 though and master can hopefully get a better solution since I
will have more time.
On Mon, 2010-11-29 at 16:59 -1000, David Cantrell wrote:
The previous fix just updated the generic.ins files, but that was not
enough. We also needed to modify geninitrdsz.c to compute the size of
the initrd.img file and add that to the initrd.addrsize file. Get the
load address from the generic.ins file.
bootdisk/s390/generic.ins | 2 +-
bootdisk/s390x/generic.ins | 2 +-
scripts/mk-images.s390 | 6 +++---
utils/geninitrdsz.c | 42 +++++++++++++++++++++++++++++++-----------
4 files changed, 36 insertions(+), 16 deletions(-)