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

Locate PKGBUILDs locally also without variant dir 

This makes it possible to checkout
https://github.com/archlinux/svntogit-packages.git and
https://github.com/archlinux/svntogit-community.git locally to build
official packages.
This commit is contained in:
Martchus 2021-11-14 23:37:33 +01:00
parent 6f652922cd
commit 0f7718c934
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
librepomgr/buildactions/preparebuild.cpp
View File

@ -436,12 +436,16 @@ void PrepareBuild::fetchMissingBuildData()
}
for (const auto &pkgbuildsDir : m_pkgbuildsDirs) {
const auto variant = packageNameData.variant();
auto pkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant;
try {
if (!filesystem::exists(pkgbuildPath + "/PKGBUILD")) {
if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageName;
std::filesystem::exists(pkgbuildsDir % '/' % packageName + "/PKGBUILD")) {
buildData.originalSourceDirectory = tupleToString(pkgbuildPath);
} else if (const auto pkgbuildPath = pkgbuildsDir % '/' % packageNameData.actualName % '/' % variant;
filesystem::exists(pkgbuildPath + "/PKGBUILD")) {
buildData.originalSourceDirectory = tupleToString(pkgbuildPath);
} else {
continue;
}
buildData.originalSourceDirectory = tupleToString(pkgbuildPath);
filesystem::create_directories(buildData.sourceDirectory);
filesystem::copy(buildData.originalSourceDirectory, buildData.sourceDirectory, std::filesystem::copy_options::recursive);

2
srv/doc/server-config-example.conf
View File

@ -13,6 +13,8 @@ permissions = read_build_actions_details modify_build_actions perform_admin_acti
load_files_dbs = off
working_directory = /var/lib/buildservice/building
local_pkgbuilds_dir = /run/media/devel/projects/pkgbuilds
local_pkgbuilds_dir = /run/media/devel/src/svntogit-packages
local_pkgbuilds_dir = /run/media/devel/src/svntogit-community
ignore_local_pkgbuilds_regex = ^(some-package-name|yet-another-package-name)$
chroot_dir = /directory/with/enough/space/for/chroot
#presets = presets.json