From e0a8c21450d860364efc45a83074a4377b439905 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 9 Nov 2018 12:02:02 +0100 Subject: buildmaster/dependencies.php: allow to only show relevant architecture --- buildmaster/dependencies.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'buildmaster') diff --git a/buildmaster/dependencies.php b/buildmaster/dependencies.php index 1f6edb4..be41234 100644 --- a/buildmaster/dependencies.php +++ b/buildmaster/dependencies.php @@ -3,9 +3,21 @@ require_once "../init.php"; require_once BASE . "/lib/mysql.php"; $match = ""; +$dependency_arch_join = ""; if (isset($_GET["a"])) $match .= " AND `architectures`.`name`=from_base64(\"" . base64_encode($_GET["a"]) . "\")"; +if (isset($_GET["ba_a"])) { + $dependency_arch_join_pre = + " JOIN `architecture_compatibilities`" . + " ON `architecture_compatibilities`.`fully_compatible`" . + " AND `architecture_compatibilities`.`built_for`=`"; + $dependency_arch_join_post = + "`.`architecture`" . + " JOIN `architectures` AS `ba_a`" . + " ON `architecture_compatibilities`.`runs_on`=`ba_a`.`id`" . + " AND `ba_a`.`name`=from_base64(\"" . base64_encode($_GET["ba_a"]) . "\")"; +} if (isset($_GET["b"])) $match .= " AND `package_sources`.`pkgbase`=from_base64(\"" . base64_encode($_GET["b"]) . "\")"; if (isset($_GET["p"])) @@ -49,6 +61,8 @@ mysql_run_query( mysql_join_dependencies_install_targets() . $ignore_install_targets . mysql_join_dependencies_install_target_providers() . + mysql_join_install_target_providers_binary_packages('','itp_bp') . + $dependency_arch_join_pre . "itp_bp" . $dependency_arch_join_post . " WHERE (`dependency_types`.`relevant_for_binary_packages` OR `repository_stabilities`.`name`=\"unbuilt\")" . " LIMIT " . $limit ); @@ -66,6 +80,7 @@ mysql_run_query( mysql_join_binary_packages_install_target_providers() . mysql_join_install_target_providers_dependencies() . mysql_join_dependencies_binary_packages('','d_bp') . + $dependency_arch_join_pre . "d_bp" . $dependency_arch_join_post . mysql_join_binary_packages_binary_packages_in_repositories('d_bp','d_bpir') . mysql_join_binary_packages_in_repositories_repositories('d_bpir','d_r') . mysql_join_repositories_repository_stabilities('d_r','d_rs') . -- cgit v1.2.3