Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add lookup for repo-specific config file path 

This could be useful to create another repository with packages that are
built using different compile flags, e.g. optimized for certain processors.
This commit is contained in:
Martchus 2021-11-14 22:59:46 +01:00
parent 2adc80e5fc
commit 6f652922cd
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
librepomgr/buildactions/buildactionprivate.h
View File

@ -562,6 +562,7 @@ private:
bool needsStaging = false;
};
[[nodiscard]] std::string locateGlobalConfigPath(const std::string &chrootDir, std::string_view trailingPath) const;
void makeMakepkgConfigFile(const std::filesystem::path &makepkgConfigPath);
void makePacmanConfigFile(
const std::filesystem::path &pacmanConfigPath, const std::vector<std::pair<std::string, std::multimap<std::string, std::string>>> &dbConfig);

18
librepomgr/buildactions/conductbuild.cpp
View File

@ -186,6 +186,18 @@ ConductBuild::ConductBuild(ServiceSetup &setup, const std::shared_ptr<BuildActio
{
}
[[nodiscard]] std::string ConductBuild::locateGlobalConfigPath(const std::string &chrootDir, std::string_view trailingPath) const
{
const auto start = (chrootDir.empty() ? m_setup.building.chrootDir : chrootDir) % "/config-";
const auto path = std::filesystem::path(start % m_buildPreparation.targetDb % '-' % m_buildPreparation.targetArch + trailingPath);
if (std::filesystem::exists(path)) {
// return repository-specific path if it exists
return path.string();
}
// fallback to generic (but still arch-specific) location
return start % m_buildPreparation.targetArch + trailingPath;
}
void ConductBuild::run()
{
// validate and read parameter/settings
@ -313,10 +325,8 @@ void ConductBuild::run()
reportError("The chroot directory is not configured.");
return;
}
m_globalPacmanConfigPath
= (chrootDir.empty() ? m_setup.building.chrootDir : chrootDir) % "/config-" % m_buildPreparation.targetArch + "/pacman.conf";
m_globalMakepkgConfigFilePath
= (chrootDir.empty() ? m_setup.building.chrootDir : chrootDir) % "/config-" % m_buildPreparation.targetArch + "/makepkg.conf";
m_globalPacmanConfigPath = locateGlobalConfigPath(chrootDir, "/pacman.conf");
m_globalMakepkgConfigFilePath = locateGlobalConfigPath(chrootDir, "/makepkg.conf");
if (m_globalCcacheDir.empty()) {
m_globalCcacheDir = m_setup.building.ccacheDir;
}