[PATCH] package_rpm: Add builddir macro to define source directory

[PATCH] package_rpm: Add builddir macro to define source directory

[Richard Purdie]

This allows its usage in other RPM macros so files in ${S} can be found.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 0f565ac..51910ec 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -689,6 +689,7 @@ python do_package_rpm () {
     cmd = rpmbuild
     cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
     cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
+    cmd = cmd + " --define '_builddir " + d.getVar('S', True) + "'"
     cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
     cmd = cmd + " --define '_use_internal_dependency_generator 0'"
     if perfiledeps:

Re: [PATCH] package_rpm: Add builddir macro to define source directory

[Mark Hatle]

On 8/29/14, 12:40 PM, Richard Purdie wrote:
> This allows its usage in other RPM macros so files in ${S} can be found.

Minor note, (traditional) RPM doesn't differentiate between the 'B' and the 'S'. 
  So build dir has historically be a combination of the two.

In this case, 'S' is likely better, because any additional post-processing is 
going to want to reference the generated objects and not the original source. 
(If the post processing needs the source, then globally S and B will need to be 
merged back together in a distribution specific configuration.)

So long story short, no objections.. just wanted to cover why S vs B makes sense 
here.

--Mark

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
> index 0f565ac..51910ec 100644
> --- a/meta/classes/package_rpm.bbclass
> +++ b/meta/classes/package_rpm.bbclass
> @@ -689,6 +689,7 @@ python do_package_rpm () {
>       cmd = rpmbuild
>       cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd
>       cmd = cmd + " --define '_topdir " + workdir + "' --define '_rpmdir " + pkgwritedir + "'"
> +    cmd = cmd + " --define '_builddir " + d.getVar('S', True) + "'"
>       cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
>       cmd = cmd + " --define '_use_internal_dependency_generator 0'"
>       if perfiledeps:
>
>