Fix relative d-i path for kernel images and initrd in boot-hppa

This commit is contained in:
John Paul Adrian Glaubitz 2017-09-06 13:54:37 +02:00
parent 96691923d8
commit 9bfd41c22b
3 changed files with 15 additions and 15 deletions

View File

@ -50,12 +50,12 @@ else
$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
fi
K32=$(basename "$DI_DIR"/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/vmlinux-*-parisc64*)
K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
cp "$DI_DIR"/$K32 "$CDDIR/install"/$K32
cp "$DI_DIR"/$K64 "$CDDIR/install"/$K64
cp "$DI_DIR"/initrd.gz "$CDDIR/install"
cp "$DI_DIR"/cdrom/2.6/$K32 "$CDDIR/install"/$K32
cp "$DI_DIR"/cdrom/2.6/$K64 "$CDDIR/install"/$K64
cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDDIR/install"
add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"

View File

@ -47,12 +47,12 @@ else
$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
fi
K32=$(basename "$DI_DIR"/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/vmlinux-*-parisc64*)
K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
cp "$DI_DIR"/$K32 "$CDROOT/install"/$K32
cp "$DI_DIR"/$K64 "$CDROOT/install"/$K64
cp "$DI_DIR"/initrd.gz "$CDROOT/install"
cp "$DI_DIR"/cdrom/2.6/$K32 "$CDROOT/install"/$K32
cp "$DI_DIR"/cdrom/2.6/$K64 "$CDROOT/install"/$K64
cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDROOT/install"
install_languages "$CDROOT"

View File

@ -50,12 +50,12 @@ else
$WGET -r -nd --no-parent -P "$DI_DIR" "$DI_WWW_HOME"
fi
K32=$(basename "$DI_DIR"/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/vmlinux-*-parisc64*)
K32=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc)
K64=$(basename "$DI_DIR"/cdrom/2.6/vmlinux-*-parisc64*)
cp "$DI_DIR"/$K32 "$CDDIR/install"/$K32
cp "$DI_DIR"/$K64 "$CDDIR/install"/$K64
cp "$DI_DIR"/initrd.gz "$CDDIR/install"
cp "$DI_DIR"/cdrom/2.6/$K32 "$CDDIR/install"/$K32
cp "$DI_DIR"/cdrom/2.6/$K64 "$CDDIR/install"/$K64
cp "$DI_DIR"/cdrom/2.6/initrd.gz "$CDDIR/install"
add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-cmdline '0/vmlinux initrd=0/ramdisk${KERNEL_PARAMS:+ $KERNEL_PARAMS}'"
add_mkisofs_opt $CDDIR/../$1.mkisofs_opts "-hppa-kernel-32 install/$K32"