Received-SPF: pass (google.com: domain of linux-kernel+bounces-216217-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <9811ea10d647ff687e140976ec50c5ebbe5ecbe5.camel@mastodonlabs.com>
In-Reply-To: <9811ea10d647ff687e140976ec50c5ebbe5ecbe5.camel@mastodonlabs.com>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 16 Jun 2024 18:39:14 +0900
Message-ID: <CAK7LNATR8NpxaBoJyPns__=pn8G_-8uOJZuB989R5q=7afO7Dw@mail.gmail.com>
Subject: Re: [PATCH 1/1] kbuild: Fix build target deb-pkg: ln: failed to
 create hard link
To: thayne@mastodonlabs.com
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sun, Jun 16, 2024 at 2:34=E2=80=AFPM Thayne Harbaugh <thayne@mastodonlab=
s.com> wrote:
>
> From: Thayne Harbaugh <thayne@mastodonlabs.com>
>
> The make deb-pkg target calls debian-orig which attempts to either
> hard link the source .tar to the build-output location or copy the
> source .tar to the build-output location.  The test to determine
> whether to ln or cp is incorrectly expanded by Make and consequently
> always attempts to ln the source .tar.  This fix corrects the escaping
> of '$' so that the test is expanded by the shell rather than by Make
> and appropriately selects between ln and cp.
>
> Signed-off-by: Thayne Harbaugh <thayne@mastodonlabs.com>


Applied with
Fixes: b44aa8c96e9e ("kbuild: deb-pkg: make .orig tarball a hard link
if possible")

Thanks!

> ---
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index 38653f3e8108..bf016af8bf8a 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -103,7 +103,7 @@ debian-orig: private version =3D $(shell dpkg-parsech=
angelog -S Version | sed 's/-
>  debian-orig: private orig-name =3D $(source)_$(version).orig.tar$(debian=
-orig-suffix)
>  debian-orig: mkdebian-opts =3D --need-source
>  debian-orig: linux.tar$(debian-orig-suffix) debian
> -       $(Q)if [ "$(df  --output=3Dtarget .. 2>/dev/null)" =3D "$(df --ou=
tput=3Dtarget $< 2>/dev/null)" ]; then \
> +       $(Q)if [ "$$(df  --output=3Dtarget .. 2>/dev/null)" =3D "$$(df --=
output=3Dtarget $< 2>/dev/null)" ]; then \
>                 ln -f $< ../$(orig-name); \
>         else \
>                 cp $< ../$(orig-name); \
> --
> 2.43.0
>
>


--=20
Best Regards
Masahiro Yamada