43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From 8ae7752efb0c771288d308772b24e16e370d9d40 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Wed, 26 Feb 2014 21:29:01 +0000
|
||
|
|
Subject: [PATCH] prepare: Remove duplicates from packages file.
|
||
|
|
|
||
|
|
---
|
||
|
|
src/prepare.ml | 10 +++++++---
|
||
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/prepare.ml b/src/prepare.ml
|
||
|
|
index 7dc26ec..4f7d6a1 100644
|
||
|
|
--- a/src/prepare.ml
|
||
|
|
+++ b/src/prepare.ml
|
||
|
|
@@ -50,10 +50,15 @@ let prepare debug (copy_kernel, dtb_wildcard, format, host_cpu,
|
||
|
|
flush stdout
|
||
|
|
);
|
||
|
|
|
||
|
|
- (* Write packages file - after removing missing packages, but before
|
||
|
|
- * resolving dependencies.
|
||
|
|
+ (* Convert input packages to a set. This removes duplicates. *)
|
||
|
|
+ let packages = package_set_of_list packages in
|
||
|
|
+
|
||
|
|
+ (* Write input packages to the 'packages' file. We don't need to
|
||
|
|
+ * write the dependencies because we do dependency resolution at
|
||
|
|
+ * build time too.
|
||
|
|
*)
|
||
|
|
let () =
|
||
|
|
+ let packages = PackageSet.elements packages in
|
||
|
|
let pkg_names = List.map ph.ph_package_name packages in
|
||
|
|
let pkg_names = List.sort compare pkg_names in
|
||
|
|
|
||
|
|
@@ -67,7 +72,6 @@ let prepare debug (copy_kernel, dtb_wildcard, format, host_cpu,
|
||
|
|
|
||
|
|
(* Resolve the dependencies. *)
|
||
|
|
let packages =
|
||
|
|
- let packages = package_set_of_list packages in
|
||
|
|
ph.ph_get_all_requires packages in
|
||
|
|
|
||
|
|
if debug >= 1 then (
|
||
|
|
--
|
||
|
|
1.8.5.3
|
||
|
|
|