From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Jul 2021 13:39:58 +0000 (+0000)
Subject: request: Drop unused PAKFIRE_SOLVER_FORCE_BEST flag
X-Git-Tag: 0.9.28~1105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1c1dffcce82144b88957bc3688d7294f2f89a9d;p=pakfire.git

request: Drop unused PAKFIRE_SOLVER_FORCE_BEST flag

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 0c4765016..ac2c02b61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -624,7 +624,7 @@ TESTSUITE_LDADD = \
 TESTS_ENVIRONMENT = \
 	TEST_DATA_DIR="$(abs_top_srcdir)/tests/data" \
 	PAKFIRE_LOG=debug \
-	PYTHONPATH="$(top_srcdir)/.libs:$(top_srcdir)/src" \
+	#PYTHONPATH="$(top_srcdir)/.libs:$(top_srcdir)/src" \
 	topdir="$(shell pwd)"
 
 dist_check_SCRIPTS = \
diff --git a/contrib/config/distros/ipfire3.conf b/contrib/config/distros/ipfire3.conf
index cc2e6a914..79769fa6e 100644
--- a/contrib/config/distros/ipfire3.conf
+++ b/contrib/config/distros/ipfire3.conf
@@ -15,7 +15,7 @@ source_dl	= https://source.ipfire.org/source-3.x/
 
 [build]
 
-requires	= @Build
+requires	= pakfire-build, gcc, filesystem, ccache, /bin/bash, filesystem, coreutils, util-linux, diffutils, make, gcc, kernel-headers, tar, patch, xz, gzip, bzip2, strace, less, vim
 
 [repo:stable]
 description	= IPFire 3 - Stable Repository
diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h
index 6b2db6b25..574e02e37 100644
--- a/src/libpakfire/include/pakfire/request.h
+++ b/src/libpakfire/include/pakfire/request.h
@@ -40,7 +40,6 @@ enum pakfire_request_job_flags {
 
 enum _pakfire_solver_flags {
 	PAKFIRE_SOLVER_ALLOW_UNINSTALL    = 1 << 0,
-	PAKFIRE_SOLVER_FORCE_BEST         = 1 << 1,
 	PAKFIRE_SOLVER_ALLOW_DOWNGRADE    = 1 << 3,
 	PAKFIRE_SOLVER_ALLOW_VENDORCHANGE = 1 << 4,
 };