fixup! Introduce an rpm-controlled per-build directory

pmatilai · Feb 5, 2024 · 80a60aa · 80a60aa
1 parent 2e18582
commit 80a60aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
@@ -1284,7 +1284,7 @@ int parsePreamble(rpmSpec spec, int initialPackage)
 	    rpmPushMacro(spec->macros, "pkgbuilddir", NULL, spec->buildDir, RMIL_SPEC);
 	    rpmPushMacro(spec->macros, "_builddir", NULL, spec->buildDir, RMIL_SPEC);
 
-	    spec->buildRoot = rpmGetPath(spec->buildDir, "/%{_target_platform}-root", NULL);
+	    spec->buildRoot = rpmGetPath(spec->buildDir, "/%{_target_cpu}-%{_target_os}-root", NULL);
 	    rpmPushMacro(spec->macros, "buildroot", NULL, spec->buildRoot, RMIL_SPEC
 );
 	}

diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
@@ -2252,17 +2252,17 @@ runroot rpmbuild -bb --quiet /data/SPECS/filemiss.spec
 ],
 [1],
 [],
-[error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/share/doc/filemisstest-1.0/CREDITS
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/foo
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/bar{a,b}
+[error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/share/doc/filemisstest-1.0/CREDITS
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/foo
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/bar{a,b}
 cp: cannot stat '/build/BUILD/filemisstest-1.0-PKG/INSTALL': No such file or directory
 cp: cannot stat '/build/BUILD/filemisstest-1.0-PKG/README*': No such file or directory
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/share/doc/filemisstest-1.0/INSTALL
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/share/doc/filemisstest-1.0/README*
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/share/doc/filemisstest-1.0/INSTALL
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/share/doc/filemisstest-1.0/README*
 cp: cannot stat '/build/BUILD/filemisstest-1.0-PKG/LICENSE': No such file or directory
 cp: cannot stat '/build/BUILD/filemisstest-1.0-PKG/OTHERLICENSE?': No such file or directory
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/share/licenses/filemisstest-1.0/LICENSE
-error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-redhat-linux-root/opt/share/licenses/filemisstest-1.0/OTHERLICENSE?
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/share/licenses/filemisstest-1.0/LICENSE
+error: File not found: /build/BUILD/filemisstest-1.0-PKG/noarch-linux-root/opt/share/licenses/filemisstest-1.0/OTHERLICENSE?
 ],
 )
 RPMTEST_CLEANUP