[WIP,20/30] scripts/package: buildtar: modify use of ${srctree} to assume trailing slash

Message ID	fcab9c00fd264b4c83ca979a89da6f9ce3355c57.1709508292.git.ehem+linux@m5p.com (mailing list archive)
State	New
Headers	show Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E377038D for <linux-kbuild@vger.kernel.org>; Mon, 4 Mar 2024 02:37:15 +0000 (UTC) Message-Id: <fcab9c00fd264b4c83ca979a89da6f9ce3355c57.1709508292.git.ehem+linux@m5p.com> In-Reply-To: <cover.1709508290.git.ehem+linux@m5p.com> References: <cover.1709508290.git.ehem+linux@m5p.com> From: Elliott Mitchell <ehem+linux@m5p.com> Date: Fri, 1 Mar 2024 17:43:44 -0800 Subject: [WIP PATCH 20/30] scripts/package: buildtar: modify use of ${srctree} to assume trailing slash To: masahiroy@kernel.org, nathan@kernel.org, nicolas@fjasle.eu Cc: linux-kbuild@vger.kernel.org Precedence: bulk
Series	Adding trailing slash to $(tree) \| expand [WIP,00/30] Adding trailing slash to $(tree) [WIP,29/30] tools/build: modify uses of $(srctree) to assume trailing slash [WIP,06/30] build: modify uses of $(srctree) to assume trailing slash [WIP,07/30] build: modify uses of $(srctree) to assume trailing slash [WIP,11/30] scripts: modify uses of $(srctree) to assume trailing slash [WIP,08/30] build: modify uses of $(srctree) to assume trailing slash [WIP,12/30] scripts: modify uses of $(srctree) to assume trailing slash [WIP,01/30] build: replace uses of $(abspath ) with existing variables [WIP,16/30] scripts/dtc: dtx_diff: include trailing slash in ${srctree} variable [WIP,02/30] scripts/coccicheck: modify to handle ${srctree} with trailing slash [WIP,25/30] scripts/coccicheck: modify to handle ${srctree} with trailing slash [WIP,15/30] build/scripts: install.sh: modify use of ${srctree} for trailing slash [WIP,17/30] build/scripts: generate_initcall_order.pl: modify use of ${srctree} for trailing slash [WIP,18/30] build/scripts: streamline_config.pl: modify use of ${srctree} for trailing slash [WIP,14/30] build/scripts: link-vmlinux.sh: modify use of ${objtree} for trailing slash [WIP,19/30] scripts/package: mkdebian: modify use of ${srctree} to assume trailing slash [WIP,20/30] scripts/package: buildtar: modify use of ${srctree} to assume trailing slash [WIP,22/30] scripts/nsdeps: modify use of ${srctree} to assume trailing slash [WIP,23/30] build/scripts: makelst: modify suggested use of ${srctree} for trailing slash [WIP,21/30] scripts/package: mkspec: modify use of ${srctree} to assume trailing slash [WIP,24/30] scripts/generate_rust_analyzer.py: modify use of ${srctree} for trailing slash [WIP,03/30] build: handle optional trailing slash in $(srctree) [WIP,30/30] tools/build: modify uses of $(objtree) to assume trailing slash [WIP,10/30] scripts: modify uses of $(srctree) to assume trailing slash [WIP,28/30] tools/build: modify uses of $(srctree) to assume trailing slash [WIP,27/30] tools/build: add trailing slash to $(tree) [WIP,26/30] build: change $(tree) to empty for current directory [WIP,04/30] build: add trailing slash to $(*tree) [WIP,05/30] build: modify uses of $(srctree) to assume trailing slash [WIP,13/30] scripts: modify uses of $(objtree) to assume trailing slash [WIP,09/30] build: modify uses of $(objtree) to assume trailing slash

diff --git a/scripts/package/buildtar b/scripts/package/buildtar index 72c91a1b832f..f3281a52150e 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -30,8 +30,8 @@ mkdir -p -- "${tmpdir}/boot" # if grep -q '^CONFIG_OF_EARLY_FLATTREE=y' include/config/auto.conf; then # Only some architectures with OF support have this target - if [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then - $MAKE ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_DTBS_PATH="${tmpdir}/boot/dtbs/${KERNELRELEASE}" dtbs_install + if [ -d "${srctree}arch/${SRCARCH}/boot/dts" ]; then + $MAKE ARCH="${ARCH}" -f ${srctree}Makefile INSTALL_DTBS_PATH="${tmpdir}/boot/dtbs/${KERNELRELEASE}" dtbs_install fi fi @@ -39,15 +39,15 @@ fi # # Install modules # -make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install +make ARCH="${ARCH}" -f ${srctree}Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install # # Install basic kernel files # -cp -v -- "${objtree}/System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}" +cp -v -- "${objtree}System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}" cp -v -- "${KCONFIG_CONFIG}" "${tmpdir}/boot/config-${KERNELRELEASE}" -cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" +cp -v -- "${objtree}vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" # @@ -55,48 +55,48 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" # case "${ARCH}" in x86|i386|x86_64) - [ -f "${objtree}/arch/x86/boot/bzImage" ] && cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + [ -f "${objtree}arch/x86/boot/bzImage" ] && cp -v -- "${objtree}arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" ;; alpha) - [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + [ -f "${objtree}arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" ;; parisc*) [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - [ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}" + [ -f "${objtree}lifimage" ] && cp -v -- "${objtree}lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}" ;; mips) - if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then - cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" - elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" ]; then - cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" - elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.srec" ]; then - cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.srec" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" - elif [ -f "${objtree}/vmlinux.32" ]; then - cp -v -- "${objtree}/vmlinux.32" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - elif [ -f "${objtree}/vmlinux.64" ]; then - cp -v -- "${objtree}/vmlinux.64" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - elif [ -f "${objtree}/arch/mips/boot/vmlinux.bin" ]; then - cp -v -- "${objtree}/arch/mips/boot/vmlinux.bin" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - elif [ -f "${objtree}/arch/mips/boot/vmlinux.ecoff" ]; then - cp -v -- "${objtree}/arch/mips/boot/vmlinux.ecoff" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - elif [ -f "${objtree}/arch/mips/boot/vmlinux.srec" ]; then - cp -v -- "${objtree}/arch/mips/boot/vmlinux.srec" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" - elif [ -f "${objtree}/vmlinux" ]; then - cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + if [ -f "${objtree}arch/mips/boot/compressed/vmlinux.bin" ]; then + cp -v -- "${objtree}arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + elif [ -f "${objtree}arch/mips/boot/compressed/vmlinux.ecoff" ]; then + cp -v -- "${objtree}arch/mips/boot/compressed/vmlinux.ecoff" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + elif [ -f "${objtree}arch/mips/boot/compressed/vmlinux.srec" ]; then + cp -v -- "${objtree}arch/mips/boot/compressed/vmlinux.srec" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + elif [ -f "${objtree}vmlinux.32" ]; then + cp -v -- "${objtree}vmlinux.32" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + elif [ -f "${objtree}vmlinux.64" ]; then + cp -v -- "${objtree}vmlinux.64" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + elif [ -f "${objtree}arch/mips/boot/vmlinux.bin" ]; then + cp -v -- "${objtree}arch/mips/boot/vmlinux.bin" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + elif [ -f "${objtree}arch/mips/boot/vmlinux.ecoff" ]; then + cp -v -- "${objtree}arch/mips/boot/vmlinux.ecoff" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + elif [ -f "${objtree}arch/mips/boot/vmlinux.srec" ]; then + cp -v -- "${objtree}arch/mips/boot/vmlinux.srec" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + elif [ -f "${objtree}vmlinux" ]; then + cp -v -- "${objtree}vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" fi ;; arm64) for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo vmlinuz.efi ; do - if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then - cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" + if [ -f "${objtree}arch/arm64/boot/${i}" ] ; then + cp -v -- "${objtree}arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" break fi done ;; riscv) for i in Image.bz2 Image.gz Image; do - if [ -f "${objtree}/arch/riscv/boot/${i}" ] ; then - cp -v -- "${objtree}/arch/riscv/boot/${i}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" + if [ -f "${objtree}arch/riscv/boot/${i}" ] ; then + cp -v -- "${objtree}arch/riscv/boot/${i}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" break fi done

[WIP,20/30] scripts/package: buildtar: modify use of ${srctree} to assume trailing slash

Commit Message

Patch