From 4674403d78ff86ea6b5d900c9f44588af08648fe Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 14 Oct 2016 15:53:34 +0100 Subject: Write macros to /etc/rpm/macros None is user specific and install_lang will only work there. --- lib/Iurt/Chroot.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 982c116..43a9ceb 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -16,7 +16,6 @@ our @EXPORT = qw( clean_chroot create_build_chroot create_temp_chroot - dump_rpmmacros remove_chroot ); @@ -69,7 +68,7 @@ sub clean_and_build_chroot { return; } - if (!dump_rpmmacros($run, $config, "$chroot/home/builder/.rpmmacros")) { + if (!dump_rpmmacros($run, $config, "$chroot/etc/rpm/macros")) { plog('ERROR', "Failed to dump macros"); return; } @@ -185,8 +184,6 @@ sub add_local_user { sudo($config, '--chroot', $chroot_tmp, 'usermod', '-d', "/home/$luser", '-u', $uid, '-o', '-l', $luser, 'root'); } - dump_rpmmacros($run, $config, "$chroot_tmp/home/$luser/.rpmmacros") or return; - 1; } -- cgit v1.2.1