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 0c47650167483a3a45d2ad4e803a30637899d1bc..ac2c02b619e069c937b717dd4b7c3d629c282b46 100644 (file)
--- 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 cc2e6a914250091faf9386877f0e9aecb9232374..79769fa6e40459fa76ce95ce51950920b1bf013e 100644 (file)
--- 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 6b2db6b2543dfdf9cbfa6dd757b0121a98f2f87f..574e02e377aaa7c51b5f706f32f7670f4f39c994 100644 (file)
--- 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,
 };