2018-07-13 16:26:24

by Olof Johansson

[permalink] [raw]
Subject: [PATCH 1/2] kbuild: buildtar: remove crufty vax pieces

ARCH=vax isn't in mainline; it can be added back if/when it shows up.

Signed-off-by: Olof Johansson <[email protected]>
---
scripts/package/buildtar | 4 ----
1 file changed, 4 deletions(-)

diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index e8cc72a51b32..55887ac84ee4 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -84,10 +84,6 @@ case "${ARCH}" in
[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
[ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
;;
- vax)
- [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
- [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
- ;;
mips)
if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
--
2.11.0



2018-07-13 16:26:46

by Olof Johansson

[permalink] [raw]
Subject: [PATCH 2/2] kbuild: buildtar: add arm64 support

Make 'make tar-pkg' work on arm64.

Cc: Will Deacon <[email protected]>
Cc: Catalin Marinas <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
---
scripts/package/buildtar | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 55887ac84ee4..d624a07a4e77 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -105,6 +105,14 @@ case "${ARCH}" in
cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
fi
;;
+ arm64)
+ for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do
+ if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then
+ cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+ break
+ fi
+ done
+ ;;
*)
[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
echo "" >&2
--
2.11.0


2018-07-18 23:16:44

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 2/2] kbuild: buildtar: add arm64 support

2018-07-14 1:24 GMT+09:00 Olof Johansson <[email protected]>:
> Make 'make tar-pkg' work on arm64.
>
> Cc: Will Deacon <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> Signed-off-by: Olof Johansson <[email protected]>
> ---

Applied to linux-kbuild. Thanks!



> scripts/package/buildtar | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/scripts/package/buildtar b/scripts/package/buildtar
> index 55887ac84ee4..d624a07a4e77 100755
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -105,6 +105,14 @@ case "${ARCH}" in
> cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
> fi
> ;;
> + arm64)
> + for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do
> + if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then
> + cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
> + break
> + fi
> + done
> + ;;
> *)
> [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
> echo "" >&2
> --
> 2.11.0
>



--
Best Regards
Masahiro Yamada

2018-07-18 23:17:04

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/2] kbuild: buildtar: remove crufty vax pieces

2018-07-14 1:24 GMT+09:00 Olof Johansson <[email protected]>:
> ARCH=vax isn't in mainline; it can be added back if/when it shows up.
>
> Signed-off-by: Olof Johansson <[email protected]>
> ---

Applied to linux-kbuild. Thanks!


> scripts/package/buildtar | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/scripts/package/buildtar b/scripts/package/buildtar
> index e8cc72a51b32..55887ac84ee4 100755
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -84,10 +84,6 @@ case "${ARCH}" in
> [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
> [ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
> ;;
> - vax)
> - [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
> - [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
> - ;;
> mips)
> if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
> cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
> --
> 2.11.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html



--
Best Regards
Masahiro Yamada