[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 2/4] Rename geninitrdsz.c to gen-initrd-addr.c (#546422)




On 05/04/2010 11:40 PM, David Cantrell wrote:
> Rename the geninitrdsz.c program to gen-initrd-addr.c to more accurately

Rename the geninitrdsz.c program to gen-initrd-patch.c to more accurately

> reflect what it's generating.  Update Makefile.am and its usage in the
> buildinstall scripts.  The load address is provided as a shell variable
> in scripts/mk-images.s390.
> ---
>  scripts/mk-images       |    2 +-
>  scripts/mk-images.s390  |    9 +++--
>  utils/Makefile.am       |    2 +-
>  utils/gen-initrd-addr.c |   81 +++++++++++++++++++++++++++++++++++++++++++++++
>  utils/geninitrdsz.c     |   81 -----------------------------------------------
>  5 files changed, 89 insertions(+), 86 deletions(-)
>  create mode 100644 utils/gen-initrd-addr.c
>  delete mode 100644 utils/geninitrdsz.c
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index bf76ce3..a7e047e 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -160,7 +160,7 @@ mkdir -p $INSTIMGPATH
>  # Stuff that we need
>  TRIMPCIIDS=$IMGPATH/usr/lib/anaconda-runtime/trimpciids
>  GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
> -GENINITRDSZ=$IMGPATH/usr/lib/anaconda-runtime/geninitrdsz
> +GENINITRDADDR=$IMGPATH/usr/lib/anaconda-runtime/gen-initrd-addr

GENINITRDPATCH=$IMGPATH/usr/lib/anaconda-runtime/gen-initrd-patch

>  MKS390CDBOOT=$IMGPATH/usr/lib/anaconda-runtime/mk-s390-cdboot
>  GENMODINFO=$IMGPATH/usr/lib/anaconda-runtime/genmodinfo
>  KEYMAPS=$TMPDIR/keymaps-$BUILDARCH.$$
> diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
> index 2de6819..b2c4c92 100644
> --- a/scripts/mk-images.s390
> +++ b/scripts/mk-images.s390
> @@ -17,6 +17,10 @@
>  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
>  #
> 
> +# initrd.img load address for generic.ins LPAR booting
> +# See https://bugzilla.redhat.com/show_bug.cgi?id=546422 for details.
> +INITRD_ADDR=0x2000000
> +
>  getAllS390ModuleNames() {
>      s390dir="${KERNELROOT}/lib/modules/${version}/kernel/drivers/s390"
>      if [ -d "${s390dir}" ]; then
> @@ -33,8 +37,7 @@ makeBootImages() {
>  	    --initrdsize 20000 \
>  	    --loaderbin loader \
>  	    --modules "$INITRDMODS $(getAllS390ModuleNames)"
> -	sz=$(ls -l $TOPDESTPATH/images/initrd.img | awk '{print $5}')
> -	$GENINITRDSZ $sz $TOPDESTPATH/images/initrd.size
> +	$GENINITRDADDR $INITRD_ADDR $TOPDESTPATH/images/initrd.addr

	$GENINITRDPATCH $INITRD_ADDR $TOPDESTPATH/images/initrd.img
$TOPDESTPATH/images/initrd.patch

>  	cp -vf $KERNELROOT/boot/${KERNELNAME}-${version} $TOPDESTPATH/images/kernel.img
> 
>  	cp -v $BOOTDISKDIR/redhat.exec $TOPDESTPATH/images/redhat.exec
> @@ -51,7 +54,7 @@ makeBootImages() {
>  [images-$KERNELARCH]
>  kernel = images/kernel.img
>  initrd = images/initrd.img
> -initrd.size = images/initrd.size
> +initrd.addr = images/initrd.addr

initrd.patch = images/initrd.patch

>  generic.prm = images/generic.prm
>  generic.ins = generic.ins
>  cdboot.img = images/cdboot.img
> diff --git a/utils/Makefile.am b/utils/Makefile.am
> index bfc8fd4..a00e8c4 100644
> --- a/utils/Makefile.am
> +++ b/utils/Makefile.am
> @@ -24,7 +24,7 @@ noinst_PROGRAMS     = snarffont
>  dist_noinst_SCRIPTS = filtermoddeps
> 
>  if IS_S390
> -utils_PROGRAMS      += geninitrdsz mk-s390-cdboot
> +utils_PROGRAMS      += gen-initrd-addr mk-s390-cdboot

utils_PROGRAMS      += gen-initrd-patch mk-s390-cdboot

>  endif
> 
>  modlist_CFLAGS      = -I$(top_srcdir)/loader $(GLIB_CFLAGS)
> diff --git a/utils/gen-initrd-addr.c b/utils/gen-initrd-addr.c
> new file mode 100644
> index 0000000..68b8083
> --- /dev/null
> +++ b/utils/gen-initrd-addr.c

> diff --git a/utils/geninitrdsz.c b/utils/geninitrdsz.c
> deleted file mode 100644
> index b8c824a..0000000
> --- a/utils/geninitrdsz.c
> +++ /dev/null


Steffen

Linux on System z Development

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]