diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-09-11 18:22:34 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-09-11 18:22:34 +0000 |
| commit | 7dd7abcc692ce8dec30b1758f096de5af55fb3dc (patch) | |
| tree | 4fbdbb3e45dbc2b230de317e7e8635dd5fa92605 | |
| parent | 586970dacc60b937e18c2d62a509c539ed7f8444 (diff) | |
| download | anaconda-7dd7abcc692ce8dec30b1758f096de5af55fb3dc.tar.gz anaconda-7dd7abcc692ce8dec30b1758f096de5af55fb3dc.tar.xz anaconda-7dd7abcc692ce8dec30b1758f096de5af55fb3dc.zip | |
* scripts/mk-images.s390: Use the size of the actual initrd.img for
the value in initrd.size.
* utils/Makefile: Only build and install geninitrdsz on zSeries.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | scripts/mk-images.s390 | 3 | ||||
| -rw-r--r-- | utils/Makefile | 14 |
3 files changed, 21 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2006-09-11 David Cantrell <dcantrell@redhat.com> + * scripts/mk-images.s390: Use the size of the actual initrd.img for + the value in initrd.size. + + * utils/Makefile: Only build and install geninitrdsz on zSeries. + +2006-09-11 David Cantrell <dcantrell@redhat.com> + * utils/geninitrdsz.c: Added util to generate the initrd.size file needed on zSeries (#197773). diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390 index fd5d7499c..eedfc585b 100644 --- a/scripts/mk-images.s390 +++ b/scripts/mk-images.s390 @@ -8,7 +8,8 @@ makeBootImages() { --initrdsize 20000 \ --loaderbin loader \ --modules "$INITRDMODS $S390MODS" - $GENINITRDSZ 12288475 $TOPDESTPATH/images/initrd.size + sz=$(ls -l $TOPDESTPATH/images/initrd.img | awk '{print $5}') + $GENINITRDSZ $sz $TOPDESTPATH/images/initrd.size cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img cp -v $BOOTDISKDIR/generic.prm $TOPDESTPATH/images/generic.prm diff --git a/utils/Makefile b/utils/Makefile index ee5bc9994..d459947a3 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -11,6 +11,14 @@ CFLAGS += -I.. -I$(LOADERDIR) -fno-strict-aliasing RPMCFLAGS = $(CFLAGS) -I/usr/include/rpm LDFLAGS = -g +UTILS = modlist moddeps snarffont mapshdr readmap +ifeq (s390, $(ARCH)) +UTILS += geninitrdsz +endif +ifeq (s390x, $(ARCH)) +UTILS += geninitrdsz +endif + ifeq (.depend,$(wildcard .depend)) TARGET=all else @@ -19,7 +27,7 @@ endif everything: $(TARGET) -all: modlist moddeps snarffont mapshdr readmap geninitrdsz +all: $(UTILS) modlist: modlist.o moduleinfo.o $(CC) $(LDFLAGS) -o modlist modlist.o moduleinfo.o $(LOADLIBES) @@ -57,7 +65,9 @@ install: all install -m755 modlist $(DESTDIR)/$(RUNTIMEDIR) install -m755 readmap $(DESTDIR)/$(RUNTIMEDIR) install -m755 mapshdr $(DESTDIR)/$(RUNTIMEDIR) - install -m755 geninitrdsz $(DESTDIR)/$(RUNTIMEDIR) + if [ -x geninitrdsz ]; then \ + install -m755 geninitrdsz $(DESTDIR)/$(RUNTIMEDIR) ; \ + fi clean: rm -f modlist moddeps snarffont mapshdr readmap geninitrdsz \ |